Moodle release 3.4.1

Previously we appended a dot at the end of IP addresses and domain names in the
cURL security helper, but it causes issues with Google OAuth so this patch removes it.

.eslintignore

@@ -3,14 +3,12 @@
 */**/build/
 node_modules/
 vendor/
-admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.js
 admin/tool/usertours/amd/src/tour.js
+admin/tool/usertours/amd/src/popper.js
 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
@@ -43,6 +41,7 @@ lib/html2text/
 lib/markdown/
 lib/recaptchalib.php
 lib/xhprof/
+lib/xmlize.php
 lib/horde/
 lib/requirejs/
 lib/amd/src/loglevel.js
@@ -59,10 +58,7 @@ lib/maxmind/MaxMind/
 lib/ltiprovider/
 lib/amd/src/truncate.js
 lib/fonts/
-lib/amd/src/adapter.js
 lib/validateurlsyntax.php
-lib/amd/src/popper.js
-lib/geopattern-php/
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/

.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,19 +1,15 @@
 # Generated by "grunt ignorefiles"
-**/yui/build/*
 theme/bootstrapbase/style/
 theme/clean/style/custom.css
 theme/more/style/custom.css
-theme/boost/style/moodle.css
 node_modules/
 vendor/
-admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.js
 admin/tool/usertours/amd/src/tour.js
+admin/tool/usertours/amd/src/popper.js
 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
@@ -46,6 +42,7 @@ lib/html2text/
 lib/markdown/
 lib/recaptchalib.php
 lib/xhprof/
+lib/xmlize.php
 lib/horde/
 lib/requirejs/
 lib/amd/src/loglevel.js
@@ -62,10 +59,7 @@ lib/maxmind/MaxMind/
 lib/ltiprovider/
 lib/amd/src/truncate.js
 lib/fonts/
-lib/amd/src/adapter.js
 lib/validateurlsyntax.php
-lib/amd/src/popper.js
-lib/geopattern-php/
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/

.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:
@@ -57,7 +56,7 @@ matrix:
     include:
           # Run grunt/npm install on highest version ('node' is an alias for the latest node.js version.)
         - php: 7.2
-          env: DB=none     TASK=GRUNT   NVM_VERSION='lts/carbon'
+          env: DB=none     TASK=GRUNT   NVM_VERSION='8.9'
 
     exclude:
         # MySQL - it's just too slow.
@@ -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_34_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`
@@ -249,7 +248,7 @@ script:
     - >
       if [ "$TASK" = 'PHPUNIT' ];
       then
-        vendor/bin/phpunit --fail-on-risky --disallow-test-output --verbose;
+        vendor/bin/phpunit;
       fi
 
     - >
@@ -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
@@ -138,16 +137,6 @@ module.exports = function(grunt) {
                 }
            }
         },
-        sass: {
-            dist: {
-                files: {
-                    "theme/boost/style/moodle.css": "theme/boost/scss/preset/default.scss"
-                }
-            },
-            options: {
-                includePaths: ["theme/boost/scss/"]
-            }
-        },
         watch: {
             options: {
                 nospawn: true // We need not to spawn so config can be changed dynamically.
@@ -223,11 +212,9 @@ 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',
-          'theme/boost/style/moodle.css'
+          'theme/more/style/custom.css'
       ].concat(thirdPartyPaths);
       grunt.file.write('.stylelintignore', stylelintIgnores.join('\n'));
     };
@@ -375,7 +362,6 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-less');
     grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-sass');
     grunt.loadNpmTasks('grunt-eslint');
     grunt.loadNpmTasks('grunt-stylelint');
 
@@ -388,7 +374,7 @@ module.exports = function(grunt) {
     grunt.registerTask('js', ['amd', 'yui']);
 
     // Register CSS taks.
-    grunt.registerTask('css', ['stylelint:scss', 'sass', 'stylelint:less', 'less:bootstrapbase', 'stylelint:css']);
+    grunt.registerTask('css', ['stylelint:scss', 'stylelint:less', 'less:bootstrapbase', 'stylelint:css']);
 
     // Register the startup task.
     grunt.registerTask('startup', 'Run the correct tasks for the current directory', tasks.startup);

admin/category.php

@@ -75,7 +75,7 @@ if ($data = data_submitted() and confirm_sesskey()) {
 if ($PAGE->user_allowed_editing() && $adminediting != -1) {
     $USER->editing = $adminediting;
 }
-$buttons = null;
+
 if ($PAGE->user_allowed_editing()) {
     $url = clone($PAGE->url);
     if ($PAGE->user_is_editing()) {
@@ -129,9 +129,7 @@ if ($savebutton) {
 $visiblepathtosection = array_reverse($settingspage->visiblepath);
 $PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
 $PAGE->set_heading($SITE->fullname);
-if ($buttons) {
-    $PAGE->set_button($buttons);
-}
+$PAGE->set_button($buttons);
 
 echo $OUTPUT->header();
 

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/classes/privacy/provider.php

@@ -1,41 +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/>.
-/**
- * Privacy Subsystem implementation for core_admin.
- *
- * @package    core_admin
- * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-namespace core_admin\privacy;
-defined('MOODLE_INTERNAL') || die();
-/**
- * Privacy Subsystem for core_admin implementing null_provider.
- *
- * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class provider implements \core_privacy\local\metadata\null_provider {
-    /**
-     * Get the language string identifier with the component's language
-     * file to explain why this plugin stores no data.
-     *
-     * @return  string
-     */
-    public static function get_reason() : string {
-        return 'privacy:metadata';
-    }
-}

admin/cli/fix_deleted_users.php

@@ -73,7 +73,6 @@ foreach ($rs as $user) {
     echo "Redeleting user $user->id: $user->username ($user->email)\n";
     delete_user($user);
 }
-$rs->close();
 
 cli_heading('Deleting all leftovers');
 

admin/cli/install.php

@@ -219,6 +219,7 @@ $databases = array('mysqli' => moodle_database::get_driver_instance('mysqli', 'n
                    'pgsql'  => moodle_database::get_driver_instance('pgsql',  'native'),
                    'oci'    => moodle_database::get_driver_instance('oci',    'native'),
                    'sqlsrv' => moodle_database::get_driver_instance('sqlsrv', 'native'), // MS SQL*Server PHP driver
+                   'mssql'  => moodle_database::get_driver_instance('mssql',  'native'), // FreeTDS driver
                   );
 foreach ($databases as $type=>$database) {
     if ($database->driver_installed() !== true) {
@@ -442,7 +443,6 @@ if ($interactive) {
     }
 }
 $CFG->tempdir       = $CFG->dataroot.'/temp';
-$CFG->backuptempdir = $CFG->tempdir.'/backup';
 $CFG->cachedir      = $CFG->dataroot.'/cache';
 $CFG->localcachedir = $CFG->dataroot.'/localcache';
 
@@ -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:
@@ -135,11 +131,10 @@ if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
     cli_error(get_string('pluginschecktodo', 'admin'));
 }
 
-$a = new stdClass();
-$a->oldversion = $oldversion;
-$a->newversion = $newversion;
-
 if ($interactive) {
+    $a = new stdClass();
+    $a->oldversion = $oldversion;
+    $a->newversion = $newversion;
     echo cli_heading(get_string('databasechecking', '', $a)) . PHP_EOL;
 }
 
@@ -188,24 +183,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.
@@ -213,5 +193,5 @@ foreach ($settingsoutput as $setting => $value) {
 // to immediately start browsing the site.
 upgrade_themes();
 
-echo get_string('cliupgradefinished', 'admin', $a)."\n";
+echo get_string('cliupgradefinished', 'admin')."\n";
 exit(0); // 0 means success

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>
@@ -2437,730 +2435,4 @@
       </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
-  <MOODLE version="3.6" requires="3.1">
-    <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.0.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.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.
  */
@@ -40,15 +40,14 @@ if ($unregistration && \core\hub\registration::is_registered()) {
     if ($siteunregistrationform->is_cancelled()) {
         redirect(new moodle_url('/admin/registration/index.php'));
     } else if ($data = $siteunregistrationform->get_data()) {
-        \core\hub\registration::unregister($data->unpublishalladvertisedcourses,
-            $data->unpublishalluploadedcourses);
-        if (!\core\hub\registration::is_registered()) {
+        if (\core\hub\registration::unregister($data->unpublishalladvertisedcourses,
+            $data->unpublishalluploadedcourses)) {
             redirect(new moodle_url('/admin/registration/index.php'));
         }
     }
 
     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 +81,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,14 +103,14 @@ 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');
+$renderer = $PAGE->get_renderer('core', 'register');
 echo $renderer->moodleorg_registration_message();
 
 $siteregistrationform->display();

admin/registration/renderer.php

@@ -0,0 +1,41 @@
+<?php
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// This file is part of Moodle - http://moodle.org/                      //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//                                                                       //
+// 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/>.       //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+/**
+ * Registration renderer.
+ * @package   moodle
+ * @subpackage registration
+ * @copyright 2010 Moodle Pty Ltd (http://moodle.com)
+ * @author    Jerome Mouneyrac
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class core_register_renderer extends plugin_renderer_base {
+
+    /**
+     * Display message about the benefits of registering on Moodle.org
+     *
+     * @return string
+     */
+    public function moodleorg_registration_message() {
+        return format_text(get_string('registermoodlenet', 'admin'), FORMAT_HTML, ['noclean' => true]);
+    }
+}

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();
@@ -1991,7 +1990,7 @@ class core_admin_renderer extends plugin_renderer_base {
                 if (empty($CFG->docroot) or $environment_result->plugin) {
                     $report = get_string($stringtouse, 'admin', $rec);
                 } else {
-                    $report = $this->doc_link(join($linkparts, '/'), get_string($stringtouse, 'admin', $rec), true);
+                    $report = $this->doc_link(join($linkparts, '/'), get_string($stringtouse, 'admin', $rec));
                 }
                 // Enclose report text in div so feedback text will be displayed underneath it.
                 $report = html_writer::div($report);
@@ -2085,34 +2084,4 @@ class core_admin_renderer extends plugin_renderer_base {
             return $this->warning(get_string('legacylogginginuse'));
         }
     }
-
-    /**
-     * Display message about the benefits of registering on Moodle.org
-     *
-     * @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);
-    }
 }

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

@@ -29,8 +29,7 @@ $mode = required_param('mode', PARAM_ALPHANUMEXT);
 $classformode = array(
     'assign' => 'core_role_allow_assign_page',
     'override' => 'core_role_allow_override_page',
-    'switch' => 'core_role_allow_switch_page',
-    'view' => 'core_role_allow_view_page'
+    'switch' => 'core_role_allow_switch_page'
 );
 if (!isset($classformode[$mode])) {
     print_error('invalidmode', '', '', $mode);
@@ -46,6 +45,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) {
@@ -58,9 +58,6 @@ if (optional_param('submit', false, PARAM_BOOL) && data_submitted() && confirm_s
         case 'switch':
             $event = \core\event\role_allow_switch_updated::create(array('context' => $syscontext));
             break;
-        case 'view':
-            $event = \core\event\role_allow_view_updated::create(array('context' => $syscontext));
-            break;
     }
     if ($event) {
         $event->trigger();

admin/roles/assign.php

@@ -245,7 +245,7 @@ if ($roleid) {
     $select = new single_select($PAGE->url, 'roleid', $nameswithcounts, $roleid, null);
     $select->label = get_string('assignanotherrole', 'core_role');
     echo $OUTPUT->render($select);
-    echo '<p><a href="' . $url . '">' . get_string('backtoallroles', 'core_role') . '</a></p>';
+    echo '<p><a href="' . $PAGE->url . '">' . get_string('backtoallroles', 'core_role') . '</a></p>';
     echo '</div>';
 
 } else if (empty($assignableroles)) {

admin/roles/classes/allow_assign_page.php

@@ -33,7 +33,7 @@ class core_role_allow_assign_page extends core_role_allow_role_page {
     }
 
     protected function set_allow($fromroleid, $targetroleid) {
-        core_role_set_assign_allowed($fromroleid, $targetroleid);
+        allow_assign($fromroleid, $targetroleid);
     }
 
     protected function get_cell_tooltip($fromrole, $targetrole) {

admin/roles/classes/allow_override_page.php

@@ -33,7 +33,7 @@ class core_role_allow_override_page extends core_role_allow_role_page {
     }
 
     protected function set_allow($fromroleid, $targetroleid) {
-        core_role_set_override_allowed($fromroleid, $targetroleid);
+        allow_override($fromroleid, $targetroleid);
     }
 
     protected function get_cell_tooltip($fromrole, $targetrole) {

admin/roles/classes/allow_switch_page.php

@@ -41,7 +41,7 @@ class core_role_allow_switch_page extends core_role_allow_role_page {
     }
 
     protected function set_allow($fromroleid, $targetroleid) {
-        core_role_set_switch_allowed($fromroleid, $targetroleid);
+        allow_switch($fromroleid, $targetroleid);
     }
 
     protected function is_allowed_target($targetroleid) {

admin/roles/classes/allow_view_page.php

@@ -1,77 +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/>.
-
-/**
- * Role view matrix.
- *
- * @package    core_role
- * @copyright  2016 onwards Andrew Hancox <andrewdchancox@googlemail.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Subclass of role_allow_role_page for the Allow views tab.
- *
- * @package    core_role
- * @copyright  2016 onwards Andrew Hancox <andrewdchancox@googlemail.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class core_role_allow_view_page extends core_role_allow_role_page {
-    /** @var array */
-    protected $allowedtargetroles;
-
-    /**
-     * core_role_allow_view_page constructor.
-     */
-    public function __construct() {
-        parent::__construct('role_allow_view', 'allowview');
-    }
-
-
-    /**
-     * Allow from role to view target role.
-     * @param int $fromroleid
-     * @param int $targetroleid
-     */
-    protected function set_allow($fromroleid, $targetroleid) {
-        core_role_set_view_allowed($fromroleid, $targetroleid);
-    }
-
-    /**
-     * Get tool tip for cell.
-     * @param string $fromrole
-     * @param string $targetrole
-     * @return string
-     * @throws \coding_exception
-     */
-    protected function get_cell_tooltip($fromrole, $targetrole) {
-        $a = new stdClass;
-        $a->fromrole = $fromrole->localname;
-        $a->targetrole = $targetrole->localname;
-        return get_string('allowroletoview', 'core_role', $a);
-    }
-
-    /**
-     * Get intro text for role allow view page.
-     * @return string
-     * @throws \coding_exception
-     */
-    public function get_intro_text() {
-        return get_string('configallowview', 'core_admin');
-    }
-}

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

@@ -42,7 +42,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
     protected $allowassign;
     protected $allowoverride;
     protected $allowswitch;
-    protected $allowview;
 
     public function __construct($context, $roleid) {
         $this->roleid = $roleid;
@@ -73,7 +72,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
             $this->allowassign = array_keys($this->get_allow_roles_list('assign'));
             $this->allowoverride = array_keys($this->get_allow_roles_list('override'));
             $this->allowswitch = array_keys($this->get_allow_roles_list('switch'));
-            $this->allowview = array_keys($this->get_allow_roles_list('view'));
 
         } else {
             $this->role = new stdClass;
@@ -85,7 +83,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
             $this->allowassign = array();
             $this->allowoverride = array();
             $this->allowswitch = array();
-            $this->allowview = array();
         }
         parent::load_current_permissions();
     }
@@ -103,8 +100,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
             $this->role->shortname = core_text::strtolower(clean_param($this->role->shortname, PARAM_ALPHANUMEXT));
             if (empty($this->role->shortname)) {
                 $this->errors['shortname'] = get_string('errorbadroleshortname', 'core_role');
-            } else if (core_text::strlen($this->role->shortname) > 100) { // Check if it exceeds the max of 100 characters.
-                $this->errors['shortname'] = get_string('errorroleshortnametoolong', 'core_role');
             }
         }
         if ($DB->record_exists_select('role', 'shortname = ? and id <> ?', array($this->role->shortname, $this->roleid))) {
@@ -167,10 +162,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
         if (!is_null($allow)) {
             $this->allowswitch = $allow;
         }
-        $allow = optional_param_array('allowview', null, PARAM_INT);
-        if (!is_null($allow)) {
-            $this->allowview = $allow;
-        }
 
         // Now read the permissions for each capability.
         parent::read_submitted_permissions();
@@ -187,8 +178,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
      * @param int $roleid role id or 0 for no role
      * @param array $options array with following keys:
      *      'name', 'shortname', 'description', 'permissions', 'archetype',
-     *      'contextlevels', 'allowassign', 'allowoverride', 'allowswitch',
-     *      'allowview'
+     *      'contextlevels', 'allowassign', 'allowoverride', 'allowswitch'
      */
     public function force_duplicate($roleid, array $options) {
         global $DB;
@@ -225,9 +215,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
             if ($options['allowswitch']) {
                 $this->allowswitch = array();
             }
-            if ($options['allowview']) {
-                $this->allowview = array();
-            }
 
             if ($options['permissions']) {
                 foreach ($this->capabilities as $capid => $cap) {
@@ -273,9 +260,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
         if ($options['allowswitch']) {
             $this->allowswitch = array_keys($this->get_allow_roles_list('switch', $roleid));
         }
-        if ($options['allowview']) {
-            $this->allowview = array_keys($this->get_allow_roles_list('view', $roleid));
-        }
 
         if ($options['permissions']) {
             $this->permissions = $DB->get_records_menu('role_capabilities',
@@ -296,8 +280,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
      * @param string $archetype
      * @param array $options array with following keys:
      *      'name', 'shortname', 'description', 'permissions', 'archetype',
-     *      'contextlevels', 'allowassign', 'allowoverride', 'allowswitch',
-     *      'allowview'
+     *      'contextlevels', 'allowassign', 'allowoverride', 'allowswitch'
      */
     public function force_archetype($archetype, array $options) {
         $archetypes = get_role_archetypes();
@@ -338,9 +321,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
         if ($options['allowswitch']) {
             $this->allowswitch = get_default_role_archetype_allows('switch', $archetype);
         }
-        if ($options['allowview']) {
-            $this->allowview = get_default_role_archetype_allows('view', $archetype);
-        }
 
         if ($options['permissions']) {
             $defaultpermissions = get_default_capabilities($archetype);
@@ -360,8 +340,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
      * @param string $xml
      * @param array $options array with following keys:
      *      'name', 'shortname', 'description', 'permissions', 'archetype',
-     *      'contextlevels', 'allowassign', 'allowoverride', 'allowswitch',
-     *      'allowview'
+     *      'contextlevels', 'allowassign', 'allowoverride', 'allowswitch'
      */
     public function force_preset($xml, array $options) {
         if (!$info = core_role_preset::parse_preset($xml)) {
@@ -398,7 +377,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
             }
         }
 
-        foreach (array('assign', 'override', 'switch', 'view') as $type) {
+        foreach (array('assign', 'override', 'switch') as $type) {
             if ($options['allow'.$type]) {
                 if (isset($info['allow'.$type])) {
                     $this->{'allow'.$type} = $info['allow'.$type];
@@ -434,7 +413,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 +427,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.
@@ -458,7 +438,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
         $this->save_allow('assign');
         $this->save_allow('override');
         $this->save_allow('switch');
-        $this->save_allow('view');
 
         // Permissions.
         parent::save_changes();
@@ -470,7 +449,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
         $current = array_keys($this->get_allow_roles_list($type));
         $wanted = $this->{'allow'.$type};
 
-        $addfunction = "core_role_set_{$type}_allowed";
+        $addfunction = 'allow_'.$type;
         $deltable = 'role_allow_'.$type;
         $field = 'allow'.$type;
 
@@ -497,7 +476,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
     }
 
     protected function get_shortname_field($id) {
-        return '<input type="text" id="' . $id . '" name="' . $id . '" maxlength="100" value="' . s($this->role->shortname) . '"' .
+        return '<input type="text" id="' . $id . '" name="' . $id . '" maxlength="254" value="' . s($this->role->shortname) . '"' .
                 ' class="form-control"/>';
     }
 
@@ -527,11 +506,9 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
             if (!$this->disabled) {
                 $output .= '<input type="hidden" name="contextlevel' . $cl . '" value="0" />';
             }
-            $output .= '<div class="form-check justify-content-start w-100">';
-            $output .= '<input class="form-check-input" type="checkbox" id="cl' . $cl . '" name="contextlevel' . $cl .
+            $output .= '<input type="checkbox" id="cl' . $cl . '" name="contextlevel' . $cl .
                 '" value="1" ' . $extraarguments . '/> ';
-            $output .= '<label class="form-check-label" for="cl' . $cl . '">' . $clname . "</label>\n";
-            $output .= '</div>';
+            $output .= '<label for="cl' . $cl . '">' . $clname . "</label><br />\n";
         }
         return $output;
     }
@@ -546,7 +523,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
     protected function get_allow_roles_list($type, $roleid = null) {
         global $DB;
 
-        if ($type !== 'assign' and $type !== 'switch' and $type !== 'override' and $type !== 'view') {
+        if ($type !== 'assign' and $type !== 'switch' and $type !== 'override') {
             debugging('Invalid role allowed type specified', DEBUG_DEVELOPER);
             return array();
         }
@@ -570,11 +547,11 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
     /**
      * Returns an array of roles with the allowed type.
      *
-     * @param string $type Must be one of: assign, switch, override or view.
+     * @param string $type Must be one of: assign, switch, or override.
      * @return array Am array of role names with the allowed type
      */
     protected function get_allow_role_control($type) {
-        if ($type !== 'assign' and $type !== 'switch' and $type !== 'override' and $type !== 'view') {
+        if ($type !== 'assign' and $type !== 'switch' and $type !== 'override') {
             debugging('Invalid role allowed type specified', DEBUG_DEVELOPER);
             return '';
         }
@@ -623,7 +600,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])) {
@@ -664,7 +641,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
         $this->print_field('menuallowassign', get_string('allowassign', 'core_role'), $this->get_allow_role_control('assign'));
         $this->print_field('menuallowoverride', get_string('allowoverride', 'core_role'), $this->get_allow_role_control('override'));
         $this->print_field('menuallowswitch', get_string('allowswitch', 'core_role'), $this->get_allow_role_control('switch'));
-        $this->print_field('menuallowview', get_string('allowview', 'core_role'), $this->get_allow_role_control('view'));
         if ($risks = $this->get_role_risks_info()) {
             $this->print_field('', get_string('rolerisks', 'core_role'), $risks);
         }

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/preset.php

@@ -84,7 +84,7 @@ class core_role_preset {
             $contextlevels->appendChild($dom->createElement('level', $name));
         }
 
-        foreach (array('assign', 'override', 'switch', 'view') as $type) {
+        foreach (array('assign', 'override', 'switch') as $type) {
             $allows = $dom->createElement('allow'.$type);
             $top->appendChild($allows);
             $records = $DB->get_records('role_allow_'.$type, array('roleid'=>$roleid), "allow$type ASC");
@@ -205,7 +205,7 @@ class core_role_preset {
             }
         }
 
-        foreach (array('assign', 'override', 'switch', 'view') as $type) {
+        foreach (array('assign', 'override', 'switch') as $type) {
             $values = self::get_node_children_values($dom, '/role/allow'.$type, 'shortname');
             if (!isset($values)) {
                 $info['allow'.$type] = null;

admin/roles/classes/preset_form.php

@@ -79,7 +79,6 @@ class core_role_preset_form extends moodleform {
             $mform->addElement('advcheckbox', 'allowassign', get_string('allowassign', 'core_role'));
             $mform->addElement('advcheckbox', 'allowoverride', get_string('allowoverride', 'core_role'));
             $mform->addElement('advcheckbox', 'allowswitch', get_string('allowswitch', 'core_role'));
-            $mform->addElement('advcheckbox', 'allowview', get_string('allowview', 'core_role'));
             $mform->addElement('advcheckbox', 'permissions', get_string('permissions', 'core_role'));
         }
 

admin/roles/classes/privacy/provider.php

@@ -1,459 +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/>.
-
-/**
- * Privacy Subsystem implementation for core_role.
- *
- * @package    core_role
- * @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;
-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.
- *
- * @copyright  2018 Carlos Escobedo <carlos@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\subsystem\provider,
-    \core_privacy\local\request\subsystem\plugin_provider,
-    \core_privacy\local\request\user_preference_provider,
-    \core_privacy\local\request\core_userlist_provider {
-
-    /**
-     * Get information about the user data stored by this plugin.
-     *
-     * @param  collection $collection An object for storing metadata.
-     * @return collection The metadata.
-     */
-    public static function get_metadata(collection $collection) : collection {
-        $rolecapabilities = [
-            'roleid' => 'privacy:metadata:role_capabilities:roleid',
-            'capability' => 'privacy:metadata:role_capabilities:capability',
-            'permission' => 'privacy:metadata:role_capabilities:permission',
-            'timemodified' => 'privacy:metadata:role_capabilities:timemodified',
-            'modifierid' => 'privacy:metadata:role_capabilities:modifierid'
-        ];
-        $roleassignments = [
-            'roleid' => 'privacy:metadata:role_assignments:roleid',
-            'userid' => 'privacy:metadata:role_assignments:userid',
-            'timemodified' => 'privacy:metadata:role_assignments:timemodified',
-            'modifierid' => 'privacy:metadata:role_assignments:modifierid',
-            'component' => 'privacy:metadata:role_assignments:component',
-            'itemid' => 'privacy:metadata:role_assignments:itemid'
-        ];
-        $collection->add_database_table('role_capabilities', $rolecapabilities,
-            'privacy:metadata:role_capabilities:tableexplanation');
-        $collection->add_database_table('role_assignments', $roleassignments,
-            'privacy:metadata:role_assignments:tableexplanation');
-
-        $collection->add_user_preference('definerole_showadvanced',
-            'privacy:metadata:preference:showadvanced');
-
-        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) {
-        $showadvanced = get_user_preferences('definerole_showadvanced', null, $userid);
-        if ($showadvanced !== null) {
-            writer::export_user_preference('core_role',
-                'definerole_showadvanced',
-                transform::yesno($showadvanced),
-                get_string('privacy:metadata:preference:showadvanced', 'core_role')
-            );
-        }
-    }
-    /**
-     * Return all contexts for this userid.
-     *
-     * @param  int $userid The user ID.
-     * @return contextlist The list of context IDs.
-     */
-    public static function get_contexts_for_userid(int $userid) : contextlist {
-        global $DB;
-
-        $contextlist = new contextlist();
-
-        // The role_capabilities table contains user data.
-        $contexts = [
-            CONTEXT_SYSTEM,
-            CONTEXT_USER,
-            CONTEXT_COURSECAT,
-            CONTEXT_COURSE,
-            CONTEXT_MODULE,
-            CONTEXT_BLOCK
-        ];
-        list($insql, $inparams) = $DB->get_in_or_equal($contexts, SQL_PARAMS_NAMED);
-        $sql = "SELECT ctx.id
-                  FROM {context} ctx
-                  JOIN {role_capabilities} rc
-                    ON rc.contextid = ctx.id
-                   AND ((ctx.contextlevel {$insql} AND rc.modifierid = :modifierid)
-                    OR (ctx.contextlevel = :contextlevel AND ctx.instanceid = :userid))";
-        $params = [
-            'modifierid' => $userid,
-            'contextlevel' => CONTEXT_USER,
-            'userid' => $userid
-         ];
-        $params += $inparams;
-
-        $contextlist->add_from_sql($sql, $params);
-
-        // The role_assignments table contains user data.
-        $contexts = [
-            CONTEXT_SYSTEM,
-            CONTEXT_USER,
-            CONTEXT_COURSECAT,
-            CONTEXT_COURSE,
-            CONTEXT_MODULE,
-            CONTEXT_BLOCK
-        ];
-        list($insql, $inparams) = $DB->get_in_or_equal($contexts, SQL_PARAMS_NAMED);
-        $params = [
-            'userid' => $userid,
-            'modifierid' => $userid
-         ];
-        $params += $inparams;
-        $sql = "SELECT ctx.id
-                  FROM {role_assignments} ra
-                  JOIN {context} ctx
-                    ON ctx.id = ra.contextid
-                   AND ctx.contextlevel {$insql}
-                 WHERE (ra.userid = :userid
-                    OR ra.modifierid = :modifierid)
-                   AND ra.component != 'tool_cohortroles'";
-        $contextlist->add_from_sql($sql, $params);
-
-        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.
-     *
-     * @param  approved_contextlist $contextlist The list of approved contexts for a user.
-     */
-    public static function export_user_data(approved_contextlist $contextlist) {
-        global $DB;
-
-        if (empty($contextlist)) {
-             return;
-        }
-
-        $rolesnames = self::get_roles_name();
-        $userid = $contextlist->get_user()->id;
-        $ctxfields = \context_helper::get_preload_record_columns_sql('ctx');
-        list($insql, $inparams) = $DB->get_in_or_equal($contextlist->get_contextids(), SQL_PARAMS_NAMED);
-
-        // Role Assignments export data.
-        $contexts = [
-            CONTEXT_SYSTEM,
-            CONTEXT_USER,
-            CONTEXT_COURSECAT,
-            CONTEXT_COURSE,
-            CONTEXT_MODULE,
-            CONTEXT_BLOCK
-        ];
-        list($inctxsql, $ctxparams) = $DB->get_in_or_equal($contexts, SQL_PARAMS_NAMED);
-        $sql = "SELECT ra.id, ra.contextid, ra.roleid, ra.userid, ra.timemodified, ra.modifierid, $ctxfields
-                  FROM {role_assignments} ra
-                  JOIN {context} ctx
-                    ON ctx.id = ra.contextid
-                   AND ctx.contextlevel {$inctxsql}
-                   AND (ra.userid = :userid OR ra.modifierid = :modifierid)
-                   AND ra.component != 'tool_cohortroles'
-                  JOIN {role} r
-                    ON r.id = ra.roleid
-                 WHERE ctx.id {$insql}";
-        $params = ['userid' => $userid, 'modifierid' => $userid];
-        $params += $inparams;
-        $params += $ctxparams;
-        $assignments = $DB->get_recordset_sql($sql, $params);
-        foreach ($assignments as $assignment) {
-            \context_helper::preload_from_record($assignment);
-            $alldata[$assignment->contextid][$rolesnames[$assignment->roleid]][] = (object)[
-                'timemodified' => transform::datetime($assignment->timemodified),
-                'userid' => transform::user($assignment->userid),
-                'modifierid' => transform::user($assignment->modifierid)
-            ];
-        }
-        $assignments->close();
-        if (!empty($alldata)) {
-            array_walk($alldata, function($roledata, $contextid) {
-                $context = \context::instance_by_id($contextid);
-                array_walk($roledata, function($data, $rolename) use ($context) {
-                    writer::with_context($context)->export_data(
-                            [get_string('privacy:metadata:role_assignments', 'core_role'), $rolename],
-                            (object)$data);
-                });
-            });
-            unset($alldata);
-        }
-
-        // Role Capabilities export data.
-        $strpermissions = self::get_permissions_name();
-        $contexts = [
-            CONTEXT_SYSTEM,
-            CONTEXT_USER,
-            CONTEXT_COURSECAT,
-            CONTEXT_COURSE,
-            CONTEXT_MODULE,
-            CONTEXT_BLOCK
-        ];
-        list($inctxsql, $ctxparams) = $DB->get_in_or_equal($contexts, SQL_PARAMS_NAMED);
-        $sql = "SELECT rc.id, rc.contextid, rc.capability, rc.permission, rc.timemodified, rc.roleid, $ctxfields
-                  FROM {context} ctx
-                  JOIN {role_capabilities} rc
-                    ON rc.contextid = ctx.id
-                   AND ((ctx.contextlevel {$inctxsql} AND rc.modifierid = :modifierid)
-                    OR (ctx.contextlevel = :contextlevel AND ctx.instanceid = :userid))
-                 WHERE ctx.id {$insql}";
-        $params = [
-            'modifierid' => $userid,
-            'contextlevel' => CONTEXT_USER,
-            'userid' => $userid
-         ];
-        $params += $inparams;
-        $params += $ctxparams;
-        $capabilities = $DB->get_recordset_sql($sql, $params);
-        foreach ($capabilities as $capability) {
-            \context_helper::preload_from_record($capability);
-            $alldata[$capability->contextid][$rolesnames[$capability->roleid]][] = (object)[
-                'timemodified' => transform::datetime($capability->timemodified),
-                'capability' => $capability->capability,
-                'permission' => $strpermissions[$capability->permission]
-            ];
-        }
-        $capabilities->close();
-        if (!empty($alldata)) {
-            array_walk($alldata, function($capdata, $contextid) {
-                $context = \context::instance_by_id($contextid);
-                array_walk($capdata, function($data, $rolename) use ($context) {
-                    writer::with_context($context)->export_data(
-                            [get_string('privacy:metadata:role_capabilities', 'core_role'), $rolename],
-                            (object)$data);
-                });
-            });
-        }
-    }
-    /**
-     * Exports the data relating to tool_cohortroles component on role assignments by
-     * Assign user roles to cohort feature.
-     *
-     * @param  int $userid The user ID.
-     */
-    public static function export_user_role_to_cohort(int $userid) {
-        global $DB;
-
-        $rolesnames = self::get_roles_name();
-        $sql = "SELECT ra.id, ra.contextid, ra.roleid, ra.userid, ra.timemodified, ra.modifierid, r.id as roleid
-                  FROM {role_assignments} ra
-                  JOIN {context} ctx
-                    ON ctx.id = ra.contextid
-                   AND ctx.contextlevel = :contextlevel
-                   AND ra.component = 'tool_cohortroles'
-                  JOIN {role} r
-                    ON r.id = ra.roleid
-                 WHERE ctx.instanceid = :instanceid
-                    OR ra.userid = :userid";
-        $params = ['userid' => $userid, 'instanceid' => $userid, 'contextlevel' => CONTEXT_USER];
-        $assignments = $DB->get_recordset_sql($sql, $params);
-        foreach ($assignments as $assignment) {
-            $alldata[$assignment->contextid][$rolesnames[$assignment->roleid]][] = (object)[
-                'timemodified' => transform::datetime($assignment->timemodified),
-                'userid' => transform::user($assignment->userid),
-                'modifierid' => transform::user($assignment->modifierid)
-            ];
-        }
-        $assignments->close();
-        if (!empty($alldata)) {
-            array_walk($alldata, function($roledata, $contextid) {
-                $context = \context::instance_by_id($contextid);
-                array_walk($roledata, function($data, $rolename) use ($context) {
-                    writer::with_context($context)->export_related_data(
-                            [get_string('privacy:metadata:role_cohortroles', 'core_role'), $rolename], 'cohortroles',
-                            (object)$data);
-                });
-            });
-        }
-    }
-    /**
-     * Delete all user data for this context.
-     *
-     * @param  \context $context The context to delete data for.
-     */
-    public static function delete_data_for_all_users_in_context(\context $context) {
-        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.
-
-        // 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.
-     *
-     * @param  approved_contextlist $contextlist The list of approved contexts for a user.
-     */
-    public static function delete_data_for_user(approved_contextlist $contextlist) {
-        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.
-
-        // Remove data from role_assignments.
-        if (empty($contextlist->count())) {
-            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);
-    }
-    /**
-     * Delete user entries in role_assignments related to the feature
-     * Assign user roles to cohort feature.
-     *
-     * @param  int $userid The user ID.
-     */
-    public static function delete_user_role_to_cohort(int $userid) {
-        global $DB;
-
-        // Delete entries where userid is a mentor by tool_cohortroles.
-        $DB->delete_records('role_assignments', ['userid' => $userid, 'component' => 'tool_cohortroles']);
-    }
-    /**
-     * Get all the localised roles name in a simple array.
-     *
-     * @return array Array of name of the roles by roleid.
-     */
-    protected static function get_roles_name() {
-        $roles = role_fix_names(get_all_roles(), \context_system::instance(), ROLENAME_ORIGINAL);
-        $rolesnames = array();
-        foreach ($roles as $role) {
-            $rolesnames[$role->id] = $role->localname;
-        }
-        return $rolesnames;
-    }
-    /**
-     * Get all the permissions name in a simple array.
-     *
-     * @return array Array of permissions name.
-     */
-    protected static function get_permissions_name() {
-        $strpermissions = array(
-            CAP_INHERIT => get_string('inherit', 'role'),
-            CAP_ALLOW => get_string('allow', 'role'),
-            CAP_PREVENT => get_string('prevent', 'role'),
-            CAP_PROHIBIT => get_string('prohibit', 'role')
-        );
-        return $strpermissions;
-    }
-}

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'));
 
@@ -102,8 +103,7 @@ if ($action === 'add' and $resettype !== 'none') {
             'contextlevels' => 1,
             'allowassign'   => 1,
             'allowoverride' => 1,
-            'allowswitch'   => 1,
-            'allowview'   => 1);
+            'allowswitch'   => 1);
         if ($showadvanced) {
             $definitiontable = new core_role_define_role_table_advanced($systemcontext, 0);
         } else {
@@ -150,8 +150,7 @@ if ($action === 'add' and $resettype !== 'none') {
             'contextlevels' => $data->contextlevels,
             'allowassign'   => $data->allowassign,
             'allowoverride' => $data->allowoverride,
-            'allowswitch'   => $data->allowswitch,
-            'allowview'     => $data->allowview);
+            'allowswitch'   => $data->allowswitch);
         if ($showadvanced) {
             $definitiontable = new core_role_define_role_table_advanced($systemcontext, $roleid);
         } else {

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/managetabs.php

@@ -29,7 +29,6 @@ $toprow[] = new tabobject('manage', new moodle_url('/admin/roles/manage.php'), g
 $toprow[] = new tabobject('assign', new moodle_url('/admin/roles/allow.php', array('mode'=>'assign')), get_string('allowassign', 'core_role'));
 $toprow[] = new tabobject('override', new moodle_url('/admin/roles/allow.php', array('mode'=>'override')), get_string('allowoverride', 'core_role'));
 $toprow[] = new tabobject('switch', new moodle_url('/admin/roles/allow.php', array('mode'=>'switch')), get_string('allowswitch', 'core_role'));
-$toprow[] = new tabobject('view', new moodle_url('/admin/roles/allow.php', ['mode' => 'view']), get_string('allowview', 'core_role'));
 
 echo $OUTPUT->tabtree($toprow, $currenttab);
 

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/role_schema.xml

@@ -11,7 +11,6 @@
                 <xs:element ref="allowassign" minOccurs="0"/>
                 <xs:element ref="allowoverride" minOccurs="0"/>
                 <xs:element ref="allowswitch" minOccurs="0"/>
-                <xs:element ref="allowview" minOccurs="0"/>
                 <xs:element ref="permissions" minOccurs="0"/>
             </xs:sequence>
         </xs:complexType>
@@ -46,13 +45,6 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-    <xs:element name="allowview">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" minOccurs="0" ref="shortname"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
     <xs:element name="permissions">
         <xs:complexType>
             <xs:sequence>

admin/roles/tests/preset_test.php

@@ -44,7 +44,7 @@ class core_role_preset_testcase extends advanced_testcase {
             $contextlevels = get_role_contextlevels($role->id);
             $this->assertEquals(array_values($contextlevels), array_values($info['contextlevels']));
 
-            foreach (array('assign', 'override', 'switch', 'view') as $type) {
+            foreach (array('assign', 'override', 'switch') as $type) {
                 $records = $DB->get_records('role_allow_'.$type, array('roleid'=>$role->id), "allow$type ASC");
                 $allows = array();
                 foreach ($records as $record) {

admin/roles/tests/privacy_test.php

@@ -1,747 +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/>.
-
-/**
- * Privacy test for core_role
- *
- * @package    core_role
- * @category   test
- * @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
- *
- * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class core_role_privacy_testcase extends provider_testcase {
-    /**
-     * Test to check export_user_preferences.
-     * returns user preferences data.
-     */
-    public function test_export_user_preferences() {
-        $this->resetAfterTest();
-        $this->setAdminUser();
-        $user = $this->getDataGenerator()->create_user();
-        $this->setUser($user);
-        $showadvanced = 1;
-        set_user_preference('definerole_showadvanced', $showadvanced);
-        provider::export_user_preferences($user->id);
-        $writer = writer::with_context(\context_system::instance());
-        $prefs = $writer->get_user_preferences('core_role');
-        $this->assertEquals(transform::yesno($showadvanced), transform::yesno($prefs->definerole_showadvanced->value));
-        $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.
-     */
-    public function test_get_contexts_for_userid() {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->setAdminUser();
-        $user = $this->getDataGenerator()->create_user();
-        $this->assertEmpty(provider::get_contexts_for_userid($user->id));
-
-        $user2 = $this->getDataGenerator()->create_user();
-        $usercontext2 = \context_user::instance($user2->id);
-        $course = $this->getDataGenerator()->create_course();
-        $course2 = $this->getDataGenerator()->create_course();
-        $coursecat = $this->getDataGenerator()->create_category();
-        $cm = $this->getDataGenerator()->create_module('chat', ['course' => $course->id]);
-        $cmcontext = \context_module::instance($cm->cmid);
-        $page = $this->getDataGenerator()->create_module('page', array('course' => $course->id));
-        $cmcontext2 = \context_module::instance($page->cmid);
-        $coursecontext = \context_course::instance($course->id);
-        $coursecontext2 = \context_course::instance($course2->id);
-        $coursecatcontext = \context_coursecat::instance($coursecat->id);
-        $systemcontext = \context_system::instance();
-        $block = $this->getDataGenerator()->create_block('online_users');
-        $blockcontext = \context_block::instance($block->id);
-
-        $student = $DB->get_record('role', array('shortname' => 'student'), '*', MUST_EXIST);
-        $manager = $DB->get_record('role', array('shortname' => 'manager'), '*', MUST_EXIST);
-
-        // Role assignments, where the user is assigned.
-        role_assign($student->id, $user->id, $cmcontext2->id);
-        role_assign($student->id, $user->id, $coursecontext2->id);
-        role_assign($student->id, $user->id, $blockcontext->id);
-        role_assign($manager->id, $user->id, $usercontext2->id);
-        // Role assignments, where the user makes assignments.
-        $this->setUser($user);
-        role_assign($student->id, $user2->id, $coursecontext->id);
-        role_assign($manager->id, $user2->id, $coursecatcontext->id);
-        role_assign($manager->id, $user2->id, $systemcontext->id);
-
-        // Role capabilities.
-        $this->setUser($user);
-        $result = assign_capability('moodle/backup:backupcourse', CAP_ALLOW, $student->id, $cmcontext->id);
-
-        $contextlist = provider::get_contexts_for_userid($user->id)->get_contextids();
-        $this->assertCount(8, $contextlist);
-        $this->assertTrue(in_array($cmcontext->id, $contextlist));
-    }
-
-    /**
-     * Test that user data is exported correctly.
-     */
-    public function test_export_user_data() {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->setAdminUser();
-        $user = $this->getDataGenerator()->create_user();
-        $user2 = $this->getDataGenerator()->create_user();
-        $usercontext2 = \context_user::instance($user2->id);
-        $course = $this->getDataGenerator()->create_course();
-        $course2 = $this->getDataGenerator()->create_course();
-        $coursecat = $this->getDataGenerator()->create_category();
-        $cm = $this->getDataGenerator()->create_module('chat', ['course' => $course->id]);
-        $cmcontext = \context_module::instance($cm->cmid);
-        $page = $this->getDataGenerator()->create_module('page', array('course' => $course->id));
-        $cmcontext2 = \context_module::instance($page->cmid);
-        $coursecontext = \context_course::instance($course->id);
-        $coursecontext2 = \context_course::instance($course2->id);
-        $coursecatcontext = \context_coursecat::instance($coursecat->id);
-        $systemcontext = \context_system::instance();
-        $block = $this->getDataGenerator()->create_block('online_users');
-        $blockcontext = \context_block::instance($block->id);
-
-        $student = $DB->get_record('role', array('shortname' => 'student'), '*', MUST_EXIST);
-        $manager = $DB->get_record('role', array('shortname' => 'manager'), '*', MUST_EXIST);
-        $rolesnames = self::get_roles_name();
-
-        $subcontextstudent = [
-            get_string('privacy:metadata:role_assignments', 'core_role'),
-            $rolesnames[$student->id]
-        ];
-        $subcontextmanager = [
-            get_string('privacy:metadata:role_assignments', 'core_role'),
-            $rolesnames[$manager->id]
-        ];
-        $subcontextrc = [
-            get_string('privacy:metadata:role_capabilities', 'core_role'),
-            $rolesnames[$student->id]
-        ];
-
-        // Test over role assignments.
-        // Where the user is assigned.
-        role_assign($student->id, $user->id, $cmcontext2->id);
-        role_assign($student->id, $user->id, $coursecontext2->id);
-        role_assign($student->id, $user->id, $blockcontext->id);
-        role_assign($manager->id, $user->id, $usercontext2->id);
-        // Where the user makes assignments.
-        $this->setUser($user);
-        role_assign($manager->id, $user2->id, $coursecatcontext->id);
-        role_assign($manager->id, $user2->id, $systemcontext->id);
-
-        // Test overridable roles in module, course, category, user, system and block.
-        assign_capability('moodle/backup:backupactivity', CAP_ALLOW, $student->id, $cmcontext->id, true);
-        assign_capability('moodle/backup:backupcourse', CAP_ALLOW, $student->id, $coursecontext->id, true);
-        assign_capability('moodle/category:manage', CAP_ALLOW, $student->id, $coursecatcontext->id, true);
-        assign_capability('moodle/backup:backupcourse', CAP_ALLOW, $student->id, $systemcontext->id, true);
-        assign_capability('moodle/block:edit', CAP_ALLOW, $student->id, $blockcontext->id, true);
-        assign_capability('moodle/competency:evidencedelete', CAP_ALLOW, $student->id, $usercontext2->id, true);
-
-        // Retrieve the user's context ids.
-        $contextlist = provider::get_contexts_for_userid($user->id);
-        $approvedcontextlist = new approved_contextlist($user, 'core_role', $contextlist->get_contextids());
-
-        $strpermissions = array(
-            CAP_INHERIT => get_string('inherit', 'role'),
-            CAP_ALLOW => get_string('allow', 'role'),
-            CAP_PREVENT => get_string('prevent', 'role'),
-            CAP_PROHIBIT => get_string('prohibit', 'role')
-        );
-        // Retrieve role capabilities and role assignments.
-        provider::export_user_data($approvedcontextlist);
-        foreach ($contextlist as $context) {
-            $writer = writer::with_context($context);
-            $this->assertTrue($writer->has_any_data());
-            if ($context->contextlevel == CONTEXT_MODULE) {
-                if ($data = $writer->get_data($subcontextstudent)) {
-                    $this->assertEquals($user->id, reset($data)->userid);
-                }
-                if ($data = $writer->get_data($subcontextrc)) {
-                    $this->assertEquals('moodle/backup:backupactivity', reset($data)->capability);
-                    $this->assertEquals($strpermissions[CAP_ALLOW], reset($data)->permission);
-                }
-            }
-            if ($context->contextlevel == CONTEXT_COURSE) {
-                if ($data = $writer->get_data($subcontextstudent)) {
-                    $this->assertEquals($user->id, reset($data)->userid);
-                }
-                if ($data = $writer->get_data($subcontextrc)) {
-                    $this->assertEquals('moodle/backup:backupcourse', reset($data)->capability);
-                }
-            }
-            if ($context->contextlevel == CONTEXT_COURSECAT) {
-                if ($data = $writer->get_data($subcontextmanager)) {
-                    $this->assertEquals($user->id, reset($data)->modifierid);
-                }
-                if ($data = $writer->get_data($subcontextrc)) {
-                    $this->assertEquals('moodle/category:manage', reset($data)->capability);
-                }
-            }
-            if ($context->contextlevel == CONTEXT_SYSTEM) {
-                if ($data = $writer->get_data($subcontextmanager)) {
-                    $this->assertEquals($user->id, reset($data)->modifierid);
-                }
-                if ($data = $writer->get_data($subcontextrc)) {
-                    $this->assertEquals('moodle/backup:backupcourse', reset($data)->capability);
-                }
-            }
-            if ($context->contextlevel == CONTEXT_BLOCK) {
-                if ($data = $writer->get_data($subcontextstudent)) {
-                    $this->assertEquals($user->id, reset($data)->userid);
-                }
-                if ($data = $writer->get_data($subcontextrc)) {
-                    $this->assertEquals('moodle/block:edit', reset($data)->capability);
-                }
-            }
-            if ($context->contextlevel == CONTEXT_USER) {
-                if ($data = $writer->get_data($subcontextmanager)) {
-                    $this->assertEquals($user->id, reset($data)->userid);
-                }
-                if ($data = $writer->get_data($subcontextrc)) {
-                    $this->assertEquals('moodle/competency:evidencedelete', reset($data)->capability);
-                }
-            }
-        }
-    }
-
-    /**
-     * Test for provider::delete_data_for_all_users_in_context().
-     */
-    public function test_delete_data_for_all_users_in_context() {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->setAdminUser();
-        $user = $this->getDataGenerator()->create_user();
-        $user2 = $this->getDataGenerator()->create_user();
-        $usercontext2 = \context_user::instance($user2->id);
-        $user3 = $this->getDataGenerator()->create_user();
-        $course = $this->getDataGenerator()->create_course();
-        $coursecontext = \context_course::instance($course->id);
-        $coursecat = $this->getDataGenerator()->create_category();
-        $coursecatcontext = \context_coursecat::instance($coursecat->id);
-        $systemcontext = \context_system::instance();
-        $cm = $this->getDataGenerator()->create_module('chat', ['course' => $course->id]);
-        $cmcontext = \context_module::instance($cm->cmid);
-        $student = $DB->get_record('role', array('shortname' => 'student'), '*', MUST_EXIST);
-        $manager = $DB->get_record('role', array('shortname' => 'manager'), '*', MUST_EXIST);
-        $block = $this->getDataGenerator()->create_block('online_users');
-        $blockcontext = \context_block::instance($block->id);
-
-        // Role assignments CONTEXT_COURSE.
-        role_assign($student->id, $user->id, $coursecontext->id);
-        role_assign($student->id, $user2->id, $coursecontext->id);
-        role_assign($student->id, $user3->id, $coursecontext->id);
-        $count = $DB->count_records('role_assignments', ['contextid' => $coursecontext->id]);
-        $this->assertEquals(3, $count);
-        // Role assignments CONTEXT_COURSECAT.
-        role_assign($student->id, $user2->id, $coursecatcontext->id);
-        role_assign($student->id, $user3->id, $coursecatcontext->id);
-        $count = $DB->count_records('role_assignments', ['contextid' => $coursecatcontext->id]);
-        $this->assertEquals(2, $count);
-        // Role assignments CONTEXT_SYSTEM.
-        role_assign($student->id, $user->id, $systemcontext->id);
-        $count = $DB->count_records('role_assignments', ['contextid' => $systemcontext->id]);
-        $this->assertEquals(1, $count);
-        // Role assignments CONTEXT_MODULE.
-        role_assign($student->id, $user->id, $cmcontext->id);
-        $count = $DB->count_records('role_assignments', ['contextid' => $cmcontext->id]);
-        $this->assertEquals(1, $count);
-        // Role assigments CONTEXT_BLOCK.
-        role_assign($student->id, $user->id, $blockcontext->id);
-        $count = $DB->count_records('role_assignments', ['contextid' => $blockcontext->id]);
-        $this->assertEquals(1, $count);
-        // Role assigments CONTEXT_USER.
-        role_assign($manager->id, $user->id, $usercontext2->id);
-        $count = $DB->count_records('role_assignments', ['contextid' => $usercontext2->id]);
-        $this->assertEquals(1, $count);
-
-        // Delete data based on CONTEXT_COURSE context.
-        provider::delete_data_for_all_users_in_context($coursecontext);
-        // After deletion, the role_assignments entries for this context should have been deleted.
-        $count = $DB->count_records('role_assignments', ['contextid' => $coursecontext->id]);
-        $this->assertEquals(0, $count);
-        // Check it is not removing data on other contexts.
-        $count = $DB->count_records('role_assignments', ['contextid' => $coursecatcontext->id]);
-        $this->assertEquals(2, $count);
-        $count = $DB->count_records('role_assignments', ['contextid' => $systemcontext->id]);
-        $this->assertEquals(1, $count);
-        $count = $DB->count_records('role_assignments', ['contextid' => $cmcontext->id]);
-        $this->assertEquals(1, $count);
-        // Delete data based on CONTEXT_COURSECAT context.
-        provider::delete_data_for_all_users_in_context($coursecatcontext);
-        // After deletion, the role_assignments entries for this context should have been deleted.
-        $count = $DB->count_records('role_assignments', ['contextid' => $coursecatcontext->id]);
-        $this->assertEquals(0, $count);
-        // Delete data based on CONTEXT_SYSTEM context.
-        provider::delete_data_for_all_users_in_context($systemcontext);
-        // After deletion, the role_assignments entries for this context should have been deleted.
-        $count = $DB->count_records('role_assignments', ['contextid' => $systemcontext->id]);
-        $this->assertEquals(0, $count);
-        // Delete data based on CONTEXT_MODULE context.
-        provider::delete_data_for_all_users_in_context($cmcontext);
-        // After deletion, the role_assignments entries for this context should have been deleted.
-        $count = $DB->count_records('role_assignments', ['contextid' => $cmcontext->id]);
-        $this->assertEquals(0, $count);
-        // Delete data based on CONTEXT_BLOCK context.
-        provider::delete_data_for_all_users_in_context($usercontext2);
-        // After deletion, the role_assignments entries for this context should have been deleted.
-        $count = $DB->count_records('role_assignments', ['contextid' => $usercontext2->id]);
-        $this->assertEquals(0, $count);
-    }
-
-    /**
-     * Test for provider::delete_data_for_user().
-     */
-    public function test_delete_data_for_user() {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->setAdminUser();
-        $user = $this->getDataGenerator()->create_user();
-        $user2 = $this->getDataGenerator()->create_user();
-        $usercontext2 = \context_user::instance($user2->id);
-        $user3 = $this->getDataGenerator()->create_user();
-        $usercontext3 = \context_user::instance($user3->id);
-        $course = $this->getDataGenerator()->create_course();
-        $course2 = $this->getDataGenerator()->create_course();
-        $course3 = $this->getDataGenerator()->create_course();
-        $coursecontext = \context_course::instance($course->id);
-        $coursecontext2 = \context_course::instance($course2->id);
-        $coursecontext3 = \context_course::instance($course3->id);
-        $coursecat = $this->getDataGenerator()->create_category();
-        $coursecatcontext = \context_coursecat::instance($coursecat->id);
-        $systemcontext = \context_system::instance();
-        $cm = $this->getDataGenerator()->create_module('chat', ['course' => $course->id]);
-        $cmcontext = \context_module::instance($cm->cmid);
-        $student = $DB->get_record('role', array('shortname' => 'student'), '*', MUST_EXIST);
-        $manager = $DB->get_record('role', array('shortname' => 'manager'), '*', MUST_EXIST);
-        $block = $this->getDataGenerator()->create_block('online_users');
-        $blockcontext = \context_block::instance($block->id);
-
-        // Role assignments, Where the user is assigned.
-        role_assign($student->id, $user->id, $coursecontext->id);
-        role_assign($student->id, $user->id, $coursecontext2->id);
-        role_assign($student->id, $user->id, $coursecatcontext->id);
-        role_assign($student->id, $user->id, $cmcontext->id);
-        role_assign($student->id, $user->id, $systemcontext->id);
-        role_assign($student->id, $user->id, $blockcontext->id);
-        role_assign($manager->id, $user->id, $usercontext2->id);
-        role_assign($manager->id, $user->id, $usercontext3->id);
-        $count = $DB->count_records('role_assignments', ['userid' => $user->id]);
-        $this->assertEquals(8, $count);
-        // Role assignments, where the user makes assignments.
-        $this->setUser($user);
-        role_assign($student->id, $user2->id, $coursecontext3->id);
-        role_assign($student->id, $user3->id, $coursecontext3->id);
-        $count = $DB->count_records('role_assignments', ['modifierid' => $user->id]);
-        $this->assertEquals(2, $count);
-
-        $contextlist = provider::get_contexts_for_userid($user->id);
-        $approvedcontextlist = new approved_contextlist($user, 'core_role', $contextlist->get_contextids());
-        provider::delete_data_for_user($approvedcontextlist);
-        // After deletion, the role_assignments assigned to the user should have been deleted.
-        $count = $DB->count_records('role_assignments', ['userid' => $user->id]);
-        $this->assertEquals(0, $count);
-        // After deletion, the role_assignments assigned by the user should not have been deleted.
-        $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.
-     */
-    public function test_export_user_role_to_cohort() {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->setAdminUser();
-        // Assign user roles to cohort.
-        $user = $this->getDataGenerator()->create_user();
-        $contextuser = \context_user::instance($user->id);
-        $teacher = $DB->get_record('role', array('shortname' => 'teacher'), '*', MUST_EXIST);
-        $cohort = $this->getDataGenerator()->create_cohort();
-        $userassignover = $this->getDataGenerator()->create_user();
-        $contextuserassignover = \context_user::instance($userassignover->id);
-        cohort_add_member($cohort->id, $userassignover->id);
-        $this->setAdminUser();
-        $params = (object) array(
-            'userid' => $user->id,
-            'roleid' => $teacher->id,
-            'cohortid' => $cohort->id
-        );
-        api::create_cohort_role_assignment($params);
-        api::sync_all_cohort_roles();
-        $rolesnames = self::get_roles_name();
-        $subcontextteacher = [
-            get_string('privacy:metadata:role_cohortroles', 'core_role'),
-            $rolesnames[$teacher->id]
-        ];
-        // Test User is assigned role teacher to cohort.
-        provider::export_user_role_to_cohort($user->id);
-        $writer = writer::with_context($contextuserassignover);
-        $this->assertTrue($writer->has_any_data());
-        $exported = $writer->get_related_data($subcontextteacher, 'cohortroles');
-        $this->assertEquals($user->id, reset($exported)->userid);
-
-        // Test User is member of a cohort which User2 is assigned to role to this cohort.
-        $user2 = $this->getDataGenerator()->create_user();
-        $cohort2 = $this->getDataGenerator()->create_cohort();
-        cohort_add_member($cohort2->id, $user->id);
-        $params = (object) array(
-            'userid' => $user2->id,
-            'roleid' => $teacher->id,
-            'cohortid' => $cohort2->id
-        );
-        api::create_cohort_role_assignment($params);
-        api::sync_all_cohort_roles();
-        provider::export_user_role_to_cohort($user->id);
-        $writer = writer::with_context($contextuser);
-        $this->assertTrue($writer->has_any_data());
-        $exported = $writer->get_related_data($subcontextteacher, 'cohortroles');
-        $this->assertEquals($user2->id, reset($exported)->userid);
-    }
-
-    /**
-     * Test for provider::delete_user_role_to_cohort().
-     */
-    public function test_delete_user_role_to_cohort() {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->setAdminUser();
-        // Assign user roles to cohort.
-        $user = $this->getDataGenerator()->create_user();
-        $user2 = $this->getDataGenerator()->create_user();
-        $user3 = $this->getDataGenerator()->create_user();
-        $user4 = $this->getDataGenerator()->create_user();
-        $teacher = $DB->get_record('role', array('shortname' => 'teacher'), '*', MUST_EXIST);
-        $cohort = $this->getDataGenerator()->create_cohort();
-        cohort_add_member($cohort->id, $user2->id);
-        cohort_add_member($cohort->id, $user3->id);
-        cohort_add_member($cohort->id, $user4->id);
-        $this->setAdminUser();
-        $params = (object) array(
-            'userid' => $user->id,
-            'roleid' => $teacher->id,
-            'cohortid' => $cohort->id
-        );
-        api::create_cohort_role_assignment($params);
-        api::sync_all_cohort_roles();
-
-        $count = $DB->count_records('role_assignments', ['userid' => $user->id, 'component' => 'tool_cohortroles']);
-        $this->assertEquals(3, $count);
-
-        provider::delete_user_role_to_cohort($user->id);
-        $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.
-     *
-     * @return array Array of name of the roles by roleid.
-     */
-    protected static function get_roles_name() {
-        $roles = role_fix_names(get_all_roles(), \context_system::instance(), ROLENAME_ORIGINAL);
-        $rolesnames = array();
-        foreach ($roles as $role) {
-            $rolesnames[$role->id] = $role->localname;
-        }
-        return $rolesnames;
-    }
-}

admin/searchareas.php

@@ -28,139 +28,85 @@ admin_externalpage_setup('searchareas');
 
 $areaid = optional_param('areaid', null, PARAM_ALPHAEXT);
 $action = optional_param('action', null, PARAM_ALPHA);
-$indexingenabled = \core_search\manager::is_indexing_enabled(); // This restricts many of the actions on this page.
 
-// Get a search manager instance, which we'll need for display and to handle some actions.
 try {
     $searchmanager = \core_search\manager::instance();
 } catch (core_search\engine_exception $searchmanagererror) {
-    // In action cases, we'll throw this exception below. In non-action cases, we produce a lang string error.
+    // Continue, we return an error later depending on the requested action.
 }
 
-// Handle all the actions.
+echo $OUTPUT->header();
+
 if ($action) {
-    // If dealing with an areaid, we need to check that the area exists.
+    require_sesskey();
+
     if ($areaid) {
+        // We need to check that the area exists.
         $area = \core_search\manager::get_search_area($areaid);
         if ($area === false) {
             throw new moodle_exception('invalidrequest');
         }
     }
 
-    // All the indexing actions.
-    if (in_array($action, ['delete', 'indexall', 'reindexall', 'deleteall'])) {
-
-        // All of these actions require that indexing is enabled.
-        if ($indexingenabled) {
-
-            // For all of these actions, we strictly need a manager instance.
-            if (isset($searchmanagererror)) {
-                throw $searchmanagererror;
-            }
-
-            // Show confirm prompt for all these actions as they may be inadvisable, or may cause
-            // an interruption in search functionality, on production systems.
-            if (!optional_param('confirm', 0, PARAM_INT)) {
-                // Display confirmation prompt.
-                $a = null;
-                if ($areaid) {
-                    $a = html_writer::tag('strong', $area->get_visible_name());
-                }
-
-                $actionparams = ['sesskey' => sesskey(), 'action' => $action, 'confirm' => 1];
-                if ($areaid) {
-                    $actionparams['areaid'] = $areaid;
-                }
-                $actionurl = new moodle_url('/admin/searchareas.php', $actionparams);
-                $cancelurl = new moodle_url('/admin/searchareas.php');
-                echo $OUTPUT->header();
-                echo $OUTPUT->confirm(get_string('confirm_' . $action, 'search', $a),
-                    new single_button($actionurl, get_string('continue'), 'post', true),
-                    new single_button($cancelurl, get_string('cancel'), 'get'));
-                echo $OUTPUT->footer();
-                exit;
-            } else {
-                // Confirmed, so run the required action.
-                require_sesskey();
-
-                switch ($action) {
-                    case 'delete':
-                        $searchmanager->delete_index($areaid);
-                        \core\notification::success(get_string('searchindexdeleted', 'admin'));
-                        break;
-                    case 'indexall':
-                        $searchmanager->index();
-                        \core\notification::success(get_string('searchindexupdated', 'admin'));
-                        break;
-                    case 'reindexall':
-                        $searchmanager->index(true);
-                        \core\notification::success(get_string('searchreindexed', 'admin'));
-                        break;
-                    case 'deleteall':
-                        $searchmanager->delete_index();
-                        \core\notification::success(get_string('searchalldeleted', 'admin'));
-                        break;
-                    default:
-                        break;
-                }
-
-                // Redirect back to the main page after taking action.
-                redirect(new moodle_url('/admin/searchareas.php'));
-            }
+    // All actions but enable/disable need the search engine to be ready.
+    if ($action !== 'enable' && $action !== 'disable') {
+        if (!empty($searchmanagererror)) {
+            throw $searchmanagererror;
         }
-    } else if (in_array($action, ['enable', 'disable'])) {
-        // Toggling search areas requires no confirmation.
-        require_sesskey();
+    }
 
-        switch ($action) {
-            case 'enable':
-                $area->set_enabled(true);
-                \core\notification::success(get_string('searchareaenabled', 'admin'));
-                break;
-            case 'disable':
-                $area->set_enabled(false);
-                core\notification::success(get_string('searchareadisabled', 'admin'));
-                break;
-            default:
-                break;
-        }
-
-        redirect(new moodle_url('/admin/searchareas.php'));
-    } else {
-        // Invalid action.
-        throw new moodle_exception('invalidaction');
+    switch ($action) {
+        case 'enable':
+            $area->set_enabled(true);
+            echo $OUTPUT->notification(get_string('searchareaenabled', 'admin'), \core\output\notification::NOTIFY_SUCCESS);
+            break;
+        case 'disable':
+            $area->set_enabled(false);
+            echo $OUTPUT->notification(get_string('searchareadisabled', 'admin'), \core\output\notification::NOTIFY_SUCCESS);
+            break;
+        case 'delete':
+            $search = \core_search\manager::instance();
+            $search->delete_index($areaid);
+            echo $OUTPUT->notification(get_string('searchindexdeleted', 'admin'), \core\output\notification::NOTIFY_SUCCESS);
+            break;
+        case 'indexall':
+            $searchmanager->index();
+            echo $OUTPUT->notification(get_string('searchindexupdated', 'admin'), \core\output\notification::NOTIFY_SUCCESS);
+            break;
+        case 'reindexall':
+            $searchmanager->index(true);
+            echo $OUTPUT->notification(get_string('searchreindexed', 'admin'), \core\output\notification::NOTIFY_SUCCESS);
+            break;
+        case 'deleteall':
+            $searchmanager->delete_index();
+            echo $OUTPUT->notification(get_string('searchalldeleted', 'admin'), \core\output\notification::NOTIFY_SUCCESS);
+            break;
+        default:
+            throw new moodle_exception('invalidaction');
+            break;
     }
 }
 
-
-// Display.
-if (isset($searchmanager) && $indexingenabled) {
-    \core\notification::info(get_string('indexinginfo', 'admin'));
-} else if (isset($searchmanager)) {
-    $params = (object) [
-        'url' => (new moodle_url("/admin/settings.php?section=manageglobalsearch#admin-searchindexwhendisabled"))->out(false)
-    ];
-    \core\notification::error(get_string('indexwhendisabledfullnotice', 'search', $params));
+$searchareas = \core_search\manager::get_search_areas_list();
+if (empty($searchmanagererror)) {
+    $areasconfig = $searchmanager->get_areas_config($searchareas);
 } else {
-    // In non-action cases, init errors are translated and displayed to the user as error notifications.
-    $errorstr = get_string($searchmanagererror->errorcode, $searchmanagererror->module, $searchmanagererror->a);
-    \core\notification::error($errorstr);
+    $areasconfig = false;
 }
 
-echo $OUTPUT->header();
+if (!empty($searchmanagererror)) {
+    $errorstr = get_string($searchmanagererror->errorcode, $searchmanagererror->module, $searchmanagererror->a);
+    echo $OUTPUT->notification($errorstr, \core\output\notification::NOTIFY_ERROR);
+} else {
+    echo $OUTPUT->notification(get_string('indexinginfo', 'admin'), \core\output\notification::NOTIFY_INFO);
+}
 
 $table = new html_table();
 $table->id = 'core-search-areas';
-$table->head = [
-    get_string('searcharea', 'search'),
-    get_string('enable'),
-    get_string('newestdocindexed', 'admin'),
-    get_string('searchlastrun', 'admin'),
-    get_string('searchindexactions', 'admin')
-];
 
-$searchareas = \core_search\manager::get_search_areas_list();
-$areasconfig = isset($searchmanager) ? $searchmanager->get_areas_config($searchareas) : false;
+$table->head = array(get_string('searcharea', 'search'), get_string('enable'), get_string('newestdocindexed', 'admin'),
+    get_string('searchlastrun', 'admin'), get_string('searchindexactions', 'admin'));
+
 foreach ($searchareas as $area) {
     $areaid = $area->get_area_id();
     $columns = array(new html_table_cell($area->get_visible_name()));
@@ -170,7 +116,7 @@ foreach ($searchareas as $area) {
             new pix_icon('t/hide', get_string('disable'), 'moodle', array('title' => '', 'class' => 'iconsmall')),
             null, array('title' => get_string('disable')));
 
-        if ($areasconfig && $indexingenabled) {
+        if ($areasconfig) {
             $columns[] = $areasconfig[$areaid]->lastindexrun;
 
             if ($areasconfig[$areaid]->indexingstart) {
@@ -186,24 +132,10 @@ foreach ($searchareas as $area) {
                 $laststatus = '';
             }
             $columns[] = $laststatus;
-            $accesshide = html_writer::span($area->get_visible_name(), 'accesshide');
-            $actions = [];
-            $actions[] = $OUTPUT->pix_icon('t/delete', '') .
-                    html_writer::link(admin_searcharea_action_url('delete', $areaid),
-                    get_string('deleteindex', 'search', $accesshide));
-            if ($area->supports_get_document_recordset()) {
-                $actions[] = $OUTPUT->pix_icon('i/reload', '') . html_writer::link(
-                        new moodle_url('searchreindex.php', ['areaid' => $areaid]),
-                        get_string('gradualreindex', 'search', $accesshide));
-            }
-            $columns[] = html_writer::alist($actions, ['class' => 'unstyled list-unstyled']);
+            $columns[] = html_writer::link(admin_searcharea_action_url('delete', $areaid), 'Delete index');
 
         } else {
-            if (!$areasconfig) {
-                $blankrow = new html_table_cell(get_string('searchnotavailable', 'admin'));
-            } else {
-                $blankrow = new html_table_cell(get_string('indexwhendisabledshortnotice', 'search'));
-            }
+            $blankrow = new html_table_cell(get_string('searchnotavailable', 'admin'));
             $blankrow->colspan = 3;
             $columns[] = $blankrow;
         }
@@ -222,7 +154,10 @@ foreach ($searchareas as $area) {
 }
 
 // Cross-search area tasks.
-$options = (isset($searchmanager) && $indexingenabled) ? [] : ['disabled' => true];
+$options = array();
+if (!empty($searchmanagererror)) {
+    $options['disabled'] = true;
+}
 echo $OUTPUT->box_start('search-areas-actions');
 echo $OUTPUT->single_button(admin_searcharea_action_url('indexall'), get_string('searchupdateindex', 'admin'), 'get', $options);
 echo $OUTPUT->single_button(admin_searcharea_action_url('reindexall'), get_string('searchreindexindex', 'admin'), 'get', $options);
@@ -230,13 +165,6 @@ echo $OUTPUT->single_button(admin_searcharea_action_url('deleteall'), get_string
 echo $OUTPUT->box_end();
 
 echo html_writer::table($table);
-
-if (isset($searchmanager)) {
-    // Show information about queued index requests for specific contexts.
-    $searchrenderer = $PAGE->get_renderer('core_search');
-    echo $searchrenderer->render_index_requests_info($searchmanager->get_index_requests_info());
-}
-
 echo $OUTPUT->footer();
 
 /**
@@ -247,12 +175,9 @@ echo $OUTPUT->footer();
  * @return moodle_url
  */
 function admin_searcharea_action_url($action, $areaid = false) {
-    $params = array('action' => $action);
+    $params = array('action' => $action, 'sesskey' => sesskey());
     if ($areaid) {
         $params['areaid'] = $areaid;
     }
-    if ($action === 'disable' || $action === 'enable') {
-        $params['sesskey'] = sesskey();
-    }
     return new moodle_url('/admin/searchareas.php', $params);
 }

admin/searchreindex.php

@@ -1,87 +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/>.
-
-/**
- * Adds a search area to the queue for indexing.
- *
- * @package core_search
- * @copyright 2017 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('NO_OUTPUT_BUFFERING', true);
-
-require(__DIR__ . '/../config.php');
-
-// Check access.
-require_once($CFG->libdir . '/adminlib.php');
-
-admin_externalpage_setup('searchareas', '', null, (new moodle_url('/admin/searchreindex.php'))->out(false));
-
-// Get area parameter and check it exists.
-$areaid = required_param('areaid', PARAM_ALPHAEXT);
-$area = \core_search\manager::get_search_area($areaid);
-if ($area === false) {
-    throw new moodle_exception('invalidrequest');
-}
-$areaname = $area->get_visible_name();
-
-// Start page output.
-$heading = get_string('gradualreindex', 'search', '');
-$PAGE->set_title($PAGE->title . ': ' . $heading);
-$PAGE->navbar->add($heading);
-echo $OUTPUT->header();
-echo $OUTPUT->heading($heading);
-
-// If sesskey is supplied, actually carry out the action.
-if (optional_param('sesskey', '', PARAM_ALPHANUM)) {
-    require_sesskey();
-
-    // Get all contexts for search area. This query can take time in large cases.
-    \core_php_time_limit::raise(0);
-    $contextiterator = $area->get_contexts_to_reindex();
-
-    $progress = new \core\progress\display_if_slow('');
-    $progress->start_progress($areaname);
-
-    // Request reindexing for each context (with low priority).
-    $count = 0;
-    foreach ($contextiterator as $context) {
-        \core_php_time_limit::raise(30);
-        \core_search\manager::request_index($context, $area->get_area_id(),
-                \core_search\manager::INDEX_PRIORITY_REINDEXING);
-        $progress->progress();
-        $count++;
-    }
-
-    // Unset the iterator which should close the recordset (if there is one).
-    unset($contextiterator);
-
-    $progress->end_progress();
-
-    $a = (object)['name' => html_writer::tag('strong', $areaname), 'count' => $count];
-    echo $OUTPUT->box(get_string('gradualreindex_queued', 'search', $a));
-
-    echo $OUTPUT->continue_button(new moodle_url('/admin/searchareas.php'));
-} else {
-    // Display confirmation prompt.
-    echo $OUTPUT->confirm(get_string('gradualreindex_confirm', 'search', html_writer::tag('strong', $areaname)),
-            new single_button(new moodle_url('/admin/searchreindex.php', ['areaid' => $areaid,
-                'sesskey' => sesskey()]), get_string('continue'), 'post', true),
-            new single_button(new moodle_url('/admin/searchareas.php'), get_string('cancel'), 'get'));
-}
-
-echo $OUTPUT->footer();

admin/settings.php

@@ -38,8 +38,7 @@ if (!($settingspage->check_access())) {
 $statusmsg = '';
 $errormsg  = '';
 
-// Form is submitted with changed settings. Do not want to execute when modifying a block.
-if ($data = data_submitted() and confirm_sesskey() and isset($data->action) and $data->action == 'save-settings') {
+if ($data = data_submitted() and confirm_sesskey()) {
 
     $count = admin_write_settings($data);
     // Regardless of whether any setting change was written (a positive count), check validation errors for those that didn't.

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

@@ -22,7 +22,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) { // sp
     $temp->add(new admin_setting_configcheckbox('allowuserthemes', new lang_string('allowuserthemes', 'admin'), new lang_string('configallowuserthemes', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('allowcoursethemes', new lang_string('allowcoursethemes', 'admin'), new lang_string('configallowcoursethemes', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('allowcategorythemes',  new lang_string('allowcategorythemes', 'admin'), new lang_string('configallowcategorythemes', 'admin'), 0));
-    $temp->add(new admin_setting_configcheckbox('allowcohortthemes',  new lang_string('allowcohortthemes', 'admin'), new lang_string('configallowcohortthemes', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('allowthemechangeonurl',  new lang_string('allowthemechangeonurl', 'admin'), new lang_string('configallowthemechangeonurl', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('allowuserblockhiding', new lang_string('allowuserblockhiding', 'admin'), new lang_string('configallowuserblockhiding', 'admin'), 1));
     $temp->add(new admin_setting_configcheckbox('allowblockstodock', new lang_string('allowblockstodock', 'admin'), new lang_string('configallowblockstodock', 'admin'), 1));
@@ -32,9 +31,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'
@@ -200,7 +199,7 @@ preferences,moodle|/user/preferences.php|t/preferences',
 
     // "documentation" settingpage
     $temp = new admin_settingpage('documentation', new lang_string('moodledocs'));
-    $temp->add(new admin_setting_configtext('docroot', new lang_string('docroot', 'admin'), new lang_string('configdocroot', 'admin'), 'https://docs.moodle.org', PARAM_URL));
+    $temp->add(new admin_setting_configtext('docroot', new lang_string('docroot', 'admin'), new lang_string('configdocroot', 'admin'), 'http://docs.moodle.org', PARAM_URL));
     $ltemp = array('' => get_string('forceno'));
     $ltemp += get_string_manager()->get_list_of_translations(true);
     $temp->add(new admin_setting_configselect('doclang', get_string('doclang', 'admin'), get_string('configdoclang', 'admin'), '', $ltemp));
@@ -218,9 +217,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 +226,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 +251,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

@@ -14,21 +14,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
     $temp->add(new admin_setting_configcheckbox('dndallowtextandlinks', new lang_string('dndallowtextandlinks', 'admin'), new lang_string('configdndallowtextandlinks', 'admin'), 0));
 
-    $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));
-
     $ADMIN->add('experimental', $temp);
 
     // "debugging" settingpage
@@ -43,9 +28,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $ADMIN->add('development', $temp);
 
     // "Profiling" settingpage (conditionally if the 'xhprof' extension is available only).
-    $xhprofenabled = extension_loaded('tideways_xhprof');
-    $xhprofenabled = $xhprofenabled || extension_loaded('tideways');
-    $xhprofenabled = $xhprofenabled || extension_loaded('xhprof');
+    $xhprofenabled = extension_loaded('xhprof') || extension_loaded('tideways');
     $temp = new admin_settingpage('profiling', new lang_string('profiling', 'admin'), 'moodle/site:config', !$xhprofenabled);
     // Main profiling switch.
     $temp->add(new admin_setting_configcheckbox('profilingenabled', new lang_string('profilingenabled', 'admin'), new lang_string('profilingenabled_help', 'admin'), false));
@@ -93,8 +76,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/grades.php

@@ -42,9 +42,6 @@ if (has_capability('moodle/grade:manage', $systemcontext)
         // enable publishing in exports/imports
         $temp->add(new admin_setting_configcheckbox('gradepublishing', new lang_string('gradepublishing', 'grades'), new lang_string('gradepublishing_help', 'grades'), 0));
 
-        $temp->add(new admin_setting_configcheckbox('grade_export_exportfeedback', new lang_string('exportfeedback', 'grades'),
-                                                  new lang_string('exportfeedback_desc', 'grades'), 0));
-
         $temp->add(new admin_setting_configselect('grade_export_displaytype', new lang_string('gradeexportdisplaytype', 'grades'),
                                                   new lang_string('gradeexportdisplaytype_desc', 'grades'), GRADE_DISPLAY_TYPE_REAL, $display_types));
 

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/plugins.php

@@ -556,7 +556,7 @@ if ($hassiteconfig) {
     // Search engine selection.
     $temp->add(new admin_setting_heading('searchengineheading', new lang_string('searchengine', 'admin'), ''));
     $temp->add(new admin_setting_configselect('searchengine',
-                                new lang_string('selectsearchengine', 'admin'), '', 'simpledb', $engines));
+                                new lang_string('selectsearchengine', 'admin'), '', 'solr', $engines));
     $temp->add(new admin_setting_heading('searchoptionsheading', new lang_string('searchoptions', 'admin'), ''));
     $temp->add(new admin_setting_configcheckbox('searchindexwhendisabled',
             new lang_string('searchindexwhendisabled', 'admin'), new lang_string('searchindexwhendisabled_desc', 'admin'),

admin/settings/security.php

@@ -54,7 +54,8 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
                        3600 => new lang_string('numminutes', '', 60))));
 
     $temp->add(new admin_setting_configcheckbox('extendedusernamechars', new lang_string('extendedusernamechars', 'admin'), new lang_string('configextendedusernamechars', 'admin'), 0));
-
+    $temp->add(new admin_setting_configtext('sitepolicy', new lang_string('sitepolicy', 'admin'), new lang_string('sitepolicy_help', 'admin'), '', PARAM_RAW));
+    $temp->add(new admin_setting_configtext('sitepolicyguest', new lang_string('sitepolicyguest', 'admin'), new lang_string('sitepolicyguest_help', 'admin'), (isset($CFG->sitepolicy) ? $CFG->sitepolicy : ''), PARAM_RAW));
     $temp->add(new admin_setting_configcheckbox('extendedusernamechars', new lang_string('extendedusernamechars', 'admin'), new lang_string('configextendedusernamechars', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('keeptagnamecase', new lang_string('keeptagnamecase','admin'),new lang_string('configkeeptagnamecase', 'admin'),'1'));
 

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/settings/users.php

@@ -4,7 +4,6 @@
 
 $ADMIN->add('users', new admin_category('accounts', new lang_string('accounts', 'admin')));
 $ADMIN->add('users', new admin_category('roles', new lang_string('permissions', 'role')));
-$ADMIN->add('users', new admin_category('privacy', new lang_string('privacyandpolicies', 'admin')));
 
 if ($hassiteconfig
  or has_capability('moodle/user:create', $systemcontext)
@@ -29,7 +28,7 @@ if ($hassiteconfig
         $choices['1'] = new lang_string('emaildisplayyes');
         $choices['2'] = new lang_string('emaildisplaycourse');
         $temp->add(new admin_setting_configselect('defaultpreference_maildisplay', new lang_string('emaildisplay'),
-            new lang_string('emaildisplay_help'), 2, $choices));
+            '', 2, $choices));
 
         $choices = array();
         $choices['0'] = new lang_string('textformat');
@@ -151,7 +150,6 @@ if ($hassiteconfig
         $temp->add(new admin_setting_configmultiselect('hiddenuserfields', new lang_string('hiddenuserfields', 'admin'),
                    new lang_string('confighiddenuserfields', 'admin'), array(),
                        array('description' => new lang_string('description'),
-                             'email' => new lang_string('email'),
                              'city' => new lang_string('city'),
                              'country' => new lang_string('country'),
                              'timezone' => new lang_string('timezone'),
@@ -211,48 +209,3 @@ if ($hassiteconfig
     $ADMIN->add('roles', new admin_externalpage('checkpermissions', new lang_string('checkglobalpermissions', 'role'), "$CFG->wwwroot/$CFG->admin/roles/check.php?contextid=".$systemcontext->id, array('moodle/role:assign', 'moodle/role:safeoverride', 'moodle/role:override', 'moodle/role:manage')));
 
 } // end of speedup
-
-// Privacy settings.
-if ($hassiteconfig) {
-    $temp = new admin_settingpage('privacysettings', new lang_string('privacysettings', 'admin'));
-
-    $options = array(
-        0 => get_string('no'),
-        1 => get_string('yes')
-    );
-    $url = new moodle_url('/admin/settings.php?section=supportcontact');
-    $url = $url->out();
-    $setting = new admin_setting_configselect('agedigitalconsentverification',
-        new lang_string('agedigitalconsentverification', 'admin'),
-        new lang_string('agedigitalconsentverification_desc', 'admin', $url), 0, $options);
-    $setting->set_force_ltr(true);
-    $temp->add($setting);
-
-    // See {@link https://gdpr-info.eu/art-8-gdpr/}.
-    $ageofdigitalconsentmap = implode(PHP_EOL, [
-        '*, 16',
-        'AT, 14',
-        'ES, 14',
-        'US, 13'
-    ]);
-    $setting = new admin_setting_agedigitalconsentmap('agedigitalconsentmap',
-        new lang_string('ageofdigitalconsentmap', 'admin'),
-        new lang_string('ageofdigitalconsentmap_desc', 'admin'),
-        $ageofdigitalconsentmap,
-        PARAM_RAW
-    );
-    $temp->add($setting);
-
-    $ADMIN->add('privacy', $temp);
-
-    // Policy settings.
-    $temp = new admin_settingpage('policysettings', new lang_string('policysettings', 'admin'));
-    $temp->add(new admin_settings_sitepolicy_handler_select('sitepolicyhandler', new lang_string('sitepolicyhandler', 'core_admin'),
-        new lang_string('sitepolicyhandler_desc', 'core_admin')));
-    $temp->add(new admin_setting_configtext('sitepolicy', new lang_string('sitepolicy', 'core_admin'),
-        new lang_string('sitepolicy_help', 'core_admin'), '', PARAM_RAW));
-    $temp->add(new admin_setting_configtext('sitepolicyguest', new lang_string('sitepolicyguest', 'core_admin'),
-        new lang_string('sitepolicyguest_help', 'core_admin'), (isset($CFG->sitepolicy) ? $CFG->sitepolicy : ''), PARAM_RAW));
-
-    $ADMIN->add('privacy', $temp);
-}

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.mustache

@@ -40,7 +40,6 @@
     <div class="settingsform clearfix">
         {{#params}}
             <input type="hidden" name="{{name}}" value="{{value}}">
-            <input type="hidden" name="action" value="save-settings">
         {{/params}}
         <input type="hidden" name="sesskey" value="{{sesskey}}">
         <input type="hidden" name="return" value="{{return}}">

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/tests/behat/search_areas.feature

@@ -1,21 +0,0 @@
-@core @core_admin
-Feature: Use the search areas admin screen
-  In order to control search indexing
-  As an admin
-  I need to use the search areas admin screen
-
-  Background:
-    Given I log in as "admin"
-    And I navigate to "Plugins > Search > Search areas" in site administration
-
-  Scenario: Disable and enable a search area
-    When I click on "Disable" "link" in the "Book - resource information" "table_row"
-    Then I should see "Search area disabled" in the ".alert-success" "css_element"
-    And I should see "Search area disabled" in the "Book - resource information" "table_row"
-
-    When I click on "Enable" "link" in the "Book - resource information" "table_row"
-    Then I should see "Search area enabled" in the ".alert-success" "css_element"
-    And I should not see "Search area disabled" in the "Book - resource information" "table_row"
-
-  # Note: Other scenarios are not currently easy to implement in Behat because there is no mock
-  # search engine - we could add testing once Moodle has an internal database search engine.

admin/tool/analytics/classes/clihelper.php

@@ -1,55 +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/>.
-
-/**
- * Helper class that contains helper functions for cli scripts.
- *
- * @package   tool_analytics
- * @copyright 2017 onwards Ankit Agarwal
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_analytics;
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Helper class that contains helper functions for cli scripts.
- *
- * @package   tool_analytics
- * @copyright 2017 onwards Ankit Agarwal
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class clihelper {
-
-    /**
-     * List all models in the system. To be used from cli scripts.
-     *
-     * @return void
-     */
-    public static function list_models() {
-        cli_heading("List of models");
-        echo str_pad(get_string('modelid', 'tool_analytics'), 15, ' ') . ' ' . str_pad(get_string('name'), 50, ' ') .
-            ' ' . str_pad(get_string('status'), 15, ' ') . "\n";
-        $models = \core_analytics\manager::get_all_models();
-        foreach ($models as $model) {
-            $modelid = $model->get_id();
-            $isenabled = $model->is_enabled() ? get_string('enabled', 'tool_analytics') : get_string('disabled', 'tool_analytics');
-            $name = $model->get_target()->get_name();
-            echo str_pad($modelid, 15, ' ') . ' ' . str_pad($name, 50, ' ') . ' ' . str_pad($isenabled, 15, ' ') . "\n";
-        }
-    }
-}

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/classes/privacy/provider.php

@@ -1,46 +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/>.
-
-/**
- * Privacy Subsystem implementation for tool_analytics.
- *
- * @package    tool_analytics
- * @copyright  2018 Zig Tan <zig@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_analytics\privacy;
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Privacy Subsystem for tool_analytics implementing null_provider.
- *
- * @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\null_provider {
-
-    /**
-     * Get the language string identifier with the component's language
-     * file to explain why this plugin stores no data.
-     *
-     * @return  string
-     */
-    public static function get_reason() : string {
-        return 'privacy:metadata';
-    }
-}

admin/tool/analytics/cli/enable_model.php

@@ -31,7 +31,6 @@ $help = "Enables the provided model.
 
 Options:
 --modelid           Model id
---list              List models
 --timesplitting     Time splitting method full class name
 -h, --help          Print out this help
 
@@ -43,7 +42,6 @@ Example:
 list($options, $unrecognized) = cli_get_params(
     array(
         'help'            => false,
-        'list'            => false,
         'modelid'         => false,
         'timesplitting'   => false
     ),
@@ -57,12 +55,7 @@ if ($options['help']) {
     exit(0);
 }
 
-if ($options['list'] || $options['modelid'] === false) {
-    \tool_analytics\clihelper::list_models();
-    exit(0);
-}
-
-if ($options['timesplitting'] === false) {
+if ($options['modelid'] === false || $options['timesplitting'] === false) {
     echo $help;
     exit(0);
 }

admin/tool/analytics/cli/evaluate_model.php

@@ -31,7 +31,6 @@ $help = "Evaluates the provided model.
 
 Options:
 --modelid              Model id
---list                 List models
 --non-interactive      Not interactive questions
 --timesplitting        Restrict the evaluation to 1 single time splitting method (Optional)
 --filter               Analyser dependant. e.g. A courseid would evaluate the model using a single course (Optional)
@@ -48,7 +47,6 @@ list($options, $unrecognized) = cli_get_params(
     array(
         'help'                  => false,
         'modelid'               => false,
-        'list'                  => false,
         'timesplitting'         => false,
         'reuse-prev-analysed'   => true,
         'non-interactive'       => false,
@@ -64,8 +62,8 @@ if ($options['help']) {
     exit(0);
 }
 
-if ($options['list'] || $options['modelid'] === false) {
-    \tool_analytics\clihelper::list_models();
+if ($options['modelid'] === false) {
+    echo $help;
     exit(0);
 }
 

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

@@ -34,7 +34,6 @@ $string['clearmodelpredictions'] = 'Are you sure you want to clear all "{$a}" pr
 $string['clienablemodel'] = 'You can enable the model by selecting a time-splitting method by its ID. Note that you can also enable it later using the web interface (\'none\' to exit).';
 $string['clievaluationandpredictions'] = 'A scheduled task iterates through enabled models and gets predictions. Models evaluation via the web interface is disabled. You can allow these processes to be executed manually via the web interface by disabling the <a href="{$a}">\'onlycli\'</a> analytics setting.';
 $string['clievaluationandpredictionsnoadmin'] = 'A scheduled task iterates through enabled models and gets predictions. Models evaluation via the web interface is disabled. It may be enabled by a site administrator.';
-$string['disabled'] = 'Disabled';
 $string['editmodel'] = 'Edit "{$a}" model';
 $string['edittrainedwarning'] = 'This model has already been trained. Note that changing its indicators or its time-splitting method will delete its previous predictions and start generating new predictions.';
 $string['enabled'] = 'Enabled';
@@ -62,12 +61,11 @@ $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';
 $string['loginfo'] = 'Log extra info';
-$string['modelid'] = 'Model ID';
 $string['modelinvalidanalysables'] = 'Invalid analysable elements for "{$a}" model';
 $string['modelresults'] = '{$a} results';
 $string['modeltimesplitting'] = 'Time splitting';
@@ -75,7 +73,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';
@@ -95,4 +92,3 @@ $string['trainmodels'] = 'Train models';
 $string['viewlog'] = 'Log';
 $string['weeksenddateautomaticallyset'] = 'End date automatically set based on start date and the number of sections';
 $string['weeksenddatedefault'] = 'End date automatically calculated from the course start date.';
-$string['privacy:metadata'] = 'The Analytic models plugin does not store any personal data.';

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   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017110800; // 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/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,60 @@
+<?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';