Moodle release 3.4.1

weekly release 3.4+
Merge branch 'MDL-61177-34' of git://github.com/andrewnicols/moodle into MOODLE_34_STABLE
2018-01-12 20:35:46 +01:00 · 2018-01-12 02:12:44 +01:00 · 2018-01-11 09:22:47 +08:00 · 2018-01-10 15:23:20 +08:00 · 2018-01-10 08:55:24 +08:00 · 2018-01-10 08:13:45 +08:00
7001 changed files with 152398 additions and 554074 deletions
@@ -3,15 +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/
-cache/stores/mongodb/MongoDB/
 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
@@ -44,6 +41,7 @@ lib/html2text/
 lib/markdown/
 lib/recaptchalib.php
 lib/xhprof/
+lib/xmlize.php
 lib/horde/
 lib/requirejs/
 lib/amd/src/loglevel.js
@@ -60,11 +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/
-lib/php-jwt/
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/
@@ -85,4 +79,8 @@ theme/boost/amd/src/tab.js
 theme/boost/amd/src/tooltip.js
 theme/boost/amd/src/util.js
 theme/boost/amd/src/tether.js
-theme/boost/scss/fontawesome/
+theme/boost/scss/fontawesome/
+theme/bootstrapbase/less/bootstrap/
+theme/bootstrapbase/javascript/html5shiv.js
+theme/bootstrapbase/amd/src/bootstrap.js
+theme/bootstrapbase/less/fontawesome/
@@ -1,3 +1,5 @@
 **/yui/build/** -diff
 **/amd/build/** -diff
 lib/dml/oci_native_moodle_package.sql text eol=lf
+theme/bootstrapbase/style/editor.css -diff
+theme/bootstrapbase/style/moodle.css -diff
@@ -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.*
@@ -1,18 +1,15 @@
 # Generated by "grunt ignorefiles"
-**/yui/build/*
-theme/boost/style/moodle.css
-theme/classic/style/moodle.css
+theme/bootstrapbase/style/
+theme/clean/style/custom.css
+theme/more/style/custom.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/
-cache/stores/mongodb/MongoDB/
 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
@@ -45,6 +42,7 @@ lib/html2text/
 lib/markdown/
 lib/recaptchalib.php
 lib/xhprof/
+lib/xmlize.php
 lib/horde/
 lib/requirejs/
 lib/amd/src/loglevel.js
@@ -61,11 +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/
-lib/php-jwt/
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/
@@ -86,4 +80,8 @@ theme/boost/amd/src/tab.js
 theme/boost/amd/src/tooltip.js
 theme/boost/amd/src/util.js
 theme/boost/amd/src/tether.js
-theme/boost/scss/fontawesome/
+theme/boost/scss/fontawesome/
+theme/bootstrapbase/less/bootstrap/
+theme/bootstrapbase/javascript/html5shiv.js
+theme/bootstrapbase/amd/src/bootstrap.js
+theme/bootstrapbase/less/fontawesome/
@@ -14,7 +14,7 @@ language: php
 php:
    # We only run the highest and lowest supported versions to reduce the load on travis-ci.org.
    - 7.2
-    - 7.1
+    - 7.0

 addons:
  postgresql: "9.6"
@@ -56,14 +56,14 @@ 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.
        # Exclude it on all versions except for 7.2

        - env: DB=mysqli   TASK=PHPUNIT
-          php: 7.1
+          php: 7.0

 cache:
    directories:
@@ -207,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 master;
+        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`
@@ -248,7 +248,7 @@ script:
    - >
      if [ "$TASK" = 'PHPUNIT' ];
      then
-        vendor/bin/phpunit --fail-on-risky --disallow-test-output --verbose;
+        vendor/bin/phpunit;
      fi

    - >
@@ -263,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

@@ -37,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
@@ -126,16 +126,16 @@ module.exports = function(grunt) {
                options: {report: 'none'}
            }
        },
-        sass: {
-            dist: {
+        less: {
+            bootstrapbase: {
                files: {
-                    "theme/boost/style/moodle.css": "theme/boost/scss/preset/default.scss",
-                    "theme/classic/style/moodle.css": "theme/classic/scss/classicgrunt.scss"
+                    "theme/bootstrapbase/style/moodle.css": "theme/bootstrapbase/less/moodle.less",
+                    "theme/bootstrapbase/style/editor.css": "theme/bootstrapbase/less/editor.less",
+                },
+                options: {
+                    compress: false // We must not compress to keep the comments.
                }
-            },
-            options: {
-                includePaths: ["theme/boost/scss/", "theme/classic/scss/"]
-            }
+           }
        },
        watch: {
            options: {
@@ -145,6 +145,10 @@ module.exports = function(grunt) {
                files: ['**/amd/src/**/*.js'],
                tasks: ['amd']
            },
+            bootstrapbase: {
+                files: ["theme/bootstrapbase/less/**/*.less"],
+                tasks: ["css"]
+            },
            yui: {
                files: ['**/yui/src/**/*.js'],
                tasks: ['yui']
@@ -166,6 +170,18 @@ module.exports = function(grunt) {
            }
        },
        stylelint: {
+            less: {
+                options: {
+                    syntax: 'less',
+                    configOverrides: {
+                        rules: {
+                            // These rules have to be disabled in .stylelintrc for scss compat.
+                            "at-rule-no-unknown": true,
+                        }
+                    }
+                },
+                src: ['theme/**/*.less']
+            },
            scss: {
                options: {syntax: 'scss'},
                src: ['*/**/*.scss']
@@ -196,9 +212,9 @@ module.exports = function(grunt) {
      // Generate .stylelintignore.
      var stylelintIgnores = [
          '# Generated by "grunt ignorefiles"',
-          '**/yui/build/*',
-          'theme/boost/style/moodle.css',
-          'theme/classic/style/moodle.css',
+          'theme/bootstrapbase/style/',
+          'theme/clean/style/custom.css',
+          'theme/more/style/custom.css'
      ].concat(thirdPartyPaths);
      grunt.file.write('.stylelintignore', stylelintIgnores.join('\n'));
    };
@@ -332,6 +348,7 @@ module.exports = function(grunt) {
          grunt.config('eslint.yui.src', files);
          grunt.config('uglify.amd.files', [{expand: true, src: files, rename: uglifyRename}]);
          grunt.config('shifter.options.paths', files);
+          grunt.config('stylelint.less.src', files);
          grunt.config('gherkinlint.options.files', files);
          changedFiles = Object.create(null);
    }, 200);
@@ -343,8 +360,8 @@ module.exports = function(grunt) {

    // Register NPM tasks.
    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');

@@ -357,7 +374,7 @@ module.exports = function(grunt) {
    grunt.registerTask('js', ['amd', 'yui']);

    // Register CSS taks.
-    grunt.registerTask('css', ['stylelint:scss', 'sass', '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);
@@ -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();

@@ -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;
-    }
-}
@@ -1,59 +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/>.
-
-/**
- * Testing outgoing mail configuration form
- *
- * @package    core
- * @copyright  2019 Victor Deniz <victor@moodle.com>
- * @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');
-
-/**
- * Test mail form
- *
- * @package    core
- * @copyright 2019 Victor Deniz <victor@moodle.com>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class testoutgoingmailconf_form extends \moodleform {
-    /**
-     * Add elements to form
-     */
-    public function definition() {
-        $mform = $this->_form;
-
-        // Recipient.
-        $options = ['maxlength' => '100', 'size' => '25'];
-        $mform->addElement('text', 'recipient', get_string('testoutgoingmailconf_toemail', 'admin'), $options);
-        $mform->setType('recipient', PARAM_EMAIL);
-        $mform->addRule('recipient', get_string('required'), 'required');
-
-        $buttonarray = array();
-        $buttonarray[] = $mform->createElement('submit', 'send', get_string('testoutgoingmailconf_sendtest', 'admin'));
-        $buttonarray[] = $mform->createElement('cancel');
-
-        $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
-        $mform->closeHeaderBefore('buttonar');
-
-    }
-}
@@ -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';
-    }
-}
@@ -1,288 +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/>.
-
-/**
- * Task log table.
- *
- * @package    core_admin
- * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_admin;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir . '/tablelib.php');
-
-/**
- * Table to display list of task logs.
- *
- * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class task_log_table extends \table_sql {
-
-    /**
-     * Constructor for the task_log table.
-     *
-     * @param   string      $filter
-     * @param   int         $resultfilter
-     */
-    public function __construct(string $filter = '', int $resultfilter = null) {
-        global $DB;
-
-        if (-1 === $resultfilter) {
-            $resultfilter = null;
-        }
-
-        parent::__construct('tasklogs');
-
-        $columnheaders = [
-            'classname'  => get_string('name'),
-            'type'       => get_string('tasktype', 'admin'),
-            'userid'     => get_string('user', 'admin'),
-            'timestart'  => get_string('task_starttime', 'admin'),
-            'duration'   => get_string('task_duration', 'admin'),
-            'db'         => get_string('task_dbstats', 'admin'),
-            'result'     => get_string('task_result', 'admin'),
-            'actions'    => '',
-        ];
-        $this->define_columns(array_keys($columnheaders));
-        $this->define_headers(array_values($columnheaders));
-
-        // The name column is a header.
-        $this->define_header_column('classname');
-
-        // This table is not collapsible.
-        $this->collapsible(false);
-
-        // The actions class should not wrap. Use the BS text utility class.
-        $this->column_class('actions', 'text-nowrap');
-
-        // Allow pagination.
-        $this->pageable(true);
-
-        // Allow sorting. Default to sort by timestarted DESC.
-        $this->sortable(true, 'timestart', SORT_DESC);
-
-        // Add filtering.
-        $where = [];
-        $params = [];
-        if (!empty($filter)) {
-            $orwhere = [];
-            $filter = str_replace('\\', '\\\\', $filter);
-
-            // Check the class name.
-            $orwhere[] = $DB->sql_like('classname', ':classfilter', false, false);
-            $params['classfilter'] = '%' . $DB->sql_like_escape($filter) . '%';
-
-            $orwhere[] = $DB->sql_like('output', ':outputfilter', false, false);
-            $params['outputfilter'] = '%' . $DB->sql_like_escape($filter) . '%';
-
-            $where[] = "(" . implode(' OR ', $orwhere) . ")";
-        }
-
-        if (null !== $resultfilter) {
-            $where[] = 'tl.result = :result';
-            $params['result'] = $resultfilter;
-        }
-
-        $where = implode(' AND ', $where);
-
-        $this->set_sql('', '', $where, $params);
-    }
-
-    /**
-     * Query the db. Store results in the table object for use by build_table.
-     *
-     * @param int $pagesize size of page for paginated displayed table.
-     * @param bool $useinitialsbar do you want to use the initials bar. Bar
-     * will only be used if there is a fullname column defined for the table.
-     */
-    public function query_db($pagesize, $useinitialsbar = true) {
-        global $DB;
-
-        // Fetch the attempts.
-        $sort = $this->get_sql_sort();
-        if ($sort) {
-            $sort = "ORDER BY $sort";
-        }
-
-        $extrafields = get_extra_user_fields(\context_system::instance());
-        $userfields = \user_picture::fields('u', $extrafields, 'userid2', 'user');
-
-        $where = '';
-        if (!empty($this->sql->where)) {
-            $where = "WHERE {$this->sql->where}";
-        }
-
-        $sql = "SELECT
-                    tl.*,
-                    tl.dbreads + tl.dbwrites AS db,
-                    tl.timeend - tl.timestart AS duration,
-                    {$userfields}
-                FROM {task_log} tl
-           LEFT JOIN {user} u ON u.id = tl.userid
-                {$where}
-                {$sort}";
-
-        $this->pagesize($pagesize, $DB->count_records_sql("SELECT COUNT('x') FROM {task_log} tl {$where}", $this->sql->params));
-        if (!$this->is_downloading()) {
-            $this->rawdata = $DB->get_records_sql($sql, $this->sql->params, $this->get_page_start(), $this->get_page_size());
-        } else {
-            $this->rawdata = $DB->get_records_sql($sql, $this->sql->params);
-        }
-    }
-
-    /**
-     * Format the name cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_classname($row) : string {
-        $output = '';
-        if (class_exists($row->classname)) {
-            $task = new $row->classname;
-            if ($task instanceof \core\task\scheduled_task) {
-                $output = $task->get_name();
-            }
-        }
-
-        $output .= \html_writer::tag('div', "\\{$row->classname}", [
-                'class' => 'task-class',
-            ]);
-        return $output;
-    }
-
-    /**
-     * Format the type cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_type($row) : string {
-        if (\core\task\database_logger::TYPE_SCHEDULED == $row->type) {
-            return get_string('task_type:scheduled', 'admin');
-        } else {
-            return get_string('task_type:adhoc', 'admin');
-        }
-    }
-
-    /**
-     * Format the timestart cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_result($row) : string {
-        if ($row->result) {
-            return get_string('task_result:failed', 'admin');
-        } else {
-            return get_string('success');
-        }
-    }
-
-    /**
-     * Format the timestart cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_timestart($row) : string {
-        return userdate($row->timestart, get_string('strftimedatetimeshort', 'langconfig'));
-    }
-
-    /**
-     * Format the duration cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_duration($row) : string {
-        $duration = round($row->timeend - $row->timestart, 2);
-
-        if (empty($duration)) {
-            // The format_time function returns 'now' when the difference is exactly 0.
-            // Note: format_time performs concatenation in exactly this fashion so we should do this for consistency.
-            return '0 ' . get_string('secs', 'moodle');
-        }
-
-        return format_time($duration);
-    }
-
-    /**
-     * Format the DB details cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_db($row) : string {
-        $output = '';
-
-        $output .= \html_writer::div(get_string('task_stats:dbreads', 'admin', $row->dbreads));
-        $output .= \html_writer::div(get_string('task_stats:dbwrites', 'admin', $row->dbwrites));
-
-        return $output;
-    }
-
-    /**
-     * Format the actions cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_actions($row) : string {
-        global $OUTPUT;
-
-        $actions = [];
-
-        $url = new \moodle_url('/admin/tasklogs.php', ['logid' => $row->id]);
-
-        // Quick view.
-        $actions[] = $OUTPUT->action_icon(
-            $url,
-            new \pix_icon('e/search', get_string('view')),
-            new \popup_action('click', $url)
-        );
-
-        // Download.
-        $actions[] = $OUTPUT->action_icon(
-            new \moodle_url($url, ['download' => true]),
-            new \pix_icon('t/download', get_string('download'))
-        );
-
-        return implode('&nbsp;', $actions);
-    }
-
-    /**
-     * Format the user cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_userid($row) : string {
-        if (empty($row->userid)) {
-            return '';
-        }
-
-        $user = (object) [];
-        username_load_fields_from_object($user, $row, 'user');
-
-        return fullname($user);
-    }
-}
@@ -83,7 +83,7 @@ Examples:
        Stores the given configuration variable in the shell variable, escaped
        so that it can be safely used as a shell argument.

-    # php cfg.php --name=theme --set=classic
+    # php cfg.php --name=theme --set=clean
        Sets the given configuration variable to the given value.

    # php cfg.php --name=noemailever --unset
@@ -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');

@@ -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';

@@ -710,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.
@@ -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
 }
@@ -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);
@@ -1,163 +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/>.
-
-/**
- * CLI script to uninstall plugins.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2018 Dmitrii Metelkin <dmitriim@catalyst-au.net>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__ . '/../../config.php');
-require_once($CFG->libdir . '/clilib.php');
-require_once($CFG->libdir . '/adminlib.php');
-
-$help = "Command line tool to uninstall plugins.
-
-Options:
-    -h --help                   Print this help.
-    --show-all                  Displays a list of all installed plugins.
-    --show-missing              Displays a list of plugins missing from disk.
-    --purge-missing             Uninstall all missing from disk plugins.
-    --plugins=<plugin name>     A comma separated list of plugins to be uninstalled. E.g. mod_assign,mod_forum
-    --run                       Execute uninstall. If this option is not set, then the script will be run in a dry mode.
-
-Examples:
-
-    # php uninstall_plugins.php  --show-all
-        Prints tab-separated list of all installed plugins.
-
-    # php uninstall_plugins.php  --show-missing
-        Prints tab-separated list of all missing from disk plugins.
-
-    # php uninstall_plugins.php  --purge-missing
-        A dry run of uninstalling all missing plugins.
-
-    # php uninstall_plugins.php  --purge-missing --run
-        Run uninstall of all missing plugins.
-
-    # php uninstall_plugins.php  --plugins=mod_assign,mod_forum
-        A dry run of uninstalling mod_assign and mod_forum plugins.
-
-    # php uninstall_plugins.php  --plugins=mod_assign,mod_forum --run
-        Run uninstall for mod_assign and mod_forum plugins.
-";
-
-list($options, $unrecognised) = cli_get_params([
-    'help' => false,
-    'show-all' => false,
-    'show-missing' => false,
-    'purge-missing' => false,
-    'plugins' => false,
-    'run' => false,
-], [
-    'h' => 'help'
-]);
-
-if ($unrecognised) {
-    $unrecognised = implode(PHP_EOL.'  ', $unrecognised);
-    cli_error(get_string('cliunknowoption', 'core_admin', $unrecognised));
-}
-
-if ($options['help']) {
-    cli_writeln($help);
-    exit(0);
-}
-
-$pluginman = core_plugin_manager::instance();
-$plugininfo = $pluginman->get_plugins();
-
-if ($options['show-all'] || $options['show-missing']) {
-    foreach ($plugininfo as $type => $plugins) {
-        foreach ($plugins as $name => $plugin) {
-            $pluginstring = $plugin->component . "\t" . $plugin->displayname;
-
-            if ($options['show-all']) {
-                cli_writeln($pluginstring);
-            } else {
-                if ($plugin->get_status() === core_plugin_manager::PLUGIN_STATUS_MISSING) {
-                    cli_writeln($pluginstring);
-                }
-            }
-        }
-    }
-
-    exit(0);
-}
-
-if ($options['purge-missing']) {
-    foreach ($plugininfo as $type => $plugins) {
-        foreach ($plugins as $name => $plugin) {
-            if ($plugin->get_status() === core_plugin_manager::PLUGIN_STATUS_MISSING) {
-
-                $pluginstring = $plugin->component . "\t" . $plugin->displayname;
-
-                if ($pluginman->can_uninstall_plugin($plugin->component)) {
-                    if ($options['run']) {
-                        cli_writeln('Uninstalling: ' . $pluginstring);
-
-                        $progress = new progress_trace_buffer(new text_progress_trace(), true);
-                        $pluginman->uninstall_plugin($plugin->component, $progress);
-                        $progress->finished();
-                        cli_write($progress->get_buffer());
-                    } else {
-                        cli_writeln('Will be uninstalled: ' . $pluginstring);
-                    }
-                } else {
-                    cli_writeln('Can not be uninstalled: ' . $pluginstring);
-                }
-            }
-        }
-    }
-
-    exit(0);
-}
-
-if ($options['plugins']) {
-    $components = explode(',', $options['plugins']);
-    foreach ($components as $component) {
-        $plugin = $pluginman->get_plugin_info($component);
-
-        if (is_null($plugin)) {
-            cli_writeln('Unknown plugin: ' . $component);
-        } else {
-            $pluginstring = $plugin->component . "\t" . $plugin->displayname;
-
-            if ($pluginman->can_uninstall_plugin($plugin->component)) {
-                if ($options['run']) {
-                    cli_writeln('Uninstalling: ' . $pluginstring);
-                    $progress = new progress_trace_buffer(new text_progress_trace(), true);
-                    $pluginman->uninstall_plugin($plugin->component, $progress);
-                    $progress->finished();
-                    cli_write($progress->get_buffer());
-                } else {
-                    cli_writeln('Will be uninstalled: ' . $pluginstring);
-                }
-            } else {
-                cli_writeln('Can not be uninstalled: ' . $pluginstring);
-            }
-        }
-    }
-
-    exit(0);
-}
-
-cli_writeln($help);
-exit(0);
@@ -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
@@ -1,62 +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/>.
-
-/**
- * Allows the admin to enable, disable and uninstall custom fields
- *
- * @package    core_admin
- * @copyright  2018 Daniel Neis Araujo
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-$action  = required_param('action', PARAM_ALPHANUMEXT);
-$customfieldname = required_param('field', PARAM_PLUGIN);
-
-$syscontext = context_system::instance();
-$PAGE->set_url('/admin/customfields.php');
-$PAGE->set_context($syscontext);
-
-require_login();
-require_capability('moodle/site:config', $syscontext);
-require_sesskey();
-
-$return = new moodle_url('/admin/settings.php', array('section' => 'managecustomfields'));
-
-$customfieldplugins = core_plugin_manager::instance()->get_plugins_of_type('customfield');
-$sortorder = array_flip(array_keys($customfieldplugins));
-
-if (!isset($customfieldplugins[$customfieldname])) {
-    print_error('customfieldnotfound', 'error', $return, $customfieldname);
-}
-
-switch ($action) {
-    case 'disable':
-        if ($customfieldplugins[$customfieldname]->is_enabled()) {
-            set_config('disabled', 1, 'customfield_'. $customfieldname);
-            core_plugin_manager::reset_caches();
-        }
-        break;
-    case 'enable':
-        if (!$customfieldplugins[$customfieldname]->is_enabled()) {
-            unset_config('disabled', 'customfield_'. $customfieldname);
-            core_plugin_manager::reset_caches();
-        }
-        break;
-}
-redirect($return);
@@ -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,366 +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">
-    </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">
-    </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>
 </COMPATIBILITY_MATRIX>
@@ -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.
@@ -823,11 +823,9 @@ if (isset($SESSION->pluginuninstallreturn)) {
 // Print default admin page with notifications.
 $errorsdisplayed = defined('WARN_DISPLAY_ERRORS_ENABLED');

-$lastcron = get_config('tool_task', 'lastcronstart');
+// We make the assumption that at least one schedule task should run once per day.
+$lastcron = $DB->get_field_sql('SELECT MAX(lastruntime) FROM {task_scheduled}');
 $cronoverdue = ($lastcron < time() - 3600 * 24);
-$lastcroninterval = get_config('tool_task', 'lastcroninterval');
-$expectedfrequency = $CFG->expectedcronfrequency ?? 200;
-$croninfrequent = !$cronoverdue && ($lastcroninterval > $expectedfrequency || $lastcron < time() - $expectedfrequency);
 $dbproblems = $DB->diagnose();
 $maintenancemode = !empty($CFG->maintenance_enabled);

@@ -888,4 +886,4 @@ $output = $PAGE->get_renderer('core', 'admin');
 echo $output->admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed, $cronoverdue, $dbproblems,
                                       $maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb,
                                       $registered, $cachewarnings, $eventshandlers, $themedesignermode, $devlibdir,
-                                       $mobileconfigured, $overridetossl, $invalidforgottenpasswordurl, $croninfrequent);
+                                       $mobileconfigured, $overridetossl, $invalidforgottenpasswordurl);
@@ -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();
@@ -25,101 +25,50 @@ require_once(__DIR__ . '/../config.php');
 require_once($CFG->dirroot . '/message/lib.php');
 require_once($CFG->libdir.'/adminlib.php');

-// This is an admin page.
+// This is an admin page
 admin_externalpage_setup('managemessageoutputs');

-// Fetch processors.
-$allprocessors = get_message_processors();
-$processors = array_filter($allprocessors, function($processor) {
-    return $processor->enabled;
-});
-// Fetch message providers.
-$providers = get_message_providers();
-// Fetch the manage message outputs interface.
-$preferences = get_message_output_default_preferences();
+// Require site configuration capability
+require_capability('moodle/site:config', context_system::instance());

-if (($form = data_submitted()) && confirm_sesskey()) {
-    $preferences = array();
-    // Prepare default message outputs settings.
-    foreach ($providers as $provider) {
-        $componentproviderbase = $provider->component.'_'.$provider->name;
-        $disableprovidersetting = $componentproviderbase.'_disable';
-        $providerdisabled = false;
-        if (!isset($form->$disableprovidersetting)) {
-            $providerdisabled = true;
-            $preferences[$disableprovidersetting] = 1;
-        } else {
-            $preferences[$disableprovidersetting] = 0;
-        }
+// Get the submitted params
+$disable    = optional_param('disable', 0, PARAM_INT);
+$enable     = optional_param('enable', 0, PARAM_INT);

-        foreach (array('permitted', 'loggedin', 'loggedoff') as $setting) {
-            $value = null;
-            $componentprovidersetting = $componentproviderbase.'_'.$setting;
-            if ($setting == 'permitted') {
-                // If we deal with permitted select element, we need to create individual
-                // setting for each possible processor. Note that this block will
-                // always be processed first after entring parental foreach iteration
-                // so we can change form values on this stage.
-                foreach ($processors as $processor) {
-                    $value = '';
-                    if (isset($form->{$componentprovidersetting}[$processor->name])) {
-                        $value = $form->{$componentprovidersetting}[$processor->name];
-                    }
-                    // Ensure that loggedin loggedoff options are set correctly for this permission.
-                    if (($value == 'disallowed') || $providerdisabled) {
-                        // It might be better to unset them, but I can't figure out why that cause error.
-                        $form->{$componentproviderbase.'_loggedin'}[$processor->name] = 0;
-                        $form->{$componentproviderbase.'_loggedoff'}[$processor->name] = 0;
-                    } else if ($value == 'forced') {
-                        $form->{$componentproviderbase.'_loggedin'}[$processor->name] = 1;
-                        $form->{$componentproviderbase.'_loggedoff'}[$processor->name] = 1;
-                    }
-                    // Record the site preference.
-                    $preferences[$processor->name.'_provider_'.$componentprovidersetting] = $value;
-                }
-            } else if (array_key_exists($componentprovidersetting, $form)) {
-                // We must be processing loggedin or loggedoff checkboxes. Store
-                // defained comma-separated processors as setting value.
-                // Using array_filter eliminates elements set to 0 above.
-                $value = join(',', array_keys(array_filter($form->{$componentprovidersetting})));
-                if (empty($value)) {
-                    $value = null;
-                }
-            }
-            if ($setting != 'permitted') {
-                // We have already recoded site preferences for 'permitted' type.
-                $preferences['message_provider_'.$componentprovidersetting] = $value;
-            }
-        }
+$headingtitle = get_string('managemessageoutputs', 'message');
+
+if (!empty($disable) && confirm_sesskey()) {
+    if (!$processor = $DB->get_record('message_processors', array('id'=>$disable))) {
+        print_error('outputdoesnotexist', 'message');
    }
-
-    // Update database.
-    $transaction = $DB->start_delegated_transaction();
-
-    // Save processors enabled/disabled status.
-    foreach ($allprocessors as $processor) {
-        $enabled = isset($form->{$processor->name});
-        \core_message\api::update_processor_status($processor, $enabled);
-    }
-
-    foreach ($preferences as $name => $value) {
-        set_config($name, $value, 'message');
-    }
-    $transaction->allow_commit();
-
+    \core_message\api::update_processor_status($processor, 0);     // Disable output.
    core_plugin_manager::reset_caches();
+}

+if (!empty($enable) && confirm_sesskey()) {
+    if (!$processor = $DB->get_record('message_processors', array('id'=>$enable))) {
+        print_error('outputdoesnotexist', 'message');
+    }
+    \core_message\api::update_processor_status($processor, 1);      // Enable output.
+    core_plugin_manager::reset_caches();
+}
+
+if ($disable || $enable) {
    $url = new moodle_url('message.php');
    redirect($url);
 }
-
 // Page settings
 $PAGE->set_context(context_system::instance());
-$PAGE->requires->js_init_call('M.core_message.init_defaultoutputs');

+// Grab the renderer
 $renderer = $PAGE->get_renderer('core', 'message');

-// Display the page.
+// Display the manage message outputs interface
+$processors = get_message_processors();
+$messageoutputs = $renderer->manage_messageoutputs($processors);
+
+// Display the page
 echo $OUTPUT->header();
-echo $renderer->manage_messageoutput_settings($allprocessors, $processors, $providers, $preferences);
+echo $OUTPUT->heading($headingtitle);
+echo $messageoutputs;
 echo $OUTPUT->footer();
@@ -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')) {
@@ -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();

@@ -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();
@@ -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);
@@ -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));

@@ -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);

@@ -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();
@@ -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();
@@ -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 {
@@ -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');
@@ -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();
@@ -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);
@@ -40,9 +40,8 @@ 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'));
        }
    }
@@ -111,7 +110,7 @@ if (\core\hub\registration::is_registered()) {
    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();
@@ -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]);
+    }
+}
@@ -281,7 +281,6 @@ class core_admin_renderer extends plugin_renderer_base {
     * @param bool $mobileconfigured Whether the mobile web services have been enabled
     * @param bool $overridetossl Whether or not ssl is being forced.
     * @param bool $invalidforgottenpasswordurl Whether the forgotten password URL does not link to a valid URL.
-     * @param bool $croninfrequent If true, warn that cron hasn't run in the past few minutes
     *
     * @return string HTML to output.
     */
@@ -289,7 +288,7 @@ class core_admin_renderer extends plugin_renderer_base {
            $cronoverdue, $dbproblems, $maintenancemode, $availableupdates, $availableupdatesfetch,
            $buggyiconvnomb, $registered, array $cachewarnings = array(), $eventshandlers = 0,
            $themedesignermode = false, $devlibdir = false, $mobileconfigured = false,
-            $overridetossl = false, $invalidforgottenpasswordurl = false, $croninfrequent = false) {
+            $overridetossl = false, $invalidforgottenpasswordurl = false) {
        global $CFG;
        $output = '';

@@ -303,7 +302,6 @@ class core_admin_renderer extends plugin_renderer_base {
        $output .= $this->display_errors_warning($errorsdisplayed);
        $output .= $this->buggy_iconv_warning($buggyiconvnomb);
        $output .= $this->cron_overdue_warning($cronoverdue);
-        $output .= $this->cron_infrequent_warning($croninfrequent);
        $output .= $this->db_problems($dbproblems);
        $output .= $this->maintenance_mode_warning($maintenancemode);
        $output .= $this->overridetossl_warning($overridetossl);
@@ -616,24 +614,6 @@ class core_admin_renderer extends plugin_renderer_base {
                $this->help_icon('cron', 'admin'));
    }

-    /**
-     * Render an appropriate message if cron is not being run frequently (recommended every minute).
-     *
-     * @param bool $croninfrequent
-     * @return string HTML to output.
-     */
-    public function cron_infrequent_warning(bool $croninfrequent) : string {
-        global $CFG;
-
-        if (!$croninfrequent) {
-            return '';
-        }
-
-        $expectedfrequency = $CFG->expectedcronfrequency ?? 200;
-        return $this->warning(get_string('croninfrequent', 'admin', $expectedfrequency) . '&nbsp;' .
-                $this->help_icon('cron', 'admin'));
-    }
-
    /**
     * Render an appropriate message if there are any problems with the DB set-up.
     * @param bool $dbproblems
@@ -843,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'));
@@ -1062,10 +1043,10 @@ class core_admin_renderer extends plugin_renderer_base {

                if ($isstandard = $plugin->is_standard()) {
                    $row->attributes['class'] .= ' standard';
-                    $sourcelabel = html_writer::span(get_string('sourcestd', 'core_plugin'), 'sourcetext badge badge-secondary');
+                    $sourcelabel = html_writer::span(get_string('sourcestd', 'core_plugin'), 'sourcetext label');
                } else {
                    $row->attributes['class'] .= ' extension';
-                    $sourcelabel = html_writer::span(get_string('sourceext', 'core_plugin'), 'sourcetext badge badge-info');
+                    $sourcelabel = html_writer::span(get_string('sourceext', 'core_plugin'), 'sourcetext label label-info');
                }

                $coredependency = $plugin->is_core_dependency_satisfied($version);
@@ -1074,22 +1055,22 @@ class core_admin_renderer extends plugin_renderer_base {

                $statuscode = $plugin->get_status();
                $row->attributes['class'] .= ' status-' . $statuscode;
-                $statusclass = 'statustext badge ';
+                $statusclass = 'statustext label ';
                switch ($statuscode) {
                    case core_plugin_manager::PLUGIN_STATUS_NEW:
-                        $statusclass .= $dependenciesok ? 'badge-success' : 'badge-warning';
+                        $statusclass .= $dependenciesok ? 'label-success' : 'label-warning';
                        break;
                    case core_plugin_manager::PLUGIN_STATUS_UPGRADE:
-                        $statusclass .= $dependenciesok ? 'badge-info' : 'badge-warning';
+                        $statusclass .= $dependenciesok ? 'label-info' : 'label-warning';
                        break;
                    case core_plugin_manager::PLUGIN_STATUS_MISSING:
                    case core_plugin_manager::PLUGIN_STATUS_DOWNGRADE:
                    case core_plugin_manager::PLUGIN_STATUS_DELETE:
-                        $statusclass .= 'badge-danger';
+                        $statusclass .= 'label-important';
                        break;
                    case core_plugin_manager::PLUGIN_STATUS_NODB:
                    case core_plugin_manager::PLUGIN_STATUS_UPTODATE:
-                        $statusclass .= $dependenciesok ? '' : 'badge-warning';
+                        $statusclass .= $dependenciesok ? '' : 'label-warning';
                        break;
                }
                $status = html_writer::span(get_string('status_' . $statuscode, 'core_plugin'), $statusclass);
@@ -1362,7 +1343,7 @@ class core_admin_renderer extends plugin_renderer_base {
            $supportedmoodles = array();
            foreach ($plugin->version->supportedmoodles as $moodle) {
                if ($CFG->branch == str_replace('.', '', $moodle->release)) {
-                    $supportedmoodles[] = html_writer::span($moodle->release, 'badge badge-success');
+                    $supportedmoodles[] = html_writer::span($moodle->release, 'label label-success');
                } else {
                    $supportedmoodles[] = html_writer::span($moodle->release, 'label');
                }
@@ -1467,7 +1448,7 @@ class core_admin_renderer extends plugin_renderer_base {
                    $label = '';
                } else {
                    $class = 'requires-failed';
-                    $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'badge badge-danger');
+                    $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'label label-important');
                }
                $requires[] = html_writer::tag('li',
                    html_writer::span(get_string('moodleversion', 'core_plugin', $plugin->versionrequires), 'dep dep-core').
@@ -1482,8 +1463,8 @@ class core_admin_renderer extends plugin_renderer_base {

                } else if ($reqinfo->status == $pluginman::REQUIREMENT_STATUS_MISSING) {
                    if ($reqinfo->availability == $pluginman::REQUIREMENT_AVAILABLE) {
-                        $label = html_writer::span(get_string('dependencymissing', 'core_plugin'), 'badge badge-warning');
-                        $label .= ' '.html_writer::span(get_string('dependencyavailable', 'core_plugin'), 'badge badge-warning');
+                        $label = html_writer::span(get_string('dependencymissing', 'core_plugin'), 'label label-warning');
+                        $label .= ' '.html_writer::span(get_string('dependencyavailable', 'core_plugin'), 'label label-warning');
                        $class = 'requires-failed requires-missing requires-available';
                        $actions[] = html_writer::link(
                            new moodle_url('https://moodle.org/plugins/view.php', array('plugin' => $reqname)),
@@ -1491,24 +1472,24 @@ class core_admin_renderer extends plugin_renderer_base {
                        );

                    } else {
-                        $label = html_writer::span(get_string('dependencymissing', 'core_plugin'), 'badge badge-danger');
+                        $label = html_writer::span(get_string('dependencymissing', 'core_plugin'), 'label label-important');
                        $label .= ' '.html_writer::span(get_string('dependencyunavailable', 'core_plugin'),
-                            'badge badge-danger');
+                            'label label-important');
                        $class = 'requires-failed requires-missing requires-unavailable';
                    }
                    $displayuploadlink = true;

                } else if ($reqinfo->status == $pluginman::REQUIREMENT_STATUS_OUTDATED) {
                    if ($reqinfo->availability == $pluginman::REQUIREMENT_AVAILABLE) {
-                        $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'badge badge-warning');
-                        $label .= ' '.html_writer::span(get_string('dependencyavailable', 'core_plugin'), 'badge badge-warning');
+                        $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'label label-warning');
+                        $label .= ' '.html_writer::span(get_string('dependencyavailable', 'core_plugin'), 'label label-warning');
                        $class = 'requires-failed requires-outdated requires-available';
                        $displayupdateslink = true;

                    } else {
-                        $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'badge badge-danger');
+                        $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'label label-important');
                        $label .= ' '.html_writer::span(get_string('dependencyunavailable', 'core_plugin'),
-                            'badge badge-danger');
+                            'label label-important');
                        $class = 'requires-failed requires-outdated requires-unavailable';
                    }
                    $displayuploadlink = true;
@@ -1772,13 +1753,13 @@ class core_admin_renderer extends plugin_renderer_base {
                    $source = '';
                } else {
                    $row->attributes['class'] .= ' extension';
-                    $source = html_writer::div(get_string('sourceext', 'core_plugin'), 'source badge badge-info');
+                    $source = html_writer::div(get_string('sourceext', 'core_plugin'), 'source label label-info');
                }

                if ($status === core_plugin_manager::PLUGIN_STATUS_MISSING) {
-                    $msg = html_writer::div(get_string('status_missing', 'core_plugin'), 'statusmsg badge badge-danger');
+                    $msg = html_writer::div(get_string('status_missing', 'core_plugin'), 'statusmsg label label-important');
                } else if ($status === core_plugin_manager::PLUGIN_STATUS_NEW) {
-                    $msg = html_writer::div(get_string('status_new', 'core_plugin'), 'statusmsg badge badge-success');
+                    $msg = html_writer::div(get_string('status_new', 'core_plugin'), 'statusmsg label label-success');
                } else {
                    $msg = '';
                }
@@ -2009,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);
@@ -2017,15 +1998,15 @@ class core_admin_renderer extends plugin_renderer_base {
                // Format error or warning line
                if ($errorline) {
                    $messagetype = 'error';
-                    $statusclass = 'badge-danger';
+                    $statusclass = 'label-important';
                } else if ($warningline) {
                    $messagetype = 'warn';
-                    $statusclass = 'badge-warning';
+                    $statusclass = 'label-warning';
                } else {
                    $messagetype = 'ok';
-                    $statusclass = 'badge-success';
+                    $statusclass = 'label-success';
                }
-                $status = html_writer::span($status, 'badge ' . $statusclass);
+                $status = html_writer::span($status, 'label ' . $statusclass);
                // Here we'll store all the feedback found
                $feedbacktext = '';
                // Append the feedback if there is some
@@ -2103,13 +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() {
-        return format_text(get_string('registermoodlenet', 'admin'), FORMAT_HTML, ['noclean' => true]);
-    }
 }
@@ -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();
@@ -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()));

@@ -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);
 }

@@ -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();
@@ -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)) {
@@ -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) {
@@ -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) {
@@ -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) {
@@ -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');
-    }
-}
@@ -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() {
@@ -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;

@@ -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 '';
        }
@@ -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);
        }
@@ -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;
@@ -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'));
        }

@@ -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;
-    }
-}
@@ -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 {
@@ -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;

@@ -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);

@@ -51,7 +51,7 @@ M.core_role.init_cap_table_filter = function(Y, tableid, contextid) {
                marginRight : 'auto'
            });
            // Create the capability search input.
-            this.input = Y.Node.create('<input class="form-control mx-1" type="text"' +
+            this.input = Y.Node.create('<input class="form-control m-x-1" type="text"' +
                ' id="'+this.table.get('id')+'capabilitysearch" value="'+Y.Escape.html(filtervalue)+'" />');
            // Create a label for the search input.
            this.label = Y.Node.create('<label for="' + this.input.get('id') + '">' +
@@ -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>
@@ -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) {
@@ -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;
-    }
-}
@@ -28,158 +28,95 @@ 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('searchareacategories', '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()));

-    $areacategories = [];
-    foreach (\core_search\manager::get_search_area_categories() as $category) {
-        if (key_exists($areaid, $category->get_areas())) {
-            $areacategories[] = $category->get_visiblename();
-        }
-    }
-    $columns[] = new html_table_cell(implode(', ', $areacategories));
-
    if ($area->is_enabled()) {
        $columns[] = $OUTPUT->action_icon(admin_searcharea_action_url('disable', $areaid),
            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) {
@@ -195,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;
        }
@@ -231,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);
@@ -239,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();

 /**
@@ -256,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);
 }
@@ -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();
@@ -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.
@@ -156,11 +155,4 @@ $PAGE->requires->yui_module('moodle-core-formchangechecker',
 );
 $PAGE->requires->string_for_js('changesmadereallygoaway', 'moodle');

-if ($settingspage->has_dependencies()) {
-    $opts = [
-        'dependencies' => $settingspage->get_dependencies_for_javascript()
-    ];
-    $PAGE->requires->js_call_amd('core/showhidesettings', 'init', [$opts]);
-}
-
 echo $OUTPUT->footer();
@@ -25,52 +25,10 @@
 defined('MOODLE_INTERNAL') || die();

 if ($hassiteconfig) {
-
-    $settings = new admin_settingpage('analyticssite', new lang_string('analyticssiteinfo', 'analytics'));
-    $ADMIN->add('analytics', $settings);
-
-    if ($ADMIN->fulltree) {
-        $modeinstructions = [
-            'facetoface' => get_string('modeinstructionfacetoface', 'analytics'),
-            'blendedhybrid' => get_string('modeinstructionblendedhybrid', 'analytics'),
-            'fullyonline' => get_string('modeinstructionfullyonline', 'analytics'),
-        ];
-        $settings->add(new admin_setting_configmultiselect('analytics/modeinstruction', get_string('modeinstruction', 'analytics'),
-            '', [], $modeinstructions));
-
-        $settings->add(new admin_setting_configtext_with_maxlength('analytics/percentonline',
-            get_string('percentonline', 'analytics'),
-            get_string('percentonline_help', 'analytics'), '', PARAM_INT, 3, 3));
-
-        $typeinstitutions = [
-            'typeinstitutionacademic' => get_string('typeinstitutionacademic', 'analytics'),
-            'typeinstitutiontraining' => get_string('typeinstitutiontraining', 'analytics'),
-            'typeinstitutionngo' => get_string('typeinstitutionngo', 'analytics'),
-        ];
-        $settings->add(new admin_setting_configmultiselect('analytics/typeinstitution', get_string('typeinstitution', 'analytics'),
-            '', [], $typeinstitutions));
-
-        $levelinstitutions = [
-            'levelinstitutionisced0' => get_string('levelinstitutionisced0', 'analytics'),
-            'levelinstitutionisced1' => get_string('levelinstitutionisced1', 'analytics'),
-            'levelinstitutionisced2' => get_string('levelinstitutionisced2', 'analytics'),
-            'levelinstitutionisced3' => get_string('levelinstitutionisced3', 'analytics'),
-            'levelinstitutionisced4' => get_string('levelinstitutionisced4', 'analytics'),
-            'levelinstitutionisced5' => get_string('levelinstitutionisced5', 'analytics'),
-            'levelinstitutionisced6' => get_string('levelinstitutionisced6', 'analytics'),
-            'levelinstitutionisced7' => get_string('levelinstitutionisced7', 'analytics'),
-            'levelinstitutionisced8' => get_string('levelinstitutionisced8', 'analytics'),
-        ];
-        $settings->add(new admin_setting_configmultiselect('analytics/levelinstitution',
-            get_string('levelinstitution', 'analytics'), '', [], $levelinstitutions));
-    }
-
    $settings = new admin_settingpage('analyticssettings', new lang_string('analyticssettings', 'analytics'));
    $ADMIN->add('analytics', $settings);

    if ($ADMIN->fulltree) {
-
-
        // Select the site prediction's processor.
        $predictionprocessors = \core_analytics\manager::get_all_prediction_processors();
        $predictors = array();
@@ -79,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.
@@ -117,7 +75,7 @@ if ($hassiteconfig) {
            $defaultreader, $options));

        // Enable/disable time splitting methods.
-        $alltimesplittings = \core_analytics\manager::get_time_splitting_methods_for_evaluation(true);
+        $alltimesplittings = \core_analytics\manager::get_all_time_splittings();

        $timesplittingoptions = array();
        $timesplittingdefaults = array('\core\analytics\time_splitting\quarters_accum',
@@ -125,9 +83,8 @@ if ($hassiteconfig) {
        foreach ($alltimesplittings as $key => $timesplitting) {
            $timesplittingoptions[$key] = $timesplitting->get_name();
        }
-        $settings->add(new admin_setting_configmultiselect('analytics/defaulttimesplittingsevaluation',
-            new lang_string('defaulttimesplittingmethods', 'analytics'),
-            new lang_string('defaulttimesplittingmethods_help', 'analytics'),
+        $settings->add(new admin_setting_configmultiselect('analytics/timesplittings',
+            new lang_string('enabledtimesplittings', 'analytics'), new lang_string('timesplittingmethod_help', 'analytics'),
            $timesplittingdefaults, $timesplittingoptions)
        );

@@ -22,18 +22,18 @@ 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));
    $temp->add(new admin_setting_configtextarea('custommenuitems', new lang_string('custommenuitems', 'admin'),
        new lang_string('configcustommenuitems', 'admin'), '', PARAM_RAW, '50', '10'));
    $temp->add(new admin_setting_configtextarea(
        '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'
@@ -199,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));
@@ -217,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));
@@ -229,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'));
@@ -258,3 +251,4 @@ preferences,moodle|/user/preferences.php|t/preferences',
    $ADMIN->add('appearance', $temp);

 } // end of speedup
+
@@ -57,11 +57,9 @@ if (($hassiteconfig || has_any_capability(array(
            new lang_string('badgesalt_desc', 'badges'),
            'badges' . $SITE->timecreated, PARAM_ALPHANUM));

-    $backpacks = badges_get_site_backpacks();
-    $choices = array();
-    foreach ($backpacks as $backpack) {
-        $choices[$backpack->id] = $backpack->backpackweburl;
-    }
+    $globalsettings->add(new admin_setting_configcheckbox('badges_allowexternalbackpack',
+            new lang_string('allowexternalbackpack', 'badges'),
+            new lang_string('allowexternalbackpack_desc', 'badges'), 1));

    $globalsettings->add(new admin_setting_configcheckbox('badges_allowcoursebadges',
            new lang_string('allowcoursebadges', 'badges'),
@@ -93,32 +91,4 @@ if (($hassiteconfig || has_any_capability(array(
            array('moodle/badges:createbadge'), empty($CFG->enablebadges)
        )
    );
-    $backpacksettings = new admin_settingpage('backpacksettings', new lang_string('backpacksettings', 'badges'),
-            array('moodle/badges:manageglobalsettings'), empty($CFG->enablebadges));
-
-    $backpacksettings->add(new admin_setting_configcheckbox('badges_allowexternalbackpack',
-            new lang_string('allowexternalbackpack', 'badges'),
-            new lang_string('allowexternalbackpack_desc', 'badges'), 1));
-
-    $backpacksettings->add(new admin_setting_configselect('badges_site_backpack',
-            new lang_string('sitebackpack', 'badges'),
-            new lang_string('sitebackpack_help', 'badges'),
-            1, $choices));
-
-    $warning = badges_verify_site_backpack();
-    if (!empty($warning)) {
-        $backpacksettings->add(new admin_setting_description('badges_site_backpack_verify',
-            new lang_string('sitebackpackverify', 'badges'),
-            $warning));
-    }
-
-    $ADMIN->add('badges', $backpacksettings);
-
-    $ADMIN->add('badges',
-        new admin_externalpage('managebackpacks',
-            new lang_string('managebackpacks', 'badges'),
-            new moodle_url('/badges/backpacks.php'),
-            array('moodle/badges:manageglobalsettings'), empty($CFG->enablebadges) || empty($CFG->badges_allowexternalbackpack)
-        )
-    );
 }
@@ -37,24 +37,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
            array('moodle/category:manage', 'moodle/course:create')
        )
    );
-    $ADMIN->add('courses',
-        new admin_externalpage('course_customfield', new lang_string('course_customfield', 'admin'),
-            $CFG->wwwroot . '/course/customfield.php',
-            array('moodle/course:configurecustomfields')
-        )
-    );
    $ADMIN->add('courses',
        new admin_externalpage('addcategory', new lang_string('addcategory', 'admin'),
            new moodle_url('/course/editcategory.php', array('parent' => 0)),
            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)),
@@ -161,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));
@@ -336,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));
@@ -458,28 +447,4 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {

    $ADMIN->add('backups', $temp);

-    // Create a page for asynchronous backup and restore configuration and defaults.
-    if (!empty($CFG->enableasyncbackup)) {  // Only add settings if async mode is enable at site level.
-        $temp = new admin_settingpage('asyncgeneralsettings', new lang_string('asyncgeneralsettings', 'backup'));
-
-        $temp->add(new admin_setting_configcheckbox(
-                'backup/backup_async_message_users',
-                new lang_string('asyncemailenable', 'backup'),
-                new lang_string('asyncemailenabledetail', 'backup'), 0));
-
-        $temp->add(new admin_setting_configtext(
-                'backup/backup_async_message_subject',
-                new lang_string('asyncmessagesubject', 'backup'),
-                new lang_string('asyncmessagesubjectdetail', 'backup'),
-                new lang_string('asyncmessagesubjectdefault', 'backup')));
-
-        $temp->add(new admin_setting_confightmleditor(
-                'backup/backup_async_message',
-                new lang_string('asyncmessagebody', 'backup'),
-                new lang_string('asyncmessagebodydetail', 'backup'),
-                new lang_string('asyncmessagebodydefault', 'backup')));
-
-        $ADMIN->add('backups', $temp);
-    }
-
 }
@@ -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));
@@ -59,8 +42,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
    $temp->add(new admin_setting_configcheckbox('profilingallowme', new lang_string('profilingallowme', 'admin'), new lang_string('profilingallowme_help', 'admin'), false));
    // Allow PROFILEALL/PROFILEALLSTOP GPC.
    $temp->add(new admin_setting_configcheckbox('profilingallowall', new lang_string('profilingallowall', 'admin'), new lang_string('profilingallowall_help', 'admin'), false));
-    $temp->add(new admin_setting_configtext('profilingslow', new lang_string('profilingslow', 'admin'),
-        new lang_string('profilingslow_help', 'admin'), 0, PARAM_FLOAT));
    // TODO: Allow to skip PHP functions (XHPROF_FLAGS_NO_BUILTINS)
    // TODO: Allow to skip call_user functions (ignored_functions array)
    // Specify the life time (in minutes) of profiling runs.
@@ -95,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
@@ -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));

@@ -1,78 +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 messaging related settings links for Messaging category to admin tree.
- *
- * @copyright 2019 Amaia Anabitarte <amaia@moodle.com>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-if ($hassiteconfig) {
-    $temp = new admin_settingpage('messages', new lang_string('messagingssettings', 'admin'));
-    $temp->add(new admin_setting_configcheckbox('messaging',
-        new lang_string('messaging', 'admin'),
-        new lang_string('configmessaging', 'admin'),
-        1));
-    $temp->add(new admin_setting_configcheckbox('messagingallusers',
-            new lang_string('messagingallusers', 'admin'),
-            new lang_string('configmessagingallusers', 'admin'),
-             0)
-    );
-    $temp->add(new admin_setting_configcheckbox('messagingdefaultpressenter',
-            new lang_string('messagingdefaultpressenter', 'admin'),
-            new lang_string('configmessagingdefaultpressenter', 'admin'),
-            1)
-    );
-    $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')
-    );
-    $temp->add(new admin_setting_configselect(
-            'messagingdeletereadnotificationsdelay',
-            new lang_string('messagingdeletereadnotificationsdelay', 'admin'),
-            new lang_string('configmessagingdeletereadnotificationsdelay', 'admin'),
-            604800,
-            $options)
-    );
-    $temp->add(new admin_setting_configselect(
-            'messagingdeleteallnotificationsdelay',
-            new lang_string('messagingdeleteallnotificationsdelay', 'admin'),
-            new lang_string('configmessagingdeleteallnotificationsdelay', 'admin'),
-            2620800,
-            $options)
-    );
-    $temp->add(new admin_setting_configcheckbox('messagingallowemailoverride',
-        new lang_string('messagingallowemailoverride', 'admin'),
-        new lang_string('configmessagingallowemailoverride', 'admin'),
-        0));
-    $ADMIN->add('messaging', $temp);
-    $ADMIN->add('messaging', new admin_page_managemessageoutputs());
-
-    // Notification outputs plugins.
-    $plugins = core_plugin_manager::instance()->get_plugins_of_type('message');
-    core_collator::asort_objects_by_property($plugins, 'displayname');
-    foreach ($plugins as $plugin) {
-        /** @var \core\plugininfo\message $plugin */
-        $plugin->load_settings($ADMIN, 'messaging', $hassiteconfig);
-    }
-}
@@ -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')));
-    }
-}
-
-
@@ -59,18 +59,6 @@ if ($hassiteconfig) {
        $plugin->load_settings($ADMIN, 'formatsettings', $hassiteconfig);
    }

-    // Custom fields.
-    $ADMIN->add('modules', new admin_category('customfieldsettings', new lang_string('customfields', 'core_customfield')));
-    $temp = new admin_settingpage('managecustomfields', new lang_string('managecustomfields', 'core_admin'));
-    $temp->add(new admin_setting_managecustomfields());
-    $ADMIN->add('customfieldsettings', $temp);
-    $plugins = core_plugin_manager::instance()->get_plugins_of_type('customfield');
-    core_collator::asort_objects_by_property($plugins, 'displayname');
-    foreach ($plugins as $plugin) {
-        /** @var \core\plugininfo\customfield $plugin */
-        $plugin->load_settings($ADMIN, 'customfieldsettings', $hassiteconfig);
-    }
-
    // blocks
    $ADMIN->add('modules', new admin_category('blocksettings', new lang_string('blocks')));
    $ADMIN->add('blocksettings', new admin_page_manageblocks());
@@ -81,6 +69,17 @@ if ($hassiteconfig) {
        $plugin->load_settings($ADMIN, 'blocksettings', $hassiteconfig);
    }

+    // message outputs
+    $ADMIN->add('modules', new admin_category('messageoutputs', new lang_string('messageoutputs', 'message')));
+    $ADMIN->add('messageoutputs', new admin_page_managemessageoutputs());
+    $ADMIN->add('messageoutputs', new admin_page_defaultmessageoutputs());
+    $plugins = core_plugin_manager::instance()->get_plugins_of_type('message');
+    core_collator::asort_objects_by_property($plugins, 'displayname');
+    foreach ($plugins as $plugin) {
+        /** @var \core\plugininfo\message $plugin */
+        $plugin->load_settings($ADMIN, 'messageoutputs', $hassiteconfig);
+    }
+
    // authentication plugins
    $ADMIN->add('modules', new admin_category('authsettings', new lang_string('authentication', 'admin')));

@@ -557,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'),
@@ -565,37 +564,14 @@ if ($hassiteconfig) {
    $temp->add(new admin_setting_configduration('searchindextime',
            new lang_string('searchindextime', 'admin'), new lang_string('searchindextime_desc', 'admin'),
            600));
-    $temp->add(new admin_setting_heading('searchcoursesheading', new lang_string('searchablecourses', 'admin'), ''));
    $options = [
        0 => new lang_string('searchallavailablecourses_off', 'admin'),
        1 => new lang_string('searchallavailablecourses_on', 'admin')
    ];
    $temp->add(new admin_setting_configselect('searchallavailablecourses',
            new lang_string('searchallavailablecourses', 'admin'),
-            new lang_string('searchallavailablecoursesdesc', 'admin'),
+            new lang_string('searchallavailablecourses_desc', 'admin'),
            0, $options));
-    $temp->add(new admin_setting_configcheckbox('searchincludeallcourses',
-        new lang_string('searchincludeallcourses', 'admin'), new lang_string('searchincludeallcourses_desc', 'admin'),
-        0));
-
-    // Search display options.
-    $temp->add(new admin_setting_heading('searchdisplay', new lang_string('searchdisplay', 'admin'), ''));
-    $temp->add(new admin_setting_configcheckbox('searchenablecategories',
-        new lang_string('searchenablecategories', 'admin'),
-        new lang_string('searchenablecategories_desc', 'admin'),
-        0));
-    $options = [];
-    foreach (\core_search\manager::get_search_area_categories() as $category) {
-        $options[$category->get_name()] = $category->get_visiblename();
-    }
-    $temp->add(new admin_setting_configselect('searchdefaultcategory',
-        new lang_string('searchdefaultcategory', 'admin'),
-        new lang_string('searchdefaultcategory_desc', 'admin'),
-        \core_search\manager::SEARCH_AREA_CATEGORY_ALL, $options));
-    $temp->add(new admin_setting_configcheckbox('searchhideallcategory',
-        new lang_string('searchhideallcategory', 'admin'),
-        new lang_string('searchhideallcategory_desc', 'admin'),
-        0));

    $ADMIN->add('searchplugins', $temp);
    $ADMIN->add('searchplugins', new admin_externalpage('searchareas', new lang_string('searchareas', 'admin'),
@@ -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'));

@@ -4,10 +4,10 @@

 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'), ''));
@@ -176,8 +176,6 @@ $ADMIN->add('server', $temp);

 $ADMIN->add('server', new admin_externalpage('environment', new lang_string('environment','admin'), "$CFG->wwwroot/$CFG->admin/environment.php"));
 $ADMIN->add('server', new admin_externalpage('phpinfo', new lang_string('phpinfo'), "$CFG->wwwroot/$CFG->admin/phpinfo.php"));
-$ADMIN->add('server', new admin_externalpage('testoutgoingmailconf', new lang_string('testoutgoingmailconf', 'admin'),
-            new moodle_url("$CFG->wwwroot/$CFG->admin/testoutgoingmailconf.php"), 'moodle/site:config', true));


 // "performance" settingpage
@@ -213,92 +211,6 @@ $temp->add(new admin_setting_configtext('curltimeoutkbitrate', new lang_string('
 $ADMIN->add('server', $temp);


-$ADMIN->add('server', new admin_category('taskconfig', new lang_string('taskadmintitle', 'admin')));
-$temp = new admin_settingpage('taskprocessing', new lang_string('taskprocessing','admin'));
-$temp->add(
-    new admin_setting_configtext(
-        'task_scheduled_concurrency_limit',
-        new lang_string('task_scheduled_concurrency_limit', 'admin'),
-        new lang_string('task_scheduled_concurrency_limit_desc', 'admin'),
-        3,
-        PARAM_INT
-    )
-);
-
-$temp->add(
-    new admin_setting_configduration(
-        'task_scheduled_max_runtime',
-        new lang_string('task_scheduled_max_runtime', 'admin'),
-        new lang_string('task_scheduled_max_runtime_desc', 'admin'),
-        30 * MINSECS
-    )
-);
-
-$temp->add(
-    new admin_setting_configtext(
-        'task_adhoc_concurrency_limit',
-        new lang_string('task_adhoc_concurrency_limit', 'admin'),
-        new lang_string('task_adhoc_concurrency_limit_desc', 'admin'),
-        3,
-        PARAM_INT
-    )
-);
-
-$temp->add(
-    new admin_setting_configduration(
-        'task_adhoc_max_runtime',
-        new lang_string('task_adhoc_max_runtime', 'admin'),
-        new lang_string('task_adhoc_max_runtime_desc', 'admin'),
-        30 * MINSECS
-    )
-);
-$ADMIN->add('taskconfig', $temp);
-
-$temp = new admin_settingpage('tasklogging', new lang_string('tasklogging','admin'));
-$temp->add(
-    new admin_setting_configselect(
-        'task_logmode',
-        new lang_string('task_logmode', 'admin'),
-        new lang_string('task_logmode_desc', 'admin'),
-        \core\task\logmanager::MODE_ALL,
-        [
-            \core\task\logmanager::MODE_ALL => new lang_string('task_logmode_all', 'admin'),
-            \core\task\logmanager::MODE_FAILONLY => new lang_string('task_logmode_failonly', 'admin'),
-            \core\task\logmanager::MODE_NONE => new lang_string('task_logmode_none', 'admin'),
-        ]
-    )
-);
-
-if (\core\task\logmanager::uses_standard_settings()) {
-    $temp->add(
-        new admin_setting_configduration(
-            'task_logretention',
-            new \lang_string('task_logretention', 'admin'),
-            new \lang_string('task_logretention_desc', 'admin'),
-            28 * DAYSECS
-        )
-    );
-
-    $temp->add(
-        new admin_setting_configtext(
-            'task_logretainruns',
-            new \lang_string('task_logretainruns', 'admin'),
-            new \lang_string('task_logretainruns_desc', 'admin'),
-            20,
-            PARAM_INT
-        )
-    );
-}
-$ADMIN->add('taskconfig', $temp);
-
-if (\core\task\logmanager::uses_standard_settings()) {
-    $ADMIN->add('taskconfig', new admin_externalpage(
-        'tasklogs',
-        new lang_string('tasklogs','admin'),
-        "{$CFG->wwwroot}/{$CFG->admin}/tasklogs.php"
-    ));
-}
-
 // E-mail settings.
 $ADMIN->add('server', new admin_category('email', new lang_string('categoryemail', 'admin')));

@@ -328,10 +240,6 @@ $temp->add(new admin_setting_configtextarea('allowedemaildomains',
        new lang_string('allowedemaildomains', 'admin'),
        new lang_string('configallowedemaildomains', 'admin'),
        ''));
-$url = new moodle_url('/admin/testoutgoingmailconf.php');
-$link = html_writer::link($url, get_string('testoutgoingmailconf', 'admin'));
-$temp->add(new admin_setting_heading('testoutgoinmailc', new lang_string('testoutgoingmailconf', 'admin'),
-        new lang_string('testoutgoingmaildetail', 'admin', $link)));
 $temp->add(new admin_setting_heading('emaildoesnotfit', new lang_string('doesnotfit', 'admin'),
        new lang_string('doesnotfitdetail', 'admin')));
 $charsets = get_list_of_charsets();
@@ -354,8 +262,6 @@ $choices = array(new lang_string('never', 'admin'),
                 new lang_string('onlynoreply', 'admin'));
 $temp->add(new admin_setting_configselect('emailfromvia', new lang_string('emailfromvia', 'admin'),
          new lang_string('configemailfromvia', 'admin'), 1, $choices));
-    $temp->add(new admin_setting_configtext('emailsubjectprefix', new lang_string('emailsubjectprefix', 'admin'),
-        new lang_string('configemailsubjectprefix', 'admin'), '', PARAM_RAW));

 $ADMIN->add('email', $temp);

@@ -13,6 +13,15 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

    $optionalsubsystems->add(new admin_setting_configcheckbox('enablewebservices', new lang_string('enablewebservices', 'admin'), new lang_string('configenablewebservices', 'admin'), 0));

+    $optionalsubsystems->add(new admin_setting_configcheckbox('messaging', new lang_string('messaging', 'admin'), new lang_string('configmessaging','admin'), 1));
+
+    $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), 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));
+
    $optionalsubsystems->add(new admin_setting_configcheckbox('enablestats', new lang_string('enablestats', 'admin'), new lang_string('configenablestats', 'admin'), 0));

    $optionalsubsystems->add(new admin_setting_configcheckbox('enablerssfeeds', new lang_string('enablerssfeeds', 'admin'), new lang_string('configenablerssfeeds', 'admin'), 0));
@@ -48,10 +57,4 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

    $optionalsubsystems->add(new admin_setting_configcheckbox('allowstealth', new lang_string('allowstealthmodules'),
        new lang_string('allowstealthmodules_help'), 0, 1, 0));
-
-    $optionalsubsystems->add(new admin_setting_configcheckbox('enablecoursepublishing',
-        new lang_string('enablecoursepublishing', 'hub'), new lang_string('enablecoursepublishing_help', 'hub'), 0));
-
-    $optionalsubsystems->add(new admin_setting_configcheckbox('enableasyncbackup', new lang_string('enableasyncbackup', 'backup'),
-        new lang_string('enableasyncbackup_help', 'backup'), 0, 1, 0));
 }
@@ -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);
@@ -33,7 +28,6 @@ $ADMIN->add('root', new admin_category('competencies', new lang_string('competen
 $ADMIN->add('root', new admin_category('badges', new lang_string('badges'), empty($CFG->enablebadges)));
 $ADMIN->add('root', new admin_category('location', new lang_string('location','admin')));
 $ADMIN->add('root', new admin_category('language', new lang_string('language')));
-$ADMIN->add('root', new admin_category('messaging', new lang_string('messagingcategory', 'admin')));
 $ADMIN->add('root', new admin_category('modules', new lang_string('plugins', 'admin')));
 $ADMIN->add('root', new admin_category('security', new lang_string('security','admin')));
 $ADMIN->add('root', new admin_category('appearance', new lang_string('appearance','admin')));
@@ -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'),
@@ -174,11 +172,12 @@ if ($hassiteconfig
        // Options include fields from the user table that might be helpful to
        // distinguish when adding or listing users ('I want to add the John
        // Smith from Science faculty').
+        // Username is not included as an option because in some sites, it might
+        // be a security problem to reveal usernames even to trusted staff.
        // Custom user profile fields are not currently supported.
        $temp->add(new admin_setting_configmulticheckbox('showuseridentity',
                new lang_string('showuseridentity', 'admin'),
                new lang_string('showuseridentity_desc', 'admin'), array('email' => 1), array(
-                    'username'    => new lang_string('username'),
                    'idnumber'    => new lang_string('idnumber'),
                    'email'       => new lang_string('email'),
                    'phone1'      => new lang_string('phone1'),
@@ -210,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);
-}
@@ -1,92 +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/>.
-
-/**
- * Task log.
- *
- * @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(__DIR__ . '/../config.php');
-require_once("{$CFG->libdir}/adminlib.php");
-require_once("{$CFG->libdir}/tablelib.php");
-require_once("{$CFG->libdir}/filelib.php");
-
-$filter = optional_param('filter', '', PARAM_RAW);
-$result = optional_param('result', null, PARAM_INT);
-
-$pageurl = new \moodle_url('/admin/tasklogs.php');
-$pageurl->param('filter', $filter);
-
-$PAGE->set_url($pageurl);
-$PAGE->set_context(context_system::instance());
-$PAGE->set_pagelayout('admin');
-$strheading = get_string('tasklogs', 'tool_task');
-$PAGE->set_title($strheading);
-$PAGE->set_heading($strheading);
-
-require_login();
-
-require_capability('moodle/site:config', context_system::instance());
-admin_externalpage_setup('tasklogs');
-
-$logid = optional_param('logid', null, PARAM_INT);
-$download = optional_param('download', false, PARAM_BOOL);
-
-if (null !== $logid) {
-    $log = $DB->get_record('task_log', ['id' => $logid], '*', MUST_EXIST);
-
-    if ($download) {
-        $filename = str_replace('\\', '_', $log->classname) . "-{$log->id}.log";
-        header("Content-Disposition: attachment; filename=\"{$filename}\"");
-    }
-
-    readstring_accel($log->output, 'text/plain', false);
-    exit;
-}
-
-$renderer = $PAGE->get_renderer('tool_task');
-
-echo $OUTPUT->header();
-echo $OUTPUT->render_from_template('core_admin/tasklogs', (object) [
-    'action' => $pageurl->out(),
-    'filter' => $filter,
-    'resultfilteroptions' => [
-        (object) [
-            'value' => -1,
-            'title' => get_string('all'),
-            'selected' => (-1 === $result),
-        ],
-        (object) [
-            'value' => 0,
-            'title' => get_string('success'),
-            'selected' => (0 === $result),
-        ],
-        (object) [
-            'value' => 1,
-            'title' => get_string('task_result:failed', 'admin'),
-            'selected' => (1 === $result),
-        ],
-    ],
-]);
-
-$table = new \core_admin\task_log_table($filter, $result);
-$table->baseurl = $pageurl;
-$table->out(100, false);
-
-echo $OUTPUT->footer();
@@ -29,7 +29,6 @@
    * element - The Element HTML
    * forceltr - Force this element to be displayed LTR
    * default - Default value
-    * dependenton - optional message listing the settings this one is dependent on

    Example context (json):
    {
@@ -44,11 +43,8 @@
        "default": "Default value"
    }
 }}
-{{!
-    Setting.
-}}
-<div class="form-item row" id="{{id}}">
-    <div class="form-label col-sm-3 text-sm-right">
+<div class="form-item clearfix" id="{{id}}">
+    <div class="form-label">
        <label {{#labelfor}}for="{{labelfor}}"{{/labelfor}}>
            {{{title}}}
            {{#override}}
@@ -58,17 +54,16 @@
                <div class="form-warning">{{warning}}</div>
            {{/warning}}
        </label>
-        <span class="form-shortname d-block small text-muted">{{{name}}}</span>
+        <span class="form-shortname">{{{name}}}</span>
    </div>
-    <div class="form-setting col-sm-9">
+    <div class="form-setting">
        {{#error}}
            <div><span class="error">{{error}}</span></div>
        {{/error}}
        {{{element}}}
        {{#default}}
-            <div class="form-defaultinfo text-muted {{#forceltr}}text-ltr{{/forceltr}}">{{{default}}}</div>
+            <div class="form-defaultinfo {{#forceltr}}text-ltr{{/forceltr}}">{{{default}}}</div>
        {{/default}}
-        <div class="form-description mt-3">{{{description}}}</div>
-        {{#dependenton}}<div class="form-dependenton mb-4 text-muted">{{{.}}}</div>{{/dependenton}}
    </div>
+    <div class="form-description">{{{description}}}</div>
 </div>
@@ -35,16 +35,13 @@
        "haspreviewconfig": false
    }
 }}
-{{!
-    Setting configcolourpicker.
-}}
 <div class="form-colourpicker defaultsnext">
    <div class="admin_colourpicker clearfix">
        {{#icon}}
            {{>core/pix_icon}}
        {{/icon}}
    </div>
-    <input type="text" name="{{name}}" id="{{id}}" value="{{value}}" size="12" class="form-control text-ltr">
+    <input type="text" name="{{name}}" id="{{id}}" value="{{value}}" size="12" class="text-ltr">
    {{#haspreviewconfig}}
        <input type="button" id="{{id}}_preview" value={{#quote}}{{#str}}preview{{/str}}{{/quote}} class="admin_colourpicker_preview">
    {{/haspreviewconfig}}
@@ -33,18 +33,13 @@
        "options": [ { "name": "Minutes", "value": "mins", "selected": true } ]
    }
 }}
-{{!
-    Setting configduration.
-}}
 <div class="form-duration defaultsnext">
-    <div class="form-inline">
-        <input type="text" size="5" id="{{id}}v" name="{{name}}[v]" value="{{value}}" class="form-control text-ltr">
-        <label class="sr-only" for="{{id}}u">{{#str}}durationunits, admin{{/str}}</label>
-        <select id="{{id}}u" name="{{name}}[u]" class="form-control custom-select">
-            {{#options}}
-                <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-            {{/options}}
-        </select>
-    </div>
+    <input type="text" size="5" id="{{id}}v" name="{{name}}[v]" value="{{value}}" class="text-ltr">
+    <label class="accesshide" for="{{id}}u">{{#str}}durationunits, admin{{/str}}</label>
+    <select id="{{id}}u" name="{{name}}[u]">
+        {{#options}}
+            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+        {{/options}}
+    </select>
 </div>

@@ -38,20 +38,15 @@
        "valid": false
    }
 }}
-{{!
-    Setting configfile.
-}}
 <div class="form-file defaultsnext">
-    <div class="form-inline">
-        <input type="text" name="{{name}}" id="{{id}}" size="{{size}}" value="{{value}}" class="form-control text-ltr" {{#readonly}}readonly{{/readonly}}>
-        {{#showvalidity}}
-            {{#valid}}
-                <span class="text-success">&#x2714;</span>
-            {{/valid}}
-            {{^valid}}
-                <span class="text-danger">&#x2718;</span>
-            {{/valid}}
-        {{/showvalidity}}
-    </div>
+    <input type="text" name="{{name}}" id="{{id}}" size="{{size}}" value="{{value}}" class="text-ltr" {{#readonly}}readonly{{/readonly}}>
+    {{#showvalidity}}
+        {{#valid}}
+            <span class="pathok">&#x2714;</span>
+        {{/valid}}
+        {{^valid}}
+            <span class="patherror">&#x2718;</span>
+        {{/valid}}
+    {{/showvalidity}}
 </div>

@@ -34,12 +34,9 @@
                     { "name": "Option 2", "value": "V", "selected": true } ]
    }
 }}
-{{!
-    Setting configmultiselect.
-}}
 <div class="form-select">
    <input type="hidden" name="{{name}}[xxxxx]" value="1">
-    <select id="{{id}}" name="{{name}}[]" size="{{size}}" class="form-control" multiple>
+    <select id="{{id}}" name="{{name}}[]" size="{{size}}" multiple>
        {{#options}}
            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
        {{/options}}
@@ -53,16 +53,13 @@
        ]
    }
 }}
-{{!
-    Setting configmultiselect with optgroup support.
-}}
 <div class="form-select">
    <input type="hidden" name="{{name}}[xxxxx]" value="1">
-    <select id="{{id}}" name="{{name}}[]" size="{{size}}" class="form-control" multiple>
-    {{#options}}
-        <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-    {{/options}}
-    {{#optgroups}}
+    <select id="{{id}}" name="{{name}}[]" size="{{size}}" multiple>
+        {{#options}}
+            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+        {{/options}}
+        {{#optgroups}}
            <optgroup label="{{label}}">
                {{#options}}
                    <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
@@ -34,11 +34,8 @@
        ]
    }
 }}
-{{!
-    Setting configselect.
-}}
 <div class="form-select defaultsnext">
-    <select id="{{id}}" name="{{name}}" class="custom-select">
+    <select id="{{id}}" name="{{name}}">
        {{#options}}
            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
        {{/options}}
@@ -51,11 +51,8 @@
        ]
    }
 }}
-{{!
-    Setting configselect with optgroup support.
-}}
 <div class="form-select defaultsnext">
-    <select id="{{id}}" name="{{name}}" class="custom-select">
+    <select id="{{id}}" name="{{name}}">
        {{#options}}
            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
        {{/options}}
@@ -69,4 +66,3 @@
    </select>
 </div>

-
@@ -37,9 +37,6 @@
        "attributes": [ { "name": "readonly", "value": "readonly" } ]
    }
 }}
-{{!
-    Setting configtext.
-}}
 <div class="form-text defaultsnext">
-    <input type="text" name="{{name}}" value="{{value}}" size="{{size}}" id="{{id}}" class="form-control {{#forceltr}}text-ltr{{/forceltr}}">
+    <input type="text" name="{{name}}" value="{{value}}" size="{{size}}" id="{{id}}" class="{{#forceltr}}text-ltr{{/forceltr}}"{{#attributes}} {{name}}="{{value}}"{{/attributes}}>
 </div>
@@ -36,9 +36,6 @@
        "id": "test0"
    }
 }}
-{{!
-    Setting configtextarea.
-}}
 <div class="form-textarea">
-    <textarea rows="{{rows}}" cols="{{cols}}" id="{{id}}" name="{{name}}" spellcheck="true" class="form-control {{#forceltr}}text-ltr{{/forceltr}}">{{value}}</textarea>
+    <textarea rows="{{rows}}" cols="{{cols}}" id="{{id}}" name="{{name}}" spellcheck="true" class="{{#forceltr}}text-ltr{{/forceltr}}">{{value}}</textarea>
 </div>
@@ -39,23 +39,18 @@
        ]
    }
 }}
-{{!
-    Setting configtime.
-}}
-<div class="form-time defaultsnext">
-    <div class="form-inline text-ltr">
-        <label class="sr-only" for="{{id}}h">{{#str}}hours{{/str}}</label>
-        <select id="{{id}}h" name="{{name}}[h]" class="custom-select">
-            {{#hours}}
-                <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-            {{/hours}}
-        </select>:
-        <label class="sr-only" for="{{id}}m">{{#str}}minutes{{/str}}</label>
-        <select id="{{id}}m" name="{{name}}[m]" class="custom-select">
-            {{#minutes}}
-                <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-            {{/minutes}}
-        </select>
-    </div>
+<div class="form-time defaultsnext text-ltr">
+    <label class="accesshide" for="{{id}}h">{{#str}}hours{{/str}}</label>
+    <select id="{{id}}h" name="{{name}}[h]">
+        {{#hours}}
+            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+        {{/hours}}
+    </select>:
+    <label class="accesshide" for="{{id}}m">{{#str}}minutes{{/str}}</label>
+    <select id="{{id}}m" name="{{name}}[m]">
+        {{#minutes}}
+            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
+        {{/minutes}}
+    </select>
 </div>

@@ -37,12 +37,9 @@
        ]
    }
 }}
-{{!
-    Setting courselist_frontpage.
-}}
 <div class="form-group">
    {{#selects}}
-        <select id="{{id}}{{key}}" name="{{name}}[]" class="custom-select">
+        <select id="{{id}}{{key}}" name="{{name}}[]" class="form-select">
            {{#options}}
                <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
            {{/options}}
@@ -1,46 +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 row">
-    <div class="form-label col-sm-3 text-sm-right">
-        <label>
-            {{{title}}}
-        </label>
-    </div>
-    <div class="form-setting col-sm-9">
-        <div class="form-description">{{{description}}}</div>
-    </div>
-</div>
@@ -29,10 +29,7 @@
        ]
    }
 }}
-{{!
-    Setting devicedetectregex.
-}}
-<table class="table table-striped">
+<table class="generaltable">
    <thead>
        <tr>
            <th>{{#str}}devicedetectregexexpression, admin{{/str}}</th>
@@ -43,10 +40,10 @@
        {{#expressions}}
            <tr>
                <td class="c{{index}}">
-                    <input type="text" name="{{name}}[expression{{index}}]" class="form-control" value="{{expression}}">
+                    <input type="text" name="{{name}}[expression{{index}}]" class="form-text text-ltr" value="{{expression}}">
                </td>
                <td class="c{{index}}">
-                    <input type="text" name="{{name}}[value{{index}}]" class="form-control" value="{{value}}">
+                    <input type="text" name="{{name}}[value{{index}}]" class="form-text text-ltr" value="{{value}}">
                </td>
            </tr>
        {{/expressions}}
@@ -32,9 +32,6 @@
        ]
    }
 }}
-{{!
-    Setting emoticons.
-}}
 <div class="form-group">
    <table id="emoticonsetting" class="admintable generaltable">
        <thead>
@@ -51,7 +48,7 @@
                <tr>
                    {{#fields}}
                        <td class="c{{index}}">
-                            <input type="text" name="{{name}}[{{field}}]" class="form-text form-control text-ltr" value="{{value}}">
+                            <input type="text" name="{{name}}[{{field}}]" class="form-text text-ltr" value="{{value}}">
                        </td>
                    {{/fields}}
                    <td>
@@ -37,11 +37,8 @@
        "advanced": true
    }
 }}
-{{!
-    Setting configselect.
-}}
 <div class="form-group">
-    <select id="{{id}}" name="{{name}}[value]" class="form-select custom-select">
+    <select id="{{id}}" name="{{name}}[value]" class="form-select">
        {{#options}}
            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
        {{/options}}
@@ -36,14 +36,10 @@
        "showsave": true
    }
 }}
-{{!
-    Settings.
-}}
 <form action="{{actionurl}}" method="post" id="adminsettings">
-    <div class="settingsform">
+    <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}}">
@@ -52,10 +48,8 @@
        {{/title}}
        {{{settings}}}
        {{#showsave}}
-            <div class="row">
-                <div class="offset-sm-3 col-sm-3">
-                    <button type="submit" class="btn btn-primary">{{#str}}savechanges, admin{{/str}}</button>
-                </div>
+            <div class="form-buttons">
+                <input type="submit" class="form-submit" value={{#quote}}{{#str}}savechanges, admin{{/str}}{{/quote}}>
            </div>
        {{/showsave}}
    </div>
@@ -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>
@@ -58,10 +52,8 @@
                </fieldset>
            {{/results}}
            {{#showsave}}
-                <div class="row">
-                    <div class="offset-sm-3 col-sm-3">
-                        <button type="submit" class="btn btn-primary">{{#str}}savechanges, admin{{/str}}</button>
-                    </div>
+                <div class="form-buttons">
+                    <input type="submit" class="form-submit" value={{#quote}}{{#str}}savechanges, admin{{/str}}{{/quote}}>
                </div>
            {{/showsave}}
        {{/hasresults}}
@@ -1,34 +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/tasklogs
-
-    Task Logs template.
-}}
-<form class="form-inline" method="GET" action="{{{action}}}">
-    <label class="sr-only" for="tasklog-filter">{{#str}}filter{{/str}}</label>
-    <input class="form-control" type="text" id="tasklog-filter" name="filter" value="{{{filter}}}">
-
-    <label class="sr-only" for="tasklog-resultfilter">{{#str}}resultfilter, admin{{/str}}</label>
-    <select class="form-control custom-select" name="result" id="tasklog-resultfilter">
-        {{#resultfilteroptions}}
-        <option value="{{{value}}}"{{#selected}} selected="selected"{{/selected}}>{{title}}</option>
-        {{/resultfilteroptions}}
-    </select>
-
-    <input class="btn btn-primary" type="submit" value="{{#str}}filter{{/str}}">
-</form>
@@ -1,92 +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/>.
-
-/**
- * Test output mail configuration page
- *
- * @copyright 2019 Victor Deniz <victor@moodle.com>, based on Michael Milette <michael.milette@tngconsulting.ca> code
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(__DIR__ . '/../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-// This is an admin page.
-admin_externalpage_setup('testoutgoingmailconf');
-
-$headingtitle = get_string('testoutgoingmailconf', 'admin');
-$homeurl = new moodle_url('/admin/category.php', array('category' => 'email'));
-$returnurl = new moodle_url('/admin/testoutgoingconf.php');
-
-$form = new core_admin\form\testoutgoingmailconf_form(null, ['returnurl' => $returnurl]);
-if ($form->is_cancelled()) {
-    redirect($homeurl);
-}
-
-// Display the page.
-echo $OUTPUT->header();
-echo $OUTPUT->heading($headingtitle);
-
-$data = $form->get_data();
-if ($data) {
-    $emailuser = new stdClass();
-    $emailuser->email = $data->recipient;
-    $emailuser->id = -99;
-
-    $subject = get_string('testoutgoingmailconf_subject', 'admin', $SITE->fullname);
-    $messagetext = get_string('testoutgoingmailconf_message', 'admin');
-
-    // Manage Moodle debugging options.
-    $debuglevel = $CFG->debug;
-    $debugdisplay = $CFG->debugdisplay;
-    $debugsmtp = $CFG->debugsmtp;
-    $CFG->debugdisplay = true;
-    $CFG->debugsmtp = true;
-    $CFG->debug = 15;
-
-    // Send test email.
-    ob_start();
-    $success = email_to_user($emailuser, $USER, $subject, $messagetext);
-    $smtplog = ob_get_contents();
-    ob_end_clean();
-
-    // Restore Moodle debugging options.
-    $CFG->debug = $debuglevel;
-    $CFG->debugdisplay = $debugdisplay;
-    $CFG->debugsmtp = $debugsmtp;
-
-    if ($success) {
-        $msgparams = new stdClass();
-        $msgparams->fromemail = $USER->email;
-        $msgparams->toemail = $emailuser->email;
-        $msg = get_string('testoutgoingmailconf_sentmail', 'admin', $msgparams);
-        $notificationtype = 'notifysuccess';
-    } else {
-        $notificationtype = 'notifyproblem';
-        // No communication between Moodle and the SMTP server - no error output.
-        if (trim($smtplog) == false) {
-            $msg = get_string('testoutgoingmailconf_errorcommunications', 'admin');
-        } else {
-            $msg = $smtplog;
-        }
-    }
-
-    // Show result.
-    echo $OUTPUT->notification($msg, $notificationtype);
-}
-
-$form->display();
-echo $OUTPUT->footer();
@@ -55,11 +55,19 @@ class behat_admin extends behat_base {

        foreach ($data as $label => $value) {

-            $this->execute('behat_navigation::i_select_from_flat_navigation_drawer', [get_string('administrationsite')]);
+            // We expect admin block to be visible, otherwise go to homepage.
+            if (!$this->getSession()->getPage()->find('css', '.block_settings')) {
+                $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('query', 'admin'), $label]);
-            $this->execute("behat_forms::press_button", get_string('search', 'admin'));
+            $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.
@@ -70,24 +78,21 @@ class behat_admin extends behat_base {

            // Single element settings.
            try {
-                $fieldxpath = "//*[self::input | self::textarea | self::select]" .
-                        "[not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]" .
-                        "[@id=//label[contains(normalize-space(.), $label)]/@for or " .
-                        "@id=//span[contains(normalize-space(.), $label)]/preceding-sibling::label[1]/@for]";
+                $fieldxpath = "//*[self::input | self::textarea | self::select][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]" .
+                    "[@id=//label[contains(normalize-space(.), $label)]/@for or " .
+                    "@id=//span[contains(normalize-space(.), $label)]/preceding-sibling::label[1]/@for]";
                $fieldnode = $this->find('xpath', $fieldxpath, $exception);

-                $formfieldtypenode = $this->find('xpath', $fieldxpath .
-                        "/ancestor::div[contains(concat(' ', @class, ' '), ' form-setting ')]" .
-                        "/child::div[contains(concat(' ', @class, ' '),  ' form-')]/child::*/parent::div");
+                $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[contains(., $label)]|span[contains(., $label)]]" .
-                        "/ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' form-item ')]" .
-                        "/descendant::div[contains(concat(' ', @class, ' '), ' form-group ')]" .
-                        "/descendant::*[self::input | self::textarea | self::select]" .
-                        "[not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]";
+                $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.
@@ -96,7 +101,6 @@ class behat_admin extends behat_base {

            // Getting the class which contains the field type.
            $classes = explode(' ', $formfieldtypenode->getAttribute('class'));
-            $type = false;
            foreach ($classes as $class) {
                if (substr($class, 0, 5) == 'form-') {
                    $type = substr($class, 5);
--- a/Show More
+++ b/Show More