Moodle release 3.5.2

Feedback code was doing the following, which is incompatible with the
sec-patched quickforms lib:
- appending '[0]' to non-group element names, meaning type checks in
getCleanType() were falling back to PARAM_RAW instead of PARAM_INT,
and meaning _findValue() was comparing elements it thought to be arrays
with scalar submit values (worked with eval() implementation as the 0th
element of a string was the character, but not working when patched).
- external unit tests incorrectly testing multichoice questions in the
process_page tests - patched lib highlighted failures.

It was also doing the following:
- actively setting null as default element values instead of 0 for
radio buttons and dropdowns (for 'not selected'). This is incompatible
with more recent quickforms lib (see MDL-63070).
- creating groups using addElement instead of addGroup - not recommended

This patch addresses the above.

.eslintignore

@@ -9,8 +9,6 @@ auth/cas/CAS/
 enrol/lti/ims-blti/
 filter/algebra/AlgParser.pm
 filter/tex/mimetex.*
-lib/editor/atto/plugins/html/yui/src/codemirror/
-lib/editor/atto/plugins/html/yui/src/beautify/
 lib/editor/atto/yui/src/rangy/js/*.*
 lib/editor/tinymce/plugins/pdw/tinymce/
 lib/editor/tinymce/plugins/spellchecker/rpc.php

.eslintrc

@@ -203,7 +203,7 @@
       }
     },
     {
-      files: ["**/amd/src/*.js", "Gruntfile.js"],
+      files: ["**/amd/src/*.js"],
       // Check AMD with some slightly stricter rules.
       rules: {
         'no-unused-vars': 'error',

.gitignore

@@ -9,18 +9,10 @@
 #
 # See gitignore(5) man page for more details
 #
-
-# Swap files (vim)
-[._]*.s[a-v][a-z]
-[._]*.sw[a-p]
-[._]s[a-rt-v][a-z]
-[._]ss[a-gi-z]
-[._]sw[a-p]
-# Temporary files including undo
-*~
-#
 /config.php
 /lib/editor/tinymce/extra/tools/temp/
+*~
+*.swp
 /tags
 /TAGS
 /cscope.*

.jshintignore

@@ -1,2 +0,0 @@
-**/amd/**
-/*.js

.nvmrc

@@ -1 +0,0 @@
-v8.16.1

.stylelintignore

@@ -1,5 +1,4 @@
 # Generated by "grunt ignorefiles"
-**/yui/build/*
 theme/bootstrapbase/style/
 theme/clean/style/custom.css
 theme/more/style/custom.css
@@ -12,8 +11,6 @@ auth/cas/CAS/
 enrol/lti/ims-blti/
 filter/algebra/AlgParser.pm
 filter/tex/mimetex.*
-lib/editor/atto/plugins/html/yui/src/codemirror/
-lib/editor/atto/plugins/html/yui/src/beautify/
 lib/editor/atto/yui/src/rangy/js/*.*
 lib/editor/tinymce/plugins/pdw/tinymce/
 lib/editor/tinymce/plugins/spellchecker/rpc.php

.travis.yml

@@ -11,11 +11,6 @@ notifications:
 
 language: php
 
-dist: xenial
-
-services:
-    - mysql
-
 php:
     # We only run the highest and lowest supported versions to reduce the load on travis-ci.org.
     - 7.2
@@ -23,6 +18,10 @@ php:
 
 addons:
   postgresql: "9.6"
+  packages:
+    - mysql-server-5.6
+    - mysql-client-core-5.6
+    - mysql-client-5.6
 
 # Redis tests are currently failing on php 7.2 due to https://bugs.php.net/bug.php?id=75628
 # services:
@@ -77,10 +76,10 @@ install:
         then
             sudo mkdir /mnt/ramdisk
             sudo mount -t tmpfs -o size=1024m tmpfs /mnt/ramdisk
-            sudo service mysql stop
+            sudo stop mysql
             sudo mv /var/lib/mysql /mnt/ramdisk
             sudo ln -s /mnt/ramdisk/mysql /var/lib/mysql
-            sudo service mysql restart
+            sudo start mysql
         fi
     - >
         if [ "$DB" = 'pgsql' ];
@@ -208,7 +207,7 @@ before_script:
         # We need the official upstream for comparison
         git remote add upstream https://github.com/moodle/moodle.git;
 
-        git fetch upstream MOODLE_36_STABLE;
+        git fetch upstream MOODLE_35_STABLE;
         export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`";
         export GIT_COMMIT="$TRAVIS_COMMIT";
         export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD`
@@ -264,9 +263,7 @@ script:
         grunt ;
         # Add all files to the git index and then run diff --cached to see all changes.
         # This ensures that we get the status of all files, including new files.
-        # We ignore npm-shrinkwrap.json to make the tasks immune to npm changes.
         git add . ;
-        git reset -- npm-shrinkwrap.json ;
         git diff --cached --exit-code ;
       fi
 

Gruntfile.js

@@ -24,7 +24,6 @@
  * Grunt configuration
  */
 
-/* eslint-env node */
 module.exports = function(grunt) {
     var path = require('path'),
         tasks = {},
@@ -38,7 +37,7 @@ module.exports = function(grunt) {
     var expected = semver.validRange(grunt.file.readJSON('package.json').engines.node);
     var actual = semver.valid(process.version);
     if (!semver.satisfies(actual, expected)) {
-        grunt.fail.fatal('Node version not satisfied. Require ' + expected + ', version installed: ' + actual);
+        grunt.fail.fatal('Node version too old. Require ' + expected + ', version installed: ' + actual);
     }
 
     // Windows users can't run grunt in a subdirectory, so allow them to set
@@ -223,7 +222,6 @@ module.exports = function(grunt) {
       // Generate .stylelintignore.
       var stylelintIgnores = [
           '# Generated by "grunt ignorefiles"',
-          '**/yui/build/*',
           'theme/bootstrapbase/style/',
           'theme/clean/style/custom.css',
           'theme/more/style/custom.css',

admin/classes/form/purge_caches.php

@@ -1,75 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Form for selective purging of caches.
- *
- * @package    core
- * @copyright  2018 The Open University
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_admin\form;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir.'/formslib.php');
-
-/**
- * Form for selecting which caches to purge on admin/purgecaches.php
- *
- * @package   core
- * @copyright 2018 The Open University
- * @author    Mark Johnson <mark.johnson@open.ac.uk>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class purge_caches extends \moodleform {
-    /**
-     * Define a "Purge all caches" button, and a fieldset with checkboxes for selectively purging separate caches.
-     */
-    public function definition() {
-        $mform = $this->_form;
-        $mform->addElement('hidden', 'returnurl', $this->_customdata['returnurl']);
-        $mform->setType('returnurl', PARAM_LOCALURL);
-        $mform->addElement('submit', 'all', get_string('purgecaches', 'admin'));
-        $mform->addElement('header', 'purgecacheheader', get_string('purgeselectedcaches', 'admin'));
-        $checkboxes = [
-            $mform->createElement('advcheckbox', 'theme', '', get_string('purgethemecache', 'admin')),
-            $mform->createElement('advcheckbox', 'lang', '', get_string('purgelangcache', 'admin')),
-            $mform->createElement('advcheckbox', 'js', '', get_string('purgejscache', 'admin')),
-            $mform->createElement('advcheckbox', 'filter', '', get_string('purgefiltercache', 'admin')),
-            $mform->createElement('advcheckbox', 'muc', '', get_string('purgemuc', 'admin')),
-            $mform->createElement('advcheckbox', 'other', '', get_string('purgeothercaches', 'admin'))
-        ];
-        $mform->addGroup($checkboxes, 'purgeselectedoptions');
-        $mform->addElement('submit', 'purgeselectedcaches', get_string('purgeselectedcaches', 'admin'));
-    }
-
-    /**
-     * If the "Purge selected caches" button was pressed, ensure at least one cache was selected.
-     *
-     * @param array $data
-     * @param array $files
-     * @return array Error messages
-     */
-    public function validation($data, $files) {
-        $errors = [];
-        if (isset($data['purgeselectedcaches']) && empty(array_filter($data['purgeselectedoptions']))) {
-            $errors['purgeselectedoptions'] = get_string('purgecachesnoneselected', 'admin');
-        }
-        return $errors;
-    }
-}

admin/cli/install.php

@@ -514,105 +514,100 @@ if ($interactive) {
 $database = $databases[$CFG->dbtype];
 
 
-// We cannot do any validation until all DB connection data is provided.
-$hintdatabase = '';
-do {
-    echo $hintdatabase;
-
-    // Ask for db host.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('databasehost', 'install'));
-        if ($options['dbhost'] !== '') {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['dbhost']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-        $CFG->dbhost = cli_input($prompt, $options['dbhost']);
-
+// ask for db host
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('databasehost', 'install'));
+    if ($options['dbhost'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbhost']);
     } else {
-        $CFG->dbhost = $options['dbhost'];
+        $prompt = get_string('clitypevalue', 'admin');
     }
+    $CFG->dbhost = cli_input($prompt, $options['dbhost']);
 
-    // Ask for db name.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('databasename', 'install'));
-        if ($options['dbname'] !== '') {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['dbname']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-        $CFG->dbname = cli_input($prompt, $options['dbname']);
+} else {
+    $CFG->dbhost = $options['dbhost'];
+}
 
+// ask for db name
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('databasename', 'install'));
+    if ($options['dbname'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbname']);
     } else {
-        $CFG->dbname = $options['dbname'];
+        $prompt = get_string('clitypevalue', 'admin');
     }
+    $CFG->dbname = cli_input($prompt, $options['dbname']);
 
-    // Ask for db prefix.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('dbprefix', 'install'));
-        //TODO: solve somehow the prefix trouble for oci.
-        if ($options['prefix'] !== '') {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['prefix']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-        $CFG->prefix = cli_input($prompt, $options['prefix']);
+} else {
+    $CFG->dbname = $options['dbname'];
+}
 
+// ask for db prefix
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('dbprefix', 'install'));
+    //TODO: solve somehow the prefix trouble for oci
+    if ($options['prefix'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['prefix']);
     } else {
-        $CFG->prefix = $options['prefix'];
+        $prompt = get_string('clitypevalue', 'admin');
     }
+    $CFG->prefix = cli_input($prompt, $options['prefix']);
 
-    // Ask for db port.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('databaseport', 'install'));
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbport']);
-        $CFG->dboptions['dbport'] = (int) cli_input($prompt, $options['dbport']);
+} else {
+    $CFG->prefix = $options['prefix'];
+}
 
+// ask for db port
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('databaseport', 'install'));
+    $prompt = get_string('clitypevaluedefault', 'admin', $options['dbport']);
+    $CFG->dboptions['dbport'] = (int)cli_input($prompt, $options['dbport']);
+
+} else {
+    $CFG->dboptions['dbport'] = (int)$options['dbport'];
+}
+if ($CFG->dboptions['dbport'] <= 0) {
+    $CFG->dboptions['dbport'] = '';
+}
+
+// ask for db socket
+if ($CFG->ostype === 'WINDOWS') {
+    $CFG->dboptions['dbsocket'] = '';
+
+} else if ($interactive and empty($CFG->dboptions['dbport'])) {
+    cli_separator();
+    cli_heading(get_string('databasesocket', 'install'));
+    $prompt = get_string('clitypevaluedefault', 'admin', $options['dbsocket']);
+    $CFG->dboptions['dbsocket'] = cli_input($prompt, $options['dbsocket']);
+
+} else {
+    $CFG->dboptions['dbsocket'] = $options['dbsocket'];
+}
+
+// ask for db user
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('databaseuser', 'install'));
+    if ($options['dbuser'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbuser']);
     } else {
-        $CFG->dboptions['dbport'] = (int) $options['dbport'];
-    }
-    if ($CFG->dboptions['dbport'] <= 0) {
-        $CFG->dboptions['dbport'] = '';
+        $prompt = get_string('clitypevalue', 'admin');
     }
+    $CFG->dbuser = cli_input($prompt, $options['dbuser']);
 
-    // Ask for db socket.
-    if ($CFG->ostype === 'WINDOWS') {
-        $CFG->dboptions['dbsocket'] = '';
-
-    } else if ($interactive and empty($CFG->dboptions['dbport'])) {
-        cli_separator();
-        cli_heading(get_string('databasesocket', 'install'));
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbsocket']);
-        $CFG->dboptions['dbsocket'] = cli_input($prompt, $options['dbsocket']);
-
-    } else {
-        $CFG->dboptions['dbsocket'] = $options['dbsocket'];
-    }
-
-    // Ask for db user.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('databaseuser', 'install'));
-        if ($options['dbuser'] !== '') {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['dbuser']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-        $CFG->dbuser = cli_input($prompt, $options['dbuser']);
-
-    } else {
-        $CFG->dbuser = $options['dbuser'];
-    }
-
-    // Ask for db password.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('databasepass', 'install'));
+} else {
+    $CFG->dbuser = $options['dbuser'];
+}
 
+// ask for db password
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('databasepass', 'install'));
+    do {
         if ($options['dbpass'] !== '') {
             $prompt = get_string('clitypevaluedefault', 'admin', $options['dbpass']);
         } else {
@@ -620,23 +615,19 @@ do {
         }
 
         $CFG->dbpass = cli_input($prompt, $options['dbpass']);
-        if (function_exists('distro_pre_create_db')) { // Hook for distros needing to do something before DB creation.
-            $distro = distro_pre_create_db($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix,
-                    array('dbpersist' => 0, 'dbport' => $CFG->dboptions['dbport'], 'dbsocket' => $CFG->dboptions['dbsocket']),
-                    $distro);
+        if (function_exists('distro_pre_create_db')) { // Hook for distros needing to do something before DB creation
+            $distro = distro_pre_create_db($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbport'=>$CFG->dboptions['dbport'], 'dbsocket'=>$CFG->dboptions['dbsocket']), $distro);
         }
-        $hintdatabase = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix,
-                array('dbpersist' => 0, 'dbport' => $CFG->dboptions['dbport'], 'dbsocket' => $CFG->dboptions['dbsocket']));
+        $hint_database = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbport'=>$CFG->dboptions['dbport'], 'dbsocket'=>$CFG->dboptions['dbsocket']));
+    } while ($hint_database !== '');
 
-    } else {
-        $CFG->dbpass = $options['dbpass'];
-        $hintdatabase = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix,
-                array('dbpersist' => 0, 'dbport' => $CFG->dboptions['dbport'], 'dbsocket' => $CFG->dboptions['dbsocket']));
-        if ($hintdatabase !== '') {
-            cli_error(get_string('dbconnectionerror', 'install'));
-        }
+} else {
+    $CFG->dbpass = $options['dbpass'];
+    $hint_database = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbport'=>$CFG->dboptions['dbport'], 'dbsocket'=>$CFG->dboptions['dbsocket']));
+    if ($hint_database !== '') {
+        cli_error(get_string('dbconnectionerror', 'install'));
     }
-} while ($hintdatabase !== '');
+}
 
 // ask for fullname
 if ($interactive) {
@@ -719,7 +710,7 @@ if ($interactive) {
     cli_separator();
     cli_heading(get_string('cliadminemail', 'install'));
     $prompt = get_string('clitypevaluedefault', 'admin', $options['adminemail']);
-    $options['adminemail'] = cli_input($prompt, $options['adminemail']);
+    $options['adminemail'] = cli_input($prompt);
 }
 
 // Validate that the address provided was an e-mail address.

admin/cli/install_database.php

@@ -82,6 +82,11 @@ require_once($CFG->libdir.'/installlib.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/componentlib.class.php');
 
+// make sure no tables are installed yet
+if ($DB->get_tables() ) {
+    cli_error(get_string('clitablesexist', 'install'));
+}
+
 $CFG->early_install_lang = true;
 get_string_manager(true);
 
@@ -104,17 +109,12 @@ list($options, $unrecognized) = cli_get_params(
     )
 );
 
-// We show help text even if tables are installed.
+
 if ($options['help']) {
     echo $help;
     die;
 }
 
-// Make sure no tables are installed yet.
-if ($DB->get_tables() ) {
-    cli_error(get_string('clitablesexist', 'install'));
-}
-
 if (!$options['agree-license']) {
     cli_error('You have to agree to the license. --help prints out the help'); // TODO: localize
 }

admin/cli/purge_caches.php

@@ -28,16 +28,7 @@ define('CLI_SCRIPT', true);
 require(__DIR__.'/../../config.php');
 require_once($CFG->libdir.'/clilib.php');
 
-$longoptions = [
-    'help' => false,
-    'muc' => false,
-    'theme' => false,
-    'lang' => false,
-    'js' => false,
-    'filter' => false,
-    'other' => false
-];
-list($options, $unrecognized) = cli_get_params($longoptions, ['h' => 'help']);
+list($options, $unrecognized) = cli_get_params(array('help' => false), array('h' => 'help'));
 
 if ($unrecognized) {
     $unrecognized = implode("\n  ", $unrecognized);
@@ -45,32 +36,20 @@ if ($unrecognized) {
 }
 
 if ($options['help']) {
-    // The indentation of this string is "wrong" but this is to avoid a extra whitespace in console output.
-    $help = <<<EOF
-Invalidates Moodle internal caches
-
-Specific caches can be defined (alone or in combination) using arguments. If none are specified,
-all caches will be purged.
+    $help =
+"Invalidates all Moodle internal caches
 
 Options:
 -h, --help            Print out this help
-    --muc             Purge all MUC caches (includes lang cache)
-    --theme           Purge theme cache
-    --lang            Purge language string cache
-    --js              Purge JavaScript cache
-    --filter          Purge text filter cache
-    --other           Purge all file caches and other miscellaneous caches (may include MUC
-                      if using cachestore_file).
 
 Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/purge_caches.php
-
-EOF;
+\$sudo -u www-data /usr/bin/php admin/cli/purge_caches.php
+";
 
     echo $help;
     exit(0);
 }
 
-purge_caches(array_filter($options));
+purge_all_caches();
 
 exit(0);

admin/cli/upgrade.php

@@ -51,8 +51,7 @@ list($options, $unrecognized) = cli_get_params(
         'non-interactive'   => false,
         'allow-unstable'    => false,
         'help'              => false,
-        'lang'              => $lang,
-        'verbose-settings'  => false
+        'lang'              => $lang
     ),
     array(
         'h' => 'help'
@@ -85,9 +84,6 @@ Options:
                       site language if not set. Defaults to 'en' if the lang
                       parameter is invalid or if the language pack is not
                       installed.
---verbose-settings    Show new settings values. By default only the name of
-                      new core or plugin settings are displayed. This option
-                      outputs the new values as well as the setting name.
 -h, --help            Print out this help
 
 Example:
@@ -188,24 +184,9 @@ upgrade_noncore(true);
 // log in as admin - we need doanything permission when applying defaults
 \core\session\manager::set_user(get_admin());
 
-// Apply default settings and output those that have changed.
-cli_heading(get_string('cliupgradedefaultheading', 'admin'));
-$settingsoutput = admin_apply_default_settings(null, false);
-
-foreach ($settingsoutput as $setting => $value) {
-
-    if ($options['verbose-settings']) {
-        $stringvlaues = array(
-                'name' => $setting,
-                'defaultsetting' => var_export($value, true) // Expand objects.
-        );
-        echo get_string('cliupgradedefaultverbose', 'admin', $stringvlaues) . PHP_EOL;
-
-    } else {
-        echo get_string('cliupgradedefault', 'admin', $setting) . PHP_EOL;
-
-    }
-}
+// apply all default settings, just in case do it twice to fill all defaults
+admin_apply_default_settings(NULL, false);
+admin_apply_default_settings(NULL, false);
 
 // This needs to happen at the end to ensure it occurs after all caches
 // have been purged for the last time.

admin/environment.xml

@@ -2097,7 +2097,6 @@
       <VENDOR name="oracle" version="10.2" />
     </DATABASE>
     <PHP version="7.0.0" level="required">
-      <RESTRICT function="restrict_php_version_73" message="unsupportedphpversion73" />
     </PHP>
     <PCREUNICODE level="optional">
       <FEEDBACK>
@@ -2274,7 +2273,6 @@
       <VENDOR name="oracle" version="10.2" />
     </DATABASE>
     <PHP version="7.0.0" level="required">
-      <RESTRICT function="restrict_php_version_73" message="unsupportedphpversion73" />
     </PHP>
     <PCREUNICODE level="optional">
       <FEEDBACK>
@@ -2451,7 +2449,6 @@
       <VENDOR name="oracle" version="11.2" />
     </DATABASE>
     <PHP version="7.0.0" level="required">
-      <RESTRICT function="restrict_php_version_74" message="unsupportedphpversion74" />
     </PHP>
     <PCREUNICODE level="optional">
       <FEEDBACK>
@@ -2619,548 +2616,4 @@
       </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
-  <MOODLE version="3.7" requires="3.2">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="5.5.31" />
-      <VENDOR name="mysql" version="5.6" />
-      <VENDOR name="postgres" version="9.4" />
-      <VENDOR name="mssql" version="10.0" />
-      <VENDOR name="oracle" version="11.2" />
-    </DATABASE>
-    <PHP version="7.1.0" level="required">
-      <RESTRICT function="restrict_php_version_74" message="unsupportedphpversion74" />
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="opensslrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlreader" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="intlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-      <PHP_EXTENSION name="fileinfo" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="96M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="opcache.enable" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opcacherecommended" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbstorageengine" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="quizattemptsupgradedmessage" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="slashargumentswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unsupporteddbtablerowformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unoconvwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="libcurlwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfileformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfilepertable" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddblargeprefix" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="ishttpswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="incompleteunicodesupport" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="sixtyfourbitswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="3.8" requires="3.2">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="5.5.31" />
-      <VENDOR name="mysql" version="5.6" />
-      <VENDOR name="postgres" version="9.4" />
-      <VENDOR name="mssql" version="11.0" />
-      <VENDOR name="oracle" version="11.2" />
-    </DATABASE>
-    <PHP version="7.1.0" level="required">
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="opensslrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlreader" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="intlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-      <PHP_EXTENSION name="fileinfo" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="96M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="opcache.enable" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opcacherecommended" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbstorageengine" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="quizattemptsupgradedmessage" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="slashargumentswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unsupporteddbtablerowformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unoconvwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="libcurlwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfileformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfilepertable" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddblargeprefix" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="ishttpswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="incompleteunicodesupport" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="sixtyfourbitswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="3.9" requires="3.5">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="10.2.29" />
-      <VENDOR name="mysql" version="5.6" />
-      <VENDOR name="postgres" version="9.5" />
-      <VENDOR name="mssql" version="11.0" />
-      <VENDOR name="oracle" version="11.2" />
-    </DATABASE>
-    <PHP version="7.2.0" level="required">
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="mbstringrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="opensslrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlreader" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="intlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-      <PHP_EXTENSION name="fileinfo" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="96M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="opcache.enable" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opcacherecommended" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbstorageengine" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="quizattemptsupgradedmessage" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="slashargumentswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unsupporteddbtablerowformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unoconvwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="libcurlwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfileformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfilepertable" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddblargeprefix" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="ishttpswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="incompleteunicodesupport" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="sixtyfourbitswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/filters.php

@@ -28,6 +28,10 @@ require_once($CFG->libdir . '/adminlib.php');
 $action = optional_param('action', '', PARAM_ALPHA);
 $filterpath = optional_param('filterpath', '', PARAM_PLUGIN);
 
+require_login();
+$systemcontext = context_system::instance();
+require_capability('moodle/site:config', $systemcontext);
+
 admin_externalpage_setup('managefilters');
 
 // Clean up bogus filter states first.

admin/lock.php

@@ -1,96 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This file is used to display a categories sub categories, external pages, and settings.
- *
- * @package    admin
- * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once('../config.php');
-require_once("{$CFG->libdir}/adminlib.php");
-
-$contextid = required_param('id', PARAM_INT);
-$confirm = optional_param('confirm', null, PARAM_INT);
-$returnurl = optional_param('returnurl', null, PARAM_LOCALURL);
-
-$PAGE->set_url('/admin/lock.php', ['id' => $contextid]);
-
-list($context, $course, $cm) = get_context_info_array($contextid);
-
-$parentcontext = $context->get_parent_context();
-if ($parentcontext && !empty($parentcontext->locked)) {
-    // Can't make changes to a context whose parent is locked.
-    throw new \coding_exception('Not sure how you got here');
-}
-
-if ($course) {
-    $isfrontpage = ($course->id == SITEID);
-} else {
-    $isfrontpage = false;
-    $course = $SITE;
-}
-
-require_login($course, false, $cm);
-require_capability('moodle/site:managecontextlocks', $context);
-
-$PAGE->set_pagelayout('admin');
-$PAGE->navigation->clear_cache();
-
-$a = (object) [
-    'contextname' => $context->get_context_name(),
-];
-
-if (null !== $confirm && confirm_sesskey()) {
-    $context->set_locked(!empty($confirm));
-
-    if ($context->locked) {
-        $lockmessage = get_string('managecontextlocklocked', 'admin', $a);
-    } else {
-        $lockmessage = get_string('managecontextlockunlocked', 'admin', $a);
-    }
-
-    if (empty($returnurl)) {
-        $returnurl = $context->get_url();
-    } else {
-        $returnurl = new moodle_url($returnurl);
-    }
-    redirect($returnurl, $lockmessage);
-}
-
-$heading = get_string('managecontextlock', 'admin');
-$PAGE->set_title($heading);
-$PAGE->set_heading($heading);
-
-echo $OUTPUT->header();
-
-if ($context->locked) {
-    $confirmstring = get_string('confirmcontextunlock', 'admin', $a);
-    $target = 0;
-} else {
-    $confirmstring = get_string('confirmcontextlock', 'admin', $a);
-    $target = 1;
-}
-
-$confirmurl = new \moodle_url($PAGE->url, ['confirm' => $target]);
-if (!empty($returnurl)) {
-    $confirmurl->param('returnurl', $returnurl);
-}
-
-echo $OUTPUT->confirm($confirmstring, $confirmurl, $context->get_url());
-echo $OUTPUT->footer();

admin/message.php

@@ -28,6 +28,9 @@ require_once($CFG->libdir.'/adminlib.php');
 // This is an admin page
 admin_externalpage_setup('managemessageoutputs');
 
+// Require site configuration capability
+require_capability('moodle/site:config', context_system::instance());
+
 // Get the submitted params
 $disable    = optional_param('disable', 0, PARAM_INT);
 $enable     = optional_param('enable', 0, PARAM_INT);

admin/mnet/access_control.php

@@ -12,6 +12,8 @@ $page         = optional_param('page', 0, PARAM_INT);
 $perpage      = optional_param('perpage', 30, PARAM_INT);
 $action       = trim(strtolower(optional_param('action', '', PARAM_ALPHA)));
 
+require_login();
+
 admin_externalpage_setup('ssoaccesscontrol');
 
 if (!extension_loaded('openssl')) {

admin/mnet/delete.php

@@ -34,8 +34,10 @@ $step   = optional_param('step', 'verify', PARAM_ALPHA);
 $hostid = required_param('hostid', PARAM_INT);
 
 
+require_login();
 
 $context = context_system::instance();
+require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 
 $mnet = get_mnet_environment();
 

admin/mnet/index.php

@@ -6,10 +6,12 @@
     require_once($CFG->libdir.'/adminlib.php');
     include_once($CFG->dirroot.'/mnet/lib.php');
 
+    require_login();
     admin_externalpage_setup('net');
 
     $context = context_system::instance();
 
+    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 
     $site = get_site();
     $mnet = get_mnet_environment();

admin/mnet/peers.php

@@ -32,6 +32,10 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->dirroot.'/mnet/lib.php');
 require_once($CFG->dirroot.'/'.$CFG->admin.'/mnet/peer_forms.php');
 
+require_login();
+
+$context = context_system::instance();
+require_capability('moodle/site:config', $context, $USER->id, true, 'nopermissions');
 
 /// Initialize variables.
 $hostid = optional_param('hostid', 0, PARAM_INT);

admin/mnet/profilefields.php

@@ -29,10 +29,14 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->dirroot . '/' . $CFG->admin .'/mnet/profilefields_form.php');
 $mnet = get_mnet_environment();
 
+require_login();
 $hostid = required_param('hostid', PARAM_INT);
 $mnet_peer = new mnet_peer();
 $mnet_peer->set_id($hostid);
 
+$context = context_system::instance();
+
+require_capability('moodle/site:config', $context, $USER->id, true, 'nopermissions');
 admin_externalpage_setup('mnetpeers');
 $form = new mnet_profile_form(null, array('hostid' => $hostid));
 

admin/mnet/services.php

@@ -30,8 +30,11 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/services_form.php');
 $mnet = get_mnet_environment();
 
+require_login();
 admin_externalpage_setup('mnetpeers');
 
+$context = context_system::instance();
+require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 
 $hostid = required_param('hostid', PARAM_INT);
 

admin/mnet/testclient.php

@@ -21,8 +21,12 @@ if ($CFG->mnet_dispatcher_mode === 'off') {
     print_error('mnetdisabled', 'mnet');
 }
 
+require_login();
 admin_externalpage_setup('mnettestclient');
 
+$context = context_system::instance();
+require_capability('moodle/site:config', $context);
+
 error_reporting(DEBUG_ALL);
 
 echo $OUTPUT->header();

admin/mnet/trustedhosts.php

@@ -5,8 +5,12 @@
     require_once($CFG->libdir.'/adminlib.php');
     include_once($CFG->dirroot.'/mnet/lib.php');
 
+    require_login();
     admin_externalpage_setup('trustedhosts');
 
+    $context = context_system::instance();
+
+    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 
     if (!extension_loaded('openssl')) {
         echo $OUTPUT->header();

admin/modules.php

@@ -87,13 +87,9 @@
     $table->set_attribute('class', 'admintable generaltable');
     $table->setup();
 
-    $pluginmanager = core_plugin_manager::instance();
-
     foreach ($modules as $module) {
-        $plugininfo = $pluginmanager->get_plugin_info('mod_'.$module->name);
-        $status = $plugininfo->get_status();
 
-        if ($status === core_plugin_manager::PLUGIN_STATUS_MISSING) {
+        if (!file_exists("$CFG->dirroot/mod/$module->name/lib.php")) {
             $strmodulename = '<span class="notifyproblem">'.$module->name.' ('.get_string('missingfromdisk').')</span>';
             $missing = true;
         } else {

admin/portfolio.php

@@ -35,6 +35,8 @@ if ($action == 'newon') {
 
 admin_externalpage_setup($pagename);
 
+require_capability('moodle/site:config', context_system::instance());
+
 $baseurl    = "$CFG->wwwroot/$CFG->admin/portfolio.php";
 $sesskeyurl = "$CFG->wwwroot/$CFG->admin/portfolio.php?sesskey=" . sesskey();
 $configstr  = get_string('manageportfolios', 'portfolio');

admin/purgecaches.php

@@ -27,43 +27,36 @@ require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 
 $confirm = optional_param('confirm', 0, PARAM_BOOL);
-$returnurl = optional_param('returnurl', '/admin/purgecaches.php', PARAM_LOCALURL);
-$returnurl = new moodle_url($returnurl);
+$returnurl = optional_param('returnurl', null, PARAM_LOCALURL);
 
 admin_externalpage_setup('purgecaches');
 
-$form = new core_admin\form\purge_caches(null, ['returnurl' => $returnurl]);
-
 // If we have got here as a confirmed aciton, do it.
-if ($data = $form->get_data()) {
+if ($confirm && confirm_sesskey()) {
 
     // Valid request. Purge, and redirect the user back to where they came from.
-    $selected = $data->purgeselectedoptions;
-    purge_caches($selected);
+    purge_all_caches();
 
-    if (isset($data->all)) {
-        $message = get_string('purgecachesfinished', 'admin');
+    if ($returnurl) {
+        $returnurl = $CFG->wwwroot . $returnurl;
     } else {
-        $message = get_string('purgeselectedcachesfinished', 'admin');
+        $returnurl = new moodle_url('/admin/purgecaches.php');
     }
-
-} else if ($confirm && confirm_sesskey()) {
-    purge_caches();
-    $message = get_string('purgecachesfinished', 'admin');
+    redirect($returnurl, get_string('purgecachesfinished', 'admin'));
 }
 
-if (isset($message)) {
-    redirect($returnurl, $message);
+// Otherwise, show a button to actually purge the caches.
+$actionurl = new moodle_url('/admin/purgecaches.php', array('sesskey'=>sesskey(), 'confirm'=>1));
+if ($returnurl) {
+    $actionurl->param('returnurl', $returnurl);
 }
 
-// Otherwise, show a form to actually purge the caches.
-
 echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('purgecachespage', 'admin'));
+echo $OUTPUT->heading(get_string('purgecaches', 'admin'));
 
 echo $OUTPUT->box_start('generalbox', 'notice');
 echo html_writer::tag('p', get_string('purgecachesconfirm', 'admin'));
-echo $form->render();
+echo $OUTPUT->single_button($actionurl, get_string('purgecaches', 'admin'), 'post');
 echo $OUTPUT->box_end();
 
 echo $OUTPUT->footer();

admin/qtypes.php

@@ -31,6 +31,7 @@ require_once($CFG->libdir . '/adminlib.php');
 require_once($CFG->libdir . '/tablelib.php');
 
 // Check permissions.
+require_login();
 $systemcontext = context_system::instance();
 require_capability('moodle/question:config', $systemcontext);
 $canviewreports = has_capability('report/questioninstances:view', $systemcontext);

admin/registration/confirmregistration.php

@@ -46,7 +46,7 @@ $error = optional_param('error', '', PARAM_ALPHANUM);
 admin_externalpage_setup('registrationmoodleorg');
 
 if ($url !== HUB_MOODLEORGHUBURL) {
-    // Allow other plugins to confirm registration on custom hubs. Plugins implementing this
+    // Allow other plugins to confirm registration on hubs other than moodle.net . Plugins implementing this
     // callback need to redirect or exit. See https://docs.moodle.org/en/Hub_registration .
     $callbacks = get_plugins_with_function('hub_registration');
     foreach ($callbacks as $plugintype => $plugins) {

admin/registration/forms.php

@@ -32,4 +32,5 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-debugging('Support for alternative hubs has been removed from Moodle in 3.4.', DEBUG_DEVELOPER);
+debugging('Support for alternative hubs has been removed from Moodle in 3.4. For communication with moodle.net ' .
+    'see lib/classes/hub/ .', DEBUG_DEVELOPER);

admin/registration/index.php

@@ -22,7 +22,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
  * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
  *
- * This page displays the site registration form.
+ * This page displays the site registration form for Moodle.net.
  * It handles redirection to the hub to continue the registration workflow process.
  * It also handles update operation by web service.
  */
@@ -48,7 +48,7 @@ if ($unregistration && \core\hub\registration::is_registered()) {
     }
 
     echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('registerwithmoodleorgremove', 'core_hub'), 3, 'main');
+    echo $OUTPUT->heading(get_string('unregisterfrom', 'hub', 'Moodle.net'), 3, 'main');
     $siteunregistrationform->display();
     echo $OUTPUT->footer();
     exit;
@@ -82,7 +82,7 @@ if ($fromform = $siteregistrationform->get_data()) {
 
 echo $OUTPUT->header();
 
-// Current status of registration.
+// Current status of registration on Moodle.net.
 
 $notificationtype = \core\output\notification::NOTIFY_ERROR;
 if (\core\hub\registration::is_registered()) {
@@ -104,11 +104,11 @@ if (\core\hub\registration::is_registered()) {
 
 // Heading.
 if (\core\hub\registration::is_registered()) {
-    echo $OUTPUT->heading(get_string('registerwithmoodleorgupdate', 'core_hub'));
+    echo $OUTPUT->heading(get_string('updatesite', 'hub', 'Moodle.net'));
 } else if ($isinitialregistration) {
-    echo $OUTPUT->heading(get_string('registerwithmoodleorgcomplete', 'core_hub'));
+    echo $OUTPUT->heading(get_string('completeregistration', 'hub'));
 } else {
-    echo $OUTPUT->heading(get_string('registerwithmoodleorg', 'core_hub'));
+    echo $OUTPUT->heading(get_string('registerwithmoodleorg', 'admin'));
 }
 
 $renderer = $PAGE->get_renderer('core', 'admin');

admin/registration/renewregistration.php

@@ -40,7 +40,7 @@ $token = optional_param('token', '', PARAM_TEXT);
 admin_externalpage_setup('registrationmoodleorg');
 
 if ($url !== HUB_MOODLEORGHUBURL) {
-    // Allow other plugins to renew registration on custom hubs. Plugins implementing this
+    // Allow other plugins to renew registration on hubs other than moodle.net . Plugins implementing this
     // callback need to redirect or exit. See https://docs.moodle.org/en/Hub_registration .
     $callbacks = get_plugins_with_function('hub_registration');
     foreach ($callbacks as $plugintype => $plugins) {
@@ -56,7 +56,7 @@ if ($url !== HUB_MOODLEORGHUBURL) {
 
 echo $OUTPUT->header();
 echo $OUTPUT->heading(get_string('renewregistration', 'hub'), 3, 'main');
-$hublink = html_writer::tag('a', HUB_MOODLEORGHUBURL, array('href' => HUB_MOODLEORGHUBURL));
+$hublink = html_writer::tag('a', 'Moodle.net', array('href' => HUB_MOODLEORGHUBURL));
 
 $deletedregmsg = get_string('previousregistrationdeleted', 'hub', $hublink);
 

admin/renderer.php

@@ -823,7 +823,8 @@ class core_admin_renderer extends plugin_renderer_base {
      */
     protected function registration_warning($registered) {
 
-        if (!$registered && site_is_public()) {
+        if (!$registered) {
+
             if (has_capability('moodle/site:config', context_system::instance())) {
                 $registerbutton = $this->single_button(new moodle_url('/admin/registration/index.php'),
                     get_string('register', 'admin'));
@@ -1449,11 +1450,9 @@ class core_admin_renderer extends plugin_renderer_base {
                     $class = 'requires-failed';
                     $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'label label-important');
                 }
-                if ($reqinfo->reqver != ANY_VERSION) {
-                    $requires[] = html_writer::tag('li',
-                        html_writer::span(get_string('moodleversion', 'core_plugin', $plugin->versionrequires), 'dep dep-core').
-                        ' '.$label, array('class' => $class));
-                }
+                $requires[] = html_writer::tag('li',
+                    html_writer::span(get_string('moodleversion', 'core_plugin', $plugin->versionrequires), 'dep dep-core').
+                    ' '.$label, array('class' => $class));
 
             } else {
                 $actions = array();
@@ -2092,27 +2091,6 @@ class core_admin_renderer extends plugin_renderer_base {
      * @return string
      */
     public function moodleorg_registration_message() {
-
-        $out = format_text(get_string('registerwithmoodleorginfo', 'core_hub'), FORMAT_MARKDOWN);
-
-        $out .= html_writer::link(
-            new moodle_url('/admin/settings.php', ['section' => 'moodleservices']),
-            $this->output->pix_icon('i/info', '').' '.get_string('registerwithmoodleorginfoapp', 'core_hub'),
-            ['class' => 'btn btn-link', 'role' => 'opener', 'target' => '_href']
-        );
-
-        $out .= html_writer::link(
-            HUB_MOODLEORGHUBURL,
-            $this->output->pix_icon('i/stats', '').' '.get_string('registerwithmoodleorginfostats', 'core_hub'),
-            ['class' => 'btn btn-link', 'role' => 'opener', 'target' => '_href']
-        );
-
-        $out .= html_writer::link(
-            HUB_MOODLEORGHUBURL.'/sites',
-            $this->output->pix_icon('i/location', '').' '.get_string('registerwithmoodleorginfosites', 'core_hub'),
-            ['class' => 'btn btn-link', 'role' => 'opener', 'target' => '_href']
-        );
-
-        return $this->output->box($out);
+        return format_text(get_string('registermoodlenet', 'admin'), FORMAT_HTML, ['noclean' => true]);
     }
 }

admin/repository.php

@@ -47,6 +47,7 @@ if ($action == 'newon') {
     $visible = false;
 }
 
+require_capability('moodle/site:config', context_system::instance());
 admin_externalpage_setup($pagename);
 
 $sesskeyurl = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php?sesskey=' . sesskey();

admin/repositoryinstance.php

@@ -42,6 +42,7 @@ if ($edit){
 }
 
 admin_externalpage_setup($pagename, '', null, new moodle_url('/admin/repositoryinstance.php'));
+require_capability('moodle/site:config', $context);
 
 $baseurl = new moodle_url("/$CFG->admin/repositoryinstance.php", array('sesskey'=>sesskey()));
 

admin/roles/admins.php

@@ -80,16 +80,9 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
         }
 
         if (isset($admins[$newmain])) {
-            $logstringold = implode(', ', $admins);
-
             unset($admins[$newmain]);
             array_unshift($admins, $newmain);
-
-            $logstringnew = implode(', ', $admins);
-
             set_config('siteadmins', implode(',', $admins));
-            add_to_config_log('siteadmins', $logstringold, $logstringnew, null);
-
             redirect($PAGE->url);
         }
     }
@@ -102,16 +95,8 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
             $admins[$admin] = $admin;
         }
     }
-
-    $logstringold = implode(', ', $admins);
-
     $admins[$confirmadd] = $confirmadd;
-
-    $logstringnew = implode(', ', $admins);
-
     set_config('siteadmins', implode(',', $admins));
-    add_to_config_log('siteadmins', $logstringold, $logstringnew, 'core');
-
     redirect($PAGE->url);
 
 } else if ($confirmdel and confirm_sesskey() and $confirmdel != $USER->id) {
@@ -122,16 +107,8 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
             $admins[$admin] = $admin;
         }
     }
-
-    $logstringold = implode(', ', $admins);
-
     unset($admins[$confirmdel]);
-
-    $logstringnew = implode(', ', $admins);
-
     set_config('siteadmins', implode(',', $admins));
-    add_to_config_log('siteadmins', $logstringold, $logstringnew, 'core');
-
     redirect($PAGE->url);
 }
 

admin/roles/allow.php

@@ -46,6 +46,7 @@ $controller = new $classformode[$mode]();
 
 if (optional_param('submit', false, PARAM_BOOL) && data_submitted() && confirm_sesskey()) {
     $controller->process_submission();
+    $syscontext->mark_dirty();
     $event = null;
     // Create event depending on mode.
     switch ($mode) {

admin/roles/classes/capability_table_with_risks.php

@@ -123,6 +123,9 @@ abstract class core_role_capability_table_with_risks extends core_role_capabilit
             assign_capability($changedcap, $this->permissions[$changedcap],
                 $this->roleid, $this->context->id, true);
         }
+
+        // Force accessinfo refresh for users visiting this context.
+        $this->context->mark_dirty();
     }
 
     public function display() {

admin/roles/classes/check_users_selector.php

@@ -69,11 +69,8 @@ class core_role_check_users_selector extends user_selector_base {
 
         if ($coursecontext and $coursecontext != SITEID) {
             $sql1 = " FROM {user} u
-                      JOIN (SELECT DISTINCT subu.id
-                              FROM {user} subu
-                              JOIN {user_enrolments} ue ON (ue.userid = subu.id)
-                              JOIN {enrol} e ON (e.id = ue.enrolid AND e.courseid = :courseid1)
-                           ) subq ON subq.id = u.id
+                      JOIN {user_enrolments} ue ON (ue.userid = u.id)
+                      JOIN {enrol} e ON (e.id = ue.enrolid AND e.courseid = :courseid1)
                      WHERE $wherecondition";
             $params['courseid1'] = $coursecontext->instanceid;
 

admin/roles/classes/define_role_table_advanced.php

@@ -434,7 +434,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
     }
 
     public function save_changes() {
-        global $DB;
+        global $DB, $CFG;
 
         if (!$this->roleid) {
             // Creating role.
@@ -448,7 +448,8 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
             // the UI. It would be better to do this only when we know that fields affected are
             // updated. But thats getting into the weeds of the coursecat cache and role edits
             // should not be that frequent, so here is the ugly brutal approach.
-            core_course_category::role_assignment_changed($this->role->id, context_system::instance());
+            require_once($CFG->libdir . '/coursecatlib.php');
+            coursecat::role_assignment_changed($this->role->id, context_system::instance());
         }
 
         // Assignable contexts.
@@ -623,7 +624,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
             echo "</label>\n";
         }
         if ($helpicon) {
-            echo '<span class="float-sm-right text-nowrap">'.$helpicon.'</span>';
+            echo '<span class="pull-xs-right text-nowrap">'.$helpicon.'</span>';
         }
         echo '</div>';
         if (isset($this->errors[$name])) {

admin/roles/classes/permissions_table.php

@@ -96,7 +96,7 @@ class core_role_permissions_table extends core_role_capability_table_base {
                                   "linkclass" => "preventlink", "adminurl" => $adminurl->out(), "icon" => "", "iconalt" => "");
                 if (isset($overridableroles[$id]) and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) {
                     $templatecontext['icon'] = 't/delete';
-                    $templatecontext['iconalt'] = get_string('deletexrole', 'core_role', $name);
+                    $templatecontext['iconalt'] = get_string('delete');
                 }
                 $neededroles[$id] = $renderer->render_from_template('core/permissionmanager_role', $templatecontext);
             }
@@ -109,7 +109,7 @@ class core_role_permissions_table extends core_role_capability_table_base {
                                 "icon" => "", "iconalt" => "");
                 if (isset($overridableroles[$id]) and prohibit_is_removable($id, $context, $capability->name)) {
                     $templatecontext['icon'] = 't/delete';
-                    $templatecontext['iconalt'] = get_string('deletexrole', 'core_role', $name);
+                    $templatecontext['iconalt'] = get_string('delete');
                 }
                 $forbiddenroles[$id] = $renderer->render_from_template('core/permissionmanager_role', $templatecontext);
             }

admin/roles/classes/privacy/provider.php

@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 /**
  * Privacy Subsystem implementation for core_role.
  *
@@ -21,9 +20,7 @@
  * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-
 namespace core_role\privacy;
-
 defined('MOODLE_INTERNAL') || die();
 
 use \core_privacy\local\metadata\collection;
@@ -31,8 +28,6 @@ use \core_privacy\local\request\contextlist;
 use \core_privacy\local\request\approved_contextlist;
 use \core_privacy\local\request\transform;
 use \core_privacy\local\request\writer;
-use \core_privacy\local\request\userlist;
-use \core_privacy\local\request\approved_userlist;
 
 /**
  * Privacy provider for core_role.
@@ -44,8 +39,7 @@ class provider implements
     \core_privacy\local\metadata\provider,
     \core_privacy\local\request\subsystem\provider,
     \core_privacy\local\request\subsystem\plugin_provider,
-    \core_privacy\local\request\user_preference_provider,
-    \core_privacy\local\request\core_userlist_provider {
+    \core_privacy\local\request\user_preference_provider {
 
     /**
      * Get information about the user data stored by this plugin.
@@ -157,50 +151,6 @@ class provider implements
 
         return $contextlist;
     }
-
-    /**
-     * Get the list of users within a specific context.
-     *
-     * @param userlist $userlist The userlist containing the list of users who have data in this context/plugin combination.
-     */
-    public static function get_users_in_context(userlist $userlist) {
-
-        if (empty($userlist)) {
-            return;
-        }
-
-        $context = $userlist->get_context();
-
-        // Include users who created or modified role capabilities.
-        $sql = "SELECT modifierid as userid
-                  FROM {role_capabilities}
-                 WHERE contextid = :contextid";
-
-        $params = [
-            'contextid' => $context->id
-        ];
-
-        $userlist->add_from_sql('userid', $sql, $params);
-
-        // Include users that have a role assigned to them.
-        $sql = "SELECT userid
-                  FROM {role_assignments}
-                 WHERE contextid = :contextid";
-
-        $userlist->add_from_sql('userid', $sql, $params);
-
-        // Include users who created or modified the role assignment.
-        // Differentiate and exclude special cases where tool_cohortroles adds records through the
-        // "Assign user roles to cohort" feature into the role_assignments table.
-        // These records should be separately processed in tool_cohortroles.
-        $sql = "SELECT modifierid as userid
-                  FROM {role_assignments}
-                 WHERE contextid = :contextid
-                       AND component != 'tool_cohortroles'";
-
-        $userlist->add_from_sql('userid', $sql, $params);
-    }
-
     /**
      * Export all user data for the specified user, in the specified contexts.
      *
@@ -365,32 +315,6 @@ class provider implements
         // Remove data from role_assignments.
         $DB->delete_records('role_assignments', ['contextid' => $context->id]);
     }
-
-    /**
-     * Delete multiple users within a single context.
-     *
-     * @param approved_userlist $userlist The approved context and user information to delete information for.
-     */
-    public static function delete_data_for_users(approved_userlist $userlist) {
-        global $DB;
-
-        // Don't remove data from role_capabilities.
-        // Because this data affects the whole Moodle, there are override capabilities.
-        // Don't belong to the modifier user.
-        $context = $userlist->get_context();
-        $userids = $userlist->get_userids();
-
-        if (empty($userids)) {
-            return;
-        }
-        list($usersql, $userparams) = $DB->get_in_or_equal($userids, SQL_PARAMS_NAMED);
-        $params = ['contextid' => $context->id] + $userparams;
-
-        // Remove data from role_assignments.
-        $DB->delete_records_select('role_assignments',
-            "contextid = :contextid AND userid {$usersql}", $params);
-    }
-
     /**
      * Delete all user data for this user only.
      *
@@ -408,14 +332,10 @@ class provider implements
             return;
         }
         $userid = $contextlist->get_user()->id;
-        $contextids = $contextlist->get_contextids();
-
-        list($contextsql, $contextparams) = $DB->get_in_or_equal($contextids, SQL_PARAMS_NAMED);
-        $params = ['userid' => $userid] + $contextparams;
-
-        // Only delete the roles assignments where the user is assigned in all contexts.
-        $DB->delete_records_select('role_assignments',
-            "userid = :userid AND contextid {$contextsql}", $params);
+        foreach ($contextlist->get_contexts() as $context) {
+            // Only delete the roles assignments where the user is assigned in all contexts.
+            $DB->delete_records('role_assignments', ['userid' => $userid, 'contextid' => $context->id]);
+        }
     }
     /**
      * Delete user entries in role_assignments related to the feature

admin/roles/define.php

@@ -54,6 +54,7 @@ if ($return === 'manage') {
 
 // Check access permissions.
 $systemcontext = context_system::instance();
+require_login();
 require_capability('moodle/role:manage', $systemcontext);
 admin_externalpage_setup('defineroles', '', array('action' => $action, 'roleid' => $roleid), new moodle_url('/admin/roles/define.php'));
 

admin/roles/manage.php

@@ -48,6 +48,7 @@ $defineurl = $CFG->wwwroot . '/' . $CFG->admin . '/roles/define.php';
 
 // Check access permissions.
 $systemcontext = context_system::instance();
+require_login();
 require_capability('moodle/role:manage', $systemcontext);
 admin_externalpage_setup('defineroles');
 
@@ -84,10 +85,12 @@ switch ($action) {
             die;
         }
         if (!delete_role($roleid)) {
-            // The delete failed.
+            // The delete failed, but mark the context dirty in case.
+            $systemcontext->mark_dirty();
             print_error('cannotdeleterolewithid', 'error', $baseurl, $roleid);
         }
         // Deleted a role sitewide...
+        $systemcontext->mark_dirty();
         redirect($baseurl);
         break;
 

admin/roles/permissions.php

@@ -213,7 +213,7 @@ $arguments = array('contextid' => $contextid,
 $PAGE->requires->strings_for_js(
                                 array('roleprohibitinfo', 'roleprohibitheader', 'roleallowinfo', 'roleallowheader',
                                     'confirmunassigntitle', 'confirmroleunprohibit', 'confirmroleprevent', 'confirmunassignyes',
-                                    'confirmunassignno', 'deletexrole'), 'core_role');
+                                    'confirmunassignno'), 'core_role');
 $PAGE->requires->js_call_amd('core/permissionmanager', 'initialize', array($arguments));
 $table = new core_role_permissions_table($context, $contextname, $allowoverrides, $allowsafeoverrides, $overridableroles);
 echo $OUTPUT->box_start('generalbox capbox');

admin/roles/tests/privacy_test.php

@@ -13,7 +13,6 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 /**
  * Privacy test for core_role
  *
@@ -22,16 +21,13 @@
  * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-
 defined('MOODLE_INTERNAL') || die();
-
 use \core_role\privacy\provider;
 use \core_privacy\local\request\approved_contextlist;
 use \core_privacy\local\request\writer;
 use \core_privacy\tests\provider_testcase;
 use \core_privacy\local\request\transform;
 use \tool_cohortroles\api;
-use \core_privacy\local\request\approved_userlist;
 
 /**
  * Privacy test for core_role
@@ -58,7 +54,6 @@ class core_role_privacy_testcase extends provider_testcase {
         $this->assertEquals(get_string('privacy:metadata:preference:showadvanced', 'core_role'),
             $prefs->definerole_showadvanced->description);
     }
-
     /**
      * Check all contexts are returned if there is any user data for this user.
      */
@@ -236,7 +231,6 @@ class core_role_privacy_testcase extends provider_testcase {
             }
         }
     }
-
     /**
      * Test for provider::delete_data_for_all_users_in_context().
      */
@@ -322,7 +316,6 @@ class core_role_privacy_testcase extends provider_testcase {
         $count = $DB->count_records('role_assignments', ['contextid' => $usercontext2->id]);
         $this->assertEquals(0, $count);
     }
-
     /**
      * Test for provider::delete_data_for_user().
      */
@@ -380,7 +373,6 @@ class core_role_privacy_testcase extends provider_testcase {
         $count = $DB->count_records('role_assignments', ['modifierid' => $user->id]);
         $this->assertEquals(2, $count);
     }
-
     /**
      * Export for a user with a key against a script where no instance is specified.
      */
@@ -434,7 +426,6 @@ class core_role_privacy_testcase extends provider_testcase {
         $exported = $writer->get_related_data($subcontextteacher, 'cohortroles');
         $this->assertEquals($user2->id, reset($exported)->userid);
     }
-
     /**
      * Test for provider::delete_user_role_to_cohort().
      */
@@ -469,267 +460,6 @@ class core_role_privacy_testcase extends provider_testcase {
         $count = $DB->count_records('role_assignments', ['userid' => $user->id, 'component' => 'tool_cohortroles']);
         $this->assertEquals(0, $count);
     }
-
-    /**
-     * Test that only users within a course context are fetched.
-     */
-    public function test_get_users_in_context() {
-        global $DB;
-
-        $this->resetAfterTest();
-
-        $component = 'core_role';
-
-        $this->setAdminUser();
-        $admin = \core_user::get_user_by_username('admin');
-        // Create user1.
-        $user1 = $this->getDataGenerator()->create_user();
-        $usercontext1 = \context_user::instance($user1->id);
-        // Create user2.
-        $user2 = $this->getDataGenerator()->create_user();
-        $usercontext2 = \context_user::instance($user2->id);
-        // Create course1.
-        $course1 = $this->getDataGenerator()->create_course();
-        $coursecontext1 = \context_course::instance($course1->id);
-        // Create course category.
-        $coursecat = $this->getDataGenerator()->create_category();
-        $coursecatcontext = \context_coursecat::instance($coursecat->id);
-        // Create chat module.
-        $cm = $this->getDataGenerator()->create_module('chat', ['course' => $course1->id]);
-        $cmcontext = \context_module::instance($cm->cmid);
-
-        $systemcontext = \context_system::instance();
-        // Create a block.
-        $block = $this->getDataGenerator()->create_block('online_users');
-        $blockcontext = \context_block::instance($block->id);
-
-        $studentrole = $DB->get_record('role', array('shortname' => 'student'), '*', MUST_EXIST);
-        $managerrole = $DB->get_record('role', array('shortname' => 'manager'), '*', MUST_EXIST);
-
-        // Role assignments CONTEXT_COURSE.
-        role_assign($studentrole->id, $user1->id, $coursecontext1->id);
-        role_assign($studentrole->id, $user2->id, $coursecontext1->id);
-        // Role assignments CONTEXT_COURSECAT.
-        role_assign($studentrole->id, $user2->id, $coursecatcontext->id);
-        // Role assignments CONTEXT_SYSTEM.
-        role_assign($studentrole->id, $user1->id, $systemcontext->id);
-        // Role assignments CONTEXT_MODULE.
-        role_assign($studentrole->id, $user2->id, $cmcontext->id);
-        // Role assigments CONTEXT_BLOCK.
-        role_assign($studentrole->id, $user1->id, $blockcontext->id);
-        // Role assigments CONTEXT_USER.
-        role_assign($managerrole->id, $user1->id, $usercontext2->id);
-
-        // Role capabilities.
-        $this->setUser($user1);
-        assign_capability('moodle/backup:backupcourse', CAP_ALLOW, $studentrole->id, $cmcontext->id);
-
-        // The user list for usercontext1 should not return any users.
-        $userlist1 = new \core_privacy\local\request\userlist($usercontext1, $component);
-        provider::get_users_in_context($userlist1);
-        $this->assertCount(0, $userlist1);
-        // The user list for usercontext2 should user1 and admin (role creator).
-        $userlist2 = new \core_privacy\local\request\userlist($usercontext2, $component);
-        provider::get_users_in_context($userlist2);
-        $this->assertCount(2, $userlist2);
-        $expected = [
-            $user1->id,
-            $admin->id
-        ];
-        $this->assertEquals($expected, $userlist2->get_userids(), '', 0.0, 10, true);
-
-        // The user list for coursecontext1 should user1, user2 and admin (role creator).
-        $userlist3 = new \core_privacy\local\request\userlist($coursecontext1, $component);
-        provider::get_users_in_context($userlist3);
-        $this->assertCount(3, $userlist3);
-        $expected = [
-            $user1->id,
-            $user2->id,
-            $admin->id
-        ];
-        $this->assertEquals($expected, $userlist3->get_userids(), '', 0.0, 10, true);
-
-        // The user list for coursecatcontext should user2 and admin (role creator).
-        $userlist4 = new \core_privacy\local\request\userlist($coursecatcontext, $component);
-        provider::get_users_in_context($userlist4);
-        $this->assertCount(2, $userlist4);
-        $expected = [
-            $user2->id,
-            $admin->id
-        ];
-        $this->assertEquals($expected, $userlist4->get_userids(), '', 0.0, 10, true);
-
-        // The user list for systemcontext should user1 and admin (role creator).
-        $userlist6 = new \core_privacy\local\request\userlist($systemcontext, $component);
-        provider::get_users_in_context($userlist6);
-        $this->assertCount(2, $userlist6);
-        $expected = [
-            $user1->id,
-            $admin->id
-        ];
-        $this->assertEquals($expected, $userlist6->get_userids(), '', 0.0, 10, true);
-
-        // The user list for cmcontext should user1, user2 and admin (role creator).
-        $userlist7 = new \core_privacy\local\request\userlist($cmcontext, $component);
-        provider::get_users_in_context($userlist7);
-        $this->assertCount(3, $userlist7);
-        $expected = [
-            $user1->id,
-            $user2->id,
-            $admin->id
-        ];
-        $this->assertEquals($expected, $userlist7->get_userids(), '', 0.0, 10, true);
-
-        // The user list for blockcontext should user1 and admin (role creator).
-        $userlist8 = new \core_privacy\local\request\userlist($blockcontext, $component);
-        provider::get_users_in_context($userlist8);
-        $this->assertCount(2, $userlist8);
-        $expected = [
-            $user1->id,
-            $admin->id
-        ];
-        $this->assertEquals($expected, $userlist8->get_userids(), '', 0.0, 10, true);
-    }
-
-    /**
-     * Test that data for users in approved userlist is deleted.
-     */
-    public function test_delete_data_for_users() {
-        global $DB;
-
-        $this->resetAfterTest();
-
-        $component = 'core_role';
-
-        $this->setAdminUser();
-        $admin = \core_user::get_user_by_username('admin');
-        // Create user1.
-        $user1 = $this->getDataGenerator()->create_user();
-        // Create user2.
-        $user2 = $this->getDataGenerator()->create_user();
-        $usercontext2 = \context_user::instance($user2->id);
-        // Create course1.
-        $course1 = $this->getDataGenerator()->create_course();
-        $coursecontext1 = \context_course::instance($course1->id);
-        // Create course category.
-        $coursecat = $this->getDataGenerator()->create_category();
-        $coursecatcontext = \context_coursecat::instance($coursecat->id);
-        // Create chat module.
-        $cm = $this->getDataGenerator()->create_module('chat', ['course' => $course1->id]);
-        $cmcontext = \context_module::instance($cm->cmid);
-
-        $systemcontext = \context_system::instance();
-        // Create a block.
-        $block = $this->getDataGenerator()->create_block('online_users');
-        $blockcontext = \context_block::instance($block->id);
-
-        $studentrole = $DB->get_record('role', array('shortname' => 'student'), '*', MUST_EXIST);
-        $managerrole = $DB->get_record('role', array('shortname' => 'manager'), '*', MUST_EXIST);
-
-        // Role assignments CONTEXT_COURSE.
-        role_assign($studentrole->id, $user1->id, $coursecontext1->id);
-        role_assign($studentrole->id, $user2->id, $coursecontext1->id);
-        // Role assignments CONTEXT_COURSECAT.
-        role_assign($studentrole->id, $user2->id, $coursecatcontext->id);
-        // Role assignments CONTEXT_SYSTEM.
-        role_assign($studentrole->id, $user1->id, $systemcontext->id);
-        // Role assignments CONTEXT_MODULE.
-        role_assign($studentrole->id, $user2->id, $cmcontext->id);
-        // Role assigments CONTEXT_BLOCK.
-        role_assign($studentrole->id, $user1->id, $blockcontext->id);
-        // Role assigments CONTEXT_USER.
-        role_assign($managerrole->id, $user1->id, $usercontext2->id);
-
-        // Role capabilities.
-        $this->setUser($user1);
-        assign_capability('moodle/backup:backupcourse', CAP_ALLOW, $studentrole->id, $cmcontext->id);
-
-        // The user list for usercontext2 should user1 and admin (role creator).
-        $userlist1 = new \core_privacy\local\request\userlist($usercontext2, $component);
-        provider::get_users_in_context($userlist1);
-        $this->assertCount(2, $userlist1);
-        // The user list for coursecontext1 should user1, user2 and admin (role creator).
-        $userlist2 = new \core_privacy\local\request\userlist($coursecontext1, $component);
-        provider::get_users_in_context($userlist2);
-        $this->assertCount(3, $userlist2);
-        // The user list for coursecatcontext should user2 and admin (role creator).
-        $userlist3 = new \core_privacy\local\request\userlist($coursecatcontext, $component);
-        provider::get_users_in_context($userlist3);
-        $this->assertCount(2, $userlist3);
-        // The user list for systemcontext should user1 and admin (role creator).
-        $userlist4 = new \core_privacy\local\request\userlist($systemcontext, $component);
-        provider::get_users_in_context($userlist4);
-        $this->assertCount(2, $userlist4);
-        // The user list for cmcontext should user1, user2 and admin (role creator).
-        $userlist5 = new \core_privacy\local\request\userlist($cmcontext, $component);
-        provider::get_users_in_context($userlist5);
-        $this->assertCount(3, $userlist5);
-        // The user list for blockcontext should user1 and admin (role creator).
-        $userlist6 = new \core_privacy\local\request\userlist($blockcontext, $component);
-        provider::get_users_in_context($userlist6);
-        $this->assertCount(2, $userlist6);
-
-        // Convert $userlist1 into an approved_contextlist.
-        $approvedlist1 = new approved_userlist($usercontext2, $component, $userlist1->get_userids());
-        // Delete using delete_data_for_user.
-        provider::delete_data_for_users($approvedlist1);
-        // Re-fetch users in usercontext2.
-        $userlist1 = new \core_privacy\local\request\userlist($usercontext2, $component);
-        provider::get_users_in_context($userlist1);
-        $this->assertCount(0, $userlist1);
-
-        // Convert $userlist2 into an approved_contextlist.
-        $approvedlist2 = new approved_userlist($coursecontext1, $component, $userlist2->get_userids());
-        // Delete using delete_data_for_user.
-        provider::delete_data_for_users($approvedlist2);
-        // Re-fetch users in coursecontext1.
-        $userlist2 = new \core_privacy\local\request\userlist($coursecontext1, $component);
-        provider::get_users_in_context($userlist2);
-        $this->assertCount(0, $userlist2);
-
-        // Convert $userlist3 into an approved_contextlist.
-        $approvedlist3 = new approved_userlist($coursecatcontext, $component, $userlist3->get_userids());
-        // Delete using delete_data_for_user.
-        provider::delete_data_for_users($approvedlist3);
-        // Re-fetch users in coursecatcontext.
-        $userlist3 = new \core_privacy\local\request\userlist($coursecatcontext, $component);
-        provider::get_users_in_context($userlist3);
-        $this->assertCount(0, $userlist3);
-
-        // Convert $userlist4 into an approved_contextlist.
-        $approvedlist4 = new approved_userlist($systemcontext, $component, $userlist4->get_userids());
-        // Delete using delete_data_for_user.
-        provider::delete_data_for_users($approvedlist4);
-        // Re-fetch users in systemcontext.
-        $userlist4 = new \core_privacy\local\request\userlist($systemcontext, $component);
-        provider::get_users_in_context($userlist4);
-        // The data from role_capabilities should still be present. The user list should return the admin user.
-        $this->assertCount(1, $userlist4);
-        $expected = [$admin->id];
-        $this->assertEquals($expected, $userlist4->get_userids());
-
-        // Convert $userlist5 into an approved_contextlist.
-        $approvedlist5 = new approved_userlist($cmcontext, $component, $userlist5->get_userids());
-        // Delete using delete_data_for_user.
-        provider::delete_data_for_users($approvedlist5);
-        // Re-fetch users in cmcontext.
-        $userlist5 = new \core_privacy\local\request\userlist($cmcontext, $component);
-        provider::get_users_in_context($userlist5);
-        // The data from role_capabilities should still be present. The user list should return user1.
-        $this->assertCount(1, $userlist5);
-        $expected = [$user1->id];
-        $this->assertEquals($expected, $userlist5->get_userids());
-
-        // Convert $userlist6 into an approved_contextlist.
-        $approvedlist6 = new approved_userlist($blockcontext, $component, $userlist6->get_userids());
-        // Delete using delete_data_for_user.
-        provider::delete_data_for_users($approvedlist6);
-        // Re-fetch users in blockcontext.
-        $userlist6 = new \core_privacy\local\request\userlist($blockcontext, $component);
-        provider::get_users_in_context($userlist6);
-        $this->assertCount(0, $userlist6);
-    }
-
     /**
      * Supoort function to get all the localised roles name
      * in a simple array for testing.

admin/settings/analytics.php

@@ -37,8 +37,8 @@ if ($hassiteconfig) {
             $predictors[$fullclassname] = new lang_string('pluginname', $pluginname);
         }
         $settings->add(new \core_analytics\admin_setting_predictor('analytics/predictionsprocessor',
-            new lang_string('defaultpredictionsprocessor', 'analytics'), new lang_string('predictionsprocessor_help', 'analytics'),
-            \core_analytics\manager::default_mlbackend(), $predictors)
+            new lang_string('predictionsprocessor', 'analytics'), new lang_string('predictionsprocessor_help', 'analytics'),
+            '\mlbackend_php\processor', $predictors)
         );
 
         // Log store.

admin/settings/appearance.php

@@ -32,9 +32,9 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) { // sp
         'customusermenuitems',
         new lang_string('customusermenuitems', 'admin'),
         new lang_string('configcustomusermenuitems', 'admin'),
-        'grades,grades|/grade/report/mygrades.php|t/grades
-messages,message|/message/index.php|t/message
-preferences,moodle|/user/preferences.php|t/preferences',
+        'grades,grades|/grade/report/mygrades.php|grades
+messages,message|/message/index.php|message
+preferences,moodle|/user/preferences.php|preferences',
         PARAM_RAW,
         '50',
         '10'
@@ -218,9 +218,6 @@ preferences,moodle|/user/preferences.php|t/preferences',
     // coursecontact is the person responsible for course - usually manages enrolments, receives notification, etc.
     $temp = new admin_settingpage('coursecontact', new lang_string('courses'));
     $temp->add(new admin_setting_special_coursecontact());
-    $temp->add(new admin_setting_configcheckbox('coursecontactduplicates',
-            new lang_string('coursecontactduplicates', 'admin'),
-            new lang_string('coursecontactduplicates_desc', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('courselistshortnames',
             new lang_string('courselistshortnames', 'admin'),
             new lang_string('courselistshortnames_desc', 'admin'), 0));
@@ -230,10 +227,6 @@ preferences,moodle|/user/preferences.php|t/preferences',
             new lang_string('configcourseoverviewfileslimit', 'admin'), 1, PARAM_INT));
     $temp->add(new admin_setting_configtext('courseoverviewfilesext', new lang_string('courseoverviewfilesext'),
             new lang_string('configcourseoverviewfilesext', 'admin'), '.jpg,.gif,.png'));
-    $temp->add(new admin_setting_configtext('coursegraceperiodbefore', new lang_string('coursegraceperiodbefore', 'admin'),
-        new lang_string('configcoursegraceperiodbefore', 'admin'), 0, PARAM_INT));
-    $temp->add(new admin_setting_configtext('coursegraceperiodafter', new lang_string('coursegraceperiodafter', 'admin'),
-        new lang_string('configcoursegraceperiodafter', 'admin'), 0, PARAM_INT));
     $ADMIN->add('appearance', $temp);
 
     $temp = new admin_settingpage('ajax', new lang_string('ajaxuse'));
@@ -259,3 +252,4 @@ preferences,moodle|/user/preferences.php|t/preferences',
     $ADMIN->add('appearance', $temp);
 
 } // end of speedup
+

admin/settings/courses.php

@@ -43,12 +43,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
             array('moodle/category:manage')
         )
     );
-    $ADMIN->add('courses',
-        new admin_externalpage('addnewcourse', new lang_string('addnewcourse'),
-            new moodle_url('/course/edit.php', array('category' => 0)),
-            array('moodle/category:manage')
-        )
-    );
     $ADMIN->add('courses',
         new admin_externalpage('restorecourse', new lang_string('restorecourse', 'admin'),
             new moodle_url('/backup/restorefile.php', array('contextid' => context_system::instance()->id)),
@@ -155,6 +149,7 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
 
     $ADMIN->add('courses', $temp);
 
+
     // "courserequests" settingpage.
     $temp = new admin_settingpage('courserequest', new lang_string('courserequest'));
     $temp->add(new admin_setting_configcheckbox('enablecourserequests', new lang_string('enablecourserequests', 'admin'), new lang_string('configenablecourserequests', 'admin'), 0));
@@ -330,7 +325,7 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_skip_modif_prev', new lang_string('skipmodifprev', 'backup'), new lang_string('skipmodifprevhelp', 'backup'), 0));
 
     // Automated defaults section.
-    $temp->add(new admin_setting_heading('automatedsettings', new lang_string('automatedsettings','backup'), new lang_string('recyclebin_desc', 'backup')));
+    $temp->add(new admin_setting_heading('automatedsettings', new lang_string('automatedsettings','backup'), ''));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_users', new lang_string('generalusers', 'backup'), new lang_string('configgeneralusers', 'backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_role_assignments', new lang_string('generalroleassignments','backup'), new lang_string('configgeneralroleassignments','backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', new lang_string('generalactivities','backup'), new lang_string('configgeneralactivities','backup'), 1));

admin/settings/development.php

@@ -16,16 +16,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
     $temp->add(new admin_setting_configexecutable('pathtosassc', new lang_string('pathtosassc', 'admin'), new lang_string('pathtosassc_help', 'admin'), ''));
 
-    $temp->add(new admin_setting_configcheckbox('contextlocking', new lang_string('contextlocking', 'core_admin'),
-        new lang_string('contextlocking_desc', 'core_admin'), 0));
-
-    $temp->add(new admin_setting_configcheckbox(
-            'contextlockappliestoadmin',
-            new lang_string('contextlockappliestoadmin', 'core_admin'),
-            new lang_string('contextlockappliestoadmin_desc', 'core_admin'),
-            1
-        ));
-
     $temp->add(new admin_setting_configcheckbox('forceclean', new lang_string('forceclean', 'core_admin'),
         new lang_string('forceclean_desc', 'core_admin'), 0));
 
@@ -93,8 +83,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
         $ADMIN->add('development', new admin_externalpage('mnettestclient', new lang_string('testclient', 'mnet'), "$CFG->wwwroot/$CFG->admin/mnet/testclient.php"));
     }
 
-    $ADMIN->add('development', new admin_externalpage('purgecaches', new lang_string('purgecachespage', 'admin'),
-            "$CFG->wwwroot/$CFG->admin/purgecaches.php"));
+    $ADMIN->add('development', new admin_externalpage('purgecaches', new lang_string('purgecaches','admin'), "$CFG->wwwroot/$CFG->admin/purgecaches.php"));
 
     $ADMIN->add('development', new admin_externalpage('thirdpartylibs', new lang_string('thirdpartylibs','admin'), "$CFG->wwwroot/$CFG->admin/thirdpartylibs.php"));
 } // end of speedup

admin/settings/moodleservices.php

@@ -1,53 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This file gives information about Moodle Services
- *
- * @package    core
- * @copyright  2018 Amaia Anabitarte <amaia@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-if ($hassiteconfig) {
-
-    // Create Moodle Services information.
-    $moodleservices->add(new admin_setting_heading('moodleservicesintro', '',
-        new lang_string('moodleservices_help', 'admin')));
-
-    // Moodle Partners information.
-    if (empty($CFG->disableserviceads_partner)) {
-        $moodleservices->add(new admin_setting_heading('moodlepartners',
-            new lang_string('moodlepartners', 'admin'),
-            new lang_string('moodlepartners_help', 'admin')));
-    }
-
-    // Moodle app information.
-    $moodleservices->add(new admin_setting_heading('moodleapp',
-        new lang_string('moodleapp', 'admin'),
-        new lang_string('moodleapp_help', 'admin')));
-
-    // Branded Moodle app information.
-    if (empty($CFG->disableserviceads_branded)) {
-        $moodleservices->add(new admin_setting_heading('moodlebrandedapp',
-            new lang_string('moodlebrandedapp', 'admin'),
-            new lang_string('moodlebrandedapp_help', 'admin')));
-    }
-}
-
-

admin/settings/server.php

@@ -7,8 +7,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
 // "systempaths" settingpage
 $temp = new admin_settingpage('systempaths', new lang_string('systempaths','admin'));
-$temp->add(new admin_setting_configexecutable('pathtophp', new lang_string('pathtophp', 'admin'),
-    new lang_string('configpathtophp', 'admin'), ''));
+
 $temp->add(new admin_setting_configexecutable('pathtodu', new lang_string('pathtodu', 'admin'), new lang_string('configpathtodu', 'admin'), ''));
 $temp->add(new admin_setting_configexecutable('aspellpath', new lang_string('aspellpath', 'admin'), new lang_string('edhelpaspellpath'), ''));
 $temp->add(new admin_setting_configexecutable('pathtodot', new lang_string('pathtodot', 'admin'), new lang_string('pathtodot_help', 'admin'), ''));
@@ -98,10 +97,7 @@ $options = array(
     GETREMOTEADDR_SKIP_HTTP_CLIENT_IP => 'HTTP_X_FORWARDED_FOR, REMOTE_ADDR',
     GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR => 'HTTP_CLIENT, REMOTE_ADDR',
     GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR|GETREMOTEADDR_SKIP_HTTP_CLIENT_IP => 'REMOTE_ADDR');
-$temp->add(new admin_setting_configselect('getremoteaddrconf', new lang_string('getremoteaddrconf', 'admin'),
-    new lang_string('configgetremoteaddrconf', 'admin'),
-    GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR|GETREMOTEADDR_SKIP_HTTP_CLIENT_IP, $options));
-$temp->add(new admin_setting_configtext('reverseproxyignore', new lang_string('reverseproxyignore', 'admin'), new lang_string('configreverseproxyignore', 'admin'), ''));
+$temp->add(new admin_setting_configselect('getremoteaddrconf', new lang_string('getremoteaddrconf', 'admin'), new lang_string('configgetremoteaddrconf', 'admin'), 0, $options));
 
 $temp->add(new admin_setting_heading('webproxy', new lang_string('webproxy', 'admin'), new lang_string('webproxyinfo', 'admin')));
 $temp->add(new admin_setting_configtext('proxyhost', new lang_string('proxyhost', 'admin'), new lang_string('configproxyhost', 'admin'), '', PARAM_HOST));

admin/settings/subsystems.php

@@ -15,34 +15,10 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
     $optionalsubsystems->add(new admin_setting_configcheckbox('messaging', new lang_string('messaging', 'admin'), new lang_string('configmessaging','admin'), 1));
 
-    $optionalsubsystems->add(new admin_setting_configcheckbox('messagingallusers',
-        new lang_string('messagingallusers', 'admin'),
-        new lang_string('configmessagingallusers', 'admin'),
-        0)
-    );
+    $optionalsubsystems->add(new admin_setting_configcheckbox('messaginghidereadnotifications', new lang_string('messaginghidereadnotifications', 'admin'), new lang_string('configmessaginghidereadnotifications','admin'), 0));
 
-    $options = array(
-        DAYSECS => new lang_string('secondstotime86400'),
-        WEEKSECS => new lang_string('secondstotime604800'),
-        2620800 => new lang_string('nummonths', 'moodle', 1),
-        7862400 => new lang_string('nummonths', 'moodle', 3),
-        15724800 => new lang_string('nummonths', 'moodle', 6),
-        0 => new lang_string('never')
-    );
-    $optionalsubsystems->add(new admin_setting_configselect(
-        'messagingdeletereadnotificationsdelay',
-        new lang_string('messagingdeletereadnotificationsdelay', 'admin'),
-        new lang_string('configmessagingdeletereadnotificationsdelay', 'admin'),
-        604800,
-        $options)
-    );
-    $optionalsubsystems->add(new admin_setting_configselect(
-        'messagingdeleteallnotificationsdelay',
-        new lang_string('messagingdeleteallnotificationsdelay', 'admin'),
-        new lang_string('configmessagingdeleteallnotificationsdelay', 'admin'),
-        2620800,
-        $options)
-    );
+    $options = array(DAYSECS=>new lang_string('secondstotime86400'), WEEKSECS=>new lang_string('secondstotime604800'), 2620800=>new lang_string('nummonths', 'moodle', 1), 15724800=>new lang_string('nummonths', 'moodle', 6),0=>new lang_string('never'));
+    $optionalsubsystems->add(new admin_setting_configselect('messagingdeletereadnotificationsdelay', new lang_string('messagingdeletereadnotificationsdelay', 'admin'), new lang_string('configmessagingdeletereadnotificationsdelay', 'admin'), 604800, $options));
 
     $optionalsubsystems->add(new admin_setting_configcheckbox('messagingallowemailoverride', new lang_string('messagingallowemailoverride', 'admin'), new lang_string('configmessagingallowemailoverride','admin'), 0));
 

admin/settings/top.php

@@ -15,11 +15,6 @@ $ADMIN->add('root', new admin_externalpage('registrationmoodleorg', new lang_str
  // hidden upgrade script
 $ADMIN->add('root', new admin_externalpage('upgradesettings', new lang_string('upgradesettings', 'admin'), "$CFG->wwwroot/$CFG->admin/upgradesettings.php", 'moodle/site:config', true));
 
-// Adding Moodle Services information page.
-$moodleservices = new admin_settingpage('moodleservices', new lang_string('moodleservices',
-    'admin'));
-$ADMIN->add('root', $moodleservices);
-
 if ($hassiteconfig) {
     $optionalsubsystems = new admin_settingpage('optionalsubsystems', new lang_string('advancedfeatures', 'admin'));
     $ADMIN->add('root', $optionalsubsystems);

admin/templates/setting_description.mustache

@@ -1,45 +0,0 @@
-{{!
-    This file is part of Moodle - http://moodle.org/
-
-    Moodle is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Moodle is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
-    @template core_admin/setting_description
-
-    Admin setting description template.
-
-    Context variables required for this template:
-    * labelfor - id of the form element
-    * title - Setting title
-    * name - Setting name
-
-    Example context (json):
-    {
-        "title": "Setting title",
-        "name": "Name",
-        "description": "Description goes here"
-    }
-}}
-{{!
-    Setting description.
-}}
-<div class="form-item form-horizontal clearfix">
-    <div class="form-label">
-        <label>
-            {{{title}}}
-        </label>
-        <span class="form-shortname ">{{{name}}}</span>
-    </div>
-    <div class="controls felement fstatic">{{{description}}}</div>
-</div>

admin/templates/settings_search_results.mustache

@@ -22,7 +22,7 @@
     Context variables required for this template:
     * actionurl - Url to post to
     * hasresults - True if there are results
-    * results - List of results containing url, title, path (array of strings), settings (array of raw html)
+    * results - List of results containing url, title, settings (array of raw html)
     * showsave - Show save buttons
 
     Example context (json):
@@ -30,7 +30,7 @@
         "actionurl": "/",
         "hasresults": true,
         "results": [
-            { "url": "/", "title": "Match!", "path": ["Administration", "Match!"], "settings": [ "blah blah blah" ] }
+            { "url": "/", "title": "Match!", "settings": [ "blah blah blah" ] }
         ]
     }
 }}
@@ -41,15 +41,9 @@
     </div>
     <fieldset>
         <div class="clearer"></div>
-        <h2 class="main">{{#str}}searchresults, admin{{/str}}</h2>
         {{#hasresults}}
             {{#results}}
-                <h3 class="adminpagetitle"><a href="{{url}}">{{{title}}}</a></h3>
-                <ul class="adminpagepath" aria-label="{{#str}} pagepath, core {{/str}}">
-                    {{#path}}
-                    <li>{{.}}</li>
-                    {{/path}}
-                </ul>
+                <h2 class="main">{{#str}}searchresults, admin{{/str}} - <a href="{{url}}">{{{title}}}</a></h2>
                 <fieldset class="adminsettings">
                     {{#settings}}
                         <div class="clearer"></div>

admin/tests/behat/behat_admin.php

@@ -48,6 +48,7 @@ class behat_admin extends behat_base {
      * @param TableNode $table
      */
     public function i_set_the_following_administration_settings_values(TableNode $table) {
+
         if (!$data = $table->getRowsHash()) {
             return;
         }
@@ -56,12 +57,17 @@ class behat_admin extends behat_base {
 
             // We expect admin block to be visible, otherwise go to homepage.
             if (!$this->getSession()->getPage()->find('css', '.block_settings')) {
-                $this->execute('behat_forms::i_am_on_homepage');
+                $this->getSession()->visit($this->locate_path('/'));
+                $this->wait(self::TIMEOUT * 1000, self::PAGE_READY_JS);
             }
 
             // Search by label.
-            $this->execute('behat_forms::i_set_the_field_to', [get_string('searchinsettings', 'admin'), $label]);
-            $this->execute("behat_general::i_click_on_in_the", [get_string('search', 'admin'), 'button', '.block_settings', 'css_element']);
+            $searchbox = $this->find_field(get_string('searchinsettings', 'admin'));
+            $searchbox->setValue($label);
+            $submitsearch = $this->find('css', 'form.adminsearchform input[type=submit]');
+            $submitsearch->press();
+
+            $this->wait(self::TIMEOUT * 1000, self::PAGE_READY_JS);
 
             // Admin settings does not use the same DOM structure than other moodle forms
             // but we also need to use lib/behat/form_field/* to deal with the different moodle form elements.
@@ -77,17 +83,35 @@ class behat_admin extends behat_base {
                     "@id=//span[contains(normalize-space(.), $label)]/preceding-sibling::label[1]/@for]";
                 $fieldnode = $this->find('xpath', $fieldxpath, $exception);
 
+                $formfieldtypenode = $this->find('xpath', $fieldxpath . "/ancestor::div[@class='form-setting']" .
+                    "/child::div[contains(concat(' ', @class, ' '),  ' form-')]/child::*/parent::div");
+
             } catch (ElementNotFoundException $e) {
+
                 // Multi element settings, interacting only the first one.
                 $fieldxpath = "//*[label[normalize-space(.)= $label]|span[normalize-space(.)= $label]]/" .
                     "ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' form-item ')]" .
                     "/descendant::div[@class='form-group']/descendant::*[self::input | self::textarea | self::select]" .
                     "[not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]";
                 $fieldnode = $this->find('xpath', $fieldxpath);
+
+                // It is the same one that contains the type.
+                $formfieldtypenode = $fieldnode;
             }
 
-            $this->execute('behat_forms::i_set_the_field_with_xpath_to', [$fieldxpath, $value]);
-            $this->execute("behat_general::i_click_on", [get_string('savechanges'), 'button']);
+            // Getting the class which contains the field type.
+            $classes = explode(' ', $formfieldtypenode->getAttribute('class'));
+            foreach ($classes as $class) {
+                if (substr($class, 0, 5) == 'form-') {
+                    $type = substr($class, 5);
+                }
+            }
+
+            // Instantiating the appropiate field type.
+            $field = behat_field_manager::get_field_instance($type, $fieldnode, $this->getSession());
+            $field->set_value($value);
+
+            $this->find_button(get_string('savechanges'))->press();
         }
     }
 

admin/tests/behat/enable_multiple_accounts_use_same_email.feature

@@ -1,74 +1,57 @@
-@core @core_admin @core_user
-Feature: Allowing multiple accounts to have the same email address
-  In order to manage user accounts
+@core @core_admin
+Feature: Enable multiple accounts to have the same email address
+  In order to have multiple accounts registerd on the system with the same email address
   As an admin
-  I need to be able to set whether to allow multiple accounts with the same email or not
+  I need to enable multiple accounts to be registered with the same email address and verify it is applied
 
-  Scenario Outline: Create a user with the same email as an existing user
+  Background:
+    Given I log in as "admin"
+
+  Scenario: Enable registration of multiple accounts with the same email address
     Given the following config values are set as admin:
-      | allowaccountssameemail | <allowsameemail> |
-    And the following "users" exist:
-      | username  | firstname | lastname | email           |
-      | s1        | John      | Doe      | s1@example.com  |
-    When I log in as "admin"
-    And I navigate to "Users > Accounts > Add a new user" in site administration
+      | allowaccountssameemail | 1 |
+    When I navigate to "Add a new user" node in "Site administration>Users>Accounts"
     And I set the following fields to these values:
-      | Username      | s2      |
-      | First name    | Jane    |
-      | Surname       | Doe     |
-      | Email address | <email> |
-      | New password  | test    |
+      | Username                        | testmultiemailuser1             |
+      | Choose an authentication method | Manual accounts                 |
+      | New password                    | test@User1                      |
+      | First name                      | Test                            |
+      | Surname                         | Multi1                          |
+      | Email address                   | testmultiemailuser@example.com  |
     And I press "Create user"
-    Then I should <expect> "This email address is already registered."
+    And I should see "Test Multi1"
+    And I press "Add a new user"
+    And I set the following fields to these values:
+      | Username                        | testmultiemailuser2             |
+      | Choose an authentication method | Manual accounts                 |
+      | New password                    | test@User2                      |
+      | First name                      | Test                            |
+      | Surname                         | Multi2                          |
+      | Email address                   | testmultiemailuser@example.com  |
+    And I press "Create user"
+    Then I should see "Test Multi2"
+    And I should not see "This email address is already registered"
 
-    Examples:
-      | allowsameemail | email          | expect  |
-      | 0              | s1@example.com | see     |
-      | 0              | S1@EXAMPLE.COM | see     |
-      | 1              | s1@example.com | not see |
-      | 1              | S1@EXAMPLE.COM | not see |
-
-  Scenario Outline: Update a user with the same email as an existing user
+  Scenario: Disable registration of multiple accounts with the same email address
     Given the following config values are set as admin:
-      | allowaccountssameemail | <allowsameemail> |
-    And the following "users" exist:
-      | username  | firstname | lastname | email           |
-      | s1        | John      | Doe      | s1@example.com  |
-      | s2        | Jane      | Doe      | s2@example.com  |
-    When I log in as "admin"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I click on "Edit" "link" in the "Jane Doe" "table_row"
-    And I set the field "Email address" to "<email>"
-    And I press "Update profile"
-    Then I should <expect> "This email address is already registered."
-
-    Examples:
-      | allowsameemail | email          | expect  |
-      | 0              | s1@example.com | see     |
-      | 0              | S1@EXAMPLE.COM | see     |
-      | 1              | s1@example.com | not see |
-      | 1              | S1@EXAMPLE.COM | not see |
-      | 0              | S2@EXAMPLE.COM | not see |
-      | 1              | S2@EXAMPLE.COM | not see |
-
-  Scenario Outline: Update own user profile with the same email as an existing user
-    Given the following config values are set as admin:
-      | allowaccountssameemail | <allowsameemail> |
-    And the following "users" exist:
-      | username  | firstname | lastname | email           |
-      | s1        | John      | Doe      | s1@example.com  |
-      | s2        | Jane      | Doe      | s2@example.com  |
-    When I log in as "s2"
-    And I open my profile in edit mode
-    And I set the field "Email address" to "<email>"
-    And I press "Update profile"
-    Then I should <expect> "This email address is already registered."
-
-    Examples:
-      | allowsameemail | email          | expect  |
-      | 0              | s1@example.com | see     |
-      | 0              | S1@EXAMPLE.COM | see     |
-      | 1              | s1@example.com | not see |
-      | 1              | S1@EXAMPLE.COM | not see |
-      | 0              | S2@EXAMPLE.COM | not see |
-      | 1              | S2@EXAMPLE.COM | not see |
+      | allowaccountssameemail | 0 |
+    When I navigate to "Add a new user" node in "Site administration>Users>Accounts"
+    And I set the following fields to these values:
+      | Username                        | testmultiemailuser1             |
+      | Choose an authentication method | Manual accounts                 |
+      | New password                    | test@User1                      |
+      | First name                      | Test                            |
+      | Surname                         | Multi1                          |
+      | Email address                   | testmultiemailuser@example.com  |
+    And I press "Create user"
+    And I should see "Test Multi1"
+    And I press "Add a new user"
+    And I set the following fields to these values:
+      | Username                        | testmultiemailuser2             |
+      | Choose an authentication method | Manual accounts                 |
+      | New password                    | test@User2                      |
+      | First name                      | Test                            |
+      | Surname                         | Multi2                          |
+      | Email address                   | testmultiemailuser@example.com  |
+    And I press "Create user"
+    Then I should see "This email address is already registered"

admin/tests/behat/filter_users.feature

@@ -65,20 +65,3 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
     And I should not see "User Two"
     And I should not see "User Three"
     And I should not see "User Four"
-
-  Scenario: Filter user accounts by enrolled in any course
-    When I set the following fields to these values:
-      | id_anycourses | Yes |
-    And I press "Add filter"
-    Then I should see "User One"
-    And I should see "User Two"
-    And I should see "User Three"
-    And I should not see "User Four"
-    And I press "Remove all filters"
-    And I set the following fields to these values:
-      | id_anycourses | No |
-    And I press "Add filter"
-    And I should not see "User One"
-    And I should not see "User Two"
-    And I should not see "User Three"
-    And I should see "User Four"

admin/tests/behat/manage_tokens.feature

@@ -9,7 +9,6 @@ Feature: Manage tokens
     | username  | password  | firstname | lastname |
     | testuser  | testuser  | Joe | Bloggs |
     | testuser2 | testuser2 | TestFirstname | TestLastname |
-    And I change window size to "small"
     And I log in as "admin"
     And I am on site homepage
 

admin/tests/behat/purge_caches.feature

@@ -1,34 +0,0 @@
-@core @core_admin
-Feature: Purge caches
-  In order to see changes to cached data
-  As a Moodle administrator
-  I want manually purge different data and file caches
-
-  Background:
-    Given I log in as "admin"
-    And I navigate to "Development > Purge caches" in site administration
-
-  Scenario: Purge all caches
-    Given I should not see "All caches were purged"
-    When I press "Purge all caches"
-    Then I should see "All caches were purged"
-
-  Scenario: Purge selected caches
-    Given I should not see "Selected caches were purged"
-    When I set the field "Themes" to "1"
-    And I press "Purge selected caches"
-    Then I should see "The selected caches were purged"
-
-  Scenario: Purge selected caches without selecting any caches
-    Given I should not see "Select one or more caches to purge"
-    When I press "Purge selected caches"
-    Then I should not see "The selected caches were purged"
-    And I should see "Select one or more caches to purge"
-
-  Scenario: Redirect back to the original page after following a Purge all caches link
-    Given I am on site homepage
-    And I should see "Available courses"
-    And I should not see "All caches were purged"
-    When I follow "Purge all caches"
-    Then I should see "All caches were purged"
-    And I should see "Available courses"

admin/tool/analytics/classes/output/form/edit_model.php

@@ -72,22 +72,6 @@ class edit_model extends \moodleform {
         $mform->addElement('select', 'timesplitting', get_string('timesplittingmethod', 'analytics'), $timesplittings);
         $mform->addHelpButton('timesplitting', 'timesplittingmethod', 'analytics');
 
-        $defaultprocessor = \core_analytics\manager::get_predictions_processor_name(
-            \core_analytics\manager::get_predictions_processor()
-        );
-        $predictionprocessors = ['' => get_string('defaultpredictoroption', 'analytics', $defaultprocessor)];
-        foreach ($this->_customdata['predictionprocessors'] as $classname => $predictionsprocessor) {
-            if ($predictionsprocessor->is_ready() !== true) {
-                continue;
-            }
-            $optionname = \tool_analytics\output\helper::class_to_option($classname);
-            $predictionprocessors[$optionname] = \core_analytics\manager::get_predictions_processor_name($predictionsprocessor);
-        }
-
-        $mform->addElement('select', 'predictionsprocessor', get_string('predictionsprocessor', 'analytics'),
-            $predictionprocessors);
-        $mform->addHelpButton('predictionsprocessor', 'predictionsprocessor', 'analytics');
-
         $mform->addElement('hidden', 'id', $this->_customdata['id']);
         $mform->setType('id', PARAM_INT);
 

admin/tool/analytics/classes/output/invalid_analysables.php

@@ -153,12 +153,6 @@ class invalid_analysables implements \renderable, \templatable {
             $data->analysables[] = $obj;
         }
 
-        if (empty($data->analysables)) {
-            $data->noanalysables = [
-                'message' => get_string('noinvalidanalysables', 'tool_analytics'),
-                'announce' => true,
-            ];
-        }
         return $data;
     }
 }

admin/tool/analytics/classes/output/models_list.php

@@ -141,7 +141,7 @@ class models_list implements \renderable, \templatable {
                         if ($contextid == SYSCONTEXTID) {
                             $contextname = get_string('allpredictions', 'tool_analytics');
                         } else {
-                            $contextname = shorten_text($context->get_context_name(false, true), 40);
+                            $contextname = shorten_text($context->get_context_name(true, true), 90);
                         }
                         $predictioncontexts[$contextid] = $contextname;
                     }
@@ -247,7 +247,7 @@ class models_list implements \renderable, \templatable {
             }
 
             // Clear model.
-            if (!empty($predictioncontexts) || $model->is_trained()) {
+            if (!empty($predictioncontexts)) {
                 $actionid = 'clear-' . $model->get_id();
                 $PAGE->requires->js_call_amd('tool_analytics/model', 'confirmAction', [$actionid, 'clear']);
                 $urlparams['action'] = 'clear';

admin/tool/analytics/cli/guess_course_start_and_end.php

@@ -173,8 +173,7 @@ function tool_analytics_calculate_course_dates($course, $options) {
         $formatoptions = $format->get_format_options();
 
         // Change this for a course formats API level call in MDL-60702.
-        if ((get_class($format) == 'format_weeks' || is_subclass_of($format, 'format_weeks')) &&
-                method_exists($format, 'update_end_date') && $formatoptions['automaticenddate']) {
+        if (method_exists($format, 'update_end_date') && $formatoptions['automaticenddate']) {
             // Special treatment for weeks-based formats with automatic end date.
 
             if ($options['update']) {

admin/tool/analytics/lang/en/tool_analytics.php

@@ -62,7 +62,7 @@ $string['indicators'] = 'Indicators';
 $string['info'] = 'Info';
 $string['insights'] = 'Insights';
 $string['invalidanalysables'] = 'Invalid site elements';
-$string['invalidanalysablesinfo'] = 'This page lists analysable elements that can\'t be used by this prediction model. The listed elements can\'t be used either to train the prediction model nor can the prediction model obtain predictions for them.';
+$string['invalidanalysablesinfo'] = 'This pages lists this site analysable elements that can not be used by this prediction model. The listed elements can not be used neither to train the prediction model nor the prediction model can get predictions for them.';
 $string['invalidanalysablestable'] = 'Invalid site analysable elements table';
 $string['invalidprediction'] = 'Invalid to get predictions';
 $string['invalidtraining'] = 'Invalid to train the model';
@@ -75,7 +75,6 @@ $string['nextpage'] = 'Next page';
 $string['nodatatoevaluate'] = 'There is no data to evaluate the model';
 $string['nodatatopredict'] = 'No new elements to get predictions for';
 $string['nodatatotrain'] = 'There is no new data that can be used for training';
-$string['noinvalidanalysables'] = 'This site does not contain any invalid analysable element.';
 $string['notdefined'] = 'Not yet defined';
 $string['pluginname'] = 'Analytic models';
 $string['predictionresults'] = 'Prediction results';

admin/tool/analytics/model.php

@@ -110,8 +110,7 @@ switch ($action) {
             'id' => $model->get_id(),
             'model' => $model,
             'indicators' => $model->get_potential_indicators(),
-            'timesplittings' => \core_analytics\manager::get_enabled_time_splitting_methods(),
-            'predictionprocessors' => \core_analytics\manager::get_all_prediction_processors()
+            'timesplittings' => \core_analytics\manager::get_enabled_time_splitting_methods()
         );
         $mform = new \tool_analytics\output\form\edit_model(null, $customdata);
 
@@ -127,8 +126,7 @@ switch ($action) {
                 $indicators[] = \core_analytics\manager::get_indicator($indicatorclass);
             }
             $timesplitting = \tool_analytics\output\helper::option_to_class($data->timesplitting);
-            $predictionsprocessor = \tool_analytics\output\helper::option_to_class($data->predictionsprocessor);
-            $model->update($data->enabled, $indicators, $timesplitting, $predictionsprocessor);
+            $model->update($data->enabled, $indicators, $timesplitting);
             redirect(new \moodle_url('/admin/tool/analytics/index.php'));
         }
 
@@ -139,7 +137,6 @@ switch ($action) {
         $callable = array('\tool_analytics\output\helper', 'class_to_option');
         $modelobj->indicators = array_map($callable, json_decode($modelobj->indicators));
         $modelobj->timesplitting = \tool_analytics\output\helper::class_to_option($modelobj->timesplitting);
-        $modelobj->predictionsprocessor = \tool_analytics\output\helper::class_to_option($modelobj->predictionsprocessor);
         $mform->set_data($modelobj);
         $mform->display();
         break;

admin/tool/analytics/templates/invalid_analysables.mustache

@@ -48,38 +48,31 @@
 <div class="box">
     <h3>{{#str}}modelinvalidanalysables, tool_analytics, {{modelname}}{{/str}}</h3>
     <div>{{#str}}invalidanalysablesinfo, tool_analytics{{/str}}</div>
-    {{#noanalysables}}
-        <div class="m-t-2 m-b-1">
-            {{> core/notification_info}}
-        </div>
-    {{/noanalysables}}
-    {{^noanalysables}}
-        <div class="m-t-2 m-b-1">
-            <span>{{#prev}}{{> core/single_button}}{{/prev}}</span>
-            <span>{{#next}}{{> core/single_button}}{{/next}}</span>
-        </div>
-        <table class="generaltable fullwidth">
-            <caption class="accesshide">{{#str}}invalidanalysablestable, tool_analytics{{/str}}</caption>
-            <thead>
-                <tr>
-                    <th scope="col">{{#str}}name{{/str}}</th>
-                    <th scope="col">{{#str}}invalidtraining, tool_analytics{{/str}}</th>
-                    <th scope="col">{{#str}}invalidprediction, tool_analytics{{/str}}</th>
-                </tr>
-            </thead>
-            <tbody>
-            {{#analysables}}
-                <tr>
-                    <td>{{{url}}}</td>
-                    <td>{{validtraining}}</td>
-                    <td>{{validprediction}}</td>
-                </tr>
-            {{/analysables}}
-            </tbody>
-        </table>
-        <div class="m-t-1 m-b-2">
-            <span>{{#prev}}{{> core/single_button}}{{/prev}}</span>
-            <span>{{#next}}{{> core/single_button}}{{/next}}</span>
-        </div>
-    {{/noanalysables}}
+    <div class="m-t-2 m-b-1">
+        <span>{{#prev}}{{> core/single_button}}{{/prev}}</span>
+        <span>{{#next}}{{> core/single_button}}{{/next}}</span>
+    </div>
+    <table class="generaltable fullwidth">
+        <caption class="accesshide">{{#str}}invalidanalysablestable, tool_analytics{{/str}}</caption>
+        <thead>
+            <tr>
+                <th scope="col">{{#str}}name{{/str}}</th>
+                <th scope="col">{{#str}}invalidtraining, tool_analytics{{/str}}</th>
+                <th scope="col">{{#str}}invalidprediction, tool_analytics{{/str}}</th>
+            </tr>
+        </thead>
+        <tbody>
+        {{#analysables}}
+            <tr>
+                <td>{{{url}}}</td>
+                <td>{{validtraining}}</td>
+                <td>{{validprediction}}</td>
+            </tr>
+        {{/analysables}}
+        </tbody>
+    </table>
+    <div class="m-t-1 m-b-2">
+        <span>{{#prev}}{{> core/single_button}}{{/prev}}</span>
+        <span>{{#next}}{{> core/single_button}}{{/next}}</span>
+    </div>
 </div>

admin/tool/analytics/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2018120300; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2018112800; // Requires this Moodle version.
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2018050800; // Requires this Moodle version.
 $plugin->component = 'tool_analytics'; // Full name of the plugin (used for diagnostics).

admin/tool/assignmentupgrade/batchupgrade.php

@@ -0,0 +1,72 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Script to show all the assignments that have not been upgraded after the main upgrade.
+ *
+ * @package    tool_assignmentupgrade
+ * @copyright  2012 NetSpot
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+define('NO_OUTPUT_BUFFERING', true);
+
+require_once(__DIR__ . '/../../../config.php');
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/locallib.php');
+require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/upgradableassignmentstable.php');
+require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/upgradableassignmentsbatchform.php');
+
+require_sesskey();
+
+// This calls require_login and checks moodle/site:config.
+admin_externalpage_setup('assignmentupgrade', '', array(), tool_assignmentupgrade_url('batchupgrade'));
+
+$PAGE->set_pagelayout('maintenance');
+$PAGE->navbar->add(get_string('batchupgrade', 'tool_assignmentupgrade'));
+
+$renderer = $PAGE->get_renderer('tool_assignmentupgrade');
+
+$confirm = required_param('confirm', PARAM_BOOL);
+if (!$confirm) {
+    print_error('invalidrequest');
+    die();
+}
+raise_memory_limit(MEMORY_EXTRA);
+// Release session.
+\core\session\manager::write_close();
+
+echo $renderer->header();
+echo $renderer->heading(get_string('batchupgrade', 'tool_assignmentupgrade'));
+
+$current = 0;
+if (optional_param('upgradeall', false, PARAM_BOOL)) {
+    $assignmentids = tool_assignmentupgrade_load_all_upgradable_assignmentids();
+} else {
+    $assignmentids = explode(',', optional_param('selected', '', PARAM_TEXT));
+}
+$total = count($assignmentids);
+
+foreach ($assignmentids as $assignmentid) {
+    list($summary, $success, $log) = tool_assignmentupgrade_upgrade_assignment($assignmentid);
+    $current += 1;
+    $params = array('current'=>$current, 'total'=>$total);
+    echo $renderer->heading(get_string('upgradeprogress', 'tool_assignmentupgrade', $params), 3);
+    echo $renderer->convert_assignment_result($summary, $success, $log);
+}
+
+echo $renderer->continue_button(tool_assignmentupgrade_url('listnotupgraded'));
+echo $renderer->footer();

admin/tool/assignmentupgrade/classes/privacy/provider.php

@@ -0,0 +1,73 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Privacy Subsystem implementation for tool_assignmentupgrade.
+ *
+ * @package    tool_assignmentupgrade
+ * @copyright  2018 Zig Tan <zig@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace tool_assignmentupgrade\privacy;
+
+use core_privacy\local\metadata\collection;
+use core_privacy\local\request\writer;
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Privacy Subsystem for tool_assignmentupgrade implementing metadata, plugin, and user_preference providers.
+ *
+ * @copyright  2018 Zig Tan <zig@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class provider implements
+    \core_privacy\local\metadata\provider,
+    \core_privacy\local\request\user_preference_provider {
+
+    /**
+     * Returns meta data about this system.
+     *
+     * @param   collection $collection The initialised collection to add items to.
+     * @return  collection     A listing of user data stored through this system.
+     */
+    public static function get_metadata(collection $collection) : collection {
+        $collection->add_user_preference(
+            'tool_assignmentupgrade_perpage',
+            'privacy:metadata:preference:perpage'
+        );
+        return $collection;
+    }
+
+    /**
+     * Export all user preferences for the plugin.
+     *
+     * @param   int $userid The userid of the user whose data is to be exported.
+     */
+    public static function export_user_preferences(int $userid) {
+        $perpage = get_user_preferences('tool_assignmentupgrade_perpage', null, $userid);
+        if ($perpage !== null) {
+            writer::export_user_preference(
+                'tool_assignmentupgrade',
+                'perpage',
+                $perpage,
+                get_string('privacy:metadata:preference:perpage', 'tool_assignmentupgrade')
+            );
+        }
+    }
+
+}

admin/tool/assignmentupgrade/index.php

@@ -0,0 +1,50 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This tool can upgrade old assignment activities to the new assignment activity type
+ *
+ * The upgrade can be done on any old assignment instance providing it is using one of the core
+ * assignment subtypes (online text, single upload, etc).
+ * The new assignment module was introduced in Moodle 2.3 and although it completely reproduces
+ * the features of the existing assignment type it wasn't designed to replace it entirely as there
+ * are many custom assignment types people use and it wouldn't be practical to try to convert them.
+ * Instead the existing assignment type will be left in core and people will be encouraged to
+ * use the new assignment type.
+ *
+ * This screen is the main entry-point to the plugin, it gives the admin a list
+ * of options available to them.
+ *
+ * @package    tool_assignmentupgrade
+ * @copyright  2012 NetSpot
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once(__DIR__ . '/../../../config.php');
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/locallib.php');
+
+// This calls require_login and checks moodle/site:config.
+admin_externalpage_setup('assignmentupgrade');
+
+$renderer = $PAGE->get_renderer('tool_assignmentupgrade');
+
+$actions = array();
+
+$header = get_string('pluginname', 'tool_assignmentupgrade');
+$actions[] = tool_assignmentupgrade_action::make('listnotupgraded');
+
+echo $renderer->index_page($header, $actions);

admin/tool/assignmentupgrade/lang/en/tool_assignmentupgrade.php

@@ -0,0 +1,61 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Strings for the assignment upgrade tool
+ *
+ * @package    tool_assignmentupgrade
+ * @copyright  2012 NetSpot
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+$string['areyousure'] = 'Are you sure?';
+$string['areyousuremessage'] = 'Are you sure you want to upgrade the assignment "{$a->name}"?';
+$string['assignmentid'] = 'Assignment ID';
+$string['assignmentnotfound'] = 'Assignment could not be found (id={$a})';
+$string['assignmentsperpage'] = 'Assignments per page';
+$string['assignmenttype'] = 'Assignment type';
+$string['backtoindex'] = 'Back to index';
+$string['batchoperations'] = 'Batch operations';
+$string['batchupgrade'] = 'Upgrade multiple assignments';
+$string['confirmbatchupgrade'] = 'Confirm batch upgrade assignments';
+$string['conversioncomplete'] = 'Assignment converted';
+$string['conversionfailed'] = 'The assignment conversion was not successful. The log from the upgrade was: <br />{$a}';
+$string['listnotupgraded'] = 'List assignments that have not been upgraded';
+$string['listnotupgraded_desc'] = 'You can upgrade individual assignments from here';
+$string['noassignmentsselected'] = 'No assignments selected';
+$string['noassignmentstoupgrade'] = 'There are no assignments that require upgrading';
+$string['notsupported'] = '';
+$string['notupgradedintro'] = 'This page lists the assignments created with an older version of Moodle that have not been upgraded to the new assignment module in Moodle 2.3. Not all assignments can be upgraded - if they were created with a custom assignment subtype, then that subtype will need to be upgraded to the new assignment plugin format in order to complete the upgrade.';
+$string['notupgradedtitle'] = 'Assignments not upgraded';
+$string['pluginname'] = 'Assignment upgrade helper';
+$string['select'] = 'Select';
+$string['submissions'] = 'Submissions';
+$string['supported'] = 'Upgrade';
+$string['updatetable'] = 'Update table';
+$string['unknown'] = 'Unknown';
+$string['upgradeassignmentsummary'] = 'Upgrade assignment: {$a->name} (Course: {$a->shortname})';
+$string['upgradeassignmentsuccess'] = 'Result: Upgrade successful';
+$string['upgradeassignmentfailed'] = 'Result: Upgrade failed. The log from the upgrade was: <br/><div class="tool_assignmentupgrade_upgradelog">{$a->log}</div>';
+$string['upgradable'] = 'Upgradable';
+$string['upgradeselected'] = 'Upgrade selected assignments';
+$string['upgradeselectedcount'] = 'Upgrade {$a} selected assignments?';
+$string['upgradeall'] = 'Upgrade all assignments';
+$string['upgradeallconfirm'] = 'Upgrade all assignments?';
+$string['upgradeprogress'] = 'Upgrade assignment {$a->current} of {$a->total}';
+$string['upgradesingle'] = 'Upgrade single assignment';
+$string['viewcourse'] = 'View the course with the converted assignment';
+$string['privacy:metadata:preference:perpage'] = 'The assignment upgrade records per page preference set for the user.';

admin/tool/assignmentupgrade/listnotupgraded.php

@@ -0,0 +1,59 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Script to show all the assignments that have not been upgraded after the main upgrade.
+ *
+ * @package    tool_assignmentupgrade
+ * @copyright  2012 NetSpot
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once(__DIR__ . '/../../../config.php');
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/locallib.php');
+require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/upgradableassignmentstable.php');
+require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/upgradableassignmentsbatchform.php');
+require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/paginationform.php');
+
+// This calls require_login and checks moodle/site:config.
+admin_externalpage_setup('assignmentupgrade', '', array(), tool_assignmentupgrade_url('listnotupgraded'));
+$PAGE->navbar->add(get_string('listnotupgraded', 'tool_assignmentupgrade'));
+
+$renderer = $PAGE->get_renderer('tool_assignmentupgrade');
+
+$perpage = optional_param('perpage', 0, PARAM_INT);
+if (!$perpage) {
+    $perpage = get_user_preferences('tool_assignmentupgrade_perpage', 100);
+} else {
+    set_user_preference('tool_assignmentupgrade_perpage', $perpage);
+}
+$assignments = new tool_assignmentupgrade_assignments_table($perpage);
+
+$batchform = new tool_assignmentupgrade_batchoperations_form();
+$data = $batchform->get_data();
+
+if ($data && $data->selectedassignments != '' || $data && isset($data->upgradeall)) {
+    require_sesskey();
+    echo $renderer->confirm_batch_operation_page($data);
+} else {
+    $paginationform = new tool_assignmentupgrade_pagination_form();
+    $pagedata = new stdClass();
+    $pagedata->perpage = $perpage;
+    $paginationform->set_data($pagedata);
+    echo $renderer->assignment_list_page($assignments, $batchform, $paginationform);
+}
+

admin/tool/assignmentupgrade/locallib.php

@@ -0,0 +1,234 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Assignment upgrade tool library functions
+ *
+ * @package    tool_assignmentupgrade
+ * @copyright  2012 NetSpot
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Get the URL of a script within this plugin.
+ * @param string $script the script name, without .php. E.g. 'index'
+ * @param array $params URL parameters (optional)
+ * @return moodle_url
+ */
+function tool_assignmentupgrade_url($script, $params = array()) {
+    return new moodle_url('/admin/tool/assignmentupgrade/' . $script . '.php', $params);
+}
+
+/**
+ * Class to encapsulate the continue / cancel for batch operations
+ *
+ * @package    tool_assignmentupgrade
+ * @copyright  2012 NetSpot
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class tool_assignmentupgrade_batchoperationconfirm implements renderable {
+    /** @var string $continuemessage The message to show above the continue cancel buttons */
+    public $continuemessage = '';
+    /** @var string $continueurl The url to load if the user clicks continue */
+    public $continueurl;
+
+    /**
+     * Constructor for this class
+     * @param stdClass $data - The data from the previous batch form
+     */
+    public function __construct($data) {
+        if (isset($data->upgradeselected)) {
+            $this->continuemessage = get_string('upgradeselectedcount',
+                                                'tool_assignmentupgrade',
+                                                count(explode(',', $data->selectedassignments)));
+            $urlparams = array('upgradeselected'=>'1',
+                               'confirm'=>'1',
+                               'sesskey'=>sesskey(),
+                               'selected'=>$data->selectedassignments);
+            $this->continueurl = new moodle_url('/admin/tool/assignmentupgrade/batchupgrade.php', $urlparams);
+        } else if (isset($data->upgradeall)) {
+            if (!tool_assignmentupgrade_any_upgradable_assignments()) {
+                $this->continuemessage = get_string('noassignmentstoupgrade', 'tool_assignmentupgrade');
+                $this->continueurl = '';
+            } else {
+                $this->continuemessage = get_string('upgradeallconfirm', 'tool_assignmentupgrade');
+                $urlparams = array('upgradeall'=>'1', 'confirm'=>'1', 'sesskey'=>sesskey());
+                $this->continueurl = new moodle_url('/admin/tool/assignmentupgrade/batchupgrade.php', $urlparams);
+            }
+        }
+    }
+}
+
+
+/**
+ * Class to encapsulate one of the functionalities that this plugin offers.
+ *
+ * @package    tool_assignmentupgrade
+ * @copyright  2012 NetSpot
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class tool_assignmentupgrade_action {
+    /** @var string the name of this action. */
+    public $name;
+    /** @var moodle_url the URL to launch this action. */
+    public $url;
+    /** @var string a description of this aciton. */
+    public $description;
+
+    /**
+     * Constructor to set the fields.
+     *
+     * In order to create a new tool_assignmentupgrade_action instance you must use
+     * the tool_assignmentupgrade_action::make
+     * method.
+     *
+     * @param string $name the name of this action.
+     * @param moodle_url $url the URL to launch this action.
+     * @param string $description a description of this aciton.
+     */
+    protected function __construct($name, moodle_url $url, $description) {
+        $this->name = $name;
+        $this->url = $url;
+        $this->description = $description;
+    }
+
+    /**
+     * Make an action with standard values.
+     * @param string $shortname internal name of the action. Used to get strings and build a URL.
+     * @param array $params any URL params required.
+     * @return tool_assignmentupgrade_action
+     */
+    public static function make($shortname, $params = array()) {
+        return new self(
+                get_string($shortname, 'tool_assignmentupgrade'),
+                tool_assignmentupgrade_url($shortname, $params),
+                get_string($shortname . '_desc', 'tool_assignmentupgrade'));
+    }
+}
+
+/**
+ * Determine if there are any assignments that can be upgraded
+ * @return boolean - Are there any assignments that can be upgraded
+ */
+function tool_assignmentupgrade_any_upgradable_assignments() {
+    global $DB, $CFG;
+    require_once($CFG->dirroot . '/mod/assign/locallib.php');
+    // First find all the unique assignment types.
+    $types = $DB->get_records_sql('SELECT plugin AS assignmenttype,
+                                          value AS version
+                                   FROM {config_plugins}
+                                   WHERE
+                                       name = ? AND
+                                       plugin LIKE ?', array('version', 'assignment_%'));
+
+    $upgradabletypes = array();
+
+    foreach ($types as $assignment) {
+        $shorttype = substr($assignment->assignmenttype, strlen('assignment_'));
+        if (assign::can_upgrade_assignment($shorttype, $assignment->version)) {
+            $upgradabletypes[] = $shorttype;
+        }
+    }
+    list($sql, $params) = $DB->get_in_or_equal($upgradabletypes);
+
+    $count = $DB->count_records_sql('SELECT COUNT(id) FROM {assignment} WHERE assignmenttype ' . $sql, $params);
+
+    return $count > 0;
+}
+
+/**
+ * Load a list of all the assignmentids that can be upgraded
+ * @return array of assignment ids
+ */
+function tool_assignmentupgrade_load_all_upgradable_assignmentids() {
+    global $DB, $CFG;
+    require_once($CFG->dirroot . '/mod/assign/locallib.php');
+    // First find all the unique assignment types.
+    $types = $DB->get_records_sql('SELECT
+                                       plugin AS assignmenttype,
+                                       value AS version
+                                   FROM {config_plugins}
+                                   WHERE
+                                       name = ? AND
+                                       plugin LIKE ?', array('version', 'assignment_%'));
+
+    $upgradabletypes = array();
+
+    foreach ($types as $assignment) {
+        $shorttype = substr($assignment->assignmenttype, strlen('assignment_'));
+        if (assign::can_upgrade_assignment($shorttype, $assignment->version)) {
+            $upgradabletypes[] = $shorttype;
+        }
+    }
+
+    list($sql, $params) = $DB->get_in_or_equal($upgradabletypes);
+
+    $records = $DB->get_records_sql('SELECT id from {assignment} where assignmenttype ' . $sql, $params);
+    $ids = array();
+    foreach ($records as $record) {
+        $ids[] = $record->id;
+    }
+
+    return $ids;
+}
+
+
+/**
+ * Upgrade a single assignment. This is used by both upgrade single and upgrade batch
+ *
+ * @param int $assignmentid - The assignment id to upgrade
+ * @return array(string, boolean, string) -
+ *                  The array contains
+ *                      - the assignment summary (returned by tool_assignmentupgrade_get_assignment)
+ *                      - success
+ *                      - the upgrade log
+ */
+function tool_assignmentupgrade_upgrade_assignment($assignmentid) {
+    global $CFG;
+    require_once($CFG->dirroot . '/mod/assign/upgradelib.php');
+
+    $assignment_upgrader = new assign_upgrade_manager();
+    $info = tool_assignmentupgrade_get_assignment($assignmentid);
+    if ($info) {
+        $log = '';
+        $success = $assignment_upgrader->upgrade_assignment($assignmentid, $log);
+    } else {
+        $success = false;
+        $log = get_string('assignmentnotfound', 'tool_assignmentupgrade', $assignmentid);
+        $info = new stdClass();
+        $info->name = get_string('unknown', 'tool_assignmentupgrade');
+        $info->shortname = get_string('unknown', 'tool_assignmentupgrade');
+    }
+
+    return array($info, $success, $log);
+}
+
+/**
+ * Get the information about a assignment to be upgraded.
+ * @param int $assignmentid the assignment id.
+ * @return stdClass the information about that assignment.
+ */
+function tool_assignmentupgrade_get_assignment($assignmentid) {
+    global $DB;
+    return $DB->get_record_sql("
+            SELECT a.id, a.name, c.shortname, c.id AS courseid
+            FROM {assignment} a
+            JOIN {course} c ON c.id = a.course
+            WHERE a.id = ?", array($assignmentid));
+}
+

admin/tool/assignmentupgrade/module.js

@@ -0,0 +1,70 @@
+M.tool_assignmentupgrade = {
+    init_upgrade_table: function(Y) {
+
+        Y.use('node', function(Y) {
+            checkboxes = Y.all('td.c0 input');
+            checkboxes.each(function(node) {
+                node.on('change', function(e) {
+                    rowelement = e.currentTarget.get('parentNode').get('parentNode');
+                    if (e.currentTarget.get('checked')) {
+                        rowelement.setAttribute('class', 'selectedrow');
+                    } else {
+                        rowelement.setAttribute('class', 'unselectedrow');
+                    }
+                });
+
+                rowelement = node.get('parentNode').get('parentNode');
+                if (node.get('checked')) {
+                    rowelement.setAttribute('class', 'selectedrow');
+                } else {
+                    rowelement.setAttribute('class', 'unselectedrow');
+                }
+            });
+        });
+
+        var selectall = Y.one('th.c0 input');
+        selectall.on('change', function(e) {
+            if (e.currentTarget.get('checked')) {
+                checkboxes = Y.all('td.c0 input');
+                checkboxes.each(function(node) {
+                    rowelement = node.get('parentNode').get('parentNode');
+                    node.set('checked', true);
+                    rowelement.setAttribute('class', 'selectedrow');
+                });
+            } else {
+                checkboxes = Y.all('td.c0 input');
+                checkboxes.each(function(node) {
+                    rowelement = node.get('parentNode').get('parentNode');
+                    node.set('checked', false);
+                    rowelement.setAttribute('class', 'unselectedrow');
+                });
+            }
+        });
+
+        var upgradeselectedbutton = Y.one('#id_upgradeselected');
+        upgradeselectedbutton.on('click', function(e) {
+            checkboxes = Y.all('td.c0 input');
+            var selectedassignments = [];
+            checkboxes.each(function(node) {
+                if (node.get('checked')) {
+                    selectedassignments[selectedassignments.length] = node.get('value');
+                }
+            });
+
+            operation = Y.one('#id_operation');
+            assignmentsinput = Y.one('input.selectedassignments');
+            assignmentsinput.set('value', selectedassignments.join(','));
+            if (selectedassignments.length == 0) {
+                alert(M.util.get_string('noassignmentsselected', 'tool_assignmentupgrade'));
+                e.preventDefault();
+            }
+        });
+
+        var perpage = Y.one('#id_perpage');
+        perpage.on('change', function(e) {
+            window.onbeforeunload = null;
+            Y.one('.tool_assignmentupgrade_paginationform form').submit();
+        });
+
+    }
+}

admin/tool/assignmentupgrade/paginationform.php

@@ -0,0 +1,57 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This file contains the forms to create and edit an instance of this module
+ *
+ * @package   tool_assignmentupgrade
+ * @copyright 2012 NetSpot {@link http://www.netspot.com.au}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
+
+require_once($CFG->libdir.'/formslib.php');
+
+/**
+ * Assignment upgrade table display options
+ *
+ * @package   tool_assignmentupgrade
+ * @copyright 2012 NetSpot {@link http://www.netspot.com.au}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class tool_assignmentupgrade_pagination_form extends moodleform {
+    /**
+     * Define this form - called from the parent constructor
+     */
+    public function definition() {
+        $mform = $this->_form;
+        $instance = $this->_customdata;
+
+        $mform->addElement('header', 'general', get_string('assignmentsperpage', 'tool_assignmentupgrade'));
+        // Visible elements.
+        $options = array(10=>'10', 20=>'20', 50=>'50', 100=>'100');
+        $mform->addElement('select', 'perpage', get_string('assignmentsperpage', 'assign'), $options);
+
+        // Hidden params.
+        $mform->addElement('hidden', 'action', 'saveoptions');
+        $mform->setType('action', PARAM_ALPHA);
+
+        // Buttons.
+        $this->add_action_buttons(false, get_string('updatetable', 'tool_assignmentupgrade'));
+    }
+}
+

admin/tool/assignmentupgrade/renderer.php

@@ -0,0 +1,249 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Defines the renderer for the assignment upgrade helper plugin.
+ *
+ * @package    tool_assignmentupgrade
+ * @copyright  2012 NetSpot
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Renderer for the assignment upgrade helper plugin.
+ *
+ * @package    tool_assignmentupgrade
+ * @copyright  2012 NetSpot
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class tool_assignmentupgrade_renderer extends plugin_renderer_base {
+
+    /**
+     * Render the index page.
+     * @param string $detected information about what sort of site was detected.
+     * @param array $actions list of actions to show on this page.
+     * @return string html to output.
+     */
+    public function index_page($detected, array $actions) {
+        $output = '';
+        $output .= $this->header();
+        $output .= $this->heading(get_string('pluginname', 'tool_assignmentupgrade'));
+        $output .= $this->box($detected);
+        $output .= html_writer::start_tag('ul');
+        foreach ($actions as $action) {
+            $output .= html_writer::tag('li',
+                    html_writer::link($action->url, $action->name) . ' - ' .
+                    $action->description);
+        }
+        $output .= html_writer::end_tag('ul');
+        $output .= $this->footer();
+        return $output;
+    }
+
+    /**
+     * Render a page that is just a simple message.
+     * @param string $message the message to display.
+     * @return string html to output.
+     */
+    public function simple_message_page($message) {
+        $output = '';
+        $output .= $this->header();
+        $output .= $this->heading($message);
+        $output .= $this->back_to_index();
+        $output .= $this->footer();
+        return $output;
+    }
+
+    /**
+     * Render the confirm batch operation page
+     * @param stdClass $data Submitted form data with list of assignments to upgrade
+     * @return string html to output.
+     */
+    public function confirm_batch_operation_page(stdClass $data) {
+        $output = '';
+        $output .= $this->header();
+
+        $output .= $this->heading(get_string('confirmbatchupgrade', 'tool_assignmentupgrade'));
+        $output .= $this->output->spacer(array(), true);
+
+        $output .= $this->container_start('tool_assignmentupgrade_confirmbatch');
+
+        $output .= $this->render(new tool_assignmentupgrade_batchoperationconfirm($data));
+        $output .= $this->container_end();
+
+        $output .= $this->back_to_index();
+        $output .= $this->footer();
+        return $output;
+    }
+
+    /**
+     * Render the confirm batch continue / cancel links
+     * @param tool_assignmentupgrade_batchoperationconfirm $confirm Wrapper class to determine the continue message and url
+     * @return string html to output.
+     */
+    public function render_tool_assignmentupgrade_batchoperationconfirm(tool_assignmentupgrade_batchoperationconfirm $confirm) {
+        $output = '';
+
+        if ($confirm->continueurl) {
+            $output .= $this->output->confirm($confirm->continuemessage,
+                                              $confirm->continueurl,
+                                              tool_assignmentupgrade_url('listnotupgraded'));
+        } else {
+            $output .= $this->output->box($confirm->continuemessage);
+            $output .= $this->output->continue_button(tool_assignmentupgrade_url('listnotupgraded'));
+        }
+        return $output;
+    }
+
+    /**
+     * Render the list of assignments that still need to be upgraded page.
+     * @param tool_assignmentupgrade_assignments_table $assignments of data about assignments.
+     * @param tool_assignmentupgrade_batchoperations_form $batchform Submitted form with list of assignments to upgrade
+     * @param tool_assignmentupgrade_pagination_form $paginationform Form which contains the preferences for paginating the table
+     * @return string html to output.
+     */
+    public function assignment_list_page(tool_assignmentupgrade_assignments_table $assignments,
+                                         tool_assignmentupgrade_batchoperations_form $batchform,
+                                         tool_assignmentupgrade_pagination_form $paginationform) {
+        $output = '';
+        $output .= $this->header();
+        $this->page->requires->js_init_call('M.tool_assignmentupgrade.init_upgrade_table', array());
+        $this->page->requires->string_for_js('noassignmentsselected', 'tool_assignmentupgrade');
+
+        $output .= $this->heading(get_string('notupgradedtitle', 'tool_assignmentupgrade'));
+        $output .= $this->box(get_string('notupgradedintro', 'tool_assignmentupgrade'));
+        $output .= $this->output->spacer(array(), true);
+
+        $output .= $this->container_start('tool_assignmentupgrade_upgradetable');
+
+        $output .= $this->container_start('tool_assignmentupgrade_paginationform');
+        $output .= $this->moodleform($paginationform);
+        $output .= $this->container_end();
+
+        $output .= $this->flexible_table($assignments, $assignments->get_rows_per_page(), true);
+        $output .= $this->container_end();
+
+        if ($assignments->anyupgradableassignments) {
+            $output .= $this->container_start('tool_assignmentupgrade_batchform');
+            $output .= $this->moodleform($batchform);
+            $output .= $this->container_end();
+        }
+
+        $output .= $this->back_to_index();
+        $output .= $this->footer();
+        return $output;
+    }
+
+    /**
+     * Render the result of an assignment conversion
+     * @param stdClass $assignmentsummary data about the assignment to upgrade.
+     * @param bool $success Set to true if the outcome of the conversion was a success
+     * @param string $log The log from the conversion
+     * @return string html to output.
+     */
+    public function convert_assignment_result($assignmentsummary, $success, $log) {
+        $output = '';
+
+        $output .= $this->container_start('tool_assignmentupgrade_result');
+        $output .= $this->container(get_string('upgradeassignmentsummary', 'tool_assignmentupgrade', $assignmentsummary));
+        if (!$success) {
+            $output .= $this->container(get_string('conversionfailed', 'tool_assignmentupgrade', $log));
+        } else {
+            $output .= $this->container(get_string('upgradeassignmentsuccess', 'tool_assignmentupgrade'));
+            $url = new moodle_url('/course/view.php', array('id'=>$assignmentsummary->courseid));
+            $output .= $this->container(html_writer::link($url, get_string('viewcourse', 'tool_assignmentupgrade')));
+        }
+        $output .= $this->container_end();
+
+        return $output;
+    }
+
+    /**
+     * Render the are-you-sure page to confirm a manual upgrade.
+     * @param stdClass $assignmentsummary data about the assignment to upgrade.
+     * @return string html to output.
+     */
+    public function convert_assignment_are_you_sure($assignmentsummary) {
+        $output = '';
+        $output .= $this->header();
+        $output .= $this->heading(get_string('areyousure', 'tool_assignmentupgrade'));
+
+        $params = array('id' => $assignmentsummary->id, 'confirmed' => 1, 'sesskey' => sesskey());
+        $output .= $this->confirm(get_string('areyousuremessage', 'tool_assignmentupgrade', $assignmentsummary),
+                new single_button(tool_assignmentupgrade_url('upgradesingle', $params), get_string('yes')),
+                tool_assignmentupgrade_url('listnotupgraded'));
+
+        $output .= $this->footer();
+        return $output;
+    }
+
+    /**
+     * Helper method dealing with the fact we can not just fetch the output of flexible_table
+     *
+     * @param flexible_table $table
+     * @param int $rowsperpage
+     * @param bool $displaylinks Show links in the table
+     * @return string HTML
+     */
+    protected function flexible_table(flexible_table $table, $rowsperpage, $displaylinks) {
+
+        $o = '';
+        ob_start();
+        $table->out($rowsperpage, $displaylinks);
+        $o = ob_get_contents();
+        ob_end_clean();
+
+        return $o;
+    }
+
+    /**
+     * Helper method dealing with the fact we can not just fetch the output of moodleforms
+     *
+     * @param moodleform $mform
+     * @return string HTML
+     */
+    protected function moodleform(moodleform $mform) {
+
+        $o = '';
+        ob_start();
+        $mform->display();
+        $o = ob_get_contents();
+        ob_end_clean();
+
+        return $o;
+    }
+
+
+    /**
+     * Render a link in a div, such as the 'Back to plugin main page' link.
+     * @param string|moodle_url $url the link URL.
+     * @param string $text the link text.
+     * @return string html to output.
+     */
+    public function end_of_page_link($url, $text) {
+        return html_writer::tag('div', html_writer::link($url, $text), array('class' => 'mdl-align'));
+    }
+
+    /**
+     * Output a link back to the plugin index page.
+     * @return string html to output.
+     */
+    public function back_to_index() {
+        return $this->end_of_page_link(tool_assignmentupgrade_url('index'), get_string('backtoindex', 'tool_assignmentupgrade'));
+    }
+}

admin/tool/assignmentupgrade/settings.php

@@ -15,21 +15,18 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Capability definitions for Nextcloud repository.
+ * Adds this plugin to the admin menu.
  *
- * @package    repository_nextcloud
- * @copyright  2017 Project seminar (Learnweb, University of Münster)
+ * @package    tool_assignmentupgrade
+ * @copyright  2012 NetSpot
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die();
+defined('MOODLE_INTERNAL') || die;
 
-$capabilities = array(
-    'repository/nextcloud:view' => array(
-        'captype' => 'read',
-        'contextlevel' => CONTEXT_MODULE,
-        'archetypes' => array(
-            'user' => CAP_ALLOW
-        )
-    )
-);
+if ($hassiteconfig) {
+    // Needs this condition or there is error on login page.
+    $ADMIN->add('root', new admin_externalpage('assignmentupgrade',
+            get_string('pluginname', 'tool_assignmentupgrade'),
+            new moodle_url('/admin/tool/assignmentupgrade/index.php')));
+}

admin/tool/assignmentupgrade/styles.css

@@ -0,0 +1,23 @@
+#page-admin-tool-assignmentupgrade-listnotupgraded .tool_assignmentupgrade_upgradetable .c0 {
+    display: none;
+}
+
+#page-admin-tool-assignmentupgrade-listnotupgraded.jsenabled .tool_assignmentupgrade_upgradetable .c0 {
+    display: table-cell;
+}
+/*
+.gradingbatchoperationsform { display: none; }
+.jsenabled .gradingbatchoperationsform { display: block; }
+*/
+
+#page-admin-tool-assignmentupgrade-listnotupgraded .tool_assignmentupgrade_upgradetable tr.selectedrow td {
+    background-color: #fec;
+}
+
+#page-admin-tool-assignmentupgrade-listnotupgraded .tool_assignmentupgrade_upgradetable tr.unselectedrow td {
+    background-color: white;
+}
+
+#page-admin-tool-assignmentupgrade-listnotupgraded .tool_assignmentupgrade_paginationform .hidden {
+    display: none;
+}

admin/tool/assignmentupgrade/tests/privacy_test.php

@@ -0,0 +1,75 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Privacy tests for tool_assignmentupgrade.
+ *
+ * @package    tool_assignmentupgrade
+ * @category   test
+ * @copyright  2018 Zig Tan <zig@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+use \core_privacy\tests\provider_testcase;
+use \core_privacy\local\request\writer;
+use \tool_assignmentupgrade\privacy\provider;
+
+/**
+ * Unit tests for tool_assignmentupgrade/classes/privacy/policy
+ *
+ * @copyright  2018 Zig Tan <zig@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class tool_assignmentupgrade_privacy_testcase extends provider_testcase {
+
+    /**
+     * Overriding setUp() function to always reset after tests.
+     */
+    public function setUp() {
+        $this->resetAfterTest(true);
+    }
+
+    /**
+     * Test for provider::test_export_user_preferences().
+     */
+    public function test_export_user_preferences() {
+        // Test setup.
+        $user = $this->getDataGenerator()->create_user();
+        $this->setUser($user);
+
+        // Add a user home page preference for the User.
+        set_user_preference('tool_assignmentupgrade_perpage', '100', $user);
+
+        // Test the user preference exists.
+        $params = [
+            'userid' => $user->id,
+            'name' => 'tool_assignmentupgrade_perpage'
+        ];
+
+        // Test the user preferences export contains 1 user preference record for the User.
+        provider::export_user_preferences($user->id);
+        $contextuser = context_user::instance($user->id);
+        $writer = writer::with_context($contextuser);
+        $this->assertTrue($writer->has_any_data());
+
+        $exportedpreferences = $writer->get_user_preferences('tool_assignmentupgrade');
+        $this->assertCount(1, (array) $exportedpreferences);
+        $this->assertEquals('100', $exportedpreferences->perpage->value);
+    }
+
+}

admin/tool/assignmentupgrade/upgradableassignmentsbatchform.php

@@ -0,0 +1,54 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This file contains the forms to create and edit an instance of this module
+ *
+ * @package   tool_assignmentupgrade
+ * @copyright 2012 NetSpot {@link http://www.netspot.com.au}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die('Direct access to this script is forbidden.');
+
+require_once($CFG->libdir.'/formslib.php');
+
+/**
+ * Assignment upgrade batch operations form.
+ *
+ * @package   tool_assignmentupgrade
+ * @copyright 2012 NetSpot {@link http://www.netspot.com.au}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class tool_assignmentupgrade_batchoperations_form extends moodleform {
+    /**
+     * Define this form - is called from parent constructor.
+     */
+    public function definition() {
+        $mform = $this->_form;
+        $instance = $this->_customdata;
+
+        $mform->addElement('header', 'general', get_string('batchoperations', 'tool_assignmentupgrade'));
+        // Visible elements.
+        $mform->addElement('hidden', 'selectedassignments', '', array('class'=>'selectedassignments'));
+        $mform->setType('selectedassignments', PARAM_SEQUENCE);
+
+        $mform->addElement('submit', 'upgradeselected', get_string('upgradeselected', 'tool_assignmentupgrade'));
+        $mform->addElement('submit', 'upgradeall', get_string('upgradeall', 'tool_assignmentupgrade'));
+    }
+
+}
+

admin/tool/assignmentupgrade/upgradableassignmentstable.php

@@ -0,0 +1,182 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This file contains the definition for the grading table which subclassses easy_table
+ *
+ * @package   tool_assignmentupgrade
+ * @copyright 2012 NetSpot {@link http://www.netspot.com.au}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->libdir.'/tablelib.php');
+require_once($CFG->libdir.'/gradelib.php');
+require_once($CFG->dirroot.'/mod/assign/locallib.php');
+
+/**
+ * Extends table_sql to provide a table of assignment submissions
+ *
+ * @package   tool_assignmentupgrade
+ * @copyright 2012 NetSpot {@link http://www.netspot.com.au}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class tool_assignmentupgrade_assignments_table extends table_sql implements renderable {
+
+    /** @var int $perpage */
+    private $perpage = 10;
+    /** @var int $rownum (global index of current row in table) */
+    private $rownum = -1;
+    /** @var renderer_base for getting output */
+    private $output = null;
+    /** @var boolean anyupgradableassignments - True if there is one or more assignments that can upgraded */
+    public $anyupgradableassignments = false;
+
+    /**
+     * This table loads a list of the old assignment instances and tests them to see
+     * if they can be upgraded
+     *
+     * @param int $perpage How many per page
+     * @param int $rowoffset The starting row for pagination
+     */
+    public function __construct($perpage, $rowoffset=0) {
+        global $PAGE;
+        parent::__construct('tool_assignmentupgrade_assignments');
+        $this->perpage = $perpage;
+        $this->output = $PAGE->get_renderer('tool_assignmentupgrade');
+
+        $this->define_baseurl(new moodle_url('/admin/tool/assignmentupgrade/listnotupgraded.php'));
+
+        $this->anyupgradableassignments = tool_assignmentupgrade_any_upgradable_assignments();
+
+        // Do some business - then set the sql.
+        if ($rowoffset) {
+            $this->rownum = $rowoffset - 1;
+        }
+
+        $fields = 'a.id as id,
+                   a.name as name,
+                   a.assignmenttype as type,
+                   c.shortname as courseshortname,
+                   c.id as courseid,
+                   COUNT(s.id) as submissioncount';
+        $from = '{assignment} a JOIN {course} c ON a.course = c.id ' .
+                        ' LEFT JOIN {assignment_submissions} s ON a.id = s.assignment';
+
+        $where = '1 = 1';
+        $where .= ' GROUP BY a.id, a.name, a.assignmenttype, c.shortname, c.id ';
+
+        $this->set_sql($fields, $from, $where, array());
+        $this->set_count_sql('SELECT COUNT(*) FROM {assignment} a JOIN {course} c ON a.course = c.id', array());
+
+        $columns = array();
+        $headers = array();
+
+        $columns[] = 'select';
+        $headers[] = get_string('select', 'tool_assignmentupgrade') .
+                     '<div class="selectall">' .
+                     '<input type="checkbox" name="selectall" title="' . get_string('selectall') . '"/>' .
+                     '</div>';
+        $columns[] = 'upgradable';
+        $headers[] = get_string('upgradable', 'tool_assignmentupgrade');
+        $columns[] = 'id';
+        $headers[] = get_string('assignmentid', 'tool_assignmentupgrade');
+        $columns[] = 'courseshortname';
+        $headers[] = get_string('course');
+        $columns[] = 'name';
+        $headers[] = get_string('name');
+        $columns[] = 'type';
+        $headers[] = get_string('assignmenttype', 'tool_assignmentupgrade');
+        $columns[] = 'submissioncount';
+        $headers[] = get_string('submissions', 'tool_assignmentupgrade');
+
+        // Set the columns.
+        $this->define_columns($columns);
+        $this->define_headers($headers);
+        $this->no_sorting('upgradable');
+        $this->no_sorting('select');
+    }
+
+    /**
+     * Return the number of rows to display on a single page
+     *
+     * @return int The number of rows per page
+     */
+    public function get_rows_per_page() {
+        return $this->perpage;
+    }
+
+    /**
+     * Format a link to the assignment instance
+     *
+     * @param stdClass $row
+     * @return string
+     */
+    public function col_name(stdClass $row) {
+        $url = new moodle_url('/mod/assignment/view.php', array('a' => $row->id));
+        return html_writer::link($url, $row->name);
+    }
+
+
+    /**
+     * Format a link to the upgrade single tool
+     *
+     * @param stdClass $row (contains cached result from previous upgradable check)
+     * @return string
+     */
+    public function col_upgradable(stdClass $row) {
+        if ($row->upgradable) {
+            $urlparams = array('id' => $row->id, 'sesskey' => sesskey());
+            $url = new moodle_url('/admin/tool/assignmentupgrade/upgradesingleconfirm.php', $urlparams);
+            return html_writer::link($url, get_string('supported', 'tool_assignmentupgrade'));
+        } else {
+            return get_string('notsupported', 'tool_assignmentupgrade');
+        }
+    }
+
+    /**
+     * Insert a checkbox for selecting the current row for batch operations
+     *
+     * @param stdClass $row
+     * @return string
+     */
+    public function col_select(stdClass $row) {
+        global $CFG;
+        $version = get_config('assignment_' . $row->type, 'version');
+        require_once($CFG->dirroot . '/mod/assign/locallib.php');
+        if (assign::can_upgrade_assignment($row->type, $version)) {
+            $row->upgradable = true;
+            return '<input type="checkbox" name="selectedassignment" value="' . $row->id . '"/>';
+        }
+        $row->upgradable = false;
+        return '';
+    }
+
+    /**
+     * Override the table show_hide_link to not show for select column
+     *
+     * @param string $column the column name, index into various names.
+     * @param int $index numerical index of the column.
+     * @return string HTML fragment.
+     */
+    protected function show_hide_link($column, $index) {
+        if ($index > 0) {
+            return parent::show_hide_link($column, $index);
+        }
+        return '';
+    }
+}

admin/tool/assignmentupgrade/upgradesingle.php

@@ -0,0 +1,49 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Script to show all the assignments that have not been upgraded after the main upgrade.
+ *
+ * @package    tool_assignmentupgrade
+ * @copyright  2012 NetSpot
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once(__DIR__ . '/../../../config.php');
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/locallib.php');
+
+require_sesskey();
+
+$assignmentid = required_param('id', PARAM_INT);
+
+// This calls require_login and checks moodle/site:config.
+admin_externalpage_setup('assignmentupgrade',
+                         '',
+                         array(),
+                         tool_assignmentupgrade_url('upgradesingle', array('id' => $assignmentid)));
+
+$PAGE->navbar->add(get_string('upgradesingle', 'tool_assignmentupgrade'));
+$renderer = $PAGE->get_renderer('tool_assignmentupgrade');
+
+$log = '';
+list($summary, $success, $log) = tool_assignmentupgrade_upgrade_assignment($assignmentid);
+
+echo $renderer->header();
+echo $renderer->heading(get_string('conversioncomplete', 'tool_assignmentupgrade'));
+echo $renderer->convert_assignment_result($summary, $success, $log);
+echo $renderer->continue_button(tool_assignmentupgrade_url('listnotupgraded'));
+echo $renderer->footer();

admin/tool/assignmentupgrade/upgradesingleconfirm.php

@@ -0,0 +1,44 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Script to show all the assignments that have not been upgraded after the main upgrade.
+ *
+ * @package    tool_assignmentupgrade
+ * @copyright  2012 NetSpot
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once(__DIR__ . '/../../../config.php');
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->dirroot . '/'.$CFG->admin.'/tool/assignmentupgrade/locallib.php');
+
+require_sesskey();
+
+$assignmentid = required_param('id', PARAM_INT);
+
+// This calls require_login and checks moodle/site:config.
+admin_externalpage_setup('assignmentupgrade',
+                         '',
+                         array(),
+                         tool_assignmentupgrade_url('upgradesingle', array('id' => $assignmentid)));
+
+$PAGE->navbar->add(get_string('upgradesingle', 'tool_assignmentupgrade'));
+$renderer = $PAGE->get_renderer('tool_assignmentupgrade');
+
+$assignmentinfo = tool_assignmentupgrade_get_assignment($assignmentid);
+
+echo $renderer->convert_assignment_are_you_sure($assignmentinfo);

admin/tool/assignmentupgrade/version.php

@@ -15,18 +15,16 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * This file defines observers needed by the plugin.
+ * Version details.
  *
- * @package    tool_dataprivacy
- * @copyright   2018 Mihail Geshoski <mihail@moodle.com>
+ * @package    tool_assignmentupgrade
+ * @copyright  2012 NetSpot
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
 
-$observers = [
-    [
-        'eventname'   => '\core\event\user_deleted',
-        'callback'    => '\tool_dataprivacy\event\user_deleted_observer::create_delete_data_request',
-    ],
-];
+$plugin->version   = 2018051400;
+$plugin->requires  = 2018050800;
+$plugin->component = 'tool_assignmentupgrade';
+$plugin->dependencies = array('mod_assign' => 2018050800);

admin/tool/availabilityconditions/tests/behat/manage_conditions.feature

@@ -20,7 +20,7 @@ Feature: Manage availability conditions
     And the following config values are set as admin:
       | enableavailability | 1 |
     And I am on homepage
-    And I navigate to "Plugins > Availability restrictions > Manage restrictions" in site administration
+    And I navigate to "Manage restrictions" node in "Site administration > Plugins > Availability restrictions"
 
     # Having clicked on it, I should also see the list of plugins.
     And I should see "Restriction by date"
@@ -34,7 +34,7 @@ Feature: Manage availability conditions
       | Course 1 | C1        | topics |
     And I log in as "admin"
     And I am on site homepage
-    When I navigate to "Plugins > Availability restrictions > Manage restrictions" in site administration
+    When I navigate to "Manage restrictions" node in "Site administration > Plugins > Availability restrictions"
 
     # Check the icon is there (it should be a Hide icon, meaning is currently visible).
     Then "Hide" "icon" should exist in the "Restriction by date" "table_row"

admin/tool/availabilityconditions/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2018120300;
-$plugin->requires = 2018112800;
+$plugin->version = 2018051400;
+$plugin->requires = 2018050800;
 $plugin->component = 'tool_availabilityconditions';

admin/tool/behat/cli/util.php

@@ -109,17 +109,6 @@ require_once(__DIR__ . '/../../../../lib/behat/lib.php');
 require_once(__DIR__ . '/../../../../lib/behat/classes/behat_command.php');
 require_once(__DIR__ . '/../../../../lib/behat/classes/behat_config_manager.php');
 
-// Remove error handling overrides done in config.php. This is consistent with admin/tool/behat/cli/util_single_run.php.
-$CFG->debug = (E_ALL | E_STRICT);
-$CFG->debugdisplay = 1;
-error_reporting($CFG->debug);
-ini_set('display_errors', '1');
-ini_set('log_errors', '1');
-
-// Import the necessary libraries.
-require_once($CFG->libdir . '/setuplib.php');
-require_once($CFG->libdir . '/behat/classes/util.php');
-
 // For drop option check if parallel site.
 if ((empty($options['parallel'])) && ($options['drop']) || $options['updatesteps']) {
     $options['parallel'] = behat_config_manager::get_behat_run_config_value('parallel');

admin/tool/behat/cli/util_single_run.php

@@ -218,7 +218,7 @@ if ($options['install']) {
     // Run behat command to get steps in feature files.
     $featurestepscmd = behat_command::get_behat_command(true);
     $featurestepscmd .= ' --config ' . behat_config_manager::get_behat_cli_config_filepath();
-    $featurestepscmd .= ' --dry-run --format=moodle_stepcount';
+    $featurestepscmd .= ' --dry-run --format=moodle_step_count';
     $processes = cli_execute_parallel(array($featurestepscmd), __DIR__ . "/../../../../");
     $status = print_update_step_output(array_pop($processes), $behatstepfile);
 

admin/tool/behat/lang/en/tool_behat.php

@@ -23,29 +23,29 @@
  */
 
 $string['aim'] = 'This administration tool helps developers and test writers to create .feature files describing Moodle\'s functionalities and run them automatically. Step definitions available for use in .feature files are listed below.';
-$string['allavailablesteps'] = 'All available step definitions';
+$string['allavailablesteps'] = 'All the available steps definitions';
 $string['errorbehatcommand'] = 'Error running behat CLI command. Try running "{$a} --help" manually from CLI to find out more about the problem.';
 $string['errorcomposer'] = 'Composer dependencies are not installed.';
 $string['errordataroot'] = '$CFG->behat_dataroot is not set or is invalid.';
 $string['errorsetconfig'] = '$CFG->behat_dataroot, $CFG->behat_prefix and $CFG->behat_wwwroot need to be set in config.php.';
 $string['erroruniqueconfig'] = '$CFG->behat_dataroot, $CFG->behat_prefix and $CFG->behat_wwwroot values need to be different than $CFG->dataroot, $CFG->prefix, $CFG->wwwroot, $CFG->phpunit_dataroot and $CFG->phpunit_prefix values.';
 $string['fieldvalueargument'] = 'Field value arguments';
-$string['fieldvalueargument_help'] = 'This argument should be completed by a field value. There are many field types, including simple ones like checkboxes, selects or textareas, or complex ones like date selectors. See the dev documentation <a href="https://docs.moodle.org/dev/Acceptance_testing" target="_blank">Acceptance_testing</a> for details of expected field values.';
+$string['fieldvalueargument_help'] = 'This argument should be completed by a field value, there are many field types, simple ones like checkboxes, selects or textareas or complex ones like date selectors. You can check <a href="http://docs.moodle.org/dev/Acceptance_testing#Providing_values_to_steps" target="_blank">Field values</a> to see the expected field value depending on the field type you provide.';
 $string['giveninfo'] = 'Given. Processes to set up the environment';
 $string['infoheading'] = 'Info';
 $string['installinfo'] = 'Read {$a} for installation and tests execution info';
-$string['newstepsinfo'] = 'Read {$a} for info about how to add new step definitions';
+$string['newstepsinfo'] = 'Read {$a} for info about how to add new steps definitions';
 $string['newtestsinfo'] = 'Read {$a} for info about how to write new tests';
-$string['nostepsdefinitions'] = 'There aren\'t any step definitions matching this filter';
+$string['nostepsdefinitions'] = 'There aren\'t steps definitions matching this filters';
 $string['pluginname'] = 'Acceptance testing';
 $string['stepsdefinitionscomponent'] = 'Area';
 $string['stepsdefinitionscontains'] = 'Contains';
-$string['stepsdefinitionsfilters'] = 'Step definitions';
+$string['stepsdefinitionsfilters'] = 'Steps definitions';
 $string['stepsdefinitionstype'] = 'Type';
 $string['theninfo'] = 'Then. Checkings to ensure the outcomes are the expected ones';
 $string['unknownexceptioninfo'] = 'There was a problem with Selenium or your browser. Please ensure you are using the latest version of Selenium. Error:';
 $string['viewsteps'] = 'Filter';
-$string['wheninfo'] = 'When. Action that provokes an event';
+$string['wheninfo'] = 'When. Actions that provokes an event';
 $string['wrongbehatsetup'] = 'Something is wrong with the behat setup and so step definitions cannot be listed: <b>{$a->errormsg}</b><br/><br/>Please check:<ul>
 <li>$CFG->behat_dataroot, $CFG->behat_prefix and $CFG->behat_wwwroot are set in config.php with different values from $CFG->dataroot, $CFG->prefix and $CFG->wwwroot.</li>
 <li>You ran "{$a->behatinit}" from your Moodle root directory.</li>

admin/tool/behat/renderer.php

@@ -162,11 +162,11 @@ class tool_behat_renderer extends plugin_renderer_base {
         $html .= $this->output->heading($title);
 
         // Info.
-        $installurl = behat_command::DOCS_URL;
+        $installurl = behat_command::DOCS_URL . '#Installation';
         $installlink = html_writer::tag('a', $installurl, array('href' => $installurl, 'target' => '_blank'));
-        $writetestsurl = 'https://docs.moodle.org/dev/Writing acceptance tests';
+        $writetestsurl = behat_command::DOCS_URL . '#Writing_features';
         $writetestslink = html_writer::tag('a', $writetestsurl, array('href' => $writetestsurl, 'target' => '_blank'));
-        $writestepsurl = 'https://docs.moodle.org/dev/Writing_new_acceptance_test_step_definitions';
+        $writestepsurl = behat_command::DOCS_URL . '#Adding_steps_definitions';
         $writestepslink = html_writer::tag('a', $writestepsurl, array('href' => $writestepsurl, 'target' => '_blank'));
         $infos = array(
             get_string('installinfo', 'tool_behat', $installlink),

admin/tool/behat/tests/behat/data_generators.feature

@@ -286,7 +286,7 @@ Feature: Set up contextual data for tests
       | student1 | CHSB   |
       | student1 | CHC    |
     When I log in as "admin"
-    And I navigate to "Users > Accounts > Cohorts" in site administration
+    And I navigate to "Cohorts" node in "Site administration > Users > Accounts"
     Then the following should exist in the "cohorts" table:
       | Name            | Cohort size |
       | System cohort A | 1           |

admin/tool/behat/tests/behat/edit_permissions.feature

@@ -20,12 +20,12 @@ Feature: Edit capabilities
     And I set the following system permissions of "Teacher" role:
       | capability | permission |
       | block/mnet_hosts:myaddinstance | Allow |
-      | moodle/site:messageanyuser | Inherit |
+      | moodle/community:add | Inherit |
       | moodle/grade:managesharedforms | Prevent |
       | moodle/course:request | Prohibit |
     When I follow "Edit Teacher role"
     Then "block/mnet_hosts:myaddinstance" capability has "Allow" permission
-    And "moodle/site:messageanyuser" capability has "Not set" permission
+    And "moodle/community:add" capability has "Not set" permission
     And "moodle/grade:managesharedforms" capability has "Prevent" permission
     And "moodle/course:request" capability has "Prohibit" permission
 

admin/tool/behat/tests/behat/get_and_set_fields.feature

@@ -34,7 +34,7 @@ Feature: Verify that all form fields values can be get and set
       | wiki | C1 | wiki1 | Test this one | Test this one | Test this one | collaborative | 0 |
     And I log in as "admin"
     And I am on "Course 1" course homepage
-    And I navigate to "Reset" in current page administration
+    And I navigate to "Reset" node in "Course administration"
     # Select (multi-select) - Checking "the select box should contain".
     And I expand all fieldsets
     And the "Unenrol users" select box should contain "No roles"
@@ -131,12 +131,12 @@ Feature: Verify that all form fields values can be get and set
     And the field "two" matches value ""
     # Check if field xpath set/match works.
     And I am on "Course 1" course homepage
-    And I navigate to "Edit settings" in current page administration
+    And I navigate to "Edit settings" node in "Course administration"
     And I set the field with xpath "//input[@id='id_idnumber']" to "Course id number"
     And the field with xpath "//input[@name='idnumber']" matches value "Course id number"
     And the field with xpath "//input[@name='idnumber']" does not match value ""
     And I press "Save and display"
-    And I navigate to "Edit settings" in current page administration
+    And I navigate to "Edit settings" node in "Course administration"
     And the field "Course ID number" matches value "Course id number"
 
   Scenario: with JS disabled all form fields getters and setters works as expected

admin/tool/behat/tests/behat/get_and_set_fields_in_containers.feature

@@ -1,27 +0,0 @@
-@tool_behat
-Feature: Behat steps for interacting with form work
-  In order to test my Moodle code
-  As a developer
-  I need the Behat steps for form elements to work reliably
-
-  @javascript
-  Scenario: Test fields in containers
-    Given the following "courses" exist:
-      | fullname | shortname |
-      | Course 1 | C1        |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    # Just get to any form.
-    And I navigate to "Edit settings" in current page administration
-    And I set the field "Course full name" in the "General" "fieldset" to "Frog"
-    And I set the following fields in the "Appearance" "fieldset" to these values:
-      | Show activity reports   | Yes |
-      | Number of announcements | 1   |
-    Then the field "Show activity reports" in the "Appearance" "fieldset" matches value "Yes"
-    And the field "Show activity reports" in the "Appearance" "fieldset" does not match value "No"
-    And the following fields in the "region-main" "region" match these values:
-      | Course full name        | Frog |
-      | Number of announcements | 1    |
-    And the following fields in the "region-main" "region" do not match these values:
-      | Course full name        | Course 1 |
-      | Number of announcements | 5        |

admin/tool/behat/tests/behat/list_steps.feature

@@ -7,11 +7,11 @@ Feature: List the system steps definitions
   Background:
     Given I am on homepage
     And I log in as "admin"
-    And I navigate to "Development > Acceptance testing" in site administration
+    And I navigate to "Acceptance testing" node in "Site administration > Development"
 
   @javascript
   Scenario: Accessing the list
-    Then I should see "Step definitions"
+    Then I should see "Steps definitions"
     And I should not see "There aren't steps definitions matching this filter"
 
   @javascript

admin/tool/behat/tests/manager_test.php

@@ -0,0 +1,199 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Unit tests for behat manager.
+ *
+ * @package   tool_behat
+ * @copyright  2012 David Monllaó
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->dirroot . '/' . $CFG->admin .'/tool/behat/locallib.php');
+require_once($CFG->libdir . '/behat/classes/util.php');
+require_once($CFG->libdir . '/behat/classes/behat_config_manager.php');
+
+/**
+ * Behat manager tests.
+ *
+ * @package    tool_behat
+ * @copyright  2012 David Monllaó
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class tool_behat_manager_testcase extends advanced_testcase {
+
+    /**
+     * behat_config_manager tests.
+     */
+    public function test_merge_configs() {
+
+        // Simple default config.
+        $array1 = array(
+            'the' => 'same',
+            'simple' => 'value',
+            'array' => array(
+                'one' => 'arrayvalue1',
+                'two' => 'arrayvalue2'
+            )
+        );
+
+        // Simple override.
+        $array2 = array(
+            'simple' => 'OVERRIDDEN1',
+            'array' => array(
+                'one' => 'OVERRIDDEN2'
+            ),
+            'newprofile' => array(
+                'anotherlevel' => array(
+                    'andanotherone' => array(
+                        'list1',
+                        'list2'
+                    )
+                )
+            )
+        );
+
+        $array = testable_behat_config_manager::merge_config($array1, $array2);
+        $this->assertDebuggingCalled("Use of merge_config is deprecated, please see behat_config_util");
+
+        // Overrides are applied.
+        $this->assertEquals('OVERRIDDEN1', $array['simple']);
+        $this->assertEquals('OVERRIDDEN2', $array['array']['one']);
+
+        // Other values are respected.
+        $this->assertNotEmpty($array['array']['two']);
+
+        // Completely new nodes are added.
+        $this->assertNotEmpty($array['newprofile']);
+        $this->assertNotEmpty($array['newprofile']['anotherlevel']['andanotherone']);
+        $this->assertEquals('list1', $array['newprofile']['anotherlevel']['andanotherone'][0]);
+        $this->assertEquals('list2', $array['newprofile']['anotherlevel']['andanotherone'][1]);
+
+        // Complex override changing vectors to scalars and scalars to vectors.
+        $array2 = array(
+            'simple' => array(
+                'simple' => 'should',
+                'be' => 'overridden',
+                'by' => 'this-array'
+            ),
+            'array' => 'one'
+        );
+
+        $array = testable_behat_config_manager::merge_config($array1, $array2);
+        $this->assertDebuggingCalled("Use of merge_config is deprecated, please see behat_config_util");
+
+        // Overrides applied.
+        $this->assertNotEmpty($array['simple']);
+        $this->assertNotEmpty($array['array']);
+        $this->assertTrue(is_array($array['simple']));
+        $this->assertFalse(is_array($array['array']));
+
+        // Other values are maintained.
+        $this->assertEquals('same', $array['the']);
+    }
+
+    /**
+     * behat_config_manager tests.
+     */
+    public function test_config_file_contents() {
+        global $CFG;
+
+        $this->resetAfterTest(true);
+
+        // Skip tests if behat is not installed.
+        $vendorpath = $CFG->dirroot . '/vendor';
+        if (!file_exists($vendorpath . '/autoload.php') || !is_dir($vendorpath . '/behat')) {
+            $this->markTestSkipped('Behat not installed.');
+        }
+
+        // Add some fake test url.
+        $CFG->behat_wwwroot = 'http://example.com/behat';
+
+        // To avoid user value at config.php level.
+        unset($CFG->behat_config);
+
+        // List.
+        $features = array(
+            'feature1',
+            'feature2',
+            'feature3'
+        );
+
+        // Associative array.
+        $stepsdefinitions = array(
+            'micarro' => '/me/lo/robaron',
+            'anoche' => '/cuando/yo/dormia'
+        );
+
+        $contents = testable_behat_config_manager::get_config_file_contents($features, $stepsdefinitions);
+        $this->assertDebuggingCalled("Use of get_config_file_contents is deprecated, please see behat_config_util");
+
+        // YAML decides when is is necessary to wrap strings between single quotes, so not controlled
+        // values like paths should not be asserted including the key name as they would depend on the
+        // directories values.
+        $this->assertContains($CFG->dirroot,
+            $contents['default']['extensions']['Moodle\BehatExtension']['moodledirroot']);
+
+        // Not quoted strings.
+        $this->assertEquals('/me/lo/robaron',
+            $contents['default']['extensions']['Moodle\BehatExtension']['steps_definitions']['micarro']);
+
+        // YAML uses single quotes to wrap URL strings.
+        $this->assertEquals($CFG->behat_wwwroot, $contents['default']['extensions']['Behat\MinkExtension']['base_url']);
+
+        // Lists.
+        $this->assertEquals('feature1', $contents['default']['suites']['default']['paths'][0]);
+        $this->assertEquals('feature3', $contents['default']['suites']['default']['paths'][2]);
+
+        unset($CFG->behat_wwwroot);
+    }
+
+}
+
+/**
+ * Allows access to internal methods without exposing them.
+ *
+ * @package    tool_behat
+ * @copyright  2012 David Monllaó
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class testable_behat_config_manager extends behat_config_manager {
+
+    /**
+     * Allow access to protected method
+     * @see parent::merge_config()
+     * @param mixed $config
+     * @param mixed $localconfig
+     * @return mixed
+     */
+    public static function merge_config($config, $localconfig) {
+        return parent::merge_config($config, $localconfig);
+    }
+
+    /**
+     * Allow access to protected method
+     * @see parent::get_config_file_contents()
+     * @param array $features
+     * @param array $stepsdefinitions
+     * @return string
+     */
+    public static function get_config_file_contents($features, $stepsdefinitions) {
+        return parent::get_config_file_contents($features, $stepsdefinitions);
+    }
+}

admin/tool/behat/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2018120300;   // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2018112800;   // Requires this Moodle version
+$plugin->version   = 2018051400;   // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2018050800;   // Requires this Moodle version
 $plugin->component = 'tool_behat'; // Full name of the plugin (used for diagnostics)