Moodle release 3.8.1

Merge branch 'install_38_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_38_STABLE
Automatically generated installer lang files
2020-01-10 13:03:44 +08:00 · 2020-01-10 13:03:42 +08:00 · 2020-01-10 00:12:13 +00:00 · 2020-01-09 15:42:53 +01:00 · 2020-01-09 15:22:35 +08:00 · 2020-01-09 14:55:52 +08:00
10522 changed files with 319945 additions and 654086 deletions
@@ -0,0 +1,90 @@
+# Generated by "grunt ignorefiles"
+*/**/yui/src/*/meta/
+*/**/build/
+node_modules/
+vendor/
+admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.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
+lib/editor/tinymce/tiny_mce/
+lib/mlbackend/php/phpml/
+lib/adodb/
+lib/bennu/
+lib/evalmath/
+lib/phpspreadsheet/
+lib/google/
+lib/htmlpurifier/
+lib/jabber/
+lib/minify/matthiasmullie-minify/
+lib/minify/matthiasmullie-pathconverter/
+lib/pear/HTML/Common.php
+lib/pear/HTML/QuickForm.php
+lib/pear/HTML/QuickForm/
+lib/pear/PEAR.php
+lib/phpmailer/
+lib/simplepie/
+lib/tcpdf/
+lib/typo3/
+lib/yuilib/
+lib/yuilib/gallery/
+lib/jquery/
+lib/html2text/
+lib/markdown/
+lib/xhprof/
+lib/horde/
+lib/requirejs/
+lib/amd/src/loglevel.js
+lib/mustache/
+lib/amd/src/mustache.js
+lib/graphlib.php
+lib/php-css-parser/
+lib/rtlcss/
+lib/scssphp/
+lib/spout/
+lib/amd/src/chartjs-lazy.js
+lib/maxmind/GeoIp2/
+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/
+lib/babel-polyfill/
+lib/mdn-polyfills/
+lib/emoji-data/
+lib/h5p/
+media/player/videojs/amd/src/video-lazy.js
+media/player/videojs/amd/src/Youtube-lazy.js
+media/player/videojs/videojs/
+media/player/videojs/amd/src/videojs-flash-lazy.js
+media/player/videojs/videojs/video-js.swf
+mod/assign/feedback/editpdf/fpdi/
+repository/s3/S3.php
+theme/boost/scss/bootstrap/
+theme/boost/amd/src/alert.js
+theme/boost/amd/src/button.js
+theme/boost/amd/src/carousel.js
+theme/boost/amd/src/collapse.js
+theme/boost/amd/src/dropdown.js
+theme/boost/amd/src/index.js
+theme/boost/amd/src/modal.js
+theme/boost/amd/src/popover.js
+theme/boost/amd/src/sanitizer.js
+theme/boost/amd/src/scrollspy.js
+theme/boost/amd/src/tab.js
+theme/boost/amd/src/toast.js
+theme/boost/amd/src/tooltip.js
+theme/boost/amd/src/util.js
+theme/boost/amd/src/tether.js
+theme/boost/scss/fontawesome/
@@ -2,7 +2,6 @@
  'plugins': [
    'babel',
    'promise',
-    'jsdoc',
  ],
  'env': {
    'browser': true,
@@ -192,6 +191,7 @@
        'property': 'str',
        'message': 'Use AMD module "core/str" or M.util.get_string()'
    }],
+
  },
  overrides: [
    {
@@ -200,34 +200,18 @@
      rules: {
        'no-undef': 'off',
        'no-unused-vars': 'off',
-        'no-unused-expressions': 'off',
-
-        // === JSDocs ===
-        "jsdoc/check-access": 'off',
-        "jsdoc/check-alignment": 'off',
-        "jsdoc/check-param-names": 'off',
-        "jsdoc/check-property-names": 'off',
-        "jsdoc/empty-tags": 'off',
-        "jsdoc/implements-on-classes": 'off',
-        "jsdoc/multiline-blocks": 'off',
-        "jsdoc/require-jsdoc": 'off',
-        "jsdoc/require-param": 'off',
-        "jsdoc/require-param-name": 'off',
-        "jsdoc/require-param-type": 'off',
-        "jsdoc/require-property": 'off',
-        "jsdoc/require-property-name": 'off',
-        "jsdoc/require-property-type": 'off',
+        'no-unused-expressions': 'off'
      }
    },
    {
-      files: ["**/amd/src/*.js", "**/amd/src/**/*.js", "Gruntfile.js", ".grunt/*.js", ".grunt/tasks/*.js", "jsdoc.conf.js"],
+      files: ["**/amd/src/*.js", "**/amd/src/**/*.js", "Gruntfile*.js", "babel-plugin-add-module-to-define.js"],
      // We support es6 now. Woot!
      env: {
        es6: true
      },
      // We're using babel transpiling so use their parser
      // for linting.
-      parser: '@babel/eslint-parser',
+      parser: 'babel-eslint',
      // Check AMD with some slightly stricter rules.
      rules: {
        'no-unused-vars': 'error',
@@ -254,54 +238,11 @@
        // === Promises ===
        // We have Promise now that we're using ES6.
        'promise/no-native': 'off',
-        'promise/avoid-new': 'off',
-
-        // === JSDocs ===
-        "jsdoc/check-access": [
-          'error',
-        ],
-        "jsdoc/check-alignment": 1, // Recommended.
-        "jsdoc/check-param-names": [
-          'error',
-        ],
-        "jsdoc/check-property-names": [
-          'error',
-        ],
-        "jsdoc/empty-tags": [
-          'error',
-        ],
-        "jsdoc/implements-on-classes": [
-          'error',
-        ],
-        "jsdoc/multiline-blocks": [
-          'error',
-        ],
-        "jsdoc/require-jsdoc": [
-          'error',
-        ],
-        "jsdoc/require-param": [
-          'error',
-        ],
-        "jsdoc/require-param-name": [
-          'error',
-        ],
-        "jsdoc/require-param-type": [
-          'error',
-        ],
-        "jsdoc/require-property": [
-          'error',
-        ],
-        "jsdoc/require-property-name": [
-          'error',
-        ],
-        "jsdoc/require-property-type": [
-          'error',
-        ],
+        'promise/avoid-new': 'off'
      },
      parserOptions: {
        'ecmaVersion': 9,
-        'sourceType': 'module',
-        'requireConfigFile': false,
+        'sourceType': 'module'
      }
    }
  ]
@@ -3,8 +3,6 @@
    "Feature": 0,
    "Background": 2,
    "Scenario": 2,
-    "Examples": 4,
-    "example": 6,
    "Step": 4,
    "given": 4,
    "and": 4
@@ -16,9 +14,7 @@
  "no-multiple-empty-lines": "on",
  "no-partially-commented-tag-lines": "on",
  "no-trailing-spaces": "on",
-  "no-unnamed-features": "on",
-  "no-unnamed-scenarios": "on",
-  "no-scenario-outlines-without-examples": "on",
-  "no-examples-in-scenarios": "on",
-  "new-line-at-eof": ["on", "yes"]
+  "no-unamed-features": "on",
+  "no-unamed-scenarios": "on",
+  "no-scenario-outlines-without-examples": "on"
 }
@@ -1,2 +0,0 @@
-# Primary donations pages.
-custom: ["https://moodle.com/donations/", moodle.org]
@@ -1,71 +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/>.
-
-/**
- * Template configuraton file for github actions CI/CD.
- *
- * @package    core
- * @copyright  2020 onwards Eloy Lafuente (stronk7) {@link https://stronk7.com}
- * @license    https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-// This cannot be used out from a github actions workflow, so just exit.
-getenv('GITHUB_WORKFLOW') || die; // phpcs:ignore moodle.Files.MoodleInternal.MoodleInternalGlobalState
-
-unset($CFG);
-global $CFG;
-$CFG = new stdClass();
-
-$CFG->dbtype    = getenv('dbtype');
-$CFG->dblibrary = 'native';
-$CFG->dbhost    = '127.0.0.1';
-$CFG->dbname    = 'test';
-$CFG->dbuser    = 'test';
-$CFG->dbpass    = 'test';
-$CFG->prefix    = 'm_';
-$CFG->dboptions = ['dbcollation' => 'utf8mb4_bin'];
-
-$host = 'localhost';
-$CFG->wwwroot   = "http://{$host}";
-$CFG->dataroot  = realpath(dirname(__DIR__)) . '/moodledata';
-$CFG->admin     = 'admin';
-$CFG->directorypermissions = 0777;
-
-// Debug options - possible to be controlled by flag in future.
-$CFG->debug = (E_ALL | E_STRICT); // DEBUG_DEVELOPER.
-$CFG->debugdisplay = 1;
-$CFG->debugstringids = 1; // Add strings=1 to url to get string ids.
-$CFG->perfdebug = 15;
-$CFG->debugpageinfo = 1;
-$CFG->allowthemechangeonurl = 1;
-$CFG->passwordpolicy = 0;
-$CFG->cronclionly = 0;
-$CFG->pathtophp = getenv('pathtophp');
-
-$CFG->phpunit_dataroot  = realpath(dirname(__DIR__)) . '/phpunitdata';
-$CFG->phpunit_prefix = 't_';
-
-define('TEST_EXTERNAL_FILES_HTTP_URL', 'http://localhost:8080');
-define('TEST_EXTERNAL_FILES_HTTPS_URL', 'http://localhost:8080');
-
-define('TEST_SESSION_REDIS_HOST', 'localhost');
-define('TEST_CACHESTORE_REDIS_TESTSERVERS', 'localhost');
-
-// TODO: add others (solr, mongodb, memcached, ldap...).
-
-// Too much for now: define('PHPUNIT_LONGTEST', true); // Only leaves a few tests out and they are run later by CI.
-
-require_once(__DIR__ . '/lib/setup.php');
@@ -1,115 +0,0 @@
-name: Core
-
-on:
-  push:
-    branches-ignore:
-      - master
-      - MOODLE_[0-9]+_STABLE
-    tags-ignore:
-      - v[0-9]+.[0-9]+.[0-9]+*
-
-env:
-  php: 8.0
-
-jobs:
-  Grunt:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Checking out code
-        uses: actions/checkout@v2
-
-      - name: Configuring node & npm
-        uses: actions/setup-node@v2
-        with:
-          node-version-file: '.nvmrc'
-
-      - name: Installing node stuff
-        run: npm install
-
-      - name: Running grunt
-        run: npx grunt
-
-      - name: Looking for uncommitted changes
-        # 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.
-        run: |
-          git add .
-          git reset -- npm-shrinkwrap.json
-          git diff --cached --exit-code
-
-  PHPUnit:
-    runs-on: ${{ matrix.os }}
-    services:
-      exttests:
-        image: moodlehq/moodle-exttests
-        ports:
-          - 8080:80
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-20.04
-            php: 7.3
-            extensions:
-            db: mysqli
-          - os: ubuntu-20.04
-            php: 8.0
-            db: pgsql
-            extensions: xmlrpc-beta
-
-    steps:
-      - name: Setting up DB mysql
-        if: ${{ matrix.db == 'mysqli' }}
-        uses: johanmeiring/mysql-action@tmpfs-patch
-        with:
-          collation server: utf8mb4_bin
-          mysql version: 5.7
-          mysql database: test
-          mysql user: test
-          mysql password: test
-          use tmpfs: true
-
-      - name: Setting up DB pgsql
-        if: ${{ matrix.db == 'pgsql' }}
-        uses: m4nu56/postgresql-action@v1
-        with:
-          postgresql version: 9.6
-          postgresql db: test
-          postgresql user: test
-          postgresql password: test
-
-      - name: Configuring git vars
-        uses: rlespinasse/github-slug-action@v3.x
-
-      - name: Setting up PHP ${{ matrix.php }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: ${{ matrix.extensions }}
-          ini-values: max_input_vars=5000
-          coverage: none
-
-      - name: Checking out code from ${{ env.GITHUB_REF_SLUG }}
-        uses: actions/checkout@v2
-
-      - name: Setting up PHPUnit
-        env:
-          dbtype: ${{ matrix.db }}
-        run: |
-          echo "pathtophp=$(which php)" >> $GITHUB_ENV # Inject installed pathtophp to env. The template config needs it.
-          cp .github/workflows/config-template.php config.php
-          mkdir ../moodledata
-          sudo locale-gen en_AU.UTF-8
-          php admin/tool/phpunit/cli/init.php --no-composer-self-update
-
-      - name: Running PHPUnit tests
-        env:
-          dbtype: ${{ matrix.db }}
-          phpunit_options: ${{ secrets.phpunit_options }}
-        run: vendor/bin/phpunit $phpunit_options
@@ -26,7 +26,6 @@
 /cscope.*
 /.patches/
 /.idea/
-.phpstorm.*
 /nbproject/
 CVS
 .DS_Store
@@ -34,7 +33,6 @@ CVS
 /.project
 /.buildpath
 /.cache
-.phpunit.result.cache
 phpunit.xml
 # Composer support. Do not ignore composer.json, or composer.lock. These should be shipped by us.
 composer.phar
@@ -46,9 +44,3 @@ composer.phar
 /lib/yuilib/*/*/*-coverage.js
 atlassian-ide-plugin.xml
 /node_modules/
-/.vscode/
-moodle-plugin-ci.phar
-.eslintignore
-.stylelintignore
-/jsdoc
-.phpcs.xml
@@ -1,169 +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/>.
-
-/**
- * This is a babel plugin to add the Moodle module names to the AMD modules
- * as part of the transpiling process.
- *
- * In addition it will also add a return statement for the default export if the
- * module is using default exports. This is a highly specific Moodle thing because
- * we're transpiling to AMD and none of the existing Babel 7 plugins work correctly.
- *
- * This will fix the issue where an ES6 module using "export default Foo" will be
- * transpiled into an AMD module that returns {default: Foo}; Instead it will now
- * just simply return Foo.
- *
- * Note: This means all other named exports in that module are ignored and won't be
- * exported.
- *
- * @copyright  2018 Ryan Wyllie <ryan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-"use strict";
-/* eslint-env node */
-
-module.exports = ({template, types}) => {
-    const fs = require('fs');
-    const path = require('path');
-    const cwd = process.cwd();
-    const ComponentList = require(path.join(process.cwd(), '.grunt', 'components.js'));
-
-    /**
-     * Search the list of components that match the given file name
-     * and return the Moodle component for that file, if found.
-     *
-     * Throw an exception if no matching component is found.
-     *
-     * @throws {Error}
-     * @param {string} searchFileName The file name to look for.
-     * @return {string} Moodle component
-     */
-    function getModuleNameFromFileName(searchFileName) {
-        searchFileName = fs.realpathSync(searchFileName);
-        const relativeFileName = searchFileName.replace(`${cwd}${path.sep}`, '').replace(/\\/g, '/');
-        const [componentPath, file] = relativeFileName.split('/amd/src/');
-        const fileName = file.replace('.js', '');
-
-        // Check subsystems first which require an exact match.
-        const componentName = ComponentList.getComponentFromPath(componentPath);
-        if (componentName) {
-            return `${componentName}/${fileName}`;
-        }
-
-        // This matches the previous PHP behaviour that would throw an exception
-        // if it couldn't parse an AMD file.
-        throw new Error(`Unable to find module name for ${searchFileName} (${componentPath}::${file}}`);
-    }
-
-    /**
-     * This is heavily inspired by the babel-plugin-add-module-exports plugin.
-     * See: https://github.com/59naga/babel-plugin-add-module-exports
-     *
-     * This is used when we detect a module using "export default Foo;" to make
-     * sure the transpiled code just returns Foo directly rather than an object
-     * with the default property (i.e. {default: Foo}).
-     *
-     * Note: This means that we can't support modules that combine named exports
-     * with a default export.
-     *
-     * @param {String} path
-     * @param {String} exportObjectName
-     */
-    function addModuleExportsDefaults(path, exportObjectName) {
-        const rootPath = path.findParent(path => {
-            return path.key === 'body' || !path.parentPath;
-        });
-
-        // HACK: `path.node.body.push` instead of path.pushContainer(due doesn't work in Plugin.post).
-        // This is hardcoded to work specifically with AMD.
-        rootPath.node.body.push(template(`return ${exportObjectName}.default`)());
-    }
-
-    return {
-        pre() {
-            this.seenDefine = false;
-            this.addedReturnForDefaultExport = false;
-        },
-        visitor: {
-            // Plugin ordering is only respected if we visit the "Program" node.
-            // See: https://babeljs.io/docs/en/plugins.html#plugin-preset-ordering
-            //
-            // We require this to run after the other AMD module transformation so
-            // let's visit the "Program" node.
-            Program: {
-                exit(path) {
-                    path.traverse({
-                        CallExpression(path) {
-                            // If we find a "define" function call.
-                            if (!this.seenDefine && path.get('callee').isIdentifier({name: 'define'})) {
-                                // We only want to modify the first instance of define that we find.
-                                this.seenDefine = true;
-
-                                // Get the Moodle component for the file being processed.
-                                var moduleName = getModuleNameFromFileName(this.file.opts.filename);
-
-                                // The function signature of `define()` is:
-                                // define = function (name, deps, callback) {...}
-                                // Ensure that if the moduel supplied its own name that it is replaced.
-                                if (path.node.arguments.length > 0) {
-                                    // Ensure that there is only one name.
-                                    if (path.node.arguments[0].type === 'StringLiteral') {
-                                        // eslint-disable-next-line
-                                        console.log(`Replacing module name '${path.node.arguments[0].extra.rawValue}' with ${moduleName}`);
-                                        path.node.arguments.shift();
-                                    }
-                                }
-
-                                // Add the module name as the first argument to the define function.
-                                path.node.arguments.unshift(types.stringLiteral(moduleName));
-                                // Add a space after the define function in the built file so that previous versions
-                                // of Moodle will not try to add the module name to the file when it's being served
-                                // by PHP. This forces the regex in PHP to not match for this file.
-                                path.node.callee.name = 'define ';
-                            }
-
-                            // Check for any Object.defineProperty('exports', 'default') calls.
-                            if (!this.addedReturnForDefaultExport && path.get('callee').matchesPattern('Object.defineProperty')) {
-                                const [identifier, prop] = path.get('arguments');
-                                const objectName = identifier.get('name').node;
-                                const propertyName = prop.get('value').node;
-
-                                if ((objectName === 'exports' || objectName === '_exports') && propertyName === 'default') {
-                                    addModuleExportsDefaults(path, objectName);
-                                    this.addedReturnForDefaultExport = true;
-                                }
-                            }
-                        },
-                        AssignmentExpression(path) {
-                            // Check for an exports.default assignments.
-                            if (
-                                !this.addedReturnForDefaultExport &&
-                                (
-                                    path.get('left').matchesPattern('exports.default') ||
-                                    path.get('left').matchesPattern('_exports.default')
-                                )
-                            ) {
-                                const objectName = path.get('left.object.name').node;
-                                addModuleExportsDefaults(path, objectName);
-                                this.addedReturnForDefaultExport = true;
-                            }
-                        }
-                    }, this);
-                }
-            }
-        }
-    };
-};
@@ -1,243 +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/>.
-
-/**
- * Helper functions for working with Moodle component names, directories, and sources.
- *
- * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-"use strict";
-/* eslint-env node */
-
-/** @var {Object} A list of subsystems in Moodle */
-const componentData = {};
-
-/**
- * Load details of all moodle modules.
- *
- * @returns {object}
- */
-const fetchComponentData = () => {
-    const fs = require('fs');
-    const path = require('path');
-    const glob = require('glob');
-    const gruntFilePath = process.cwd();
-
-    if (!Object.entries(componentData).length) {
-        componentData.subsystems = {};
-        componentData.pathList = [];
-
-        // Fetch the component definiitions from the distributed JSON file.
-        const components = JSON.parse(fs.readFileSync(`${gruntFilePath}/lib/components.json`));
-
-        // Build the list of moodle subsystems.
-        componentData.subsystems.lib = 'core';
-        componentData.pathList.push(process.cwd() + path.sep + 'lib');
-        for (const [component, thisPath] of Object.entries(components.subsystems)) {
-            if (thisPath) {
-                // Prefix "core_" to the front of the subsystems.
-                componentData.subsystems[thisPath] = `core_${component}`;
-                componentData.pathList.push(process.cwd() + path.sep + thisPath);
-            }
-        }
-
-        // The list of components incldues the list of subsystems.
-        componentData.components = componentData.subsystems;
-
-        // Go through each of the plugintypes.
-        Object.entries(components.plugintypes).forEach(([pluginType, pluginTypePath]) => {
-            // We don't allow any code in this place..?
-            glob.sync(`${pluginTypePath}/*/version.php`).forEach(versionPath => {
-                const componentPath = fs.realpathSync(path.dirname(versionPath));
-                const componentName = path.basename(componentPath);
-                const frankenstyleName = `${pluginType}_${componentName}`;
-                componentData.components[`${pluginTypePath}/${componentName}`] = frankenstyleName;
-                componentData.pathList.push(componentPath);
-
-                // Look for any subplugins.
-                const subPluginConfigurationFile = `${componentPath}/db/subplugins.json`;
-                if (fs.existsSync(subPluginConfigurationFile)) {
-                    const subpluginList = JSON.parse(fs.readFileSync(fs.realpathSync(subPluginConfigurationFile)));
-
-                    Object.entries(subpluginList.plugintypes).forEach(([subpluginType, subpluginTypePath]) => {
-                        glob.sync(`${subpluginTypePath}/*/version.php`).forEach(versionPath => {
-                            const componentPath = fs.realpathSync(path.dirname(versionPath));
-                            const componentName = path.basename(componentPath);
-                            const frankenstyleName = `${subpluginType}_${componentName}`;
-
-                            componentData.components[`${subpluginTypePath}/${componentName}`] = frankenstyleName;
-                            componentData.pathList.push(componentPath);
-                        });
-                    });
-                }
-            });
-        });
-
-    }
-
-    return componentData;
-};
-
-/**
- * Get the list of component paths.
- *
- * @param   {string} relativeTo
- * @returns {array}
- */
-const getComponentPaths = (relativeTo = '') => fetchComponentData().pathList.map(componentPath => {
-    return componentPath.replace(relativeTo, '');
-});
-
-/**
- * Get the list of paths to build AMD sources.
- *
- * @returns {Array}
- */
-const getAmdSrcGlobList = () => {
-    const globList = [];
-    fetchComponentData().pathList.forEach(componentPath => {
-        globList.push(`${componentPath}/amd/src/*.js`);
-        globList.push(`${componentPath}/amd/src/**/*.js`);
-    });
-
-    return globList;
-};
-
-/**
- * Get the list of paths to build YUI sources.
- *
- * @param {String} relativeTo
- * @returns {Array}
- */
-const getYuiSrcGlobList = relativeTo => {
-    const globList = [];
-    fetchComponentData().pathList.forEach(componentPath => {
-        const relativeComponentPath = componentPath.replace(relativeTo, '');
-        globList.push(`${relativeComponentPath}/yui/src/**/*.js`);
-    });
-
-    return globList;
-};
-
-/**
- * Get the list of paths to thirdpartylibs.xml.
- *
- * @param {String} relativeTo
- * @returns {Array}
- */
-const getThirdPartyLibsList = relativeTo => {
-    const fs = require('fs');
-    const path = require('path');
-
-    return fetchComponentData().pathList
-        .map(componentPath => path.relative(relativeTo, componentPath) + '/thirdpartylibs.xml')
-        .map(componentPath => componentPath.replace(/\\/g, '/'))
-        .filter(path => fs.existsSync(path))
-        .sort();
-};
-
-/**
- * Get the list of thirdparty library paths.
- *
- * @returns {array}
- */
-const getThirdPartyPaths = () => {
-    const DOMParser = require('xmldom').DOMParser;
-    const fs = require('fs');
-    const path = require('path');
-    const xpath = require('xpath');
-
-    const thirdpartyfiles = getThirdPartyLibsList(fs.realpathSync('./'));
-    const libs = ['node_modules/', 'vendor/'];
-
-    const addLibToList = lib => {
-        if (!lib.match('\\*') && fs.statSync(lib).isDirectory()) {
-            // Ensure trailing slash on dirs.
-            lib = lib.replace(/\/?$/, '/');
-        }
-
-        // Look for duplicate paths before adding to array.
-        if (libs.indexOf(lib) === -1) {
-            libs.push(lib);
-        }
-    };
-
-    thirdpartyfiles.forEach(function(file) {
-        const dirname = path.dirname(file);
-
-        const xmlContent = fs.readFileSync(file, 'utf8');
-        const doc = new DOMParser().parseFromString(xmlContent);
-        const nodes = xpath.select("/libraries/library/location/text()", doc);
-
-        nodes.forEach(function(node) {
-            let lib = path.posix.join(dirname, node.toString());
-            addLibToList(lib);
-        });
-    });
-
-    return libs;
-
-};
-
-/**
- * Find the name of the component matching the specified path.
- *
- * @param {String} path
- * @returns {String|null} Name of matching component.
- */
-const getComponentFromPath = path => {
-    const componentList = fetchComponentData().components;
-
-    if (componentList.hasOwnProperty(path)) {
-        return componentList[path];
-    }
-
-    return null;
-};
-
-/**
- * Check whether the supplied path, relative to the Gruntfile.js, is in a known component.
- *
- * @param {String} checkPath The path to check. This can be with either Windows, or Linux directory separators.
- * @returns {String|null}
- */
-const getOwningComponentDirectory = checkPath => {
-    const path = require('path');
-
-    // Fetch all components into a reverse sorted array.
-    // This ensures that components which are within the directory of another component match first.
-    const pathList = Object.keys(fetchComponentData().components).sort().reverse();
-    for (const componentPath of pathList) {
-        // If the componentPath is the directory being checked, it will be empty.
-        // If the componentPath is a parent of the directory being checked, the relative directory will not start with ..
-        if (!path.relative(componentPath, checkPath).startsWith('..')) {
-            return componentPath;
-        }
-    }
-
-    return null;
-};
-
-module.exports = {
-    getAmdSrcGlobList,
-    getComponentFromPath,
-    getComponentPaths,
-    getOwningComponentDirectory,
-    getYuiSrcGlobList,
-    getThirdPartyLibsList,
-    getThirdPartyPaths,
-};
@@ -1,19 +0,0 @@
-# Moodle JavaScript Documentation
-
-```
-                                 .-..-.
-   _____                         | || |
-  /____/-.---_  .---.  .---.  .-.| || | .---.
-  | |  _   _  |/  _  \/  _  \/  _  || |/  __ \
-  * | | | | | || |_| || |_| || |_| || || |___/
-    |_| |_| |_|\_____/\_____/\_____||_|\_____)
-
-Moodle - the world's open source learning platform
-
-```
-
-## About
-This generated documentation includes API documentation for JavaScript written in the AMD and ES2015 module formats within Moodle.
-
-## Related information
-See [https://docs.moodle.org/dev](https://docs.moodle.org/dev) for other related Developer Documentation.
@@ -1,131 +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/>.
-
-/**
- * Helper functions for working with Moodle component names, directories, and sources.
- *
- * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-"use strict";
-/* eslint-env node */
-
-// Do not include any plugins as stanard.
-const plugins = [];
-
-plugins.push('plugins/markdown');
-
-/**
- * Get the source configuration.
- *
- * @return {Object}
- */
-const getSource = () => {
-    const glob = require('glob');
-    const path = require('path');
-    const ComponentList = require(path.resolve('.grunt/components.js'));
-    const thirdPartyPaths = ComponentList.getThirdPartyPaths();
-
-    const source = {
-        include: [],
-        includePattern: ".+\\.js$",
-    };
-
-    let includeList = [];
-
-    ComponentList.getAmdSrcGlobList().forEach(async pattern => {
-        includeList.push(...glob.sync(pattern));
-    });
-
-    const cwdLength = process.cwd().length + 1;
-    includeList.forEach(path => {
-        if (source.include.indexOf(path) !== -1) {
-            // Ensure no duplicates.
-            return;
-        }
-
-        const relPath = path.substring(cwdLength);
-        if (thirdPartyPaths.indexOf(relPath) !== -1) {
-            return;
-        }
-
-        source.include.push(path);
-    });
-
-    source.include.push('.grunt/jsdoc/README.md');
-    return source;
-};
-
-const tags = {
-    // Allow the use of unknown tags.
-    // We have a lot of legacy uses of these.
-    allowUnknownTags: true,
-
-    // We make use of jsdoc and closure dictionaries as standard.
-    dictionaries: [
-        'jsdoc',
-        'closure',
-    ],
-};
-
-// Template configuraiton.
-const templates = {
-    cleverLinks: false,
-    monospaceLinks: false,
-};
-
-module.exports = {
-    opts: {
-        destination: "./jsdoc/",
-        template: "node_modules/docdash",
-    },
-    plugins,
-    recurseDepth: 10,
-    source: getSource(),
-    sourceType: 'module',
-    tags,
-    templates,
-    docdash: {
-        collapse: true,
-        search: true,
-        sort: true,
-        sectionOrder: [
-            "Namespaces",
-            "Modules",
-            "Events",
-            "Classes",
-            "Externals",
-            "Mixins",
-            "Tutorials",
-            "Interfaces"
-        ],
-        "menu": {
-            "Developer Docs": {
-                href: "https://docs.moodle.org/dev",
-                target: "_blank",
-                "class": "menu-item",
-                id: "devdocs"
-            },
-            "MDN Docs": {
-                href: "https://developer.mozilla.org/en-US/docs/Web/JavaScript",
-                target: "_blank",
-                "class": "menu-item",
-                id: "mdndocs",
-            },
-        },
-        typedefs: true,
-    },
-};
@@ -1,64 +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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-    const files = grunt.moodleEnv.files;
-
-    // Project configuration.
-    grunt.config.merge({
-        eslint: {
-            // Even though warnings dont stop the build we don't display warnings by default because
-            // at this moment we've got too many core warnings.
-            // To display warnings call: grunt eslint --show-lint-warnings
-            // To fail on warnings call: grunt eslint --max-lint-warnings=0
-            // Also --max-lint-warnings=-1 can be used to display warnings but not fail.
-            options: {
-                quiet: (!grunt.option('show-lint-warnings')) && (typeof grunt.option('max-lint-warnings') === 'undefined'),
-                maxWarnings: ((typeof grunt.option('max-lint-warnings') !== 'undefined') ? grunt.option('max-lint-warnings') : -1)
-            },
-
-            // Check AMD src files.
-            amd: {src: files ? files : grunt.moodleEnv.amdSrc},
-
-            // Check YUI module source files.
-            yui: {src: files ? files : grunt.moodleEnv.yuiSrc},
-        },
-    });
-
-    grunt.loadNpmTasks('grunt-eslint');
-
-    // On watch, we dynamically modify config to build only affected files. This
-    // method is slightly complicated to deal with multiple changed files at once (copied
-    // from the grunt-contrib-watch readme).
-    let changedFiles = Object.create(null);
-    const onChange = grunt.util._.debounce(function() {
-        const files = Object.keys(changedFiles);
-        grunt.config('eslint.amd.src', files);
-        grunt.config('eslint.yui.src', files);
-        changedFiles = Object.create(null);
-    }, 200);
-
-    grunt.event.on('watch', (action, filepath) => {
-        changedFiles[filepath] = action;
-        onChange();
-    });
-};
@@ -1,89 +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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-    /**
-     * Get the list of feature files to pass to the gherkin linter.
-     *
-     * @returns {Array}
-     */
-    const getGherkinLintTargets = () => {
-        if (grunt.moodleEnv.files) {
-            // Specific files were requested. Only check these.
-            return grunt.moodleEnv.files;
-        }
-
-        if (grunt.moodleEnv.inComponent) {
-            return [`${grunt.moodleEnv.runDir}/tests/behat/*.feature`];
-        }
-
-        return ['**/tests/behat/*.feature'];
-    };
-
-    const handler = function() {
-        const done = this.async();
-        const options = grunt.config('gherkinlint.options');
-
-        // Grab the gherkin-lint linter and required scaffolding.
-        const linter = require('gherkin-lint/dist/linter.js');
-        const featureFinder = require('gherkin-lint/dist/feature-finder.js');
-        const configParser = require('gherkin-lint/dist/config-parser.js');
-        const formatter = require('gherkin-lint/dist/formatters/stylish.js');
-
-        // Run the linter.
-        return linter.lint(
-            featureFinder.getFeatureFiles(grunt.file.expand(options.files)),
-            configParser.getConfiguration(configParser.defaultConfigFileName)
-        )
-        .then(results => {
-            // Print the results out uncondtionally.
-            formatter.printResults(results);
-
-            return results;
-        })
-        .then(results => {
-            // Report on the results.
-            // The done function takes a bool whereby a falsey statement causes the task to fail.
-            return results.every(result => result.errors.length === 0);
-        })
-        .then(done); // eslint-disable-line promise/no-callback-in-promise
-    };
-
-    grunt.registerTask('gherkinlint', 'Run gherkinlint against the current directory', handler);
-
-    grunt.config.set('gherkinlint', {
-        options: {
-            files: getGherkinLintTargets(),
-        }
-    });
-
-    grunt.config.merge({
-        watch: {
-            gherkinlint: {
-                files: [grunt.moodleEnv.inComponent ? 'tests/behat/*.feature' : '**/tests/behat/*.feature'],
-                tasks: ['gherkinlint'],
-            },
-        },
-    });
-
-    return handler;
-};
@@ -1,99 +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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-
-    /**
-     * Generate the PHPCS configuration.
-     *
-     * @param {Object} thirdPartyPaths
-     */
-    const phpcsIgnore = (thirdPartyPaths) => {
-        const {toXML} = require('jstoxml');
-
-        const config = {
-            _name: 'ruleset',
-            _attrs: {
-                name: "MoodleCore",
-            },
-            _content: [
-                {
-                    rule: {
-                        _attrs: {
-                            ref: './.phpcs.xml.dist',
-                        },
-                    },
-                },
-            ],
-        };
-
-        thirdPartyPaths.forEach(library => {
-            config._content.push({
-                'exclude-pattern': library,
-            });
-        });
-
-        grunt.file.write('.phpcs.xml', toXML(config, {
-            header: true,
-            indent: '  ',
-        }) + "\n");
-    };
-
-    /**
-     * Generate ignore files (utilising thirdpartylibs.xml data)
-     */
-    const handler = function() {
-        const path = require('path');
-        const ComponentList = require(path.join(process.cwd(), '.grunt', 'components.js'));
-
-        // An array of paths to third party directories.
-        const thirdPartyPaths = ComponentList.getThirdPartyPaths();
-
-        // Generate .eslintignore.
-        const eslintIgnores = [
-            '# Generated by "grunt ignorefiles"',
-            // Do not ignore the .grunt directory.
-            '!/.grunt',
-
-            // Ignore all yui/src meta directories and build directories.
-            '*/**/yui/src/*/meta/',
-            '*/**/build/',
-        ].concat(thirdPartyPaths);
-        grunt.file.write('.eslintignore', eslintIgnores.join('\n') + '\n');
-
-        // Generate .stylelintignore.
-        const stylelintIgnores = [
-            '# Generated by "grunt ignorefiles"',
-            '**/yui/build/*',
-            'theme/boost/style/moodle.css',
-            'theme/classic/style/moodle.css',
-            'jsdoc/styles/*.css',
-        ].concat(thirdPartyPaths);
-        grunt.file.write('.stylelintignore', stylelintIgnores.join('\n') + '\n');
-
-        phpcsIgnore(thirdPartyPaths);
-    };
-
-    grunt.registerTask('ignorefiles', 'Generate ignore files for linters', handler);
-
-    return handler;
-};
@@ -1,222 +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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-/**
- * Function to generate the destination for the uglify task
- * (e.g. build/file.min.js). This function will be passed to
- * the rename property of files array when building dynamically:
- * http://gruntjs.com/configuring-tasks#building-the-files-object-dynamically
- *
- * @param {String} destPath the current destination
- * @param {String} srcPath the  matched src path
- * @return {String} The rewritten destination path.
- */
-
-const babelRename = function(destPath, srcPath) {
-    destPath = srcPath.replace('src', 'build');
-    destPath = destPath.replace('.js', '.min.js');
-    return destPath;
-};
-
-module.exports = grunt => {
-    // Load the Ignorefiles tasks.
-    require('./ignorefiles')(grunt);
-
-    // Load the Shifter tasks.
-    require('./shifter')(grunt);
-
-    // Load ESLint.
-    require('./eslint')(grunt);
-
-    // Load JSDoc.
-    require('./jsdoc')(grunt);
-
-    const path = require('path');
-
-    // Register JS tasks.
-    grunt.registerTask('yui', ['eslint:yui', 'shifter']);
-    grunt.registerTask('amd', ['ignorefiles', 'eslint:amd', 'rollup']);
-    grunt.registerTask('js', ['amd', 'yui']);
-
-    // Register NPM tasks.
-    grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-rollup');
-
-    const babelTransform = require('@babel/core').transform;
-    const babel = (options = {}) => {
-        return {
-            name: 'babel',
-
-            transform: (code, id) => {
-                grunt.log.debug(`Transforming ${id}`);
-                options.filename = id;
-                const transformed = babelTransform(code, options);
-
-                return {
-                    code: transformed.code,
-                    map: transformed.map
-                };
-            }
-        };
-    };
-
-    // Note: We have to use a rate limit plugin here because rollup runs all tasks asynchronously and in parallel.
-    // When we kick off a full run, if we kick off a rollup of every file this will fork-bomb the machine.
-    // To work around this we use a concurrent Promise queue based on the number of available processors.
-    const rateLimit = () => {
-        const queue = [];
-        let queueRunner;
-
-        const startQueue = () => {
-            if (queueRunner) {
-                return;
-            }
-
-            queueRunner = setTimeout(() => {
-                const limit = Math.max(1, require('os').cpus().length / 2);
-                grunt.log.debug(`Starting rollup with queue size of ${limit}`);
-                runQueue(limit);
-            }, 100);
-        };
-
-        // The queue runner will run the next `size` items in the queue.
-        const runQueue = (size = 1) => {
-            queue.splice(0, size).forEach(resolve => {
-                resolve();
-            });
-        };
-
-        return {
-            name: 'ratelimit',
-
-            // The options hook is run in parallel.
-            // We can return an unresolved Promise which is queued for later resolution.
-            options: async() => {
-                return new Promise(resolve => {
-                    queue.push(resolve);
-                    startQueue();
-                });
-            },
-
-            // When an item in the queue completes, start the next item in the queue.
-            buildEnd: () => {
-                runQueue();
-            },
-        };
-    };
-
-    const terser = require('rollup-plugin-terser').terser;
-    grunt.config.merge({
-        rollup: {
-            options: {
-                format: 'esm',
-                dir: 'output',
-                sourcemap: true,
-                treeshake: false,
-                context: 'window',
-                plugins: [
-                    rateLimit(),
-                    babel({
-                        sourceMaps: true,
-                        comments: false,
-                        compact: false,
-                        plugins: [
-                            'transform-es2015-modules-amd-lazy',
-                            'system-import-transformer',
-                            // This plugin modifies the Babel transpiling for "export default"
-                            // so that if it's used then only the exported value is returned
-                            // by the generated AMD module.
-                            //
-                            // It also adds the Moodle plugin name to the AMD module definition
-                            // so that it can be imported as expected in other modules.
-                            path.resolve('.grunt/babel-plugin-add-module-to-define.js'),
-                            '@babel/plugin-syntax-dynamic-import',
-                            '@babel/plugin-syntax-import-meta',
-                            ['@babel/plugin-proposal-class-properties', {'loose': false}],
-                            '@babel/plugin-proposal-json-strings'
-                        ],
-                        presets: [
-                            ['@babel/preset-env', {
-                                targets: {
-                                    browsers: [
-                                        ">0.25%",
-                                        "last 2 versions",
-                                        "not ie <= 10",
-                                        "not op_mini all",
-                                        "not Opera > 0",
-                                        "not dead"
-                                    ]
-                                },
-                                modules: false,
-                                useBuiltIns: false
-                            }]
-                        ]
-                    }),
-
-                    terser({
-                        // Do not mangle variables.
-                        // Makes debugging easier.
-                        mangle: false,
-                    }),
-                ],
-            },
-            dist: {
-                files: [{
-                    expand: true,
-                    src: grunt.moodleEnv.files ? grunt.moodleEnv.files : grunt.moodleEnv.amdSrc,
-                    rename: babelRename
-                }],
-            },
-        },
-    });
-
-    grunt.config.merge({
-        watch: {
-            amd: {
-                files: grunt.moodleEnv.inComponent
-                    ? ['amd/src/*.js', 'amd/src/**/*.js']
-                    : ['**/amd/src/**/*.js'],
-                tasks: ['amd']
-            },
-        },
-    });
-
-    // On watch, we dynamically modify config to build only affected files. This
-    // method is slightly complicated to deal with multiple changed files at once (copied
-    // from the grunt-contrib-watch readme).
-    let changedFiles = Object.create(null);
-    const onChange = grunt.util._.debounce(function() {
-        const files = Object.keys(changedFiles);
-        grunt.config('rollup.dist.files', [{expand: true, src: files, rename: babelRename}]);
-        changedFiles = Object.create(null);
-    }, 200);
-
-    grunt.event.on('watch', function(action, filepath) {
-        changedFiles[filepath] = action;
-        onChange();
-    });
-
-    return {
-        babelRename,
-    };
-};
@@ -1,36 +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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-    // Project configuration.
-    grunt.config.merge({
-        jsdoc: {
-            dist: {
-                options: {
-                    configure: ".grunt/jsdoc/jsdoc.conf.js",
-                },
-            },
-        },
-    });
-
-    grunt.loadNpmTasks('grunt-jsdoc');
-};
@@ -1,40 +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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-    grunt.loadNpmTasks('grunt-sass');
-
-    grunt.config.merge({
-        sass: {
-            dist: {
-                files: {
-                    "theme/boost/style/moodle.css": "theme/boost/scss/preset/default.scss",
-                    "theme/classic/style/moodle.css": "theme/classic/scss/classicgrunt.scss"
-                }
-            },
-            options: {
-                implementation: require('node-sass'),
-                includePaths: ["theme/boost/scss/", "theme/classic/scss/"]
-            }
-        },
-    });
-};
@@ -1,155 +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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-/* eslint-env node */
-
-module.exports = grunt => {
-    /**
-     * Shifter task. Is configured with a path to a specific file or a directory,
-     * in the case of a specific file it will work out the right module to be built.
-     *
-     * Note that this task runs the invidiaul shifter jobs async (becase it spawns
-     * so be careful to to call done().
-     */
-    const handler = function() {
-        const done = this.async();
-        const options = grunt.config('shifter.options');
-        const async = require('async');
-        const path = require('path');
-
-        // Run the shifter processes one at a time to avoid confusing output.
-        async.eachSeries(options.paths, function(src, filedone) {
-            var args = [];
-            args.push(path.normalize(process.cwd() + '/node_modules/shifter/bin/shifter'));
-
-            // Always ignore the node_modules directory.
-            args.push('--excludes', 'node_modules');
-
-            // Determine the most appropriate options to run with based upon the current location.
-            if (grunt.file.isMatch('**/yui/**/*.js', src)) {
-                // When passed a JS file, build our containing module (this happen with
-                // watch).
-                grunt.log.debug('Shifter passed a specific JS file');
-                src = path.dirname(path.dirname(src));
-                options.recursive = false;
-            } else if (grunt.file.isMatch('**/yui/src', src)) {
-                // When in a src directory --walk all modules.
-                grunt.log.debug('In a src directory');
-                args.push('--walk');
-                options.recursive = false;
-            } else if (grunt.file.isMatch('**/yui/src/*', src)) {
-                // When in module, only build our module.
-                grunt.log.debug('In a module directory');
-                options.recursive = false;
-            } else if (grunt.file.isMatch('**/yui/src/*/js', src)) {
-                // When in module src, only build our module.
-                grunt.log.debug('In a source directory');
-                src = path.dirname(src);
-                options.recursive = false;
-            }
-
-            if (grunt.option('watch')) {
-                grunt.fail.fatal('The --watch option has been removed, please use `grunt watch` instead');
-            }
-
-            // Add the stderr option if appropriate
-            if (grunt.option('verbose')) {
-                args.push('--lint-stderr');
-            }
-
-            if (grunt.option('no-color')) {
-                args.push('--color=false');
-            }
-
-            var execShifter = function() {
-
-                grunt.log.ok("Running shifter on " + src);
-                grunt.util.spawn({
-                    cmd: "node",
-                    args: args,
-                    opts: {cwd: src, stdio: 'inherit', env: process.env}
-                }, function(error, result, code) {
-                    if (code) {
-                        grunt.fail.fatal('Shifter failed with code: ' + code);
-                    } else {
-                        grunt.log.ok('Shifter build complete.');
-                        filedone();
-                    }
-                });
-            };
-
-            // Actually run shifter.
-            if (!options.recursive) {
-                execShifter();
-            } else {
-                // Check that there are yui modules otherwise shifter ends with exit code 1.
-                if (grunt.file.expand({cwd: src}, '**/yui/src/**/*.js').length > 0) {
-                    args.push('--recursive');
-                    execShifter();
-                } else {
-                    grunt.log.ok('No YUI modules to build.');
-                    filedone();
-                }
-            }
-        }, done);
-    };
-
-    // Register the shifter task.
-    grunt.registerTask('shifter', 'Run Shifter against the current directory', handler);
-
-    // Configure it.
-    grunt.config.set('shifter', {
-        options: {
-            recursive: true,
-            // Shifter takes a relative path.
-            paths: grunt.moodleEnv.files ? grunt.moodleEnv.files : [grunt.moodleEnv.runDir]
-        }
-    });
-
-    grunt.config.merge({
-        watch: {
-            yui: {
-                files: grunt.moodleEnv.inComponent
-                    ? ['yui/src/*.json', 'yui/src/**/*.js']
-                    : ['**/yui/src/**/*.js'],
-                tasks: ['yui']
-            },
-        },
-    });
-
-    // On watch, we dynamically modify config to build only affected files. This
-    // method is slightly complicated to deal with multiple changed files at once (copied
-    // from the grunt-contrib-watch readme).
-    let changedFiles = Object.create(null);
-    const onChange = grunt.util._.debounce(function() {
-        const files = Object.keys(changedFiles);
-        grunt.config('shifter.options.paths', files);
-        changedFiles = Object.create(null);
-    }, 200);
-
-    grunt.event.on('watch', (action, filepath) => {
-        changedFiles[filepath] = action;
-        onChange();
-    });
-
-    return handler;
-};
@@ -1,48 +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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-    /**
-     * Generate ignore files (utilising thirdpartylibs.xml data)
-     */
-    const handler = function() {
-        const path = require('path');
-
-        // Are we in a YUI directory?
-        if (path.basename(path.resolve(grunt.moodleEnv.cwd, '../../')) == 'yui') {
-            grunt.task.run('yui');
-        // Are we in an AMD directory?
-        } else if (grunt.moodleEnv.inAMD) {
-            grunt.task.run('amd');
-        } else {
-            // Run them all!.
-            grunt.task.run('css');
-            grunt.task.run('js');
-            grunt.task.run('gherkinlint');
-        }
-    };
-
-    // Register the startup task.
-    grunt.registerTask('startup', 'Run the correct tasks for the current directory', handler);
-
-    return handler;
-};
@@ -1,32 +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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-    // Load the ignorefiles tasks.
-    require('./ignorefiles')(grunt);
-
-    // Load the Style Lint tasks.
-    require('./stylelint')(grunt);
-
-    // Load the SASS tasks.
-    require('./sass')(grunt);
-};
@@ -1,183 +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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-
-    const getCssConfigForFiles = files => {
-        return {
-            stylelint: {
-                css: {
-                    // Use a fully-qualified path.
-                    src: files,
-                    options: {
-                        configOverrides: {
-                            rules: {
-                                // These rules have to be disabled in .stylelintrc for scss compat.
-                                "at-rule-no-unknown": true,
-                            }
-                        }
-                    }
-                },
-            },
-        };
-    };
-
-    const getScssConfigForFiles = files => {
-        return {
-            stylelint: {
-                scss: {
-                    options: {syntax: 'scss'},
-                    src: files,
-                },
-            },
-        };
-    };
-
-    /**
-     * Register any stylelint tasks.
-     *
-     * @param {Object} grunt
-     * @param {Array} files
-     * @param {String} fullRunDir
-     */
-    const registerStyleLintTasks = () => {
-        const glob = require('glob');
-
-        // The stylelinters do not handle the case where a configuration was provided but no files were included.
-        // Keep track of whether any files were found.
-        let hasCss = false;
-        let hasScss = false;
-
-        // The stylelint processors do not take a path argument. They always check all provided values.
-        // As a result we must check through each glob and determine if any files match the current directory.
-        const scssFiles = [];
-        const cssFiles = [];
-
-        const requestedFiles = grunt.moodleEnv.files;
-        if (requestedFiles) {
-            // Grunt was called with a files argument.
-            // Check whether each of the requested files matches either the CSS or SCSS source file list.
-
-            requestedFiles.forEach(changedFilePath => {
-                let matchesGlob;
-
-                // Check whether this watched path matches any watched SCSS file.
-                matchesGlob = grunt.moodleEnv.scssSrc.some(watchedPathGlob => {
-                    return glob.sync(watchedPathGlob).indexOf(changedFilePath) !== -1;
-                });
-                if (matchesGlob) {
-                    scssFiles.push(changedFilePath);
-                    hasScss = true;
-                }
-
-                // Check whether this watched path matches any watched CSS file.
-                matchesGlob = grunt.moodleEnv.cssSrc.some(watchedPathGlob => {
-                    return glob.sync(watchedPathGlob).indexOf(changedFilePath) !== -1;
-                });
-                if (matchesGlob) {
-                    cssFiles.push(changedFilePath);
-                    hasCss = true;
-                }
-            });
-        } else {
-            // Grunt was called without a list of files.
-            // The start directory (runDir) may be a child dir of the project.
-            // Check each scssSrc file to see if it's in the start directory.
-            // This means that we can lint just mod/*/styles.css if started in the mod directory.
-
-            grunt.moodleEnv.scssSrc.forEach(path => {
-                if (path.startsWith(grunt.moodleEnv.runDir)) {
-                    scssFiles.push(path);
-                    hasScss = true;
-                }
-            });
-
-            grunt.moodleEnv.cssSrc.forEach(path => {
-                if (path.startsWith(grunt.moodleEnv.runDir)) {
-                    cssFiles.push(path);
-                    hasCss = true;
-                }
-            });
-        }
-
-        // Register the tasks.
-        const scssTasks = ['sass'];
-        if (hasScss) {
-            grunt.config.merge(getScssConfigForFiles(scssFiles));
-            scssTasks.unshift('stylelint:scss');
-        }
-        scssTasks.unshift('ignorefiles');
-
-        const cssTasks = ['ignorefiles'];
-        if (hasCss) {
-            grunt.config.merge(getCssConfigForFiles(cssFiles));
-            cssTasks.push('stylelint:css');
-        }
-
-        // The tasks must be registered, even if empty to ensure a consistent command list.
-        // They jsut won't run anything.
-        grunt.registerTask('scss', scssTasks);
-        grunt.registerTask('rawcss', cssTasks);
-    };
-
-    // Register CSS tasks.
-    grunt.loadNpmTasks('grunt-stylelint');
-
-    // Register the style lint tasks.
-    registerStyleLintTasks();
-    grunt.registerTask('css', ['scss', 'rawcss']);
-
-    const getCoreThemeMatches = () => {
-        const scssMatch = 'scss/**/*.scss';
-
-        if (grunt.moodleEnv.inTheme) {
-            return [scssMatch];
-        }
-
-        if (grunt.moodleEnv.runDir.startsWith('theme')) {
-            return [`*/${scssMatch}`];
-        }
-
-        return [`theme/*/${scssMatch}`];
-    };
-
-    // Add the watch configuration for rawcss, and scss.
-    grunt.config.merge({
-        watch: {
-            rawcss: {
-                files: [
-                    '**/*.css',
-                ],
-                excludes: [
-                    '**/moodle.css',
-                    '**/editor.css',
-                    'jsdoc/styles/*.css',
-                ],
-                tasks: ['rawcss']
-            },
-            scss: {
-                files: getCoreThemeMatches(),
-                tasks: ['scss']
-            },
-        },
-    });
-};
@@ -1,272 +0,0 @@
-/**
- * This is a wrapper task to handle the grunt watch command. It attempts to use
- * Watchman to monitor for file changes, if it's installed, because it's much faster.
- *
- * If Watchman isn't installed then it falls back to the grunt-contrib-watch file
- * watcher for backwards compatibility.
- */
-
-/* eslint-env node */
-
-module.exports = grunt => {
-    /**
-     * This is a wrapper task to handle the grunt watch command. It attempts to use
-     * Watchman to monitor for file changes, if it's installed, because it's much faster.
-     *
-     * If Watchman isn't installed then it falls back to the grunt-contrib-watch file
-     * watcher for backwards compatibility.
-     */
-    const watchHandler = function() {
-        const async = require('async');
-        const watchTaskDone = this.async();
-        let watchInitialised = false;
-        let watchTaskQueue = {};
-        let processingQueue = false;
-
-        const watchman = require('fb-watchman');
-        const watchmanClient = new watchman.Client();
-
-        // Grab the tasks and files that have been queued up and execute them.
-        var processWatchTaskQueue = function() {
-            if (!Object.keys(watchTaskQueue).length || processingQueue) {
-                // If there is nothing in the queue or we're already processing then wait.
-                return;
-            }
-
-            processingQueue = true;
-
-            // Grab all tasks currently in the queue.
-            var queueToProcess = watchTaskQueue;
-            // Reset the queue.
-            watchTaskQueue = {};
-
-            async.forEachSeries(
-                Object.keys(queueToProcess),
-                function(task, next) {
-                    var files = queueToProcess[task];
-                    var filesOption = '--files=' + files.join(',');
-                    grunt.log.ok('Running task ' + task + ' for files ' + filesOption);
-
-                    // Spawn the task in a child process so that it doesn't kill this one
-                    // if it failed.
-                    grunt.util.spawn(
-                        {
-                            // Spawn with the grunt bin.
-                            grunt: true,
-                            // Run from current working dir and inherit stdio from process.
-                            opts: {
-                                cwd: grunt.moodleEnv.fullRunDir,
-                                stdio: 'inherit'
-                            },
-                            args: [task, filesOption]
-                        },
-                        function(err, res, code) {
-                            if (code !== 0) {
-                                // The grunt task failed.
-                                grunt.log.error(err);
-                            }
-
-                            // Move on to the next task.
-                            next();
-                        }
-                    );
-                },
-                function() {
-                    // No longer processing.
-                    processingQueue = false;
-                    // Once all of the tasks are done then recurse just in case more tasks
-                    // were queued while we were processing.
-                    processWatchTaskQueue();
-                }
-            );
-        };
-
-        const originalWatchConfig = grunt.config.get(['watch']);
-        const watchConfig = Object.keys(originalWatchConfig).reduce(function(carry, key) {
-            if (key == 'options') {
-                return carry;
-            }
-
-            const value = originalWatchConfig[key];
-
-            const taskNames = value.tasks;
-            const files = value.files;
-            let excludes = [];
-            if (value.excludes) {
-                excludes = value.excludes;
-            }
-
-            taskNames.forEach(function(taskName) {
-                carry[taskName] = {
-                    files,
-                    excludes,
-                };
-            });
-
-            return carry;
-        }, {});
-
-        watchmanClient.on('error', function(error) {
-            // We have to add an error handler here and parse the error string because the
-            // example way from the docs to check if Watchman is installed doesn't actually work!!
-            // See: https://github.com/facebook/watchman/issues/509
-            if (error.message.match('Watchman was not found')) {
-                // If watchman isn't installed then we should fallback to the other watch task.
-                grunt.log.ok('It is recommended that you install Watchman for better performance using the "watch" command.');
-
-                // Fallback to the old grunt-contrib-watch task.
-                grunt.renameTask('watch-grunt', 'watch');
-                grunt.task.run(['watch']);
-                // This task is finished.
-                watchTaskDone(0);
-            } else {
-                grunt.log.error(error);
-                // Fatal error.
-                watchTaskDone(1);
-            }
-        });
-
-        watchmanClient.on('subscription', function(resp) {
-            if (resp.subscription !== 'grunt-watch') {
-                return;
-            }
-
-            resp.files.forEach(function(file) {
-                grunt.log.ok('File changed: ' + file.name);
-
-                var fullPath = grunt.moodleEnv.fullRunDir + '/' + file.name;
-                Object.keys(watchConfig).forEach(function(task) {
-
-                    const fileGlobs = watchConfig[task].files;
-                    var match = fileGlobs.some(function(fileGlob) {
-                        return grunt.file.isMatch(`**/${fileGlob}`, fullPath);
-                    });
-
-                    if (match) {
-                        // If we are watching a subdirectory then the file.name will be relative
-                        // to that directory. However the grunt tasks  expect the file paths to be
-                        // relative to the Gruntfile.js location so let's normalise them before
-                        // adding them to the queue.
-                        var relativePath = fullPath.replace(grunt.moodleEnv.gruntFilePath + '/', '');
-                        if (task in watchTaskQueue) {
-                            if (!watchTaskQueue[task].includes(relativePath)) {
-                                watchTaskQueue[task] = watchTaskQueue[task].concat(relativePath);
-                            }
-                        } else {
-                            watchTaskQueue[task] = [relativePath];
-                        }
-                    }
-                });
-            });
-
-            processWatchTaskQueue();
-        });
-
-        process.on('SIGINT', function() {
-            // Let the user know that they may need to manually stop the Watchman daemon if they
-            // no longer want it running.
-            if (watchInitialised) {
-                grunt.log.ok('The Watchman daemon may still be running and may need to be stopped manually.');
-            }
-
-            process.exit();
-        });
-
-        // Initiate the watch on the current directory.
-        watchmanClient.command(['watch-project', grunt.moodleEnv.fullRunDir], function(watchError, watchResponse) {
-            if (watchError) {
-                grunt.log.error('Error initiating watch:', watchError);
-                watchTaskDone(1);
-                return;
-            }
-
-            if ('warning' in watchResponse) {
-                grunt.log.error('warning: ', watchResponse.warning);
-            }
-
-            var watch = watchResponse.watch;
-            var relativePath = watchResponse.relative_path;
-            watchInitialised = true;
-
-            watchmanClient.command(['clock', watch], function(clockError, clockResponse) {
-                if (clockError) {
-                    grunt.log.error('Failed to query clock:', clockError);
-                    watchTaskDone(1);
-                    return;
-                }
-
-                // Generate the expression query used by watchman.
-                // Documentation is limited, but see https://facebook.github.io/watchman/docs/expr/allof.html for examples.
-                // We generate an expression to match any value in the files list of all of our tasks, but excluding
-                // all value in the  excludes list of that task.
-                //
-                // [anyof, [
-                //      [allof, [
-                //          [anyof, [
-                //              ['match', validPath, 'wholename'],
-                //              ['match', validPath, 'wholename'],
-                //          ],
-                //          [not,
-                //              [anyof, [
-                //                  ['match', invalidPath, 'wholename'],
-                //                  ['match', invalidPath, 'wholename'],
-                //              ],
-                //          ],
-                //      ],
-                var matchWholeName = fileGlob => ['match', fileGlob, 'wholename'];
-                var matches = Object.keys(watchConfig).map(function(task) {
-                    const matchAll = [];
-                    matchAll.push(['anyof'].concat(watchConfig[task].files.map(matchWholeName)));
-
-                    if (watchConfig[task].excludes.length) {
-                        matchAll.push(['not', ['anyof'].concat(watchConfig[task].excludes.map(matchWholeName))]);
-                    }
-
-                    return ['allof'].concat(matchAll);
-                });
-
-                matches = ['anyof'].concat(matches);
-
-                var sub = {
-                    expression: matches,
-                    // Which fields we're interested in.
-                    fields: ["name", "size", "type"],
-                    // Add our time constraint.
-                    since: clockResponse.clock
-                };
-
-                if (relativePath) {
-                    /* eslint-disable camelcase */
-                    sub.relative_root = relativePath;
-                }
-
-                watchmanClient.command(['subscribe', watch, 'grunt-watch', sub], function(subscribeError) {
-                    if (subscribeError) {
-                        // Probably an error in the subscription criteria.
-                        grunt.log.error('failed to subscribe: ', subscribeError);
-                        watchTaskDone(1);
-                        return;
-                    }
-
-                    grunt.log.ok('Listening for changes to files in ' + grunt.moodleEnv.fullRunDir);
-                });
-            });
-        });
-    };
-
-    // Rename the grunt-contrib-watch "watch" task because we're going to wrap it.
-    grunt.renameTask('watch', 'watch-grunt');
-
-    // Register the new watch handler.
-    grunt.registerTask('watch', 'Run tasks on file changes', watchHandler);
-
-    grunt.config.merge({
-        watch: {
-            options: {
-                nospawn: true // We need not to spawn so config can be changed dynamically.
-            },
-        },
-    });
-
-    return watchHandler;
-};
@@ -1 +1 @@
-lts/gallium
+v8.16.1
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ruleset name="MoodleCore">
-  <rule ref="moodle"/>
-</ruleset>
@@ -0,0 +1,91 @@
+# Generated by "grunt ignorefiles"
+**/yui/build/*
+theme/boost/style/moodle.css
+theme/classic/style/moodle.css
+node_modules/
+vendor/
+admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.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
+lib/editor/tinymce/tiny_mce/
+lib/mlbackend/php/phpml/
+lib/adodb/
+lib/bennu/
+lib/evalmath/
+lib/phpspreadsheet/
+lib/google/
+lib/htmlpurifier/
+lib/jabber/
+lib/minify/matthiasmullie-minify/
+lib/minify/matthiasmullie-pathconverter/
+lib/pear/HTML/Common.php
+lib/pear/HTML/QuickForm.php
+lib/pear/HTML/QuickForm/
+lib/pear/PEAR.php
+lib/phpmailer/
+lib/simplepie/
+lib/tcpdf/
+lib/typo3/
+lib/yuilib/
+lib/yuilib/gallery/
+lib/jquery/
+lib/html2text/
+lib/markdown/
+lib/xhprof/
+lib/horde/
+lib/requirejs/
+lib/amd/src/loglevel.js
+lib/mustache/
+lib/amd/src/mustache.js
+lib/graphlib.php
+lib/php-css-parser/
+lib/rtlcss/
+lib/scssphp/
+lib/spout/
+lib/amd/src/chartjs-lazy.js
+lib/maxmind/GeoIp2/
+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/
+lib/babel-polyfill/
+lib/mdn-polyfills/
+lib/emoji-data/
+lib/h5p/
+media/player/videojs/amd/src/video-lazy.js
+media/player/videojs/amd/src/Youtube-lazy.js
+media/player/videojs/videojs/
+media/player/videojs/amd/src/videojs-flash-lazy.js
+media/player/videojs/videojs/video-js.swf
+mod/assign/feedback/editpdf/fpdi/
+repository/s3/S3.php
+theme/boost/scss/bootstrap/
+theme/boost/amd/src/alert.js
+theme/boost/amd/src/button.js
+theme/boost/amd/src/carousel.js
+theme/boost/amd/src/collapse.js
+theme/boost/amd/src/dropdown.js
+theme/boost/amd/src/index.js
+theme/boost/amd/src/modal.js
+theme/boost/amd/src/popover.js
+theme/boost/amd/src/sanitizer.js
+theme/boost/amd/src/scrollspy.js
+theme/boost/amd/src/tab.js
+theme/boost/amd/src/toast.js
+theme/boost/amd/src/tooltip.js
+theme/boost/amd/src/util.js
+theme/boost/amd/src/tether.js
+theme/boost/scss/fontawesome/
@@ -2,65 +2,58 @@
 # process (which uses our internal CI system) this file is here for the benefit
 # of community developers git clones - see MDL-51458.

+sudo: required
+
+# We currently disable Travis notifications entirely until https://github.com/travis-ci/travis-ci/issues/4976
+# is fixed.
 notifications:
-  email:
-    if: env(MOODLE_EMAIL) != no
+  email: false

 language: php

-os: linux
-
-dist: bionic
+dist: xenial

 services:
    - mysql
-    - docker
+
+php:
+    # We only run the highest and lowest supported versions to reduce the load on travis-ci.org.
+    - 7.3
+    - 7.1.30 # Make this sticky because current default version (7.1.11) has a bug with redis-extension output (MDL-66062)

 addons:
  postgresql: "9.6"

-branches:
-  except:
-    - master
-    - /MOODLE_[0-9]+_STABLE/
-    - /^v[0-9]+\.[0-9]+\.[0-9]+.*/
+env:
+    # Although we want to run these jobs and see failures as quickly as possible, we also want to get the slowest job to
+    # start first so that the total run time is not too high.
+    #
+    # We only run MySQL on PHP 7.2, so run that first.
+    # CI Tests should be second-highest in priority as these only take <= 60 seconds to run under normal circumstances.
+    # Postgres is significantly is pretty reasonable in its run-time.

-jobs:
+    # Run CI Tests without running PHPUnit.
+    - DB=none     TASK=CITEST
+
+    # Run unit tests on Postgres
+    - DB=pgsql    TASK=PHPUNIT
+
+    # Perform an upgrade test too.
+    - DB=pgsql    TASK=UPGRADE
+
+matrix:
    # Enable fast finish.
    # This will fail the build if a single job fails (except those in allow_failures).
    # It will not stop the jobs from running.
    fast_finish: true

    include:
-        # First all the lowest php ones (7.3)
+          # Run mysql only on 7.3 - it's just too slow
        - php: 7.3
-          env: DB=none     TASK=CITEST
-        - php: 7.3
-          env: DB=none     TASK=GRUNT    NVM_VERSION='lts/gallium'
-
-        - if: env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present
-          php: 7.3
-          env: DB=pgsql    TASK=PHPUNIT
-
-        - if: env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all"
-          php: 7.3
-          env: DB=mysqli   TASK=PHPUNIT
-
-        # Then, conditionally, all the highest php ones (8.0)
-        - if: env(MOODLE_PHP) = "all"
-          php: 8.0
-          env: DB=none     TASK=CITEST
-        - if: env(MOODLE_PHP) = "all"
-          php: 8.0
-          env: DB=none     TASK=GRUNT    NVM_VERSION='lts/gallium'
-
-        - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present)
-          php: 8.0
-          env: DB=pgsql    TASK=PHPUNIT
-
-        - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all")
-          php: 8.0
          env: DB=mysqli   TASK=PHPUNIT
+          # 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'

 cache:
    directories:
@@ -68,9 +61,8 @@ cache:
      - $HOME/.npm

 before_install:
-    - docker run -d -p 127.0.0.1:8080:80 --name exttests moodlehq/moodle-exttests
    # Avoid IPv6 default binding as service (causes redis not to start).
-    - sudo service redis-server start --bind 127.0.0.1
+    sudo service redis-server start --bind 127.0.0.1

 install:
    - >
@@ -118,11 +110,9 @@ install:
        fi

 before_script:
-    - if [[ ${TRAVIS_PHP_VERSION:0:1} -gt 7 ]]; then pecl install xmlrpc-beta; fi
-    - echo 'max_input_vars=5000' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
    - phpenv config-rm xdebug.ini
    - >
-      if [ "$TASK" = 'PHPUNIT' ];
+      if [ "$TASK" = 'PHPUNIT' -o "$TASK" = 'UPGRADE' ];
      then
        # Copy generic configuration in place.
        cp config-dist.php config.php ;
@@ -179,19 +169,14 @@ before_script:
          -e "/require_once/i \\\$CFG->phpunit_dataroot = '\/home\/travis\/roots\/phpunit';" \
          -e "/require_once/i \\\$CFG->phpunit_prefix = 'p_';" \
          config.php ;
-        # Enable test external resources
-        sed -i \
-          -e "/require_once/i \\define('TEST_EXTERNAL_FILES_HTTP_URL', 'http://127.0.0.1:8080');" \
-          -e "/require_once/i \\define('TEST_EXTERNAL_FILES_HTTPS_URL', 'http://127.0.0.1:8080');" \
-          config.php ;
-
        # Redis cache store tests
        sed -i \
          -e "/require_once/i \\define('TEST_CACHESTORE_REDIS_TESTSERVERS', '127.0.0.1');" \
          config.php ;
-        # Redis session tests
+        # Redis session tests, but not for PHP 7.2 and up. See MDL-60978 for more info.
+        redissession="define('TEST_SESSION_REDIS_HOST', '127.0.0.1');"
        sed -i \
-          -e "/require_once/i \\define('TEST_SESSION_REDIS_HOST', '127.0.0.1');" \
+          -e "/require_once/i \\${redissession}" \
          config.php ;

        # Initialise PHPUnit for Moodle.
@@ -221,7 +206,7 @@ before_script:
        # We need the official upstream for comparison
        git remote add upstream https://github.com/moodle/moodle.git;

-        git fetch upstream MOODLE_311_STABLE;
+        git fetch upstream MOODLE_38_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`
@@ -232,6 +217,32 @@ before_script:
        export phpcmd=`which php`;
      fi

+    ########################################################################
+    # Upgrade test
+    ########################################################################
+    - >
+      if [ "$TASK" = 'UPGRADE' ];
+      then
+        # We need the official upstream.
+        git remote add upstream https://github.com/moodle/moodle.git;
+
+        # Checkout 30 STABLE branch (the first version compatible with PHP 7.x)
+        git fetch upstream MOODLE_30_STABLE;
+        git checkout MOODLE_30_STABLE;
+
+        # Perform the upgrade
+        php admin/cli/install_database.php --agree-license --adminpass=Password --adminemail=admin@example.com --fullname="Upgrade test" --shortname=Upgrade;
+
+        # Return to the previous commit
+        git checkout -;
+
+        # Perform the upgrade
+        php admin/cli/upgrade.php --non-interactive --allow-unstable ;
+
+        # The local_ci repository can be used to check upgrade savepoints.
+        git clone https://github.com/moodlehq/moodle-local_ci.git local/ci ;
+      fi
+
 script:
    - >
      if [ "$TASK" = 'PHPUNIT' ];
@@ -257,10 +268,19 @@ script:
        git diff --cached --exit-code ;
      fi

-after_script:
+    ########################################################################
+    # Upgrade test
+    ########################################################################
    - >
-      if [ "$TASK" = 'PHPUNIT' ];
+      if [ "$TASK" = 'UPGRADE' ];
      then
-        EXTTESTS_HITS=$(docker logs exttests 2>&1 | grep -Fv -e 'AH00558' -e '[pid 1]' | wc -l)
-        echo -e "\nTest local resources number of hits: ${EXTTESTS_HITS}.\n"
+        cp local/ci/check_upgrade_savepoints/check_upgrade_savepoints.php ./check_upgrade_savepoints.php
+        result=`php check_upgrade_savepoints.php`;
+        # Check if there are problems
+        count=`echo "$result" | grep -P "ERROR|WARN" | wc -l` ;
+        if (($count > 0));
+        then
+          echo "$result"
+          exit 1 ;
+        fi
      fi
@@ -16,200 +16,26 @@
 /* eslint-env node */

 /**
- * Grunt configuration for Moodle.
- *
 * @copyright  2014 Andrew Nicols
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

 /**
- * Setup the Grunt Moodle environment.
- *
- * @param   {Grunt} grunt
- * @returns {Object}
+ * Grunt configuration
 */
-const setupMoodleEnvironment = grunt => {
-    const fs = require('fs');
-    const path = require('path');
-    const ComponentList = require(path.join(process.cwd(), '.grunt', 'components.js'));

-    const getAmdConfiguration = () => {
-        // If the cwd is the amd directory in the current component then it will be empty.
-        // If the cwd is a child of the component's AMD directory, the relative directory will not start with ..
-        let inAMD = !path.relative(`${componentDirectory}/amd`, cwd).startsWith('..');
-
-        // Globbing pattern for matching all AMD JS source files.
-        let amdSrc = [];
-        if (inComponent) {
-            amdSrc.push(
-                componentDirectory + "/amd/src/*.js",
-                componentDirectory + "/amd/src/**/*.js"
-            );
-        } else {
-            amdSrc = ComponentList.getAmdSrcGlobList();
-        }
-
-        return {
-            inAMD,
-            amdSrc,
-        };
-    };
-
-    const getYuiConfiguration = () => {
-        let yuiSrc = [];
-        if (inComponent) {
-            yuiSrc.push(componentDirectory + "/yui/src/**/*.js");
-        } else {
-            yuiSrc = ComponentList.getYuiSrcGlobList(gruntFilePath + '/');
-        }
-
-        return {
-            yuiSrc,
-        };
-    };
-
-    const getStyleConfiguration = () => {
-        const ComponentList = require(path.join(process.cwd(), '.grunt', 'components.js'));
-        // Build the cssSrc and scssSrc.
-        // Valid paths are:
-        // [component]/styles.css; and either
-        // [theme/[themename]]/scss/**/*.scss; or
-        // [theme/[themename]]/style/*.css.
-        //
-        // If a theme has scss, then it is assumed that the style directory contains generated content.
-        let cssSrc = [];
-        let scssSrc = [];
-
-        const checkComponentDirectory = componentDirectory => {
-            const isTheme = componentDirectory.startsWith('theme/');
-            if (isTheme) {
-                const scssDirectory = `${componentDirectory}/scss`;
-
-                if (fs.existsSync(scssDirectory)) {
-                    // This theme has an SCSS directory.
-                    // Include all scss files within it recursively, but do not check for css files.
-                    scssSrc.push(`${scssDirectory}/*.scss`);
-                    scssSrc.push(`${scssDirectory}/**/*.scss`);
-                } else {
-                    // This theme has no SCSS directory.
-                    // Only hte CSS files in the top-level directory are checked.
-                    cssSrc.push(`${componentDirectory}/style/*.css`);
-                }
-            } else {
-                // This is not a theme.
-                // All other plugin types are restricted to a single styles.css in their top level.
-                cssSrc.push(`${componentDirectory}/styles.css`);
-            }
-        };
-
-        if (inComponent) {
-            checkComponentDirectory(componentDirectory);
-        } else {
-            ComponentList.getComponentPaths(`${gruntFilePath}/`).forEach(componentPath => {
-                checkComponentDirectory(componentPath);
-            });
-        }
-
-        return {
-            cssSrc,
-            scssSrc,
-        };
-    };
-
-    /**
-     * Calculate the cwd, taking into consideration the `root` option (for Windows).
-     *
-     * @param {Object} grunt
-     * @returns {String} The current directory as best we can determine
-     */
-    const getCwd = grunt => {
-        let cwd = fs.realpathSync(process.env.PWD || process.cwd());
-
-        // Windows users can't run grunt in a subdirectory, so allow them to set
-        // the root by passing --root=path/to/dir.
-        if (grunt.option('root')) {
-            const root = grunt.option('root');
-            if (grunt.file.exists(__dirname, root)) {
-                cwd = fs.realpathSync(path.join(__dirname, root));
-                grunt.log.ok('Setting root to ' + cwd);
-            } else {
-                grunt.fail.fatal('Setting root to ' + root + ' failed - path does not exist');
-            }
-        }
-
-        return cwd;
-    };
-
-    // Detect directories:
-    // * gruntFilePath          The real path on disk to this Gruntfile.js
-    // * cwd                    The current working directory, which can be overridden by the `root` option
-    // * relativeCwd            The cwd, relative to the Gruntfile.js
-    // * componentDirectory     The root directory of the component if the cwd is in a valid component
-    // * inComponent            Whether the cwd is in a valid component
-    // * runDir                 The componentDirectory or cwd if not in a component, relative to Gruntfile.js
-    // * fullRunDir             The full path to the runDir
-    const gruntFilePath = fs.realpathSync(process.cwd());
-    const cwd = getCwd(grunt);
-    const relativeCwd = path.relative(gruntFilePath, cwd);
-    const componentDirectory = ComponentList.getOwningComponentDirectory(relativeCwd);
-    const inComponent = !!componentDirectory;
-    const inTheme = !!componentDirectory && componentDirectory.startsWith('theme/');
-    const runDir = inComponent ? componentDirectory : relativeCwd;
-    const fullRunDir = fs.realpathSync(gruntFilePath + path.sep + runDir);
-    const {inAMD, amdSrc} = getAmdConfiguration();
-    const {yuiSrc} = getYuiConfiguration();
-    const {cssSrc, scssSrc} = getStyleConfiguration();
-
-    let files = null;
-    if (grunt.option('files')) {
-        // Accept a comma separated list of files to process.
-        files = grunt.option('files').split(',');
-    }
-
-    grunt.log.debug('============================================================================');
-    grunt.log.debug(`= Node version:        ${process.versions.node}`);
-    grunt.log.debug(`= grunt version:       ${grunt.package.version}`);
-    grunt.log.debug(`= process.cwd:         '` + process.cwd() + `'`);
-    grunt.log.debug(`= process.env.PWD:     '${process.env.PWD}'`);
-    grunt.log.debug(`= path.sep             '${path.sep}'`);
-    grunt.log.debug('============================================================================');
-    grunt.log.debug(`= gruntFilePath:       '${gruntFilePath}'`);
-    grunt.log.debug(`= relativeCwd:         '${relativeCwd}'`);
-    grunt.log.debug(`= componentDirectory:  '${componentDirectory}'`);
-    grunt.log.debug(`= inComponent:         '${inComponent}'`);
-    grunt.log.debug(`= runDir:              '${runDir}'`);
-    grunt.log.debug(`= fullRunDir:          '${fullRunDir}'`);
-    grunt.log.debug('============================================================================');
-
-    if (inComponent) {
-        grunt.log.ok(`Running tasks for component directory ${componentDirectory}`);
-    }
-
-    return {
-        amdSrc,
-        componentDirectory,
-        cwd,
-        cssSrc,
-        files,
-        fullRunDir,
-        gruntFilePath,
-        inAMD,
-        inComponent,
-        inTheme,
-        relativeCwd,
-        runDir,
-        scssSrc,
-        yuiSrc,
-    };
-};
-
-/**
- * Verify tha tthe current NodeJS version matches the required version in package.json.
- *
- * @param   {Grunt} grunt
- */
-const verifyNodeVersion = grunt => {
-    const semver = require('semver');
+/* eslint-env node */
+module.exports = function(grunt) {
+    var path = require('path'),
+        tasks = {},
+        cwd = process.env.PWD || process.cwd(),
+        async = require('async'),
+        DOMParser = require('xmldom').DOMParser,
+        xpath = require('xpath'),
+        semver = require('semver'),
+        watchman = require('fb-watchman'),
+        watchmanClient = new watchman.Client(),
+        gruntFilePath = process.cwd();

    // Verify the node version is new enough.
    var expected = semver.validRange(grunt.file.readJSON('package.json').engines.node);
@@ -217,45 +43,604 @@ const verifyNodeVersion = grunt => {
    if (!semver.satisfies(actual, expected)) {
        grunt.fail.fatal('Node version not satisfied. Require ' + expected + ', version installed: ' + actual);
    }
-};

-/**
- * Grunt configuration.
- *
- * @param {Grunt} grunt
- */
-module.exports = function(grunt) {
-    // Verify that the Node version meets our requirements.
-    verifyNodeVersion(grunt);
+    // Windows users can't run grunt in a subdirectory, so allow them to set
+    // the root by passing --root=path/to/dir.
+    if (grunt.option('root')) {
+        var root = grunt.option('root');
+        if (grunt.file.exists(__dirname, root)) {
+            cwd = path.join(__dirname, root);
+            grunt.log.ok('Setting root to ' + cwd);
+        } else {
+            grunt.fail.fatal('Setting root to ' + root + ' failed - path does not exist');
+        }
+    }

-    // Setup the Moodle environemnt within the Grunt object.
-    grunt.moodleEnv = setupMoodleEnvironment(grunt);
+    var files = null;
+    if (grunt.option('files')) {
+        // Accept a comma separated list of files to process.
+        files = grunt.option('files').split(',');
+    }
+
+    var inAMD = path.basename(cwd) == 'amd';
+
+    // Globbing pattern for matching all AMD JS source files.
+    var amdSrc = [];
+    if (inAMD) {
+        amdSrc.push(cwd + "/src/*.js");
+        amdSrc.push(cwd + "/src/**/*.js");
+    } else {
+        amdSrc.push("**/amd/src/*.js");
+        amdSrc.push("**/amd/src/**/*.js");
+    }

    /**
-     * Add the named task.
+     * Function to generate the destination for the uglify task
+     * (e.g. build/file.min.js). This function will be passed to
+     * the rename property of files array when building dynamically:
+     * http://gruntjs.com/configuring-tasks#building-the-files-object-dynamically
     *
-     * @param   {string} name
-     * @param   {Grunt} grunt
+     * @param {String} destPath the current destination
+     * @param {String} srcPath the  matched src path
+     * @return {String} The rewritten destination path.
     */
-    const addTask = (name, grunt) => {
-        const path = require('path');
-        const taskPath = path.resolve(`./.grunt/tasks/${name}.js`);
-
-        grunt.log.debug(`Including tasks for ${name} from ${taskPath}`);
-
-        require(path.resolve(`./.grunt/tasks/${name}.js`))(grunt);
+    var babelRename = function(destPath, srcPath) {
+        destPath = srcPath.replace('src', 'build');
+        destPath = destPath.replace('.js', '.min.js');
+        return destPath;
    };

+    /**
+     * Find thirdpartylibs.xml and generate an array of paths contained within
+     * them (used to generate ignore files and so on).
+     *
+     * @return {array} The list of thirdparty paths.
+     */
+    var getThirdPartyPathsFromXML = function() {
+        var thirdpartyfiles = grunt.file.expand('*/**/thirdpartylibs.xml');
+        var libs = ['node_modules/', 'vendor/'];

-    // Add Moodle task configuration.
-    addTask('gherkinlint', grunt);
-    addTask('ignorefiles', grunt);
+        thirdpartyfiles.forEach(function(file) {
+          var dirname = path.dirname(file);

-    addTask('javascript', grunt);
-    addTask('style', grunt);
+          var doc = new DOMParser().parseFromString(grunt.file.read(file));
+          var nodes = xpath.select("/libraries/library/location/text()", doc);

-    addTask('watch', grunt);
-    addTask('startup', grunt);
+          nodes.forEach(function(node) {
+            var lib = path.join(dirname, node.toString());
+            if (grunt.file.isDir(lib)) {
+                // Ensure trailing slash on dirs.
+                lib = lib.replace(/\/?$/, '/');
+            }
+
+            // Look for duplicate paths before adding to array.
+            if (libs.indexOf(lib) === -1) {
+                libs.push(lib);
+            }
+          });
+        });
+        return libs;
+    };
+
+    // Project configuration.
+    grunt.initConfig({
+        eslint: {
+            // Even though warnings dont stop the build we don't display warnings by default because
+            // at this moment we've got too many core warnings.
+            options: {quiet: !grunt.option('show-lint-warnings')},
+            amd: {src: files ? files : amdSrc},
+            // Check YUI module source files.
+            yui: {src: files ? files : ['**/yui/src/**/*.js', '!*/**/yui/src/*/meta/*.js']}
+        },
+        babel: {
+            options: {
+                sourceMaps: true,
+                comments: false,
+                plugins: [
+                    'transform-es2015-modules-amd-lazy',
+                    'system-import-transformer',
+                    // This plugin modifies the Babel transpiling for "export default"
+                    // so that if it's used then only the exported value is returned
+                    // by the generated AMD module.
+                    //
+                    // It also adds the Moodle plugin name to the AMD module definition
+                    // so that it can be imported as expected in other modules.
+                    path.resolve('babel-plugin-add-module-to-define.js'),
+                    '@babel/plugin-syntax-dynamic-import',
+                    '@babel/plugin-syntax-import-meta',
+                    ['@babel/plugin-proposal-class-properties', {'loose': false}],
+                    '@babel/plugin-proposal-json-strings'
+                ],
+                presets: [
+                    ['minify', {
+                        // This minification plugin needs to be disabled because it breaks the
+                        // source map generation and causes invalid source maps to be output.
+                        simplify: false,
+                        builtIns: false
+                    }],
+                    ['@babel/preset-env', {
+                        targets: {
+                            browsers: [
+                                ">0.25%",
+                                "last 2 versions",
+                                "not ie <= 10",
+                                "not op_mini all",
+                                "not Opera > 0",
+                                "not dead"
+                            ]
+                        },
+                        modules: false,
+                        useBuiltIns: false
+                    }]
+                ]
+            },
+            dist: {
+                files: [{
+                    expand: true,
+                    src: files ? files : amdSrc,
+                    rename: babelRename
+                }]
+            }
+        },
+        sass: {
+            dist: {
+                files: {
+                    "theme/boost/style/moodle.css": "theme/boost/scss/preset/default.scss",
+                    "theme/classic/style/moodle.css": "theme/classic/scss/classicgrunt.scss"
+                }
+            },
+            options: {
+                includePaths: ["theme/boost/scss/", "theme/classic/scss/"]
+            }
+        },
+        watch: {
+            options: {
+                nospawn: true // We need not to spawn so config can be changed dynamically.
+            },
+            amd: {
+                files: ['**/amd/src/**/*.js'],
+                tasks: ['amd']
+            },
+            boost: {
+                files: ['**/theme/boost/scss/**/*.scss'],
+                tasks: ['scss']
+            },
+            rawcss: {
+                files: ['**/*.css', '**/theme/**/!(moodle.css|editor.css)'],
+                tasks: ['rawcss']
+            },
+            yui: {
+                files: ['**/yui/src/**/*.js'],
+                tasks: ['yui']
+            },
+            gherkinlint: {
+                files: ['**/tests/behat/*.feature'],
+                tasks: ['gherkinlint']
+            }
+        },
+        shifter: {
+            options: {
+                recursive: true,
+                paths: files ? files : [cwd]
+            }
+        },
+        gherkinlint: {
+            options: {
+                files: files ? files : ['**/tests/behat/*.feature'],
+            }
+        },
+        stylelint: {
+            scss: {
+                options: {syntax: 'scss'},
+                src: files ? files : ['*/**/*.scss']
+            },
+            css: {
+                src: files ? files : ['*/**/*.css'],
+                options: {
+                    configOverrides: {
+                        rules: {
+                            // These rules have to be disabled in .stylelintrc for scss compat.
+                            "at-rule-no-unknown": true,
+                        }
+                    }
+                }
+            }
+        }
+    });
+
+    /**
+     * Generate ignore files (utilising thirdpartylibs.xml data)
+     */
+    tasks.ignorefiles = function() {
+      // An array of paths to third party directories.
+      var thirdPartyPaths = getThirdPartyPathsFromXML();
+      // Generate .eslintignore.
+      var eslintIgnores = ['# Generated by "grunt ignorefiles"', '*/**/yui/src/*/meta/', '*/**/build/'].concat(thirdPartyPaths);
+      grunt.file.write('.eslintignore', eslintIgnores.join('\n'));
+      // Generate .stylelintignore.
+      var stylelintIgnores = [
+          '# Generated by "grunt ignorefiles"',
+          '**/yui/build/*',
+          'theme/boost/style/moodle.css',
+          'theme/classic/style/moodle.css',
+      ].concat(thirdPartyPaths);
+      grunt.file.write('.stylelintignore', stylelintIgnores.join('\n'));
+    };
+
+    /**
+     * Shifter task. Is configured with a path to a specific file or a directory,
+     * in the case of a specific file it will work out the right module to be built.
+     *
+     * Note that this task runs the invidiaul shifter jobs async (becase it spawns
+     * so be careful to to call done().
+     */
+    tasks.shifter = function() {
+        var done = this.async(),
+            options = grunt.config('shifter.options');
+
+        // Run the shifter processes one at a time to avoid confusing output.
+        async.eachSeries(options.paths, function(src, filedone) {
+            var args = [];
+            args.push(path.normalize(__dirname + '/node_modules/shifter/bin/shifter'));
+
+            // Always ignore the node_modules directory.
+            args.push('--excludes', 'node_modules');
+
+            // Determine the most appropriate options to run with based upon the current location.
+            if (grunt.file.isMatch('**/yui/**/*.js', src)) {
+                // When passed a JS file, build our containing module (this happen with
+                // watch).
+                grunt.log.debug('Shifter passed a specific JS file');
+                src = path.dirname(path.dirname(src));
+                options.recursive = false;
+            } else if (grunt.file.isMatch('**/yui/src', src)) {
+                // When in a src directory --walk all modules.
+                grunt.log.debug('In a src directory');
+                args.push('--walk');
+                options.recursive = false;
+            } else if (grunt.file.isMatch('**/yui/src/*', src)) {
+                // When in module, only build our module.
+                grunt.log.debug('In a module directory');
+                options.recursive = false;
+            } else if (grunt.file.isMatch('**/yui/src/*/js', src)) {
+                // When in module src, only build our module.
+                grunt.log.debug('In a source directory');
+                src = path.dirname(src);
+                options.recursive = false;
+            }
+
+            if (grunt.option('watch')) {
+                grunt.fail.fatal('The --watch option has been removed, please use `grunt watch` instead');
+            }
+
+            // Add the stderr option if appropriate
+            if (grunt.option('verbose')) {
+                args.push('--lint-stderr');
+            }
+
+            if (grunt.option('no-color')) {
+                args.push('--color=false');
+            }
+
+            var execShifter = function() {
+
+                grunt.log.ok("Running shifter on " + src);
+                grunt.util.spawn({
+                    cmd: "node",
+                    args: args,
+                    opts: {cwd: src, stdio: 'inherit', env: process.env}
+                }, function(error, result, code) {
+                    if (code) {
+                        grunt.fail.fatal('Shifter failed with code: ' + code);
+                    } else {
+                        grunt.log.ok('Shifter build complete.');
+                        filedone();
+                    }
+                });
+            };
+
+            // Actually run shifter.
+            if (!options.recursive) {
+                execShifter();
+            } else {
+                // Check that there are yui modules otherwise shifter ends with exit code 1.
+                if (grunt.file.expand({cwd: src}, '**/yui/src/**/*.js').length > 0) {
+                    args.push('--recursive');
+                    execShifter();
+                } else {
+                    grunt.log.ok('No YUI modules to build.');
+                    filedone();
+                }
+            }
+        }, done);
+    };
+
+    tasks.gherkinlint = function() {
+        var done = this.async(),
+            options = grunt.config('gherkinlint.options');
+
+        var args = grunt.file.expand(options.files);
+        args.unshift(path.normalize(__dirname + '/node_modules/.bin/gherkin-lint'));
+        grunt.util.spawn({
+            cmd: 'node',
+            args: args,
+            opts: {stdio: 'inherit', env: process.env}
+        }, function(error, result, code) {
+            // Propagate the exit code.
+            done(code === 0);
+        });
+    };
+
+    tasks.startup = function() {
+        // Are we in a YUI directory?
+        if (path.basename(path.resolve(cwd, '../../')) == 'yui') {
+            grunt.task.run('yui');
+        // Are we in an AMD directory?
+        } else if (inAMD) {
+            grunt.task.run('amd');
+        } else {
+            // Run them all!.
+            grunt.task.run('css');
+            grunt.task.run('js');
+            grunt.task.run('gherkinlint');
+        }
+    };
+
+    /**
+     * This is a wrapper task to handle the grunt watch command. It attempts to use
+     * Watchman to monitor for file changes, if it's installed, because it's much faster.
+     *
+     * If Watchman isn't installed then it falls back to the grunt-contrib-watch file
+     * watcher for backwards compatibility.
+     */
+    tasks.watch = function() {
+        var watchTaskDone = this.async();
+        var watchInitialised = false;
+        var watchTaskQueue = {};
+        var processingQueue = false;
+
+        // Grab the tasks and files that have been queued up and execute them.
+        var processWatchTaskQueue = function() {
+            if (!Object.keys(watchTaskQueue).length || processingQueue) {
+                // If there is nothing in the queue or we're already processing then wait.
+                return;
+            }
+
+            processingQueue = true;
+
+            // Grab all tasks currently in the queue.
+            var queueToProcess = watchTaskQueue;
+            // Reset the queue.
+            watchTaskQueue = {};
+
+            async.forEachSeries(
+                Object.keys(queueToProcess),
+                function(task, next) {
+                    var files = queueToProcess[task];
+                    var filesOption = '--files=' + files.join(',');
+                    grunt.log.ok('Running task ' + task + ' for files ' + filesOption);
+
+                    // Spawn the task in a child process so that it doesn't kill this one
+                    // if it failed.
+                    grunt.util.spawn(
+                        {
+                            // Spawn with the grunt bin.
+                            grunt: true,
+                            // Run from current working dir and inherit stdio from process.
+                            opts: {
+                                cwd: cwd,
+                                stdio: 'inherit'
+                            },
+                            args: [task, filesOption]
+                        },
+                        function(err, res, code) {
+                            if (code !== 0) {
+                                // The grunt task failed.
+                                grunt.log.error(err);
+                            }
+
+                            // Move on to the next task.
+                            next();
+                        }
+                    );
+                },
+                function() {
+                    // No longer processing.
+                    processingQueue = false;
+                    // Once all of the tasks are done then recurse just in case more tasks
+                    // were queued while we were processing.
+                    processWatchTaskQueue();
+                }
+            );
+        };
+
+        var watchConfig = grunt.config.get(['watch']);
+        watchConfig = Object.keys(watchConfig).reduce(function(carry, key) {
+            if (key == 'options') {
+                return carry;
+            }
+
+            var value = watchConfig[key];
+            var fileGlobs = value.files;
+            var taskNames = value.tasks;
+
+            taskNames.forEach(function(taskName) {
+                carry[taskName] = fileGlobs;
+            });
+
+            return carry;
+        }, {});
+
+        watchmanClient.on('error', function(error) {
+            // We have to add an error handler here and parse the error string because the
+            // example way from the docs to check if Watchman is installed doesn't actually work!!
+            // See: https://github.com/facebook/watchman/issues/509
+            if (error.message.match('Watchman was not found')) {
+                // If watchman isn't installed then we should fallback to the other watch task.
+                grunt.log.ok('It is recommended that you install Watchman for better performance using the "watch" command.');
+
+                // Fallback to the old grunt-contrib-watch task.
+                grunt.renameTask('watch-grunt', 'watch');
+                grunt.task.run(['watch']);
+                // This task is finished.
+                watchTaskDone(0);
+            } else {
+                grunt.log.error(error);
+                // Fatal error.
+                watchTaskDone(1);
+            }
+        });
+
+        watchmanClient.on('subscription', function(resp) {
+            if (resp.subscription !== 'grunt-watch') {
+                return;
+            }
+
+            resp.files.forEach(function(file) {
+                grunt.log.ok('File changed: ' + file.name);
+
+                var fullPath = cwd + '/' + file.name;
+                Object.keys(watchConfig).forEach(function(task) {
+                    var fileGlobs = watchConfig[task];
+                    var match = fileGlobs.every(function(fileGlob) {
+                        return grunt.file.isMatch(fileGlob, fullPath);
+                    });
+                    if (match) {
+                        // If we are watching a subdirectory then the file.name will be relative
+                        // to that directory. However the grunt tasks  expect the file paths to be
+                        // relative to the Gruntfile.js location so let's normalise them before
+                        // adding them to the queue.
+                        var relativePath = fullPath.replace(gruntFilePath + '/', '');
+                        if (task in watchTaskQueue) {
+                            if (!watchTaskQueue[task].includes(relativePath)) {
+                                watchTaskQueue[task] = watchTaskQueue[task].concat(relativePath);
+                            }
+                        } else {
+                            watchTaskQueue[task] = [relativePath];
+                        }
+                    }
+                });
+            });
+
+            processWatchTaskQueue();
+        });
+
+        process.on('SIGINT', function() {
+            // Let the user know that they may need to manually stop the Watchman daemon if they
+            // no longer want it running.
+            if (watchInitialised) {
+                grunt.log.ok('The Watchman daemon may still be running and may need to be stopped manually.');
+            }
+
+            process.exit();
+        });
+
+        // Initiate the watch on the current directory.
+        watchmanClient.command(['watch-project', cwd], function(watchError, watchResponse) {
+            if (watchError) {
+                grunt.log.error('Error initiating watch:', watchError);
+                watchTaskDone(1);
+                return;
+            }
+
+            if ('warning' in watchResponse) {
+                grunt.log.error('warning: ', watchResponse.warning);
+            }
+
+            var watch = watchResponse.watch;
+            var relativePath = watchResponse.relative_path;
+            watchInitialised = true;
+
+            watchmanClient.command(['clock', watch], function(clockError, clockResponse) {
+                if (clockError) {
+                    grunt.log.error('Failed to query clock:', clockError);
+                    watchTaskDone(1);
+                    return;
+                }
+
+                // Use the matching patterns specified in the watch config.
+                var matches = Object.keys(watchConfig).map(function(task) {
+                    var fileGlobs = watchConfig[task];
+                    var fileGlobMatches = fileGlobs.map(function(fileGlob) {
+                        return ['match', fileGlob, 'wholename'];
+                    });
+
+                    return ['allof'].concat(fileGlobMatches);
+                });
+
+                var sub = {
+                    expression: ["anyof"].concat(matches),
+                    // Which fields we're interested in.
+                    fields: ["name", "size", "type"],
+                    // Add our time constraint.
+                    since: clockResponse.clock
+                };
+
+                if (relativePath) {
+                    /* eslint-disable camelcase */
+                    sub.relative_root = relativePath;
+                }
+
+                watchmanClient.command(['subscribe', watch, 'grunt-watch', sub], function(subscribeError) {
+                    if (subscribeError) {
+                        // Probably an error in the subscription criteria.
+                        grunt.log.error('failed to subscribe: ', subscribeError);
+                        watchTaskDone(1);
+                        return;
+                    }
+
+                    grunt.log.ok('Listening for changes to files in ' + cwd);
+                });
+            });
+        });
+    };
+
+    // On watch, we dynamically modify config to build only affected files. This
+    // method is slightly complicated to deal with multiple changed files at once (copied
+    // from the grunt-contrib-watch readme).
+    var changedFiles = Object.create(null);
+    var onChange = grunt.util._.debounce(function() {
+        var files = Object.keys(changedFiles);
+        grunt.config('eslint.amd.src', files);
+        grunt.config('eslint.yui.src', files);
+        grunt.config('shifter.options.paths', files);
+        grunt.config('gherkinlint.options.files', files);
+        grunt.config('babel.dist.files', [{expand: true, src: files, rename: babelRename}]);
+        changedFiles = Object.create(null);
+    }, 200);
+
+    grunt.event.on('watch', function(action, filepath) {
+        changedFiles[filepath] = action;
+        onChange();
+    });
+
+    // Register NPM tasks.
+    grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.loadNpmTasks('grunt-sass');
+    grunt.loadNpmTasks('grunt-eslint');
+    grunt.loadNpmTasks('grunt-stylelint');
+    grunt.loadNpmTasks('grunt-babel');
+
+    // Rename the grunt-contrib-watch "watch" task because we're going to wrap it.
+    grunt.renameTask('watch', 'watch-grunt');
+
+    // Register JS tasks.
+    grunt.registerTask('shifter', 'Run Shifter against the current directory', tasks.shifter);
+    grunt.registerTask('gherkinlint', 'Run gherkinlint against the current directory', tasks.gherkinlint);
+    grunt.registerTask('ignorefiles', 'Generate ignore files for linters', tasks.ignorefiles);
+    grunt.registerTask('watch', 'Run tasks on file changes', tasks.watch);
+    grunt.registerTask('yui', ['eslint:yui', 'shifter']);
+    grunt.registerTask('amd', ['eslint:amd', 'babel']);
+    grunt.registerTask('js', ['amd', 'yui']);
+
+    // Register CSS taks.
+    grunt.registerTask('css', ['stylelint:scss', 'sass', 'stylelint:css']);
+    grunt.registerTask('scss', ['stylelint:scss', 'sass']);
+    grunt.registerTask('rawcss', ['stylelint:css']);
+
+    // Register the startup task.
+    grunt.registerTask('startup', 'Run the correct tasks for the current directory', tasks.startup);

    // Register the default task.
    grunt.registerTask('default', ['startup']);
@@ -2,7 +2,7 @@ MOODLE TRADEMARKS POLICY
 ========================

 The word "Moodle" is trademarked in many countries around the world. The word
-was originally coined as an acronym: Modular Object-Oriented Dynamic Learning
+was originally an acronym: Modular Object-Oriented Dynamic Learning
 Environment. The trademark is owned by Martin Dougiamas, Founder and Director
 of Moodle.

@@ -0,0 +1,48 @@
+<?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/>.
+
+/**
+ * Admin settings search form
+ *
+ * @package    admin
+ * @copyright  2016 Damyon Wiese
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once $CFG->libdir.'/formslib.php';
+
+/**
+ * Admin settings search form
+ *
+ * @package    admin
+ * @copyright  2016 Damyon Wiese
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class admin_settings_search_form extends moodleform {
+    function definition () {
+        $mform = $this->_form;
+
+        //$mform->addElement('header', 'settingsheader', get_string('search', 'admin'));
+        $elements = [];
+        $elements[] = $mform->createElement('text', 'query', get_string('query', 'admin'));
+        $elements[] = $mform->createElement('submit', 'search', get_string('search'));
+        $mform->addGroup($elements);
+        $mform->setType('query', PARAM_RAW);
+        $mform->setDefault('query', optional_param('query', '', PARAM_RAW));
+    }
+}
@@ -98,10 +98,8 @@ switch ($action) {
    default:
        break;
 }
-$new = implode(',', $activeantiviruses);
-add_to_config_log('antiviruses', $CFG->antiviruses, $new, 'core');
-set_config('antiviruses', $new);

+set_config('antiviruses', implode(',', $activeantiviruses));
 core_plugin_manager::reset_caches();

-redirect ($returnurl);
+redirect ($returnurl);
@@ -44,9 +44,7 @@ switch ($action) {
        $key = array_search($auth, $authsenabled);
        if ($key !== false) {
            unset($authsenabled[$key]);
-            $value = implode(',', $authsenabled);
-            add_to_config_log('auth', $CFG->auth, $value, 'core');
-            set_config('auth', $value);
+            set_config('auth', implode(',', $authsenabled));
        }

        if ($auth == $CFG->registerauth) {
@@ -61,11 +59,8 @@ switch ($action) {
        if (!in_array($auth, $authsenabled)) {
            $authsenabled[] = $auth;
            $authsenabled = array_unique($authsenabled);
-            $value = implode(',', $authsenabled);
-            add_to_config_log('auth', $CFG->auth, $value, 'core');
-            set_config('auth', $value);
+            set_config('auth', implode(',', $authsenabled));
        }
-
        \core\session\manager::gc(); // Remove stale sessions.
        core_plugin_manager::reset_caches();
        break;
@@ -81,9 +76,7 @@ switch ($action) {
            $fsave = $authsenabled[$key];
            $authsenabled[$key] = $authsenabled[$key + 1];
            $authsenabled[$key + 1] = $fsave;
-            $value = implode(',', $authsenabled);
-            add_to_config_log('auth', $CFG->auth, $value, 'core');
-            set_config('auth', $value);
+            set_config('auth', implode(',', $authsenabled));
        }
        break;

@@ -98,9 +91,7 @@ switch ($action) {
            $fsave = $authsenabled[$key];
            $authsenabled[$key] = $authsenabled[$key - 1];
            $authsenabled[$key - 1] = $fsave;
-            $value = implode(',', $authsenabled);
-            add_to_config_log('auth', $CFG->auth, $value, 'core');
-            set_config('auth', $value);
+            set_config('auth', implode(',', $authsenabled));
        }
        break;

@@ -171,6 +171,8 @@ function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts,
                // limit for the setting name is 100.
                continue;
            }
+        } elseif ($fieldname == 'url') {
+            $fieldname = get_string('webpage');
        } else {
            $fieldname = get_string($fieldname);
        }
@@ -158,9 +158,4 @@ echo $outputhtml;
 echo html_writer::end_tag('fieldset');
 echo html_writer::end_tag('form');

-$PAGE->requires->yui_module('moodle-core-formchangechecker', 'M.core_formchangechecker.init', [[
-    'formid' => 'adminsettings'
-]]);
-$PAGE->requires->string_for_js('changesmadereallygoaway', 'moodle');
-
 echo $OUTPUT->footer();
@@ -43,7 +43,7 @@ class testoutgoingmailconf_form extends \moodleform {
        $mform = $this->_form;

        // Recipient.
-        $options = ['maxlength' => '100', 'size' => '25', 'autocomplete' => 'email'];
+        $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');
@@ -1,71 +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/>.
-
-/**
- * External admin page class that allows a callback to be provided to determine whether page can be accessed
- *
- * @package     core_admin
- * @copyright   2019 Marina Glancy
- * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_admin\local\externalpage;
-
-use admin_externalpage;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once("{$CFG->libdir}/adminlib.php");
-
-/**
- * Admin externalpage class
- *
- * @package     core_admin
- * @copyright   2019 Marina Glancy
- * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class accesscallback extends admin_externalpage {
-
-    /** @var callable $accesscheckcallback */
-    protected $accesscheckcallback;
-
-    /**
-     * Class constructor
-     *
-     * @param string $name
-     * @param string $visiblename
-     * @param string $url
-     * @param callable $accesscheckcallback The callback method that will be executed to check whether user has access to
-     *     this page. The setting instance ($this) is passed as an argument to the callback. Should return boolean value
-     * @param bool $hidden
-     */
-    public function __construct(string $name, string $visiblename, string $url, callable $accesscheckcallback,
-            bool $hidden = false) {
-
-        $this->accesscheckcallback = $accesscheckcallback;
-
-        parent::__construct($name, $visiblename, $url, [], $hidden);
-    }
-
-    /**
-     * Determines if the current user has access to this external page based on access callback
-     *
-     * @return bool
-     */
-    public function check_access() {
-        return ($this->accesscheckcallback)($this);
-    }
-}
@@ -1,206 +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/>.
-
-/**
- * Auto complete admin setting.
- *
- * @package    core_admin
- * @copyright  2020 The Open University
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_admin\local\settings;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir . '/adminlib.php');
-/**
- * Auto complete setting class.
- *
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @copyright 2020 The Open University
- */
-class autocomplete extends \admin_setting_configmultiselect {
-    /** @var boolean Should we allow typing new entries to the field? */
-    protected $tags = false;
-    /** @var string Name of an AMD module to send/process ajax requests. */
-    protected $ajax = '';
-    /** @var string Placeholder text for an empty list. */
-    protected $placeholder = '';
-    /** @var bool Whether the search has to be case-sensitive. */
-    protected $casesensitive = false;
-    /** @var bool Show suggestions by default - but this can be turned off. */
-    protected $showsuggestions = true;
-    /** @var string String that is shown when there are no selections. */
-    protected $noselectionstring = '';
-    /** @var string Delimiter to store values in database. */
-    protected $delimiter = ',';
-    /** @var string Should be multiple choices? */
-    protected $multiple = true;
-    /** @var string The link to manage choices. */
-    protected $manageurl = true;
-    /** @var string The text to display in manage link. */
-    protected $managetext = true;
-
-    /**
-     * Constructor
-     *
-     * @param string $name unique ascii name, either 'mysetting' for settings that in config, or 'myplugin/mysetting'
-     * for ones in config_plugins.
-     * @param string $visiblename localised
-     * @param string $description long localised info
-     * @param array $defaultsetting array of selected items
-     * @param array $choices options for autocomplete field
-     * @param array $attributes settings for autocomplete field
-     */
-    public function __construct($name, $visiblename, $description, $defaultsetting, $choices, $attributes = null) {
-
-        if ($attributes === null) {
-            $attributes = [];
-        }
-
-        $this->placeholder = get_string('search');
-        $this->noselectionstring = get_string('noselection', 'form');
-        $defaultattributes = [
-                'tags',
-                'showsuggestions',
-                'placeholder',
-                'noselectionstring',
-                'ajax',
-                'casesensitive',
-                'delimiter',
-                'multiple',
-                'manageurl',
-                'managetext'
-        ];
-
-        foreach ($defaultattributes as $attributename) {
-            if (isset($attributes[$attributename])) {
-                $this->$attributename = $attributes[$attributename];
-            }
-        }
-
-        parent::__construct($name, $visiblename, $description, $defaultsetting, $choices);
-    }
-
-    /**
-     * Returns the select setting(s)
-     *
-     * @return mixed null or array. Null if no settings else array of setting(s)
-     */
-    public function get_setting() {
-        $result = $this->config_read($this->name);
-        if (is_null($result)) {
-            return null;
-        }
-        if ($result === '') {
-            return [];
-        }
-        return explode($this->delimiter, $result);
-    }
-
-    /**
-     * Saves setting(s) provided through $data
-     *
-     * @param array $data
-     */
-    public function write_setting($data) {
-        if (!is_array($data)) {
-            return ''; // Ignore it.
-        }
-        if (!$this->load_choices() || empty($this->choices)) {
-            return '';
-        }
-
-        unset($data['xxxxx']);
-
-        $save = [];
-        foreach ($data as $value) {
-            if (!array_key_exists($value, $this->choices)) {
-                continue; // Ignore it.
-            }
-            $save[] = $value;
-        }
-
-        return ($this->config_write($this->name, implode($this->delimiter, $save)) ? '' : get_string('errorsetting', 'admin'));
-    }
-
-    /**
-     * Returns XHTML autocomplete field
-     *
-     * @param array $data Array of values to select by default
-     * @param string $query
-     * @return string XHTML autocomplete field
-     */
-    public function output_html($data, $query = '') {
-        global $OUTPUT;
-
-        if (!$this->load_choices() or empty($this->choices)) {
-            return '';
-        }
-
-        $default = $this->get_defaultsetting();
-        if (empty($default)) {
-            $default = [];
-        }
-
-        if (is_null($data)) {
-            $data = [];
-        }
-
-        $context = [
-                'id' => $this->get_id(),
-                'name' => $this->get_full_name()
-        ];
-
-        $defaults = [];
-        $options = [];
-        $template = 'core_admin/local/settings/autocomplete';
-
-        foreach ($this->choices as $value => $name) {
-            if (in_array($value, $default)) {
-                $defaults[] = $name;
-            }
-            $options[] = [
-                    'value' => $value,
-                    'text' => $name,
-                    'selected' => in_array($value, $data),
-                    'disabled' => false
-            ];
-        }
-
-        $context['options'] = $options;
-        $context['tags'] = $this->tags;
-        $context['placeholder'] = $this->placeholder;
-        $context['casesensitive'] = $this->casesensitive;
-        $context['multiple'] = $this->multiple;
-        $context['showsuggestions'] = $this->showsuggestions;
-        $context['manageurl'] = $this->manageurl;
-        $context['managetext'] = $this->managetext;
-
-        if (is_null($default)) {
-            $defaultinfo = null;
-        } if (!empty($defaults)) {
-            $defaultinfo = implode(', ', $defaults);
-        } else {
-            $defaultinfo = get_string('none');
-        }
-
-        $element = $OUTPUT->render_from_template($template, $context);
-
-        return format_admin_setting($this, $this->visiblename, $element, $this->description, true, '', $defaultinfo, $query);
-    }
-}
@@ -126,7 +126,6 @@ class filesize extends \admin_setting {
        if (is_null($bytes)) {
            return null;
        }
-        $bytes = intval($bytes);

        return self::parse_bytes($bytes);
    }
@@ -146,10 +145,9 @@ class filesize extends \admin_setting {
            return get_string('errorsetting', 'admin');
        }

-        // Calculate size in bytes, ensuring we don't overflow PHP_INT_MAX.
        $bytes = $data['v'] * $data['u'];
-        $result = (is_int($bytes) && $this->config_write($this->name, $bytes));

+        $result = $this->config_write($this->name, $bytes);
        return ($result ? '' : get_string('errorsetting', 'admin'));
    }

@@ -180,7 +178,6 @@ class filesize extends \admin_setting {
            'id' => $this->get_id(),
            'name' => $this->get_full_name(),
            'value' => $data['v'],
-            'readonly' => $this->is_readonly(),
            'options' => array_map(function($unit, $title) use ($data, $defaultunit) {
                return [
                    'value' => $unit,
@@ -1,74 +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/>.
-
-/**
- * Payment gateway admin setting.
- *
- * @package    core_admin
- * @copyright  2020 Shamim Rezaie <shamim@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_admin\local\settings;
-
-/**
- * Generic class for managing plugins in a table that allows re-ordering and enable/disable of each plugin.
- */
-class manage_payment_gateway_plugins extends \admin_setting_manage_plugins {
-    /**
-     * Get the admin settings section title (use get_string).
-     *
-     * @return string
-     */
-    public function get_section_title() {
-        return get_string('type_paygw_plural', 'plugin');
-    }
-
-    /**
-     * Get the type of plugin to manage.
-     *
-     * @return string
-     */
-    public function get_plugin_type() {
-        return 'paygw';
-    }
-
-    /**
-     * Get the name of the second column.
-     *
-     * @return string
-     */
-    public function get_info_column_name() {
-        return get_string('supportedcurrencies', 'core_payment');
-    }
-
-    /**
-     * Get the type of plugin to manage.
-     *
-     * @param plugininfo The plugin info class.
-     * @return string
-     */
-    public function get_info_column($plugininfo) {
-        $codes = $plugininfo->get_supported_currencies();
-
-        $currencies = [];
-        foreach ($codes as $c) {
-            $currencies[$c] = new \lang_string($c, 'core_currencies');
-        }
-
-        return implode(get_string('listsep', 'langconfig') . ' ', $currencies);
-    }
-}
@@ -57,8 +57,6 @@ class task_log_table extends \table_sql {
            'userid'     => get_string('user', 'admin'),
            'timestart'  => get_string('task_starttime', 'admin'),
            'duration'   => get_string('task_duration', 'admin'),
-            'hostname'   => get_string('hostname', 'tool_task'),
-            'pid'        => get_string('pid', 'tool_task'),
            'db'         => get_string('task_dbstats', 'admin'),
            'result'     => get_string('task_result', 'admin'),
            'actions'    => '',
@@ -124,9 +122,8 @@ class task_log_table extends \table_sql {
            $sort = "ORDER BY $sort";
        }

-        // TODO Does not support custom user profile fields (MDL-70456).
-        $userfieldsapi = \core_user\fields::for_identity(\context_system::instance(), false)->with_userpic();
-        $userfields = $userfieldsapi->get_sql('u', false, 'user', 'userid2', false)->selects;
+        $extrafields = get_extra_user_fields(\context_system::instance());
+        $userfields = \user_picture::fields('u', $extrafields, 'userid2', 'user');

        $where = '';
        if (!empty($this->sql->where)) {
@@ -135,7 +132,6 @@ class task_log_table extends \table_sql {

        $sql = "SELECT
                    tl.id, tl.type, tl.component, tl.classname, tl.userid, tl.timestart, tl.timeend,
-                    tl.hostname, tl.pid,
                    tl.dbreads, tl.dbwrites, tl.result,
                    tl.dbreads + tl.dbwrites AS db,
                    tl.timeend - tl.timestart AS duration,
@@ -1,131 +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 executor for adhoc tasks.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
- * @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}/cronlib.php");
-
-list($options, $unrecognized) = cli_get_params(
-    [
-        'execute' => false,
-        'help' => false,
-        'keep-alive' => 0,
-        'showsql' => false,
-        'showdebugging' => false,
-        'ignorelimits' => false,
-        'force' => false,
-    ], [
-        'h' => 'help',
-        'e' => 'execute',
-        'k' => 'keep-alive',
-        'i' => 'ignorelimits',
-        'f' => 'force',
-    ]
-);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help'] or empty($options['execute'])) {
-    $help = <<<EOT
-Ad hoc cron tasks.
-
-Options:
- -h, --help                Print out this help
-     --showsql             Show sql queries before they are executed
-     --showdebugging       Show developer level debugging information
- -e, --execute             Run all queued adhoc tasks
- -k, --keep-alive=N        Keep this script alive for N seconds and poll for new adhoc tasks
- -i  --ignorelimits        Ignore task_adhoc_concurrency_limit and task_adhoc_max_runtime limits
- -f, --force               Run even if cron is disabled
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/adhoc_task.php --execute
-
-EOT;
-
-    echo $help;
-    die;
-}
-
-if ($options['showdebugging']) {
-    set_debugging(DEBUG_DEVELOPER, true);
-}
-
-if ($options['showsql']) {
-    $DB->set_debug(true);
-}
-
-if (CLI_MAINTENANCE) {
-    echo "CLI maintenance mode active, cron execution suspended.\n";
-    exit(1);
-}
-
-if (moodle_needs_upgrading()) {
-    echo "Moodle upgrade pending, cron execution suspended.\n";
-    exit(1);
-}
-
-if (empty($options['execute'])) {
-    exit(0);
-}
-
-if (!get_config('core', 'cron_enabled') && !$options['force']) {
-    mtrace('Cron is disabled. Use --force to override.');
-    exit(1);
-}
-
-if (empty($options['keep-alive'])) {
-    $options['keep-alive'] = 0;
-}
-
-if (!empty($CFG->showcronsql)) {
-    $DB->set_debug(true);
-}
-if (!empty($CFG->showcrondebugging)) {
-    set_debugging(DEBUG_DEVELOPER, true);
-}
-
-$checklimits = empty($options['ignorelimits']);
-
-core_php_time_limit::raise();
-
-// Increase memory limit.
-raise_memory_limit(MEMORY_EXTRA);
-
-// Emulate normal session - we use admin account by default.
-cron_setup_user();
-
-$humantimenow = date('r', time());
-$keepalive = (int)$options['keep-alive'];
-
-\core\local\cli\shutdown::script_supports_graceful_exit();
-
-mtrace("Server Time: {$humantimenow}\n");
-cron_run_adhoc_tasks(time(), $keepalive, $checklimits);
@@ -120,23 +120,11 @@ if ($options['unset'] || $options['set'] !== null) {
    }

    // Check that the variable is not hard-set in the main config.php already.
-    $component = $options['component'];
-    if (!empty($component)) {
-        $componentsettings = $CFG->forced_plugin_settings[$component] ?? [];
-        $settinginconfig = array_key_exists($options['name'], $componentsettings);
-    } else {
-        $settinginconfig = array_key_exists($options['name'], $CFG->config_php_settings);
-    }
-    if ($settinginconfig) {
+    if (array_key_exists($options['name'], $CFG->config_php_settings)) {
        cli_error('The configuration variable is hard-set in the config.php, unable to change.', 4);
    }

-    $new = $options['set'];
-    $old = get_config($options['component'], $options['name']);
-    if ($new !== $old) {
-        set_config($options['name'], $options['set'], $options['component']);
-        add_to_config_log($options['name'], $old, $new, $options['component']);
-    }
+    set_config($options['name'], $options['set'], $options['component']);
    exit(0);
 }

@@ -1,171 +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 tool for system checks
- *
- * @package    core
- * @category   check
- * @copyright  2020 Brendan Heywood (brendan@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');
-
-use core\check\result;
-
-list($options, $unrecognized) = cli_get_params([
-    'help'    => false,
-    'filter'  => '',
-    'type'    => 'status',
-    'verbose' => false,
-], [
-    'h' => 'help',
-    'f' => 'filter',
-    'v' => 'verbose',
-    't' => 'type',
-]);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-$checks = \core\check\manager::get_checks($options['type']);
-$types = join(', ', \core\check\manager::TYPES);
-
-$help = "Run Moodle system checks
-
-Options:
- -h, --help      Print out this help
- -f, --filter    Filter to a subset of checks
- -t, --type      Which set of checks? Defaults to 'status'
-                 One of $types
- -v, --verbose   Show details of all checks, not just failed checks
-
-Example:
-
-  sudo -u www-data php admin/cli/checks.php
-  sudo -u www-data php admin/cli/checks.php -v
-  sudo -u www-data php admin/cli/checks.php -v --filter=environment
-
-";
-
-if ($options['help']) {
-    echo $help;
-    die();
-}
-
-$filter = $options['filter'];
-if ($filter) {
-    $checks = array_filter($checks, function($check, $key) use ($filter) {
-        $ref = $check->get_ref();
-        return (strpos($ref, $filter) !== false);
-    }, 1);
-}
-
-// These shell exit codes and labels align with the NRPE standard.
-$exitcodes = [
-    result::NA        => 0,
-    result::OK        => 0,
-    result::INFO      => 0,
-    result::UNKNOWN   => 3,
-    result::WARNING   => 1,
-    result::ERROR     => 2,
-    result::CRITICAL  => 2,
-];
-$exitlabel = [
-    result::NA        => 'OK',
-    result::OK        => 'OK',
-    result::INFO      => 'OK',
-    result::UNKNOWN   => 'UNKNOWN',
-    result::WARNING   => 'WARNING',
-    result::ERROR     => 'CRITICAL',
-    result::CRITICAL  => 'CRITICAL',
-];
-
-$format = "%      10s| % -60s\n";
-$spacer = "----------+--------------------------------------------------------------------\n";
-$prefix = '          |';
-
-$output = '';
-$header = $exitlabel[result::OK] . ': ' . get_string('checksok', '', $options['type']) . "\n";
-$exitcode = $exitcodes[result::OK];
-
-foreach ($checks as $check) {
-    $ref = $check->get_ref();
-    $result = $check->get_result();
-
-    $status = $result->get_status();
-    $checkexitcode = $exitcodes[$status];
-
-    // Summary is treated as html.
-    $summary = $result->get_summary();
-    $summary = html_to_text($summary, 60, false);
-
-    if ($checkexitcode > $exitcode) {
-        $exitcode = $checkexitcode;
-        $header = $exitlabel[$status] . ': ' . $check->get_name() . " (" . $check->get_ref() . ")\n";
-    }
-
-    if (empty($messages[$status])) {
-        $messages[$status] = $result;
-    }
-
-    $len = strlen(get_string('status' . $status));
-
-    if ($options['verbose'] ||
-        $status == result::WARNING ||
-        $status == result::CRITICAL ||
-        $status == result::ERROR) {
-
-        $output .= sprintf(
-            $format,
-            $OUTPUT->check_result($result),
-            sprintf('%s (%s)', $check->get_name(), $ref)
-        );
-
-        $summary = str_replace("\n", "\n" . $prefix . '     ', $summary);
-        $output .= sprintf( $format, '', '    ' . $summary);
-
-        if ($options['verbose']) {
-            $actionlink = $check->get_action_link();
-            if ($actionlink) {
-                $output .= sprintf( $format, '', '    ' . $actionlink->url);
-            }
-            $output .= sprintf( $format, '', '');
-        }
-    }
-}
-
-// Print NRPE header.
-print $header;
-
-// Only show the table header if there is anything to show.
-if ($output) {
-    print sprintf($format,
-        get_string('status'). ' ',
-        get_string('check')
-    ) .  $spacer;
-    print $output;
-}
-
-// NRPE shell exit code.
-exit($exitcode);
-
@@ -35,25 +35,8 @@ require_once($CFG->libdir.'/clilib.php');      // cli only functions
 require_once($CFG->libdir.'/cronlib.php');

 // now get cli options
-list($options, $unrecognized) = cli_get_params(
-    [
-        'help' => false,
-        'stop' => false,
-        'list' => false,
-        'force' => false,
-        'enable' => false,
-        'disable' => false,
-        'disable-wait' => false,
-    ], [
-        'h' => 'help',
-        's' => 'stop',
-        'l' => 'list',
-        'f' => 'force',
-        'e' => 'enable',
-        'd' => 'disable',
-        'w' => 'disable-wait',
-    ]
-);
+list($options, $unrecognized) = cli_get_params(array('help'=>false),
+                                               array('h'=>'help'));

 if ($unrecognized) {
    $unrecognized = implode("\n  ", $unrecognized);
@@ -65,13 +48,7 @@ if ($options['help']) {
 "Execute periodic cron actions.

 Options:
-h, --help               Print out this help
-s, --stop               Notify all other running cron processes to stop after the current task
-l, --list               Show the list of currently running tasks and how long they have been running
-f, --force              Execute task even if cron is disabled
-e, --enable             Enable cron
-d, --disable            Disable cron
-w, --disable-wait=600   Disable cron and wait until all tasks finished or fail after N seconds (optional param)
+-h, --help            Print out this help

 Example:
 \$sudo -u www-data /usr/bin/php admin/cli/cron.php
@@ -81,98 +58,4 @@ Example:
    die;
 }

-if ($options['stop']) {
-    // By clearing the caches this signals to other running processes
-    // to exit after finishing the current task.
-    \core\task\manager::clear_static_caches();
-    die;
-}
-
-if ($options['enable']) {
-    set_config('cron_enabled', 1);
-    mtrace('Cron has been enabled for the site.');
-    exit(0);
-}
-
-if ($options['disable']) {
-    set_config('cron_enabled', 0);
-    \core\task\manager::clear_static_caches();
-    mtrace('Cron has been disabled for the site.');
-    exit(0);
-}
-
-if ($options['list']) {
-    $tasks = \core\task\manager::get_running_tasks();
-    mtrace('The list of currently running tasks:');
-    $format = "%7s %-12s %-9s %-20s %-52s\n";
-    printf ($format,
-        'PID',
-        'HOST',
-        'TYPE',
-        'TIME',
-        'CLASSNAME'
-    );
-    foreach ($tasks as $task) {
-        printf ($format,
-            $task->pid,
-            substr($task->hostname, 0, 12),
-            $task->type,
-            format_time(time() - $task->timestarted),
-            substr($task->classname, 0, 52)
-        );
-    }
-    exit(0);
-}
-
-if ($wait = $options['disable-wait']) {
-    $started = time();
-    if (true === $wait) {
-        // Default waiting time.
-        $waitsec = 600;
-    } else {
-        $waitsec = $wait;
-        $wait = true;
-    }
-
-    set_config('cron_enabled', 0);
-    \core\task\manager::clear_static_caches();
-    mtrace('Cron has been disabled for the site.');
-    mtrace('Allocating '. format_time($waitsec) . ' for the tasks to finish.');
-
-    $lastcount = 0;
-    while ($wait) {
-        $tasks = \core\task\manager::get_running_tasks();
-
-        if (count($tasks) == 0) {
-            mtrace('');
-            mtrace('All scheduled and adhoc tasks finished.');
-            exit(0);
-        }
-
-        if (time() - $started >= $waitsec) {
-            mtrace('');
-            mtrace('Wait time ('. format_time($waitsec) . ') elapsed, but ' . count($tasks) . ' task(s) still running.');
-            mtrace('Exiting with code 1.');
-            exit(1);
-        }
-
-        if (count($tasks) !== $lastcount) {
-            mtrace('');
-            mtrace(count($tasks) . " tasks currently running.", '');
-            $lastcount = count($tasks);
-        } else {
-            mtrace('.', '');
-        }
-
-        sleep(1);
-    }
-}
-
-if (!get_config('core', 'cron_enabled') && !$options['force']) {
-    mtrace('Cron is disabled. Use --force to override.');
-    exit(1);
-}
-
-\core\local\cli\shutdown::script_supports_graceful_exit();
-
 cron_run();
@@ -1,65 +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 reset dashboards.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2021 Brendan Heywood (brendan@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->dirroot.'/my/lib.php');
-
-list($options, $unrecognized) = cli_get_params([
-    'help'    => false,
-    'execute' => false,
-], [
-    'h' => 'help',
-    'e' => 'execute',
-]);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized), 2);
-}
-
-if (!$options['execute']) {
-    $help = <<<EOF
-Resets Moodle dashboards for all users
-
-Options:
-h, --help          Print out this help
-e, --execute       Actually run the reset
-
-Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/dashboard_reset.php -e
-
-EOF;
-
-    echo $help;
-    exit(0);
-}
-
-$progressbar = new progress_bar();
-$progressbar->create();
-my_reset_page_for_all_users(MY_PAGE_PRIVATE, 'my-index', $progressbar);
-
@@ -1,138 +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/>.
-
-/**
- * Fix orphaned calendar events that were broken by MDL-67494.
- *
- * This script will look for all the calendar events which userids
- * where broken by a wrong upgrade step, affecting to Moodle 3.9.5
- * and up.
- *
- * It performs checks to both:
- *    a) Detect if the site was affected (ran the wrong upgrade step).
- *    b) Look for orphaned calendar events, categorising them as:
- *       - standard: site / category / course / group / user events
- *       - subscription: events created via subscriptions.
- *       - action: normal action events, created to show common important dates.
- *       - override: user and group override events, particular, that some activities support.
- *       - custom: other events, not being any of the above, common or particular.
- * By specifying it (--fix) try to recover as many broken events (missing userid) as
- * possible. Standard, subscription, action, override events in core are fully supported but
- * override or custom events should be fixed by each plugin as far as there isn't any standard
- * API (plugin-wise) to launch a rebuild of the calendar events.
- *
- * @package core
- * @copyright 2021 onwards Simey Lameze <simey@moodle.com>
- * @license    https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require_once(__DIR__ . '/../../config.php');
-require_once($CFG->libdir . "/clilib.php");
-require_once($CFG->libdir . '/db/upgradelib.php');
-
-// Supported options.
-$long = ['fix'  => false, 'help' => false];
-$short = ['f' => 'fix', 'h' => 'help'];
-
-// CLI options.
-[$options, $unrecognized] = cli_get_params($long, $short);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help']) {
-    $help = <<<EOT
-Fix orphaned calendar events.
-
-  This script detects calendar events that have had their
-  userid lost. By default it will perform various checks
-  and report them, showing the site status in an easy way.
-
-  Also, optionally (--fix), it wil try to recover as many
-  lost userids as possible from different sources. Note that
-  this script aims to process well-know events in core,
-  leaving custom events in 3rd part plugins mostly unmodified
-  because there isn't any consistent way to regenerate them.
-
-  For more details:  https://tracker.moodle.org/browse/MDL-71156
-
-Options:
-  -h, --help    Print out this help.
-  -f, --fix     Fix the orphaned calendar events in the DB.
-                If not specified only check and report problems to STDERR.
-
-Usage:
-  - Only report:    \$ sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_calendar_events.php
-  - Report and fix: \$ sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_calendar_events.php -f
-EOT;
-
-    cli_writeln($help);
-    die;
-}
-
-// Check various usual pre-requisites.
-if (empty($CFG->version)) {
-    cli_error('Database is not yet installed.');
-}
-
-$admin = get_admin();
-if (!$admin) {
-    cli_error('Error: No admin account was found.');
-}
-
-if (moodle_needs_upgrading()) {
-    cli_error('Moodle upgrade pending, script execution suspended.');
-}
-
-// Do everything as admin by default.
-\core\session\manager::set_user($admin);
-
-// Report current site status.
-cli_heading('Checking the site status');
-$needsfix = upgrade_calendar_site_status();
-
-// Report current calendar events status.
-cli_heading('Checking the calendar events status');
-$info = upgrade_calendar_events_status();
-$hasbadevents = $info['total']->bad > 0 || $info['total']->bad != $info['other']->bad;
-$needsfix = $needsfix || $hasbadevents;
-
-// If, selected, fix as many calendar events as possible.
-if ($options['fix']) {
-
-    // If the report has told us that the fix was not needed... ask for confirmation!
-    if (!$needsfix) {
-        cli_writeln("This site DOES NOT NEED to run the calendar events fix.");
-        $input = cli_input('Are you completely sure that you want to run the fix? (y/N)', 'N', ['y', 'Y', 'n', 'N']);
-        if (strtolower($input) != 'y') {
-            exit(0);
-        }
-        cli_writeln("");
-    }
-    cli_heading('Fixing as many as possible calendar events');
-    upgrade_calendar_events_fix_remaining($info);
-    // Report current (after fix) calendar events status.
-    cli_heading('Checking the calendar events status (after fix)');
-    upgrade_calendar_events_status();
-} else if ($needsfix) {
-    // Fix option was not provided but problem events have been found. Notify the user and provide info how to fix these events.
-    cli_writeln("This site NEEDS to run the calendar events fix!");
-    cli_writeln("To fix the calendar events, re-run this script with the --fix option.");
-}
@@ -1,79 +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/>.
-
-/**
- * Generates a secure key for the current server (presuming it does not already exist).
- *
- * @package core_admin
- * @copyright 2020 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-use \core\encryption;
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__ . '/../../config.php');
-require_once($CFG->libdir . '/clilib.php');
-
-// Get cli options.
-[$options, $unrecognized] = cli_get_params(
-        ['help' => false, 'method' => null],
-        ['h' => 'help']);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-// TODO: MDL-71421 - Remove the openssl alternative once sodium becomes a requirement in Moodle 4.2.
-
-if ($options['help']) {
-    echo "Generate secure key
-
-This script manually creates a secure key within the secret data root folder (configured in
-config.php as \$CFG->secretdataroot). You must run it using an account with access to write
-to that folder.
-
-In normal use Moodle automatically creates the key; this script is intended when setting up
-a new Moodle system, for cases where the secure folder is not on shared storage and the key
-may be manually installed on multiple servers.
-
-Options:
-h, --help         Print out this help
--method <method>  Generate key for specified encryption method instead of default.
-                   * sodium
-                   * openssl-aes-256-ctr
-
-Example:
-php admin/cli/generate_key.php
-";
-    exit;
-}
-
-$method = $options['method'];
-
-if (encryption::key_exists($method)) {
-    echo 'Key already exists: ' . encryption::get_key_file($method) . "\n";
-    exit;
-}
-
-// Creates key with default permissions (no chmod).
-echo "Generating key...\n";
-encryption::create_key($method, false);
-
-echo "\nKey created: " . encryption::get_key_file($method) . "\n\n";
-echo "If the key folder is not shared storage, then key files should be copied to all servers.\n";
@@ -215,7 +215,6 @@ define('SITEID', 1);

 //Database types
 $databases = array('mysqli' => moodle_database::get_driver_instance('mysqli', 'native'),
-                   'auroramysql' => moodle_database::get_driver_instance('auroramysql', 'native'),
                   'mariadb'=> moodle_database::get_driver_instance('mariadb', 'native'),
                   'pgsql'  => moodle_database::get_driver_instance('pgsql',  'native'),
                   'oci'    => moodle_database::get_driver_instance('oci',    'native'),
@@ -267,7 +266,6 @@ list($options, $unrecognized) = cli_get_params(
 );

 $interactive = empty($options['non-interactive']);
-$skipdatabase = $options['skip-database'];

 // set up language
 $lang = clean_param($options['lang'], PARAM_SAFEDIR);
@@ -639,100 +637,96 @@ do {
    }
 } while ($hintdatabase !== '');

-// If --skip-database option is provided, we do not need to ask for site fullname, shortname, adminuser, adminpass, adminemail.
-// These fields will be requested during the database install part.
-if (!$skipdatabase) {
-    // Ask for fullname.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('fullsitename', 'moodle'));
+// ask for fullname
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('fullsitename', 'moodle'));

-        if ($options['fullname'] !== '') {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['fullname']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-
-        do {
-            $options['fullname'] = cli_input($prompt, $options['fullname']);
-        } while (empty($options['fullname']));
+    if ($options['fullname'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['fullname']);
    } else {
-        if (empty($options['fullname'])) {
-            $a = (object)['option' => 'fullname', 'value' => $options['fullname']];
-            cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-        }
-    }
-
-    // Ask for shortname.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('shortsitename', 'moodle'));
-
-        if ($options['shortname'] !== '') {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['shortname']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-
-        do {
-            $options['shortname'] = cli_input($prompt, $options['shortname']);
-        } while (empty($options['shortname']));
-    } else {
-        if (empty($options['shortname'])) {
-            $a = (object)['option' => 'shortname', 'value' => $options['shortname']];
-            cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-        }
-    }
-
-    // Ask for admin user name.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('cliadminusername', 'install'));
-        if (!empty($options['adminuser'])) {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['adminuser']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-        do {
-            $options['adminuser'] = cli_input($prompt, $options['adminuser']);
-        } while (empty($options['adminuser']) or $options['adminuser'] === 'guest');
-    } else {
-        if ((empty($options['adminuser']) || $options['adminuser'] === 'guest')) {
-            $a = (object)['option' => 'adminuser', 'value' => $options['adminuser']];
-            cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-        }
-    }
-
-    // Ask for admin user password.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('cliadminpassword', 'install'));
        $prompt = get_string('clitypevalue', 'admin');
-        do {
-            $options['adminpass'] = cli_input($prompt);
-        } while (empty($options['adminpass']) or $options['adminpass'] === 'admin');
-    } else {
-        if ((empty($options['adminpass']) or $options['adminpass'] === 'admin')) {
-            $a = (object)['option' => 'adminpass', 'value' => $options['adminpass']];
-            cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-        }
    }

-    // Ask for the admin email address.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('cliadminemail', 'install'));
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['adminemail']);
-        $options['adminemail'] = cli_input($prompt, $options['adminemail']);
-    }
-
-    // Validate that the address provided was an e-mail address.
-    if (!empty($options['adminemail']) && !validate_email($options['adminemail'])) {
-        $a = (object)['option' => 'adminemail', 'value' => $options['adminemail']];
+    do {
+        $options['fullname'] = cli_input($prompt, $options['fullname']);
+    } while (empty($options['fullname']));
+} else {
+    if (empty($options['fullname'])) {
+        $a = (object)array('option'=>'fullname', 'value'=>$options['fullname']);
        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
    }
 }

+// ask for shortname
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('shortsitename', 'moodle'));
+
+    if ($options['shortname'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['shortname']);
+    } else {
+        $prompt = get_string('clitypevalue', 'admin');
+    }
+
+    do {
+        $options['shortname'] = cli_input($prompt, $options['shortname']);
+    } while (empty($options['shortname']));
+} else {
+    if (empty($options['shortname'])) {
+        $a = (object)array('option'=>'shortname', 'value'=>$options['shortname']);
+        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
+    }
+}
+
+// ask for admin user name
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('cliadminusername', 'install'));
+    if (!empty($options['adminuser'])) {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['adminuser']);
+    } else {
+        $prompt = get_string('clitypevalue', 'admin');
+    }
+    do {
+        $options['adminuser'] = cli_input($prompt, $options['adminuser']);
+    } while (empty($options['adminuser']) or $options['adminuser'] === 'guest');
+} else {
+    if (empty($options['adminuser']) or $options['adminuser'] === 'guest') {
+        $a = (object)array('option'=>'adminuser', 'value'=>$options['adminuser']);
+        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
+    }
+}
+
+// ask for admin user password
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('cliadminpassword', 'install'));
+    $prompt = get_string('clitypevalue', 'admin');
+    do {
+        $options['adminpass'] = cli_input($prompt);
+    } while (empty($options['adminpass']) or $options['adminpass'] === 'admin');
+} else {
+    if (empty($options['adminpass']) or $options['adminpass'] === 'admin') {
+        $a = (object)array('option'=>'adminpass', 'value'=>$options['adminpass']);
+        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
+    }
+}
+
+// Ask for the admin email address.
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('cliadminemail', 'install'));
+    $prompt = get_string('clitypevaluedefault', 'admin', $options['adminemail']);
+    $options['adminemail'] = cli_input($prompt, $options['adminemail']);
+}
+
+// Validate that the address provided was an e-mail address.
+if (!empty($options['adminemail']) && !validate_email($options['adminemail'])) {
+    $a = (object) array('option' => 'adminemail', 'value' => $options['adminemail']);
+    cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
+}
+
 // Ask for the upgrade key.
 if ($interactive) {
    cli_separator();
@@ -751,27 +745,23 @@ if ($options['upgradekey'] !== '') {
    $CFG->upgradekey = $options['upgradekey'];
 }

-// The user does not also need to pass agree-license when --skip-database is provided as the user will need to accept
-// the license again in the database install part.
-if (!$skipdatabase) {
-    if ($interactive) {
-        if (!$options['agree-license']) {
-            cli_separator();
-            cli_heading(get_string('copyrightnotice'));
-            echo "Moodle  - Modular Object-Oriented Dynamic Learning Environment\n";
-            echo get_string('gpl3')."\n\n";
-            echo get_string('doyouagree')."\n";
-            $prompt = get_string('cliyesnoprompt', 'admin');
-            $input = cli_input($prompt, '', array(get_string('clianswerno', 'admin'), get_string('cliansweryes', 'admin')));
-            if ($input == get_string('clianswerno', 'admin')) {
-                exit(1);
-            }
-        }
-    } else {
-        if (!$options['agree-license'] && !$skipdatabase) {
-            cli_error(get_string('climustagreelicense', 'install'));
+if ($interactive) {
+    if (!$options['agree-license']) {
+        cli_separator();
+        cli_heading(get_string('copyrightnotice'));
+        echo "Moodle  - Modular Object-Oriented Dynamic Learning Environment\n";
+        echo get_string('gpl3')."\n\n";
+        echo get_string('doyouagree')."\n";
+        $prompt = get_string('cliyesnoprompt', 'admin');
+        $input = cli_input($prompt, '', array(get_string('clianswerno', 'admin'), get_string('cliansweryes', 'admin')));
+        if ($input == get_string('clianswerno', 'admin')) {
+            exit(1);
        }
    }
+} else {
+    if (!$options['agree-license']) {
+        cli_error(get_string('climustagreelicense', 'install'));
+    }
 }

 // Finally we have all info needed for config.php
@@ -819,7 +809,7 @@ if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
    cli_error(get_string('pluginschecktodo', 'admin'));
 }

-if (!$skipdatabase) {
+if (!$options['skip-database']) {
    install_cli_database($options, $interactive);
    // This needs to happen at the end to ensure it occurs after all caches
    // have been purged for the last time.
@@ -56,7 +56,6 @@ Options:
 --agree-license       Indicates agreement with software license.
 --fullname=STRING     Name of the site
 --shortname=STRING    Name of the site
--summary=STRING      The summary to be displayed on the front page
 -h, --help            Print out this help

 Example:
@@ -97,7 +96,6 @@ list($options, $unrecognized) = cli_get_params(
        'adminemail'        => '',
        'fullname'          => '',
        'shortname'         => '',
-        'summary'           => '',
        'agree-license'     => false,
        'help'              => false
    ),
@@ -106,11 +104,6 @@ list($options, $unrecognized) = cli_get_params(
    )
 );

-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
 // We show help text even if tables are installed.
 if ($options['help']) {
    echo $help;
@@ -119,7 +119,7 @@ if (!empty($options['collation'])) {
    if ($dbcollation->value !== $collation || $dbcharset->value !== $charset) {
        // Try to convert the DB.
        echo "Converting database to '$collation' for $CFG->wwwroot:\n";
-        $sql = "ALTER DATABASE `$CFG->dbname` DEFAULT CHARACTER SET $charset DEFAULT COLLATE = $collation";
+        $sql = "ALTER DATABASE $CFG->dbname DEFAULT CHARACTER SET $charset DEFAULT COLLATE = $collation";
        try {
            $DB->change_database_structure($sql);
        } catch (exception $e) {
@@ -146,7 +146,7 @@ if (!empty($options['collation'])) {

        } else {
            try {
-                $DB->change_database_structure("ALTER TABLE `$table->name` CONVERT TO CHARACTER SET $charset COLLATE $collation");
+                $DB->change_database_structure("ALTER TABLE $table->name CONVERT TO CHARACTER SET $charset COLLATE $collation");
                echo "CONVERTED\n";
                $converted++;
            } catch (ddl_exception $e) {
@@ -163,7 +163,7 @@ if (!empty($options['collation'])) {
            }
        }

-        $sql = "SHOW FULL COLUMNS FROM `$table->name` WHERE collation IS NOT NULL";
+        $sql = "SHOW FULL COLUMNS FROM $table->name WHERE collation IS NOT NULL";
        $rs2 = $DB->get_recordset_sql($sql);
        foreach ($rs2 as $column) {
            $column = (object)array_change_key_case((array)$column, CASE_LOWER);
@@ -181,7 +181,7 @@ if (!empty($options['collation'])) {
                $notnull = ($column->null === 'NO') ? 'NOT NULL' : 'NULL';
                $default = (!is_null($column->default) and $column->default !== '') ? "DEFAULT '$column->default'" : '';
                // primary, unique and inc are not supported for texts
-                $sql = "ALTER TABLE `$table->name`
+                $sql = "ALTER TABLE $table->name
                        MODIFY COLUMN $column->field $column->type
                        CHARACTER SET $charset
                        COLLATE $collation $notnull $default";
@@ -192,11 +192,11 @@ if (!empty($options['collation'])) {
                $default = !is_null($column->default) ? "DEFAULT '$column->default'" : '';

                if ($rowformat != '') {
-                    $sql = "ALTER TABLE `$table->name` $rowformat";
+                    $sql = "ALTER TABLE $table->name $rowformat";
                    $DB->change_database_structure($sql);
                }

-                $sql = "ALTER TABLE `$table->name`
+                $sql = "ALTER TABLE $table->name
                        MODIFY COLUMN $column->field $column->type
                        CHARACTER SET $charset
                        COLLATE $collation $notnull $default";
@@ -315,8 +315,8 @@ function mysql_set_row_format($tablename, $charset, $collation, $engine) {
        if ($rs->row_format == 'Compact' || $rs->row_format == 'Redundant') {
            $rowformat = $DB->get_row_format_sql($engine, $collation);
            // Try to convert to compressed format and then try updating the collation again.
-            $DB->change_database_structure("ALTER TABLE `$tablename` $rowformat");
-            $DB->change_database_structure("ALTER TABLE `$tablename` CONVERT TO CHARACTER SET $charset COLLATE $collation");
+            $DB->change_database_structure("ALTER TABLE $tablename $rowformat");
+            $DB->change_database_structure("ALTER TABLE $tablename CONVERT TO CHARACTER SET $charset COLLATE $collation");
        } else {
            // Row format may not be the problem. Can not diagnose problem. Send fail reply.
            return false;
@@ -158,7 +158,7 @@ if (!empty($options['info'])) {
    }

    foreach ($fixtables as $table) {
-        $DB->change_database_structure("ALTER TABLE `{$prefix}$table` ROW_FORMAT=Compressed");
+        $DB->change_database_structure("ALTER TABLE {$prefix}$table ROW_FORMAT=Compressed");
        echo str_pad($prefix . $table, 32, ' ', STR_PAD_RIGHT) . " ... Compressed\n";
    }

@@ -189,7 +189,7 @@ if (!empty($options['info'])) {
    echo "SET GLOBAL innodb_file_per_table=1;\n";
    echo "SET GLOBAL innodb_file_format=Barracuda;\n";
    foreach ($fixtables as $table) {
-        echo "ALTER TABLE `{$prefix}$table` ROW_FORMAT=Compressed;\n";
+        echo "ALTER TABLE {$prefix}$table ROW_FORMAT=Compressed;\n";
    }
    echo "\n";
    exit(0);
@@ -1,109 +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 script allows to restore a course from CLI.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2020 Catalyst IT
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', 1);
-
-require(__DIR__ . '/../../config.php');
-require_once($CFG->libdir . '/clilib.php');
-require_once($CFG->dirroot . "/backup/util/includes/restore_includes.php");
-
-list($options, $unrecognized) = cli_get_params([
-    'file' => '',
-    'categoryid' => '',
-    'showdebugging' => false,
-    'help' => false,
-], [
-    'f' => 'file',
-    'c' => 'categoryid',
-    's' => 'showdebugging',
-    'h' => 'help',
-]);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help'] || !($options['file']) || !($options['categoryid'])) {
-    $help = <<<EOL
-Restore backup into provided category.
-
-Options:
-f, --file=STRING           Path to the backup file.
-c, --categoryid=INT        ID of the category to restore too.
-s, --showdebugging         Show developer level debugging information
-h, --help                  Print out this help.
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/restore_backup.php --file=/path/to/backup/file.mbz --categoryid=1\n
-EOL;
-
-    echo $help;
-    exit(0);
-}
-
-if ($options['showdebugging']) {
-    set_debugging(DEBUG_DEVELOPER, true);
-}
-
-if (!$admin = get_admin()) {
-    print_error('noadmins');
-}
-
-if (!file_exists($options['file'])) {
-    print_error('filenotfound');
-}
-
-if (!$category = $DB->get_record('course_categories', ['id' => $options['categoryid']], 'id')) {
-    print_error('invalidcategoryid');
-}
-
-$backupdir = "restore_" . uniqid();
-$path = $CFG->tempdir . DIRECTORY_SEPARATOR . "backup" . DIRECTORY_SEPARATOR . $backupdir;
-
-cli_heading(get_string('extractingbackupfileto', 'backup', $path));
-$fp = get_file_packer('application/vnd.moodle.backup');
-$fp->extract_to_pathname($options['file'], $path);
-
-cli_heading(get_string('preprocessingbackupfile'));
-try {
-    list($fullname, $shortname) = restore_dbops::calculate_course_names(0, get_string('restoringcourse', 'backup'),
-        get_string('restoringcourseshortname', 'backup'));
-
-    $courseid = restore_dbops::create_new_course($fullname, $shortname, $category->id);
-
-    $rc = new restore_controller($backupdir, $courseid, backup::INTERACTIVE_NO,
-        backup::MODE_GENERAL, $admin->id, backup::TARGET_NEW_COURSE);
-    $rc->execute_precheck();
-    $rc->execute_plan();
-    $rc->destroy();
-} catch (Exception $e) {
-    cli_heading(get_string('cleaningtempdata'));
-    fulldelete($path);
-    print_error('generalexceptionmessage', 'error', '', $e->getMessage());
-}
-
-cli_heading(get_string('restoredcourseid', 'backup', $courseid));
-exit(0);
@@ -1,168 +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 task execution.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2014 Petr Skoda
- * @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/cronlib.php");
-
-list($options, $unrecognized) = cli_get_params(
-    [
-        'help' => false,
-        'list' => false,
-        'execute' => false,
-        'showsql' => false,
-        'showdebugging' => false,
-        'force' => false,
-    ], [
-        'h' => 'help',
-        'f' => 'force',
-    ]
-);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help'] or (!$options['list'] and !$options['execute'])) {
-    $help =
-    "Scheduled cron tasks.
-
-    Options:
-    --execute=\\some\\task  Execute scheduled task manually
-    --list                List all scheduled tasks
-    --showsql             Show sql queries before they are executed
-    --showdebugging       Show developer level debugging information
-    -h, --help            Print out this help
-    -f, --force           Execute task even if cron is disabled
-
-    Example:
-    \$sudo -u www-data /usr/bin/php admin/cli/scheduled_task.php --execute=\\core\\task\\session_cleanup_task
-
-    ";
-
-    echo $help;
-    die;
-}
-
-if ($options['showdebugging'] || !empty($CFG->showcrondebugging)) {
-    set_debugging(DEBUG_DEVELOPER, true);
-}
-
-if ($options['showsql'] || !empty($CFG->showcronsql)) {
-    $DB->set_debug(true);
-}
-if ($options['list']) {
-    cli_heading("List of scheduled tasks ($CFG->wwwroot)");
-
-    $shorttime = get_string('strftimedatetimeshort');
-
-    $tasks = \core\task\manager::get_all_scheduled_tasks();
-    echo str_pad(get_string('scheduledtasks', 'tool_task'), 50, ' ') . ' ' . str_pad(get_string('runpattern', 'tool_task'), 17, ' ')
-        . ' ' . str_pad(get_string('lastruntime', 'tool_task'), 40, ' ') . get_string('nextruntime', 'tool_task') . "\n";
-    foreach ($tasks as $task) {
-        $class = '\\' . get_class($task);
-        $schedule = $task->get_minute() . ' '
-            . $task->get_hour() . ' '
-            . $task->get_day() . ' '
-            . $task->get_day_of_week() . ' '
-            . $task->get_month() . ' '
-            . $task->get_day_of_week();
-        $nextrun = $task->get_next_run_time();
-        $lastrun = $task->get_last_run_time();
-
-        $plugininfo = core_plugin_manager::instance()->get_plugin_info($task->get_component());
-        $plugindisabled = $plugininfo && $plugininfo->is_enabled() === false && !$task->get_run_if_component_disabled();
-
-        if ($plugindisabled) {
-            $nextrun = get_string('plugindisabled', 'tool_task');
-        } else if ($task->get_disabled()) {
-            $nextrun = get_string('taskdisabled', 'tool_task');
-        } else if ($nextrun > time()) {
-            $nextrun = userdate($nextrun);
-        } else {
-            $nextrun = get_string('asap', 'tool_task');
-        }
-
-        if ($lastrun) {
-            $lastrun = userdate($lastrun);
-        } else {
-            $lastrun = get_string('never');
-        }
-
-        echo str_pad($class, 50, ' ') . ' ' . str_pad($schedule, 17, ' ') .
-            ' ' . str_pad($lastrun, 40, ' ') . ' ' . $nextrun . "\n";
-    }
-    exit(0);
-}
-
-if ($execute = $options['execute']) {
-    if (!$task = \core\task\manager::get_scheduled_task($execute)) {
-        mtrace("Task '$execute' not found");
-        exit(1);
-    }
-
-    if (moodle_needs_upgrading()) {
-        mtrace("Moodle upgrade pending, cannot execute tasks.");
-        exit(1);
-    }
-
-    if (!get_config('core', 'cron_enabled') && !$options['force']) {
-        mtrace('Cron is disabled. Use --force to override.');
-        exit(1);
-    }
-
-    \core\task\manager::scheduled_task_starting($task);
-
-    // Increase memory limit.
-    raise_memory_limit(MEMORY_EXTRA);
-
-    // Emulate normal session - we use admin account by default.
-    cron_setup_user();
-
-    // Execute the task.
-    \core\local\cli\shutdown::script_supports_graceful_exit();
-    $cronlockfactory = \core\lock\lock_config::get_lock_factory('cron');
-    if (!$cronlock = $cronlockfactory->get_lock('core_cron', 10)) {
-        mtrace('Cannot obtain cron lock');
-        exit(129);
-    }
-    if (!$lock = $cronlockfactory->get_lock('\\' . get_class($task), 10)) {
-        $cronlock->release();
-        mtrace('Cannot obtain task lock');
-        exit(130);
-    }
-
-    $task->set_lock($lock);
-    if (!$task->is_blocking()) {
-        $cronlock->release();
-    } else {
-        $task->set_cron_lock($cronlock);
-    }
-
-    cron_run_inner_scheduled_task($task);
-}
@@ -38,17 +38,17 @@ if ($unrecognized) {
 }

 // If necessary add files that should be ignored - such as in 3rd party plugins.
-$ignorelist = array();
+$blacklist = array();
 $path = $options['path'];
 if (!file_exists($path)) {
    cli_error("Invalid path $path");
 }

 if ($options['ie9fix']) {
-    core_admin_recurse_svgs($path, '', 'core_admin_svgtool_ie9fix', $ignorelist);
+    core_admin_recurse_svgs($path, '', 'core_admin_svgtool_ie9fix', $blacklist);

 } else if ($options['noaspectratio']) {
-    core_admin_recurse_svgs($path, '', 'core_admin_svgtool_noaspectratio', $ignorelist);
+    core_admin_recurse_svgs($path, '', 'core_admin_svgtool_noaspectratio', $blacklist);

 } else {
    $help =
@@ -153,9 +153,9 @@ function core_admin_svgtool_noaspectratio($file) {
 * @param string $base
 * @param string $sub
 * @param string $filecallback
- * @param array $ignorelist List of files to be ignored and skipped.
+ * @param array $blacklist
 */
-function core_admin_recurse_svgs($base, $sub, $filecallback, $ignorelist) {
+function core_admin_recurse_svgs($base, $sub, $filecallback, $blacklist) {
    if (is_dir("$base/$sub")) {
        $items = new DirectoryIterator("$base/$sub");
        foreach ($items as $item) {
@@ -163,7 +163,7 @@ function core_admin_recurse_svgs($base, $sub, $filecallback, $ignorelist) {
                continue;
            }
            $file = $item->getFilename();
-            core_admin_recurse_svgs("$base/$sub", $file, $filecallback, $ignorelist);
+            core_admin_recurse_svgs("$base/$sub", $file, $filecallback, $blacklist);
        }
        unset($item);
        unset($items);
@@ -174,7 +174,7 @@ function core_admin_recurse_svgs($base, $sub, $filecallback, $ignorelist) {
            return;
        }
        $file = realpath("$base/$sub");
-        if (in_array($file, $ignorelist)) {
+        if (in_array($file, $blacklist)) {
            return;
        }
        $filecallback($file);
@@ -34,22 +34,16 @@ $help = "Command line tool to uninstall plugins.
 Options:
    -h --help                   Print this help.
    --show-all                  Displays a list of all installed plugins.
-    --show-contrib              Displays a list of all third-party 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.
-    --showsql                   Show sql queries before they are executed.
-    --showdebugging             Show developer level debugging information.

 Examples:

    # php uninstall_plugins.php  --show-all
        Prints tab-separated list of all installed plugins.

-    # php uninstall_plugins.php  --show-contrib
-        Prints tab-separated list of all third-party installed plugins.
-
    # php uninstall_plugins.php  --show-missing
        Prints tab-separated list of all missing from disk plugins.

@@ -69,13 +63,10 @@ Examples:
 list($options, $unrecognised) = cli_get_params([
    'help' => false,
    'show-all' => false,
-    'show-contrib' => false,
    'show-missing' => false,
    'purge-missing' => false,
    'plugins' => false,
    'run' => false,
-    'showsql' => false,
-    'showdebugging' => false,
 ], [
    'h' => 'help'
 ]);
@@ -90,26 +81,15 @@ if ($options['help']) {
    exit(0);
 }

-if ($options['showdebugging']) {
-    set_debugging(DEBUG_DEVELOPER, true);
-}
-
-if ($options['showsql']) {
-    $DB->set_debug(true);
-}
-
 $pluginman = core_plugin_manager::instance();
 $plugininfo = $pluginman->get_plugins();

-if ($options['show-all'] || $options['show-missing'] || $options['show-contrib']) {
+if ($options['show-all'] || $options['show-missing']) {
    foreach ($plugininfo as $type => $plugins) {
        foreach ($plugins as $name => $plugin) {
-            if ($options['show-contrib'] && $plugin->is_standard()) {
-                continue;
-            }
            $pluginstring = $plugin->component . "\t" . $plugin->displayname;

-            if ($options['show-all'] || $options['show-contrib']) {
+            if ($options['show-all']) {
                cli_writeln($pluginstring);
            } else {
                if ($plugin->get_status() === core_plugin_manager::PLUGIN_STATUS_MISSING) {
@@ -135,18 +135,9 @@ if (!$envstatus) {
    exit(1);
 }

-// Make sure there are no files left over from previous versions.
-if (upgrade_stale_php_files_present()) {
-    cli_problem(get_string('upgradestalefiles', 'admin'));
-
-    // Stale file info contains HTML elements which aren't suitable for CLI.
-    $upgradestalefilesinfo = get_string('upgradestalefilesinfo', 'admin', get_docs_url('Upgrading'));
-    cli_error(strip_tags($upgradestalefilesinfo));
-}
-
 // Test plugin dependencies.
 $failed = array();
-if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
+if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
    cli_problem(get_string('pluginscheckfailed', 'admin', array('pluginslist' => implode(', ', array_unique($failed)))));
    cli_error(get_string('pluginschecktodo', 'admin'));
 }
@@ -1,84 +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/>.
-
-/**
- * Content bank and its plugins settings.
- *
- * @package    core
- * @subpackage contentbank
- * @copyright  2020 Amaia Anabitarte <amaia@moodle.com>
- * @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);
-$name   = required_param('name', PARAM_PLUGIN);
-
-$syscontext = context_system::instance();
-$PAGE->set_url('/admin/contentbank.php');
-$PAGE->set_context($syscontext);
-
-require_admin();
-require_sesskey();
-
-$return = new moodle_url('/admin/settings.php', array('section' => 'managecontentbanktypes'));
-
-$plugins = core_plugin_manager::instance()->get_plugins_of_type('contenttype');
-$sortorder = array_flip(array_keys($plugins));
-
-if (!isset($plugins[$name])) {
-    print_error('contenttypenotfound', 'error', $return, $name);
-}
-
-switch ($action) {
-    case 'disable':
-        if ($plugins[$name]->is_enabled()) {
-            set_config('disabled', 1, 'contentbank_'. $name);
-        }
-        break;
-    case 'enable':
-        if (!$plugins[$name]->is_enabled()) {
-            unset_config('disabled', 'contentbank_'. $name);
-        }
-        break;
-    case 'up':
-        if ($sortorder[$name]) {
-            $currentindex = $sortorder[$name];
-            $seq = array_keys($plugins);
-            $seq[$currentindex] = $seq[$currentindex - 1];
-            $seq[$currentindex - 1] = $name;
-            set_config('contentbank_plugins_sortorder', implode(',', $seq));
-        }
-        break;
-    case 'down':
-        if ($sortorder[$name] < count($sortorder) - 1) {
-            $currentindex = $sortorder[$name];
-            $seq = array_keys($plugins);
-            $seq[$currentindex] = $seq[$currentindex + 1];
-            $seq[$currentindex + 1] = $name;
-            set_config('contentbank_plugins_sortorder', implode(',', $seq));
-        }
-        break;
-}
-core_plugin_manager::reset_caches();
-$cache = cache::make('core', 'contentbank_enabled_extensions');
-$cache->purge();
-$cache = cache::make('core', 'contentbank_context_extensions');
-$cache->purge();
-
-redirect($return);
@@ -2815,7 +2815,6 @@
      <VENDOR name="oracle" version="11.2" />
    </DATABASE>
    <PHP version="7.1.0" level="required">
-      <RESTRICT function="restrict_php_version_80" message="unsupportedphpversion80" />
    </PHP>
    <PCREUNICODE level="optional">
      <FEEDBACK>
@@ -2997,7 +2996,6 @@
      <VENDOR name="oracle" version="11.2" />
    </DATABASE>
    <PHP version="7.2.0" level="required">
-      <RESTRICT function="restrict_php_version_80" message="unsupportedphpversion80" />
    </PHP>
    <PCREUNICODE level="optional">
      <FEEDBACK>
@@ -3163,768 +3161,6 @@
          <ON_CHECK message="sixtyfourbitswarning" />
        </FEEDBACK>
      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_igbinary322_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="igbinary322buggyversion" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="3.10" requires="3.5">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="10.2.29" />
-      <VENDOR name="mysql" version="5.7" />
-      <VENDOR name="postgres" version="9.6" />
-      <VENDOR name="mssql" version="11.0" />
-      <VENDOR name="oracle" version="11.2" />
-    </DATABASE>
-    <PHP version="7.2.0" level="required">
-      <RESTRICT function="restrict_php_version_80" message="unsupportedphpversion80" />
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="mbstringrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="opensslrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlreader" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="intlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-      <PHP_EXTENSION name="fileinfo" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="96M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="opcache.enable" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opcacherecommended" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbstorageengine" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="quizattemptsupgradedmessage" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="slashargumentswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unsupporteddbtablerowformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unoconvwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="libcurlwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfileformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfilepertable" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddblargeprefix" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="ishttpswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="incompleteunicodesupport" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="sixtyfourbitswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_igbinary322_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="igbinary322buggyversion" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="3.11" requires="3.6">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="10.2.29" />
-      <VENDOR name="mysql" version="5.7" />
-      <VENDOR name="postgres" version="9.6" />
-      <VENDOR name="mssql" version="14.0" />
-      <VENDOR name="oracle" version="11.2" />
-    </DATABASE>
-    <PHP version="7.3.0" level="required">
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="mbstringrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="opensslrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlreader" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="intlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-      <PHP_EXTENSION name="fileinfo" level="required"/>
-      <PHP_EXTENSION name="sodium" level="optional"/>
-    </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_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="4.0" requires="3.6">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="10.2.29" />
-      <VENDOR name="mysql" version="5.7" />
-      <VENDOR name="postgres" version="10" />
-      <VENDOR name="mssql" version="14.0" />
-      <VENDOR name="oracle" version="11.2" />
-    </DATABASE>
-    <PHP version="7.3.0" level="required">
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="mbstringrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="opensslrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlreader" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="intlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-      <PHP_EXTENSION name="fileinfo" level="required"/>
-      <PHP_EXTENSION name="sodium" level="optional"/>
-      <PHP_EXTENSION name="exif" level="optional"/>
-    </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_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="iscustomadminwarnings" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="4.1" requires="3.9">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="10.4" />
-      <VENDOR name="mysql" version="5.7" />
-      <VENDOR name="postgres" version="12" />
-      <VENDOR name="mssql" version="14.0" />
-      <VENDOR name="oracle" version="19" />
-    </DATABASE>
-    <PHP version="7.4.0" level="required">
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="mbstringrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="opensslrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlreader" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="intlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-      <PHP_EXTENSION name="fileinfo" level="required"/>
-      <PHP_EXTENSION name="sodium" level="optional"/>
-      <PHP_EXTENSION name="exif" level="optional"/>
-    </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_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="iscustomadminwarnings" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
-      </CUSTOM_CHECK>
    </CUSTOM_CHECKS>
  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -226,7 +226,7 @@ if (!core_tables_exist()) {
    }
    if (empty($confirmrelease)) {
        require_once($CFG->libdir.'/environmentlib.php');
-        list($envstatus, $environmentresults) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
+        list($envstatus, $environment_results) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
        $strcurrentrelease = get_string('currentrelease');

        $PAGE->navbar->add($strcurrentrelease);
@@ -235,13 +235,13 @@ if (!core_tables_exist()) {
        $PAGE->set_cacheable(false);

        $output = $PAGE->get_renderer('core', 'admin');
-        echo $output->install_environment_page($maturity, $envstatus, $environmentresults, $release);
+        echo $output->install_environment_page($maturity, $envstatus, $environment_results, $release);
        die();
    }

    // check plugin dependencies
    $failed = array();
-    if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
+    if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
        $PAGE->navbar->add(get_string('pluginscheck', 'admin'));
        $PAGE->set_title($strinstallation);
        $PAGE->set_heading($strinstallation . ' - Moodle ' . $CFG->target_release);
@@ -358,9 +358,9 @@ if (!$cache and $version > $CFG->version) {  // upgrade
        echo $output->upgrade_confirm_page($a->newversion, $maturity, $testsite);
        die();

-    } else if (empty($confirmrelease)) {
+    } else if (empty($confirmrelease)){
        require_once($CFG->libdir.'/environmentlib.php');
-        list($envstatus, $environmentresults) = check_moodle_environment($release, ENV_SELECT_RELEASE);
+        list($envstatus, $environment_results) = check_moodle_environment($release, ENV_SELECT_RELEASE);
        $strcurrentrelease = get_string('currentrelease');

        $PAGE->navbar->add($strcurrentrelease);
@@ -368,7 +368,7 @@ if (!$cache and $version > $CFG->version) {  // upgrade
        $PAGE->set_heading($strcurrentrelease);
        $PAGE->set_cacheable(false);

-        echo $output->upgrade_environment_page($release, $envstatus, $environmentresults);
+        echo $output->upgrade_environment_page($release, $envstatus, $environment_results);
        die();

    } else if (empty($confirmplugins)) {
@@ -508,9 +508,8 @@ if (!$cache and $version > $CFG->version) {  // upgrade
    } else {
        // Always verify plugin dependencies!
        $failed = array();
-        if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
-            echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
-                array('confirmplugincheck' => 0)));
+        if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
+            echo $output->unsatisfied_dependencies_page($version, $failed, $PAGE->url);
            die();
        }
        unset($failed);
@@ -534,10 +533,7 @@ if (!$cache and $branch <> $CFG->branch) {  // Update the branch

 if (!$cache and moodle_needs_upgrading()) {

-    $PAGE->set_url(new moodle_url($PAGE->url, array(
-        'confirmrelease' => $confirmrelease,
-        'confirmplugincheck' => $confirmplugins,
-    )));
+    $PAGE->set_url(new moodle_url($PAGE->url, array('confirmplugincheck' => $confirmplugins)));

    check_upgrade_key($upgradekeyhash);

@@ -547,21 +543,7 @@ if (!$cache and moodle_needs_upgrading()) {
        $pluginman = core_plugin_manager::instance();
        $output = $PAGE->get_renderer('core', 'admin');

-        if (empty($confirmrelease)) {
-            require_once($CFG->libdir . '/environmentlib.php');
-
-            list($envstatus, $environmentresults) = check_moodle_environment($release, ENV_SELECT_RELEASE);
-            $strcurrentrelease = get_string('currentrelease');
-
-            $PAGE->navbar->add($strcurrentrelease);
-            $PAGE->set_title($strcurrentrelease);
-            $PAGE->set_heading($strcurrentrelease);
-            $PAGE->set_cacheable(false);
-
-            echo $output->upgrade_environment_page($release, $envstatus, $environmentresults);
-            die();
-
-        } else if (!$confirmplugins) {
+        if (!$confirmplugins) {
            $strplugincheck = get_string('plugincheck');

            $PAGE->navbar->add($strplugincheck);
@@ -700,10 +682,9 @@ if (!$cache and moodle_needs_upgrading()) {

        // Make sure plugin dependencies are always checked.
        $failed = array();
-        if (!$pluginman->all_plugins_ok($version, $failed, $CFG->branch)) {
+        if (!$pluginman->all_plugins_ok($version, $failed)) {
            $output = $PAGE->get_renderer('core', 'admin');
-            echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
-                array('confirmplugincheck' => 0)));
+            echo $output->unsatisfied_dependencies_page($version, $failed, $PAGE->url);
            die();
        }
        unset($failed);
@@ -821,7 +802,7 @@ $SESSION->admin_critical_warning = ($insecuredataroot==INSECURE_DATAROOT_ERROR);
 $adminroot = admin_get_root();

 // Check if there are any new admin settings which have still yet to be set
-if (any_new_admin_settings($adminroot)) {
+if (any_new_admin_settings($adminroot)){
    redirect('upgradesettings.php');
 }

@@ -845,9 +826,8 @@ $errorsdisplayed = defined('WARN_DISPLAY_ERRORS_ENABLED');
 $lastcron = get_config('tool_task', 'lastcronstart');
 $cronoverdue = ($lastcron < time() - 3600 * 24);
 $lastcroninterval = get_config('tool_task', 'lastcroninterval');
-
-$expectedfrequency = $CFG->expectedcronfrequency ?? MINSECS;
-$croninfrequent = !$cronoverdue && ($lastcroninterval > ($expectedfrequency + MINSECS) || $lastcron < time() - $expectedfrequency);
+$expectedfrequency = $CFG->expectedcronfrequency ?? 200;
+$croninfrequent = !$cronoverdue && ($lastcroninterval > $expectedfrequency || $lastcron < time() - $expectedfrequency);
 $dbproblems = $DB->diagnose();
 $maintenancemode = !empty($CFG->maintenance_enabled);

@@ -901,12 +881,6 @@ if (empty($CFG->disabledevlibdirscheck) && (is_dir($CFG->dirroot.'/vendor') || i
 // Check if the site is being foced onto ssl.
 $overridetossl = !empty($CFG->overridetossl);

-// Check if moodle campaign content setting is enabled or not.
-$showcampaigncontent = !isset($CFG->showcampaigncontent) || $CFG->showcampaigncontent;
-
-// Encourage admins to enable the user feedback feature if it is not enabled already.
-$showfeedbackencouragement = empty($CFG->enableuserfeedback);
-
 admin_externalpage_setup('adminnotifications');

 $output = $PAGE->get_renderer('core', 'admin');
@@ -914,5 +888,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,
-                                       $showcampaigncontent, $showfeedbackencouragement);
+                                       $mobileconfigured, $overridetossl, $invalidforgottenpasswordurl, $croninfrequent);
@@ -0,0 +1,56 @@
+<?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 admin to configure licenses.
+ */
+
+require_once('../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir.'/licenselib.php');
+
+require_admin();
+
+$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=managelicenses";
+
+$action = optional_param('action', '', PARAM_ALPHANUMEXT);
+$license = optional_param('license', '', PARAM_SAFEDIR);
+
+////////////////////////////////////////////////////////////////////////////////
+// process actions
+
+if (!confirm_sesskey()) {
+    redirect($returnurl);
+}
+
+$return = true;
+switch ($action) {
+    case 'disable':
+        license_manager::disable($license);
+        break;
+
+    case 'enable':
+        license_manager::enable($license);
+        break;
+
+    default:
+        break;
+}
+
+if ($return) {
+    redirect ($returnurl);
+}
@@ -83,7 +83,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
                }
            } else {
                $newsettings = array();
-                if (property_exists($form, $componentprovidersetting)) {
+                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.
@@ -119,19 +119,10 @@ if (($form = data_submitted()) && confirm_sesskey()) {
    // Save processors enabled/disabled status.
    foreach ($allprocessors as $processor) {
        $enabled = isset($form->{$processor->name});
-        if ($enabled != $processor->enabled) {
-            add_to_config_log($processor->name, $processor->enabled, $enabled, 'core');
-        }
        \core_message\api::update_processor_status($processor, $enabled);
    }

    foreach ($newpreferences as $name => $value) {
-        $old = isset($preferences->$name) ? $preferences->$name : '';
-
-        if ($old != $value) {
-            add_to_config_log($name, $old, $value, 'core');
-        }
-
        set_config($name, $value, 'message');
    }
    $transaction->allow_commit();
@@ -156,7 +156,7 @@ class mnet_review_host_form extends moodleform {
        if ($mnet_peer && !empty($mnet_peer->deleted)) {
            $radioarray = array();
            $radioarray[] = $mform->createElement('static', 'deletedinfo', '',
-                $OUTPUT->container(get_string('deletedhostinfo', 'mnet'), 'alert alert-warning'));
+                $OUTPUT->container(get_string('deletedhostinfo', 'mnet'), 'deletedhostinfo'));
            $radioarray[] = $mform->createElement('radio', 'deleted', '', get_string('yes'), 1);
            $radioarray[] = $mform->createElement('radio', 'deleted', '', get_string('no'), 0);
            $mform->addGroup($radioarray, 'radioar', get_string('deleted'), array(' ', ' '), false);
@@ -49,7 +49,6 @@
                array($module->id));
        core_plugin_manager::reset_caches();
        admin_get_root(true, false);  // settings not required - only pages
-        redirect(new moodle_url('/admin/modules.php'));
    }

    if (!empty($show) and confirm_sesskey()) {
@@ -67,7 +66,6 @@
                array($module->id));
        core_plugin_manager::reset_caches();
        admin_get_root(true, false);  // settings not required - only pages
-        redirect(new moodle_url('/admin/modules.php'));
    }

    echo $OUTPUT->header();
@@ -123,8 +121,8 @@
            $count = -1;
        }
        if ($count>0) {
-            $countlink = $OUTPUT->action_link(new moodle_url('/course/search.php', ['modulelist' => $module->name]),
-                $count, null, ['title' => $strshowmodulecourse]);
+            $countlink = "<a href=\"{$CFG->wwwroot}/course/search.php?modulelist=$module->name" .
+                "&amp;sesskey=".sesskey()."\" title=\"$strshowmodulecourse\">$count</a>";
        } else if ($count < 0) {
            $countlink = get_string('error');
        } else {
@@ -34,12 +34,11 @@ $error = optional_param('error', '', PARAM_RAW);
 if ($error) {
    $message = optional_param('error_description', '', PARAM_RAW);
    if ($message) {
-        $SESSION->loginerrormsg = $message;
-        redirect(new moodle_url(get_login_url()));
+        print_error($message);
    } else {
-        $SESSION->loginerrormsg = $error;
-        redirect(new moodle_url(get_login_url()));
+        print_error($error);
    }
+    die();
 }

 // The authorization code generated by the authorization server.
@@ -54,6 +53,5 @@ if (isset($params['sesskey']) and confirm_sesskey($params['sesskey'])) {
    $redirecturl->param('oauth2code', $code);
    redirect($redirecturl);
 } else {
-    $SESSION->loginerrormsg = get_string('invalidsesskey', 'error');
-    redirect(new moodle_url(get_login_url()));
+    print_error('invalidsesskey');
 }
@@ -53,6 +53,7 @@ $pageurl = new moodle_url('/admin/plugins.php', $pageparams);
 $pluginman = core_plugin_manager::instance();

 if ($uninstall) {
+    require_sesskey();

    if (!$confirmed) {
        admin_externalpage_setup('pluginsoverview', '', $pageparams);
@@ -91,7 +92,6 @@ if ($uninstall) {
        exit();

    } else {
-        require_sesskey();
        $SESSION->pluginuninstallreturn = $pluginfo->get_return_url_after_uninstall($return);
        $progress = new progress_trace_buffer(new text_progress_trace(), false);
        $pluginman->uninstall_plugin($pluginfo->component, $progress);
@@ -38,11 +38,12 @@ $form = new core_admin\form\purge_caches(null, ['returnurl' => $returnurl]);
 if ($data = $form->get_data()) {

    // Valid request. Purge, and redirect the user back to where they came from.
+    $selected = $data->purgeselectedoptions;
+    purge_caches($selected);
+
    if (isset($data->all)) {
-        purge_caches();
        $message = get_string('purgecachesfinished', 'admin');
    } else {
-        purge_caches($data->purgeselectedoptions);
        $message = get_string('purgeselectedcachesfinished', 'admin');
    }

@@ -51,14 +52,8 @@ if ($data = $form->get_data()) {
    $message = get_string('purgecachesfinished', 'admin');
 }

-// Redirect and/or show notification message confirming cache(s) were purged.
 if (isset($message)) {
-    if (!$PAGE->url->compare($returnurl, URL_MATCH_BASE)) {
-        redirect($returnurl, $message);
-    }
-
-    // We are already on the purge caches page, add the notification.
-    \core\notification::add($message, \core\output\notification::NOTIFY_INFO);
+    redirect($returnurl, $message);
 }

 // Otherwise, show a form to actually purge the caches.
@@ -170,7 +170,7 @@ foreach ($sortedbehaviours as $behaviour => $behaviourname) {
    if ($version) {
        $row[] = $version;
    } else {
-        $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'text-muted'));
+        $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'disabled'));
    }

    // Other question types required by this one.
@@ -172,7 +172,7 @@ foreach ($sortedqtypes as $qtypename => $localname) {
    if ($version) {
        $row[] = $version;
    } else {
-        $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'text-muted'));
+        $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'disabled'));
    }

    // Other question types required by this one.
@@ -1,48 +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/>.
-
-/**
- * Endpoint to get the Moodle version
- *
- * Moodle linkchecker will check this endpoint when it cannot get the Moodle version otherwise.
- *
- * @package    core
- * @copyright  2022 Victor Deniz <victor@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(__DIR__ . '/../../config.php');
-require_once($CFG->libdir . '/filelib.php');
-
-// Get public key.
-$key = download_file_content(HUB_STATSPUBLICKEY);
-// Check $key is a valid public key.
-$publickey = openssl_pkey_get_public($key);
-if ($publickey !== false) {
-    $publickeystr = openssl_pkey_get_details($publickey)['key'];
-} else {
-    die('Error getting a valid public key');
-}
-
-// Encrypt data.
-$message = $CFG->release;
-$success = openssl_public_encrypt(utf8_encode($message), $encrypteddata, $publickeystr);
-
-if ($success) {
-    echo base64_encode($encrypteddata);
-} else {
-    die ('Error encrypting the data');
-}
@@ -45,7 +45,7 @@ $error = optional_param('error', '', PARAM_ALPHANUM);

 admin_externalpage_setup('registrationmoodleorg');

-if (parse_url($url, PHP_URL_HOST) !== parse_url(HUB_MOODLEORGHUBURL, PHP_URL_HOST)) {
+if ($url !== HUB_MOODLEORGHUBURL) {
    // Allow other plugins to confirm registration on custom hubs. Plugins implementing this
    // callback need to redirect or exit. See https://docs.moodle.org/en/Hub_registration .
    $callbacks = get_plugins_with_function('hub_registration');
@@ -39,7 +39,7 @@ $token = optional_param('token', '', PARAM_TEXT);

 admin_externalpage_setup('registrationmoodleorg');

-if (parse_url($url, PHP_URL_HOST) !== parse_url(HUB_MOODLEORGHUBURL, PHP_URL_HOST)) {
+if ($url !== HUB_MOODLEORGHUBURL) {
    // Allow other plugins to renew registration on custom hubs. Plugins implementing this
    // callback need to redirect or exit. See https://docs.moodle.org/en/Hub_registration .
    $callbacks = get_plugins_with_function('hub_registration');
@@ -220,7 +220,7 @@ class core_admin_renderer extends plugin_renderer_base {
            $output .= $this->container_end();
        }

-        $button = new single_button($continueurl, get_string('upgradestart', 'admin'), 'get', true);
+        $button = new single_button($continueurl, get_string('upgradestart', 'admin'), 'get');
        $button->class = 'continuebutton';
        $output .= $this->render($button);
        $output .= $this->footer();
@@ -253,7 +253,7 @@ class core_admin_renderer extends plugin_renderer_base {
            $out .= $this->output->container(get_string('cancelinstallinfodir', 'core_plugin', $pluginfo->rootdir));
            if ($repotype = $pluginman->plugin_external_source($pluginfo->component)) {
                $out .= $this->output->container(get_string('uninstalldeleteconfirmexternal', 'core_plugin', $repotype),
-                    'alert alert-warning mt-2');
+                    'uninstalldeleteconfirmexternal');
            }
        }

@@ -282,8 +282,6 @@ class core_admin_renderer extends plugin_renderer_base {
     * @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
-     * @param bool $showcampaigncontent Whether the campaign content should be visible or not.
-     * @param bool $showfeedbackencouragement Whether the feedback encouragement content should be displayed or not.
     *
     * @return string HTML to output.
     */
@@ -291,9 +289,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,
-            $showcampaigncontent = false, bool $showfeedbackencouragement = false) {
-
+            $overridetossl = false, $invalidforgottenpasswordurl = false, $croninfrequent = false) {
        global $CFG;
        $output = '';

@@ -316,8 +312,6 @@ class core_admin_renderer extends plugin_renderer_base {
        $output .= $this->registration_warning($registered);
        $output .= $this->mobile_configuration_warning($mobileconfigured);
        $output .= $this->forgotten_password_url_warning($invalidforgottenpasswordurl);
-        $output .= $this->userfeedback_encouragement($showfeedbackencouragement);
-        $output .= $this->campaign_content($showcampaigncontent);

        //////////////////////////////////////////////////////////////////////////////////////////////////
        ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
@@ -367,15 +361,14 @@ class core_admin_renderer extends plugin_renderer_base {
        $output = '';

        if ($checker->enabled()) {
-            $output .= $this->container_start('checkforupdates mb-4');
+            $output .= $this->container_start('checkforupdates');
            $output .= $this->single_button(
                new moodle_url($reloadurl, array('fetchupdates' => 1)),
                get_string('checkforupdates', 'core_plugin')
            );
            if ($timefetched = $checker->get_last_timefetched()) {
                $timefetched = userdate($timefetched, get_string('strftimedatetime', 'core_langconfig'));
-                $output .= $this->container(get_string('checkforupdateslast', 'core_plugin', $timefetched),
-                    'lasttimefetched small text-muted mt-1');
+                $output .= $this->container(get_string('checkforupdateslast', 'core_plugin', $timefetched), 'lasttimefetched');
            }
            $output .= $this->container_end();
        }
@@ -439,7 +432,7 @@ class core_admin_renderer extends plugin_renderer_base {

        if ($repotype = $pluginman->plugin_external_source($pluginfo->component)) {
            $confirm .= $this->output->container(get_string('uninstalldeleteconfirmexternal', 'core_plugin', $repotype),
-                'alert alert-warning mt-2');
+                'uninstalldeleteconfirmexternal');
        }

        // After any uninstall we must execute full upgrade to finish the cleanup!
@@ -518,7 +511,7 @@ class core_admin_renderer extends plugin_renderer_base {
     * @return string HTML to output.
     */
    protected function warning($message, $type = 'warning') {
-        return $this->box($message, 'generalbox alert alert-' . $type);
+        return $this->box($message, 'generalbox admin' . $type);
    }

    /**
@@ -533,7 +526,7 @@ class core_admin_renderer extends plugin_renderer_base {
            return $this->warning(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot));

        } else if ($insecuredataroot == INSECURE_DATAROOT_ERROR) {
-            return $this->warning(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'danger');
+            return $this->warning(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'error');

        } else {
            return '';
@@ -551,7 +544,7 @@ class core_admin_renderer extends plugin_renderer_base {
        if ($devlibdir) {
            $moreinfo = new moodle_url('/report/security/index.php');
            $warning = get_string('devlibdirpresent', 'core_admin', ['moreinfourl' => $moreinfo->out()]);
-            return $this->warning($warning, 'danger');
+            return $this->warning($warning, 'error');

        } else {
            return '';
@@ -608,9 +601,19 @@ class core_admin_renderer extends plugin_renderer_base {
            return '';
        }

-        $check = new \tool_task\check\cronrunning();
-        $result = $check->get_result();
-        return $this->warning($result->get_summary() . '&nbsp;' . $this->help_icon('cron', 'admin'));
+        if (empty($CFG->cronclionly)) {
+            $url = new moodle_url('/admin/cron.php');
+            if (!empty($CFG->cronremotepassword)) {
+                $url = new moodle_url('/admin/cron.php', array('password' => $CFG->cronremotepassword));
+            }
+
+            return $this->warning(get_string('cronwarning', 'admin', $url->out()) . '&nbsp;' .
+                    $this->help_icon('cron', 'admin'));
+        }
+
+        // $CFG->cronclionly is not empty: cron can run only from CLI.
+        return $this->warning(get_string('cronwarningcli', 'admin') . '&nbsp;' .
+                $this->help_icon('cron', 'admin'));
    }

    /**
@@ -626,9 +629,9 @@ class core_admin_renderer extends plugin_renderer_base {
            return '';
        }

-        $check = new \tool_task\check\cronrunning();
-        $result = $check->get_result();
-        return $this->warning($result->get_summary() . '&nbsp;' . $this->help_icon('cron', 'admin'));
+        $expectedfrequency = $CFG->expectedcronfrequency ?? 200;
+        return $this->warning(get_string('croninfrequent', 'admin', $expectedfrequency) . '&nbsp;' .
+                $this->help_icon('cron', 'admin'));
    }

    /**
@@ -718,7 +721,7 @@ class core_admin_renderer extends plugin_renderer_base {
        return $this->warning(
                    $this->container(get_string('maturitycorewarning', 'admin', $maturitylevel)) .
                    $this->container($this->doc_link('admin/versions', get_string('morehelp'))),
-                'danger');
+                'error');
    }

    /*
@@ -734,7 +737,7 @@ class core_admin_renderer extends plugin_renderer_base {
        }

        $warning = (get_string('testsiteupgradewarning', 'admin', $testsite));
-        return $this->warning($warning, 'danger');
+        return $this->warning($warning, 'error');
    }

    /**
@@ -769,7 +772,7 @@ class core_admin_renderer extends plugin_renderer_base {
        $level = 'warning';

        if ($maturity == MATURITY_ALPHA) {
-            $level = 'danger';
+            $level = 'error';
        }

        $maturitylevel = get_string('maturity' . $maturity, 'admin');
@@ -820,7 +823,7 @@ class core_admin_renderer extends plugin_renderer_base {
            }
        }

-        $updateinfo .= $this->container_start('checkforupdates mt-1');
+        $updateinfo .= $this->container_start('checkforupdates');
        $fetchurl = new moodle_url('/admin/index.php', array('fetchupdates' => 1, 'sesskey' => sesskey(), 'cache' => 0));
        $updateinfo .= $this->single_button($fetchurl, get_string('checkforupdates', 'core_plugin'));
        if ($fetch) {
@@ -884,20 +887,6 @@ class core_admin_renderer extends plugin_renderer_base {
        return $output;
    }

-    /**
-     * Display campaign content.
-     *
-     * @param bool $showcampaigncontent Whether the campaign content should be visible or not.
-     * @return string the campaign content raw html.
-     */
-    protected function campaign_content(bool $showcampaigncontent): string {
-        if (!$showcampaigncontent) {
-            return '';
-        }
-
-        return $this->render_from_template('core/campaign_content', ['lang' => current_language()]);
-    }
-
    /**
     * Display a warning about the forgotten password URL not linking to a valid URL.
     *
@@ -923,7 +912,7 @@ class core_admin_renderer extends plugin_renderer_base {
     */
    protected function moodle_available_update_info(\core\update\info $updateinfo) {

-        $boxclasses = 'moodleupdateinfo mb-2';
+        $boxclasses = 'moodleupdateinfo';
        $info = array();

        if (isset($updateinfo->release)) {
@@ -943,8 +932,7 @@ class core_admin_renderer extends plugin_renderer_base {
        }

        if (isset($updateinfo->download)) {
-            $info[] = html_writer::link($updateinfo->download, get_string('download'),
-                array('class' => 'info download btn btn-secondary'));
+            $info[] = html_writer::link($updateinfo->download, get_string('download'), array('class' => 'info download'));
        }

        if (isset($updateinfo->url)) {
@@ -952,9 +940,9 @@ class core_admin_renderer extends plugin_renderer_base {
                array('class' => 'info more'));
        }

-        $box  = $this->output->container_start($boxclasses);
-        $box .= $this->output->container(implode(html_writer::tag('span', ' | ', array('class' => 'separator')), $info), '');
-        $box .= $this->output->container_end();
+        $box  = $this->output->box_start($boxclasses);
+        $box .= $this->output->box(implode(html_writer::tag('span', ' ', array('class' => 'separator')), $info), '');
+        $box .= $this->output->box_end();

        return $box;
    }
@@ -966,7 +954,7 @@ class core_admin_renderer extends plugin_renderer_base {
    protected function release_notes_link() {
        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
        $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
-        return $this->box($releasenoteslink, 'generalbox alert alert-info');
+        return $this->box($releasenoteslink, 'generalbox releasenoteslink');
    }

    /**
@@ -995,7 +983,7 @@ class core_admin_renderer extends plugin_renderer_base {
     * @return string HTML code
     */
    public function plugins_check_table(core_plugin_manager $pluginman, $version, array $options = array()) {
-        global $CFG;
+
        $plugininfo = $pluginman->get_plugins();

        if (empty($plugininfo)) {
@@ -1066,7 +1054,7 @@ class core_admin_renderer extends plugin_renderer_base {
                $displayname = new html_table_cell(
                    $icon.
                    html_writer::span($plugin->displayname, 'pluginname').
-                    html_writer::div($plugin->get_dir(), 'plugindir text-muted small')
+                    html_writer::div($plugin->get_dir(), 'plugindir')
                );

                $versiondb = new html_table_cell($plugin->versiondb);
@@ -1081,10 +1069,8 @@ class core_admin_renderer extends plugin_renderer_base {
                }

                $coredependency = $plugin->is_core_dependency_satisfied($version);
-                $incompatibledependency = $plugin->is_core_compatible_satisfied($CFG->branch);
-
                $otherpluginsdependencies = $pluginman->are_dependencies_satisfied($plugin->get_other_required_plugins());
-                $dependenciesok = $coredependency && $otherpluginsdependencies && $incompatibledependency;
+                $dependenciesok = $coredependency && $otherpluginsdependencies;

                $statuscode = $plugin->get_status();
                $row->attributes['class'] .= ' status-' . $statuscode;
@@ -1103,17 +1089,17 @@ class core_admin_renderer extends plugin_renderer_base {
                        break;
                    case core_plugin_manager::PLUGIN_STATUS_NODB:
                    case core_plugin_manager::PLUGIN_STATUS_UPTODATE:
-                        $statusclass .= $dependenciesok ? 'badge-light' : 'badge-warning';
+                        $statusclass .= $dependenciesok ? '' : 'badge-warning';
                        break;
                }
                $status = html_writer::span(get_string('status_' . $statuscode, 'core_plugin'), $statusclass);

                if (!empty($installabortable[$plugin->component])) {
                    $status .= $this->output->single_button(
-                        new moodle_url($this->page->url, array('abortinstall' => $plugin->component, 'confirmplugincheck' => 0)),
+                        new moodle_url($this->page->url, array('abortinstall' => $plugin->component)),
                        get_string('cancelinstallone', 'core_plugin'),
                        'post',
-                        array('class' => 'actionbutton cancelinstallone d-block mt-1')
+                        array('class' => 'actionbutton cancelinstallone')
                    );
                }

@@ -1122,7 +1108,7 @@ class core_admin_renderer extends plugin_renderer_base {
                        new moodle_url($this->page->url, array('abortupgrade' => $plugin->component)),
                        get_string('cancelupgradeone', 'core_plugin'),
                        'post',
-                        array('class' => 'actionbutton cancelupgradeone d-block mt-1')
+                        array('class' => 'actionbutton cancelupgradeone')
                    );
                }

@@ -1134,11 +1120,8 @@ class core_admin_renderer extends plugin_renderer_base {
                }

                $status = new html_table_cell($sourcelabel.' '.$status);
-                if ($plugin->pluginsupported != null) {
-                    $requires = new html_table_cell($this->required_column($plugin, $pluginman, $version, $CFG->branch));
-                } else {
-                    $requires = new html_table_cell($this->required_column($plugin, $pluginman, $version));
-                }
+
+                $requires = new html_table_cell($this->required_column($plugin, $pluginman, $version));

                $statusisboring = in_array($statuscode, array(
                        core_plugin_manager::PLUGIN_STATUS_NODB, core_plugin_manager::PLUGIN_STATUS_UPTODATE));
@@ -1195,7 +1178,7 @@ class core_admin_renderer extends plugin_renderer_base {
            }
        }

-        $out .= $this->output->container_start('actions mb-2');
+        $out .= $this->output->container_start('actions');

        $installableupdates = $pluginman->filter_installable($pluginman->available_updates());
        if ($installableupdates) {
@@ -1203,16 +1186,16 @@ class core_admin_renderer extends plugin_renderer_base {
                new moodle_url($this->page->url, array('installupdatex' => 1)),
                get_string('updateavailableinstallall', 'core_admin', count($installableupdates)),
                'post',
-                array('class' => 'singlebutton updateavailableinstallall mr-1')
+                array('class' => 'singlebutton updateavailableinstallall')
            );
        }

        if ($installabortable) {
            $out .= $this->output->single_button(
-                new moodle_url($this->page->url, array('abortinstallx' => 1, 'confirmplugincheck' => 0)),
+                new moodle_url($this->page->url, array('abortinstallx' => 1)),
                get_string('cancelinstallall', 'core_plugin', count($installabortable)),
                'post',
-                array('class' => 'singlebutton cancelinstallall mr-1')
+                array('class' => 'singlebutton cancelinstallall')
            );
        }

@@ -1221,17 +1204,15 @@ class core_admin_renderer extends plugin_renderer_base {
                new moodle_url($this->page->url, array('abortupgradex' => 1)),
                get_string('cancelupgradeall', 'core_plugin', count($upgradeabortable)),
                'post',
-                array('class' => 'singlebutton cancelupgradeall mr-1')
+                array('class' => 'singlebutton cancelupgradeall')
            );
        }

        $out .= html_writer::div(html_writer::link(new moodle_url($this->page->url, array('showallplugins' => 0)),
-            get_string('plugincheckattention', 'core_plugin')).' '.html_writer::span($sumattention, 'badge badge-light'),
-            'btn btn-link mr-1');
+            get_string('plugincheckattention', 'core_plugin')).' '.html_writer::span($sumattention, 'badge'));

        $out .= html_writer::div(html_writer::link(new moodle_url($this->page->url, array('showallplugins' => 1)),
-            get_string('plugincheckall', 'core_plugin')).' '.html_writer::span($sumtotal, 'badge badge-light'),
-            'btn btn-link mr-1');
+            get_string('plugincheckall', 'core_plugin')).' '.html_writer::span($sumtotal, 'badge'));

        $out .= $this->output->container_end(); // End of .actions container.
        $out .= $this->output->container_end(); // End of #plugins-check-info container.
@@ -1299,13 +1280,12 @@ class core_admin_renderer extends plugin_renderer_base {
            }
        }

-        $out  = $this->output->container_start('plugins-check-dependencies mb-4');
+        $out  = $this->output->container_start('plugins-check-dependencies');

        if ($unavailable or $unknown) {
            $out .= $this->output->heading(get_string('misdepsunavail', 'core_plugin'));
            if ($unknown) {
-                $out .= $this->output->render((new \core\output\notification(get_string('misdepsunknownlist', 'core_plugin',
-                    implode(', ', $unknown))))->set_show_closebutton(false));
+                $out .= $this->output->notification(get_string('misdepsunknownlist', 'core_plugin', implode($unknown, ', ')));
            }
            if ($unavailable) {
                $unavailablelist = array();
@@ -1319,18 +1299,18 @@ class core_admin_renderer extends plugin_renderer_base {
                    }
                    $unavailablelist[] = $unavailablelistitem;
                }
-                $out .= $this->output->render((new \core\output\notification(get_string('misdepsunavaillist', 'core_plugin',
-                    implode(', ', $unavailablelist))))->set_show_closebutton(false));
+                $out .= $this->output->notification(get_string('misdepsunavaillist', 'core_plugin',
+                    implode($unavailablelist, ', ')));
            }
-            $out .= $this->output->container_start('plugins-check-dependencies-actions mb-4');
+            $out .= $this->output->container_start('plugins-check-dependencies-actions');
            $out .= ' '.html_writer::link(new moodle_url('/admin/tool/installaddon/'),
-                get_string('dependencyuploadmissing', 'core_plugin'), array('class' => 'btn btn-secondary'));
+                get_string('dependencyuploadmissing', 'core_plugin'));
            $out .= $this->output->container_end(); // End of .plugins-check-dependencies-actions container.
        }

        if ($available) {
            $out .= $this->output->heading(get_string('misdepsavail', 'core_plugin'));
-            $out .= $this->output->container_start('plugins-check-dependencies-actions mb-2');
+            $out .= $this->output->container_start('plugins-check-dependencies-actions');

            $installable = $pluginman->filter_installable($available);
            if ($installable) {
@@ -1338,13 +1318,12 @@ class core_admin_renderer extends plugin_renderer_base {
                    new moodle_url($this->page->url, array('installdepx' => 1)),
                    get_string('dependencyinstallmissing', 'core_plugin', count($installable)),
                    'post',
-                    array('class' => 'singlebutton dependencyinstallmissing d-inline-block mr-1')
+                    array('class' => 'singlebutton dependencyinstallmissing')
                );
            }

            $out .= html_writer::div(html_writer::link(new moodle_url('/admin/tool/installaddon/'),
-                get_string('dependencyuploadmissing', 'core_plugin'), array('class' => 'btn btn-link')),
-                'dependencyuploadmissing d-inline-block mr-1');
+                get_string('dependencyuploadmissing', 'core_plugin')), 'dependencyuploadmissing');

            $out .= $this->output->container_end(); // End of .plugins-check-dependencies-actions container.

@@ -1385,7 +1364,7 @@ class core_admin_renderer extends plugin_renderer_base {
                if ($CFG->branch == str_replace('.', '', $moodle->release)) {
                    $supportedmoodles[] = html_writer::span($moodle->release, 'badge badge-success');
                } else {
-                    $supportedmoodles[] = html_writer::span($moodle->release, 'badge badge-light');
+                    $supportedmoodles[] = html_writer::span($moodle->release, 'label');
                }
            }

@@ -1399,7 +1378,7 @@ class core_admin_renderer extends plugin_renderer_base {
                }
                $info = html_writer::div(
                    get_string('requiredby', 'core_plugin', implode(', ', $requriedby)),
-                    'requiredby mb-1'
+                    'requiredby'
                );
            } else {
                $info = '';
@@ -1410,39 +1389,38 @@ class core_admin_renderer extends plugin_renderer_base {
            $info .= html_writer::div(
                html_writer::link('https://moodle.org/plugins/view.php?plugin='.$plugin->component,
                    get_string('misdepinfoplugin', 'core_plugin')),
-                'misdepinfoplugin d-inline-block mr-3 mb-1'
+                'misdepinfoplugin'
            );

            $info .= html_writer::div(
                html_writer::link('https://moodle.org/plugins/pluginversion.php?id='.$plugin->version->id,
                    get_string('misdepinfoversion', 'core_plugin')),
-                'misdepinfoversion d-inline-block mr-3 mb-1'
+                'misdepinfoversion'
            );

-            $info .= html_writer::div(html_writer::link($plugin->version->downloadurl, get_string('download')),
-                'misdepdownload d-inline-block mr-3 mb-1');
+            $info .= html_writer::div(html_writer::link($plugin->version->downloadurl, get_string('download')), 'misdepdownload');

            if ($pluginman->is_remote_plugin_installable($plugin->component, $plugin->version->version, $reason)) {
                $info .= $this->output->single_button(
                    new moodle_url($this->page->url, array('installdep' => $plugin->component)),
                    get_string('dependencyinstall', 'core_plugin'),
                    'post',
-                    array('class' => 'singlebutton dependencyinstall mr-3 mb-1')
+                    array('class' => 'singlebutton dependencyinstall')
                );
            } else {
                $reasonhelp = $this->info_remote_plugin_not_installable($reason);
                if ($reasonhelp) {
-                    $info .= html_writer::div($reasonhelp, 'reasonhelp dependencyinstall d-inline-block mr-3 mb-1');
+                    $info .= html_writer::div($reasonhelp, 'reasonhelp dependencyinstall');
                }
            }

            $info .= $this->output->container_end(); // End of .actions container.

            $table->data[] = array(
-                html_writer::div($plugin->name, 'name').' '.html_writer::div($plugin->component, 'component text-muted small'),
+                html_writer::div($plugin->name, 'name').' '.html_writer::div($plugin->component, 'component'),
                $plugin->version->release,
                $plugin->version->version,
-                implode(' ', $supportedmoodles),
+                implode($supportedmoodles, ' '),
                $info
            );
        }
@@ -1474,38 +1452,24 @@ class core_admin_renderer extends plugin_renderer_base {
     * @param \core\plugininfo\base $plugin the plugin we are rendering the row for.
     * @param core_plugin_manager $pluginman provides data on all the plugins.
     * @param string $version
-     * @param int $branch the current Moodle branch
     * @return string HTML code
     */
-    protected function required_column(\core\plugininfo\base $plugin, core_plugin_manager $pluginman, $version, $branch = null) {
+    protected function required_column(\core\plugininfo\base $plugin, core_plugin_manager $pluginman, $version) {

        $requires = array();
        $displayuploadlink = false;
        $displayupdateslink = false;

-        $requirements = $pluginman->resolve_requirements($plugin, $version, $branch);
-        foreach ($requirements as $reqname => $reqinfo) {
+        foreach ($pluginman->resolve_requirements($plugin, $version) as $reqname => $reqinfo) {
            if ($reqname === 'core') {
                if ($reqinfo->status == $pluginman::REQUIREMENT_STATUS_OK) {
-                    $class = 'requires-ok text-muted';
+                    $class = 'requires-ok';
                    $label = '';
                } else {
                    $class = 'requires-failed';
                    $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'badge badge-danger');
                }
-
-                if ($branch != null && !$plugin->is_core_compatible_satisfied($branch)) {
-                    $requires[] = html_writer::tag('li',
-                    html_writer::span(get_string('incompatibleversion', 'core_plugin', $branch), 'dep dep-core').
-                    ' '.$label, array('class' => $class));
-
-                } else if ($branch != null && $plugin->pluginsupported != null) {
-                    $requires[] = html_writer::tag('li',
-                        html_writer::span(get_string('moodlebranch', 'core_plugin',
-                        array('min' => $plugin->pluginsupported[0], 'max' => $plugin->pluginsupported[1])), 'dep dep-core').
-                        ' '.$label, array('class' => $class));
-
-                } else if ($reqinfo->reqver != ANY_VERSION) {
+                if ($reqinfo->reqver != ANY_VERSION) {
                    $requires[] = html_writer::tag('li',
                        html_writer::span(get_string('moodleversion', 'core_plugin', $plugin->versionrequires), 'dep dep-core').
                        ' '.$label, array('class' => $class));
@@ -1516,7 +1480,7 @@ class core_admin_renderer extends plugin_renderer_base {

                if ($reqinfo->status == $pluginman::REQUIREMENT_STATUS_OK) {
                    $label = '';
-                    $class = 'requires-ok text-muted';
+                    $class = 'requires-ok';

                } else if ($reqinfo->status == $pluginman::REQUIREMENT_STATUS_MISSING) {
                    if ($reqinfo->availability == $pluginman::REQUIREMENT_AVAILABLE) {
@@ -1570,14 +1534,13 @@ class core_admin_renderer extends plugin_renderer_base {
            return '';
        }

-        $out = html_writer::tag('ul', implode("\n", $requires), array('class' => 'm-0'));
+        $out = html_writer::tag('ul', implode("\n", $requires));

        if ($displayuploadlink) {
            $out .= html_writer::div(
                html_writer::link(
                    new moodle_url('/admin/tool/installaddon/'),
-                    get_string('dependencyuploadmissing', 'core_plugin'),
-                    array('class' => 'btn btn-secondary btn-sm m-1')
+                    get_string('dependencyuploadmissing', 'core_plugin')
                ),
                'dependencyuploadmissing'
            );
@@ -1587,20 +1550,12 @@ class core_admin_renderer extends plugin_renderer_base {
            $out .= html_writer::div(
                html_writer::link(
                    new moodle_url($this->page->url, array('sesskey' => sesskey(), 'fetchupdates' => 1)),
-                    get_string('checkforupdates', 'core_plugin'),
-                    array('class' => 'btn btn-secondary btn-sm m-1')
+                    get_string('checkforupdates', 'core_plugin')
                ),
                'checkforupdates'
            );
        }

-        // Check if supports is present, and $branch is not in, only if $incompatible check was ok.
-        if ($plugin->pluginsupported != null && $class == 'requires-ok' && $branch != null) {
-            if ($pluginman->check_explicitly_supported($plugin, $branch) == $pluginman::VERSION_NOT_SUPPORTED) {
-                $out .= html_writer::div(get_string('notsupported', 'core_plugin', $branch));
-            }
-        }
-
        return $out;

    }
@@ -1616,18 +1571,12 @@ class core_admin_renderer extends plugin_renderer_base {

        $plugininfo = $pluginman->get_plugins();

-        $numtotal = $numextension = $numupdatable = $numinstallable = 0;
+        $numtotal = $numextension = $numupdatable = 0;

        foreach ($plugininfo as $type => $plugins) {
            foreach ($plugins as $name => $plugin) {
-                if ($res = $plugin->available_updates()) {
+                if ($plugin->available_updates()) {
                    $numupdatable++;
-                    foreach ($res as $updateinfo) {
-                        if ($pluginman->is_remote_plugin_installable($updateinfo->component, $updateinfo->version, $reason, false)) {
-                            $numinstallable++;
-                            break;
-                        }
-                    }
                }
                if ($plugin->get_status() === core_plugin_manager::PLUGIN_STATUS_MISSING) {
                    continue;
@@ -1670,13 +1619,16 @@ class core_admin_renderer extends plugin_renderer_base {
            $out .= $this->output->heading(get_string('overviewext', 'core_plugin'), 3);
        }

-        if ($numinstallable) {
-            $out .= $this->output->single_button(
-                new moodle_url($this->page->url, array('installupdatex' => 1)),
-                get_string('updateavailableinstallall', 'core_admin', $numinstallable),
-                'post',
-                array('class' => 'singlebutton updateavailableinstallall')
-            );
+        if ($numupdatable) {
+            $installableupdates = $pluginman->filter_installable($pluginman->available_updates());
+            if ($installableupdates) {
+                $out .= $this->output->single_button(
+                    new moodle_url($this->page->url, array('installupdatex' => 1)),
+                    get_string('updateavailableinstallall', 'core_admin', count($installableupdates)),
+                    'post',
+                    array('class' => 'singlebutton updateavailableinstallall')
+                );
+            }
        }

        $out .= html_writer::div($infoall, 'info info-all').
@@ -1910,7 +1862,7 @@ class core_admin_renderer extends plugin_renderer_base {
            'infos'
        );

-        if ($pluginman->is_remote_plugin_installable($updateinfo->component, $updateinfo->version, $reason, false)) {
+        if ($pluginman->is_remote_plugin_installable($updateinfo->component, $updateinfo->version, $reason)) {
            $box .= $this->output->single_button(
                new moodle_url($this->page->url, array('installupdate' => $updateinfo->component,
                    'installupdateversion' => $updateinfo->version)),
@@ -1950,7 +1902,7 @@ class core_admin_renderer extends plugin_renderer_base {
            get_string('status'),
        );
        $servertable->colclasses = array('centeralign name', 'centeralign info', 'leftalign report', 'leftalign plugin', 'centeralign status');
-        $servertable->attributes['class'] = 'admintable environmenttable generaltable table-sm';
+        $servertable->attributes['class'] = 'admintable environmenttable generaltable';
        $servertable->id = 'serverstatus';

        $serverdata = array('ok'=>array(), 'warn'=>array(), 'error'=>array());
@@ -1963,7 +1915,7 @@ class core_admin_renderer extends plugin_renderer_base {
            get_string('status'),
        );
        $othertable->colclasses = array('aligncenter info', 'alignleft report', 'alignleft plugin', 'aligncenter status');
-        $othertable->attributes['class'] = 'admintable environmenttable generaltable table-sm';
+        $othertable->attributes['class'] = 'admintable environmenttable generaltable';
        $othertable->id = 'otherserverstatus';

        $otherdata = array('ok'=>array(), 'warn'=>array(), 'error'=>array());
@@ -2059,7 +2011,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), true);
                }
                // Enclose report text in div so feedback text will be displayed underneath it.
                $report = html_writer::div($report);
@@ -2130,16 +2082,8 @@ class core_admin_renderer extends plugin_renderer_base {
        $output .= $this->container_start('upgradekeyreq');
        $output .= $this->heading(get_string('upgradekeyreq', 'core_admin'));
        $output .= html_writer::start_tag('form', array('method' => 'POST', 'action' => $url));
-        $output .= html_writer::empty_tag('input', [
-            'name' => 'upgradekey',
-            'type' => 'password',
-            'class' => 'form-control w-auto',
-        ]);
-        $output .= html_writer::empty_tag('input', [
-            'type' => 'submit',
-            'value' => get_string('submit'),
-            'class' => 'btn btn-primary mt-3',
-        ]);
+        $output .= html_writer::empty_tag('input', array('name' => 'upgradekey', 'type' => 'password'));
+        $output .= html_writer::empty_tag('input', array('value' => get_string('submit'), 'type' => 'submit'));
        $output .= html_writer::end_tag('form');
        $output .= $this->container_end();
        $output .= $this->footer();
@@ -2191,21 +2135,4 @@ class core_admin_renderer extends plugin_renderer_base {

        return $this->output->box($out);
    }
-
-    /**
-     * Display message about benefits of enabling the user feedback feature.
-     *
-     * @param bool $showfeedbackencouragement Whether the encouragement content should be displayed or not
-     * @return string
-     */
-    protected function userfeedback_encouragement(bool $showfeedbackencouragement): string {
-        $output = '';
-
-        if ($showfeedbackencouragement) {
-            $settingslink = new moodle_url('/admin/settings.php', ['section' => 'userfeedback']);
-            $output .= $this->warning(get_string('userfeedbackencouragement', 'admin', $settingslink->out()), 'info');
-        }
-
-        return $output;
-    }
 }
@@ -271,8 +271,7 @@ if ($roleid) {
    foreach ($assignableroles as $roleid => $notused) {
        $roleusers = '';
        if (0 < $assigncounts[$roleid] && $assigncounts[$roleid] <= MAX_USERS_TO_LIST_PER_ROLE) {
-            $userfieldsapi = \core_user\fields::for_name();
-            $userfields = 'u.id, u.username' . $userfieldsapi->get_sql('u')->selects;
+            $userfields = 'u.id, u.username, ' . get_all_user_name_fields(true, 'u');
            $roleusers = get_role_users($roleid, $context, false, $userfields);
            if (!empty($roleusers)) {
                $strroleusers = array();
@@ -43,7 +43,7 @@ abstract class core_role_capability_table_base {
    protected $id;

    /** Added to the class="" attribute on output. */
-    protected $classes = array('rolecap table-hover');
+    protected $classes = array('rolecap');

    /** Default number of capabilities in the table for the search UI to be shown. */
    const NUM_CAPS_FOR_SEARCH = 12;
@@ -50,7 +50,6 @@ class core_role_check_capability_table extends core_role_capability_table_base {
        $this->contextname = $contextname;
        $this->stryes = get_string('yes');
        $this->strno = get_string('no');
-        $this->add_classes(['table-striped']);
    }

    protected function add_header_cells() {
@@ -55,7 +55,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
        foreach ($levels as $level => $classname) {
            $this->allcontextlevels[$level] = context_helper::get_level_name($level);
        }
-        $this->add_classes(['table-striped']);
    }

    protected function load_current_permissions() {
@@ -66,9 +66,9 @@ class core_role_override_permissions_table_advanced extends core_role_capability
        $rowattributes = parent::get_row_attributes($capability);
        if ($this->permissions[$capability->name] !== 0) {
            if (empty($rowattributes['class'])) {
-                $rowattributes['class'] = "overriddenpermission table-warning";
+                $rowattributes['class'] = "overriddenpermission";
            } else {
-                $rowattributes['class'] .= " overriddenpermission table-warning";
+                $rowattributes['class'] .= " overriddenpermission";
            }
        }
        return $rowattributes;
@@ -163,8 +163,7 @@ if (!empty($capabilities)) {
    echo html_writer::start_tag('div', array('class'=>'submit_buttons'));
    $attrs = array('type'=>'submit', 'name'=>'savechanges', 'value'=>get_string('savechanges'), 'class'=>'btn btn-primary');
    echo html_writer::empty_tag('input', $attrs);
-    $attrs = array('type' => 'submit', 'name' => 'cancel', 'value' => get_string('cancel'),
-        'class' => 'btn btn-secondary ml-1');
+    $attrs = array('type'=>'submit', 'name'=>'cancel', 'value'=>get_string('cancel'), 'class' => 'btn btn-secondary');
    echo html_writer::empty_tag('input', $attrs);
    echo html_writer::end_tag('div');
    echo html_writer::end_tag('div');
@@ -14,19 +14,19 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

-namespace core_role;
-
-use core_role_preset;
-
 /**
 * Role XML presets test case.
 *
 * @package   core_role
- * @category  test
+ * @category  phpunit
 * @copyright 2013 Petr Skoda {@link http://skodak.org}
 * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-class preset_test extends \advanced_testcase {
+
+defined('MOODLE_INTERNAL') || die();
+
+
+class core_role_preset_testcase extends advanced_testcase {
    public function test_xml() {
        global $DB;

@@ -61,7 +61,7 @@ class preset_test extends \advanced_testcase {
                   FROM {role_capabilities}
                  WHERE contextid = :syscontext AND roleid = :roleid
               ORDER BY capability ASC",
-                array('syscontext' => \context_system::instance()->id, 'roleid' => $role->id));
+                array('syscontext'=>context_system::instance()->id, 'roleid'=>$role->id));

            foreach ($capabilities as $cap) {
                $this->assertEquals($cap->permission, $info['permissions'][$cap->capability]);
@@ -1,748 +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
- */
-namespace core_role\privacy;
-
-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 provider_test 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->assertEqualsCanonicalizing($expected, $userlist2->get_userids());
-
-        // 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->assertEqualsCanonicalizing($expected, $userlist3->get_userids());
-
-        // 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->assertEqualsCanonicalizing($expected, $userlist4->get_userids());
-
-        // 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->assertEqualsCanonicalizing($expected, $userlist6->get_userids());
-
-        // 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->assertEqualsCanonicalizing($expected, $userlist7->get_userids());
-
-        // 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->assertEqualsCanonicalizing($expected, $userlist8->get_userids());
-    }
-
-    /**
-     * 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;
-    }
-}
@@ -0,0 +1,747 @@
+<?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;
+    }
+}
@@ -68,16 +68,9 @@ if ($errormsg !== '') {
 $showsettingslinks = true;

 if ($hassiteconfig) {
-    $data = [
-        'action' => new moodle_url('/admin/search.php'),
-        'btnclass' => 'btn-primary',
-        'inputname' => 'query',
-        'searchstring' => get_string('search'),
-        'query' => $query,
-        'extraclasses' => 'd-flex justify-content-center'
-    ];
-    echo $OUTPUT->render_from_template('core/search_input', $data);
-
+    require_once("admin_settings_search_form.php");
+    $form = new admin_settings_search_form();
+    $form->display();
    echo '<hr>';
    if ($query) {
        echo admin_search_settings_html($query);
@@ -26,7 +26,7 @@ require_once($CFG->libdir . '/adminlib.php');

 admin_externalpage_setup('searchareas');

-$areaid = optional_param('areaid', null, PARAM_ALPHANUMEXT);
+$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.

@@ -131,10 +131,15 @@ if ($hassiteconfig && \core_analytics\manager::is_analytics_enabled()) {
            $timesplittingdefaults, $timesplittingoptions)
        );

-        // Predictions processor output dir - specify default in setting description (used if left blank).
-        $defaultmodeloutputdir = \core_analytics\model::default_output_dir();
+        // Predictions processor output dir.
+        $defaultmodeloutputdir = rtrim($CFG->dataroot, '/') . DIRECTORY_SEPARATOR . 'models';
+        if (empty(get_config('analytics', 'modeloutputdir')) && !file_exists($defaultmodeloutputdir) &&
+                is_writable($defaultmodeloutputdir)) {
+            // Automatically create the dir for them so users don't see the invalid value red cross.
+            mkdir($defaultmodeloutputdir, $CFG->directorypermissions, true);
+        }
        $settings->add(new admin_setting_configdirectory('analytics/modeloutputdir', new lang_string('modeloutputdir', 'analytics'),
-            new lang_string('modeloutputdirwithdefaultinfo', 'analytics', $defaultmodeloutputdir), ''));
+            new lang_string('modeloutputdirinfo', 'analytics'), $defaultmodeloutputdir));

        // Disable web interface evaluation and get predictions.
        $settings->add(new admin_setting_configcheckbox('analytics/onlycli', new lang_string('onlycli', 'analytics'),
@@ -144,20 +149,5 @@ if ($hassiteconfig && \core_analytics\manager::is_analytics_enabled()) {
        $settings->add(new admin_setting_configduration('analytics/modeltimelimit', new lang_string('modeltimelimit', 'analytics'),
            new lang_string('modeltimelimitinfo', 'analytics'), 20 * MINSECS));

-        $options = array(
-            0    => new lang_string('neverdelete', 'analytics'),
-            1000 => new lang_string('numdays', '', 1000),
-            365  => new lang_string('numdays', '', 365),
-            180  => new lang_string('numdays', '', 180),
-            150  => new lang_string('numdays', '', 150),
-            120  => new lang_string('numdays', '', 120),
-            90   => new lang_string('numdays', '', 90),
-            60   => new lang_string('numdays', '', 60),
-            35   => new lang_string('numdays', '', 35));
-        $settings->add(new admin_setting_configselect('analytics/calclifetime',
-            new lang_string('calclifetime', 'analytics'),
-            new lang_string('configlcalclifetime', 'analytics'), 35, $options));
-
-
    }
 }
@@ -25,12 +25,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) { // sp
    $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('langmenuinsecurelayout',
-        new lang_string('langmenuinsecurelayout', 'admin'),
-        new lang_string('langmenuinsecurelayout_desc', 'admin'), 0));
-    $temp->add(new admin_setting_configcheckbox('logininfoinsecurelayout',
-        new lang_string('logininfoinsecurelayout', 'admin'),
-        new lang_string('logininfoinsecurelayout_desc', 'admin'), 0));
    $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(
@@ -269,6 +263,7 @@ preferences,moodle|/user/preferences.php|t/preferences',
    $setting = new admin_setting_configcheckbox('cachejs', new lang_string('cachejs', 'admin'), new lang_string('cachejs_help', 'admin'), 1);
    $setting->set_updatedcallback('js_reset_all_caches');
    $temp->add($setting);
+    $temp->add(new admin_setting_configcheckbox('modchooserdefault', new lang_string('modchooserdefault', 'admin'), new lang_string('configmodchooserdefault', 'admin'), 1));
    $ADMIN->add('appearance', $temp);

    // Link to tag management interface.
@@ -57,14 +57,16 @@ 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_allowcoursebadges',
            new lang_string('allowcoursebadges', 'badges'),
            new lang_string('allowcoursebadges_desc', 'badges'), 1));

-    $globalsettings->add(new admin_setting_configcheckbox('badges_allowexternalbackpack',
-            new lang_string('allowexternalbackpack', 'badges'),
-            new lang_string('allowexternalbackpack_desc', 'badges'), 1));
-
    $ADMIN->add('badges', $globalsettings);

    $ADMIN->add('badges',
@@ -91,6 +93,26 @@ 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',
@@ -22,8 +22,6 @@
 * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-use core_admin\local\settings\filesize;
-
 $capabilities = array(
    'moodle/backup:backupcourse',
    'moodle/category:manage',
@@ -77,17 +75,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    $temp->add(new admin_setting_configselect('moodlecourse/visible', new lang_string('visible'), new lang_string('visible_help'),
        1, $choices));

-    // Enable/disable download course content.
-    $choices = [
-        DOWNLOAD_COURSE_CONTENT_DISABLED => new lang_string('no'),
-        DOWNLOAD_COURSE_CONTENT_ENABLED => new lang_string('yes'),
-    ];
-    $downloadcontentsitedefault = new admin_setting_configselect('moodlecourse/downloadcontentsitedefault',
-            new lang_string('enabledownloadcoursecontent', 'course'),
-            new lang_string('downloadcoursecontent_help', 'course'), 0, $choices);
-    $downloadcontentsitedefault->add_dependent_on('downloadcoursecontentallowed');
-    $temp->add($downloadcontentsitedefault);
-
    // Course format.
    $temp->add(new admin_setting_heading('courseformathdr', new lang_string('type_format', 'plugin'), ''));

@@ -139,13 +126,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
        new lang_string('coursehelpshowgrades'), 1, array(0 => new lang_string('no'), 1 => new lang_string('yes'))));
    $temp->add(new admin_setting_configselect('moodlecourse/showreports', new lang_string('showreports'), '', 0,
        array(0 => new lang_string('no'), 1 => new lang_string('yes'))));
-    $temp->add(new admin_setting_configselect('moodlecourse/showactivitydates',
-        new lang_string('showactivitydates'),
-        new lang_string('showactivitydates_help'), 1, [
-            0 => new lang_string('no'),
-            1 => new lang_string('yes')
-        ]
-    ));

    // Files and uploads.
    $temp->add(new admin_setting_heading('filesanduploadshdr', new lang_string('filesanduploads'), ''));
@@ -170,15 +150,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    $temp->add(new admin_setting_configselect('moodlecourse/enablecompletion', new lang_string('completion', 'completion'),
        new lang_string('enablecompletion_help', 'completion'), 1, array(0 => new lang_string('no'), 1 => new lang_string('yes'))));

-    // Display completion conditions.
-    $temp->add(new admin_setting_configselect('moodlecourse/showcompletionconditions',
-        new lang_string('showcompletionconditions', 'completion'),
-        new lang_string('showcompletionconditions_help', 'completion'), 1, [
-            0 => new lang_string('no'),
-            1 => new lang_string('yes')
-        ]
-    ));
-
    // Groups.
    $temp->add(new admin_setting_heading('groups', new lang_string('groups', 'group'), ''));
    $choices = array();
@@ -190,21 +161,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {

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

-    // Download course content.
-    $downloadcoursedefaulturl = new moodle_url('/admin/settings.php', ['section' => 'coursesettings']);
-    $temp = new admin_settingpage('downloadcoursecontent', new lang_string('downloadcoursecontent', 'course'));
-    $temp->add(new admin_setting_configcheckbox('downloadcoursecontentallowed',
-            new lang_string('downloadcoursecontentallowed', 'admin'),
-            new lang_string('downloadcoursecontentallowed_desc', 'admin', $downloadcoursedefaulturl->out()), 0));
-
-    // 50MB default maximum size per file when downloading course content.
-    $defaultmaxdownloadsize = 50 * filesize::UNIT_MB;
-    $temp->add(new filesize('maxsizeperdownloadcoursefile', new lang_string('maxsizeperdownloadcoursefile', 'admin'),
-            new lang_string('maxsizeperdownloadcoursefile_desc', 'admin'), $defaultmaxdownloadsize, filesize::UNIT_MB));
-    $temp->hide_if('maxsizeperdownloadcoursefile', 'downloadcoursecontentallowed');
-
-    $ADMIN->add('courses', $temp);
-
    // "courserequests" settingpage.
    $temp = new admin_settingpage('courserequest', new lang_string('courserequest'));
    $temp->add(new admin_setting_configcheckbox('enablecourserequests',
@@ -225,56 +181,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
                $CFG->wwwroot . '/course/pending.php', array('moodle/site:approvecourse')));
    }

-    // Add a category for the Activity Chooser.
-    $ADMIN->add('courses', new admin_category('activitychooser', new lang_string('activitychoosercategory', 'course')));
-    $temp = new admin_settingpage('activitychoosersettings', new lang_string('activitychoosersettings', 'course'));
-    // Tab mode for the activity chooser.
-    $temp->add(
-        new admin_setting_configselect(
-            'activitychoosertabmode',
-            new lang_string('activitychoosertabmode', 'course'),
-            new lang_string('activitychoosertabmode_desc', 'course'),
-            0,
-            [
-                0 => new lang_string('activitychoosertabmodeone', 'course'),
-                1 => new lang_string('activitychoosertabmodetwo', 'course'),
-                2 => new lang_string('activitychoosertabmodethree', 'course'),
-            ]
-        )
-    );
-
-    // Build a list of plugins that use the footer callback.
-    $pluginswithfunction = get_plugins_with_function('custom_chooser_footer', 'lib.php');
-    $pluginsoptions = [];
-    $pluginsoptions[COURSE_CHOOSER_FOOTER_NONE] = get_string('activitychooserhidefooter', 'course');
-    if ($pluginswithfunction) {
-        foreach ($pluginswithfunction as $plugintype => $plugins) {
-            foreach ($plugins as $pluginname => $pluginfunction) {
-                $plugin = $plugintype.'_'.$pluginname;
-                $pluginsoptions[$plugin] = get_string('pluginname', $plugin);
-            }
-        }
-    }
-
-    // Select what plugin to show in the footer.
-    $temp->add(
-        new admin_setting_configselect(
-            'activitychooseractivefooter',
-            new lang_string('activitychooseractivefooter', 'course'),
-            new lang_string('activitychooseractivefooter_desc', 'course'),
-            COURSE_CHOOSER_FOOTER_NONE,
-            $pluginsoptions
-        )
-    );
-
-    $ADMIN->add('activitychooser', $temp);
-    $ADMIN->add('activitychooser',
-        new admin_externalpage('activitychooserrecommended', new lang_string('activitychooserrecommendations', 'course'),
-            new moodle_url('/course/recommendations.php'),
-            array('moodle/course:recommendactivity')
-        )
-    );
-
    // Add a category for backups.
    $ADMIN->add('courses', new admin_category('backups', new lang_string('backups','admin')));

@@ -323,15 +229,7 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
            new lang_string('generalgroups', 'backup'), new lang_string('configgeneralgroups', 'backup'),
            array('value' => 1, 'locked' => 0)));
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_competencies', new lang_string('generalcompetencies','backup'), new lang_string('configgeneralcompetencies','backup'), array('value'=>1, 'locked'=>0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_contentbankcontent',
-        new lang_string('generalcontentbankcontent', 'backup'),
-        new lang_string('configgeneralcontentbankcontent', 'backup'),
-        ['value' => 1, 'locked' => 0])
-    );

-    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_legacyfiles',
-        new lang_string('generallegacyfiles', 'backup'),
-        new lang_string('configlegacyfiles', 'backup'), array('value' => 1, 'locked' => 0)));
    $ADMIN->add('backups', $temp);

    // Create a page for general import configuration and defaults.
@@ -343,11 +241,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {

    // Import defaults section.
    $temp->add(new admin_setting_heading('importsettings', new lang_string('importsettings', 'backup'), ''));
-    $temp->add(new admin_setting_configcheckbox_with_lock(
-            'backup/backup_import_permissions',
-            new lang_string('generalpermissions', 'backup'),
-            new lang_string('configgeneralpermissions', 'backup'),
-            array('value' => 0, 'locked' => 0)));
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_import_activities', new lang_string('generalactivities','backup'), new lang_string('configgeneralactivities','backup'), array('value'=>1, 'locked'=>0)));
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_import_blocks', new lang_string('generalblocks','backup'), new lang_string('configgeneralblocks','backup'), array('value'=>1, 'locked'=>0)));
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_import_filters', new lang_string('generalfilters','backup'), new lang_string('configgeneralfilters','backup'), array('value'=>1, 'locked'=>0)));
@@ -357,15 +250,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
            new lang_string('generalgroups', 'backup'), new lang_string('configgeneralgroups', 'backup'),
            array('value' => 1, 'locked' => 0)));
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_import_competencies', new lang_string('generalcompetencies','backup'), new lang_string('configgeneralcompetencies','backup'), array('value'=>1, 'locked'=>0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock(
-        'backup/backup_import_contentbankcontent',
-        new lang_string('generalcontentbankcontent', 'backup'),
-        new lang_string('configgeneralcontentbankcontent', 'backup'),
-        ['value' => 1, 'locked' => 0])
-    );
-    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_import_legacyfiles',
-        new lang_string('generallegacyfiles', 'backup'),
-        new lang_string('configlegacyfiles', 'backup'), array('value' => 1, 'locked' => 0)));

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

@@ -392,8 +276,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    $maxkeptoptions = array(
        0 => new lang_string('all'), 1 => '1',
        2 => '2',
-        3 => '3',
-        4 => '4',
        5 => '5',
        10 => '10',
        20 => '20',
@@ -485,16 +367,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_groups', new lang_string('generalgroups', 'backup'),
            new lang_string('configgeneralgroups', 'backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_competencies', new lang_string('generalcompetencies','backup'), new lang_string('configgeneralcompetencies','backup'), 1));
-    $temp->add(new admin_setting_configcheckbox(
-        'backup/backup_auto_contentbankcontent',
-        new lang_string('generalcontentbankcontent', 'backup'),
-        new lang_string('configgeneralcontentbankcontent', 'backup'),
-        1)
-    );
-
-    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_legacyfiles',
-        new lang_string('generallegacyfiles', 'backup'),
-        new lang_string('configlegacyfiles', 'backup'), 1));

    //$temp->add(new admin_setting_configcheckbox('backup/backup_auto_messages', new lang_string('messages', 'message'), new lang_string('backupmessageshelp','message'), 0));
    //$temp->add(new admin_setting_configcheckbox('backup/backup_auto_blogs', new lang_string('blogs', 'blog'), new lang_string('backupblogshelp','blog'), 0));
@@ -522,9 +394,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_role_assignments',
        new lang_string('generalroleassignments', 'backup'),
        new lang_string('configrestoreroleassignments', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_permissions',
-        new lang_string('generalpermissions', 'backup'),
-        new lang_string('configrestorepermissions', 'backup'), array('value' => 1, 'locked' => 0)));
    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_activities',
        new lang_string('generalactivities', 'backup'),
        new lang_string('configrestoreactivities', 'backup'), array('value' => 1, 'locked' => 0)));
@@ -558,12 +427,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_competencies',
        new lang_string('generalcompetencies', 'backup'),
        new lang_string('configrestorecompetencies', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_contentbankcontent',
-        new lang_string('generalcontentbankcontent', 'backup'),
-        new lang_string('configrestorecontentbankcontent', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_legacyfiles',
-        new lang_string('generallegacyfiles', 'backup'),
-        new lang_string('configlegacyfiles', 'backup'), array('value' => 1, 'locked' => 0)));

    // Restore defaults when merging into another course.
    $temp->add(new admin_setting_heading('mergerestoredefaults', new lang_string('mergerestoredefaults', 'backup'), ''));
@@ -10,6 +10,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
    $temp = new admin_settingpage('experimentalsettings', new lang_string('experimentalsettings', 'admin'));
    //TODO: Re-enable cc-import once re-implemented in 2.0.x
    //$temp->add(new admin_setting_configcheckbox('enableimsccimport', new lang_string('enable_cc_import', 'imscc'), new lang_string('enable_cc_import_description', 'imscc'), 0));
+    $temp->add(new admin_setting_configcheckbox('enablesafebrowserintegration', new lang_string('enablesafebrowserintegration', 'admin'), new lang_string('configenablesafebrowserintegration', 'admin'), 0));

    $temp->add(new admin_setting_configcheckbox('dndallowtextandlinks', new lang_string('dndallowtextandlinks', 'admin'), new lang_string('configdndallowtextandlinks', 'admin'), 0));

@@ -38,17 +39,9 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
    // "debugging" settingpage
    $temp = new admin_settingpage('debugging', new lang_string('debugging', 'admin'));
    $temp->add(new admin_setting_special_debug());
-    $temp->add(new admin_setting_configcheckbox('debugdisplay', new lang_string('debugdisplay', 'admin'),
-        new lang_string('configdebugdisplay', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('debugdisplay', new lang_string('debugdisplay', 'admin'), new lang_string('configdebugdisplay', 'admin'), ini_get_bool('display_errors')));
    $temp->add(new admin_setting_configcheckbox('perfdebug', new lang_string('perfdebug', 'admin'), new lang_string('configperfdebug', 'admin'), '7', '15', '7'));
    $temp->add(new admin_setting_configcheckbox('debugstringids', new lang_string('debugstringids', 'admin'), new lang_string('debugstringids_desc', 'admin'), 0));
-    $temp->add(new admin_setting_configselect('debugsqltrace',
-            new lang_string('debugsqltrace', 'admin'),
-            new lang_string('debugsqltrace_desc', 'admin'), 0, array(
-               0 => new lang_string('disabled', 'admin'),
-               1 => new lang_string('debugsqltrace1', 'admin'),
-               2 => new lang_string('debugsqltrace2', 'admin'),
-             100 => new lang_string('debugsqltrace100', 'admin'))));
    $temp->add(new admin_setting_configcheckbox('debugvalidators', new lang_string('debugvalidators', 'admin'), new lang_string('configdebugvalidators', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('debugpageinfo', new lang_string('debugpageinfo', 'admin'), new lang_string('configdebugpageinfo', 'admin'), 0));
    $ADMIN->add('development', $temp);
@@ -24,21 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-// H5P overview.
-$ADMIN->add('h5p', new admin_externalpage('h5poverview', get_string('h5poverview', 'core_h5p'),
-    new moodle_url('/h5p/overview.php'), ['moodle/site:config']));
-
-// Manage H5P libraries page.
-$ADMIN->add('h5p', new admin_externalpage('h5pmanagelibraries', get_string('h5pmanage', 'core_h5p'),
+// Settings page.
+$ADMIN->add('h5p', new admin_externalpage('h5psettings', get_string('h5pmanage', 'core_h5p'),
    new moodle_url('/h5p/libraries.php'), ['moodle/site:config', 'moodle/h5p:updatelibraries']));
-
-// H5P settings.
-$defaulth5plib = \core_h5p\local\library\autoloader::get_default_handler_library();
-if (!empty($defaulth5plib)) {
-    // As for now this page only has this setting, it will be hidden if there isn't any H5P libraries handler defined.
-    $settings = new admin_settingpage('h5psettings', new lang_string('h5psettings', 'core_h5p'));
-    $ADMIN->add('h5p', $settings);
-
-    $settings->add(new admin_settings_h5plib_handler_select('h5plibraryhandler', new lang_string('h5plibraryhandler', 'core_h5p'),
-        new lang_string('h5plibraryhandler_help', 'core_h5p'), $defaulth5plib));
-}
@@ -8,8 +8,6 @@ if ($hassiteconfig) {
    $temp = new admin_settingpage('langsettings', new lang_string('languagesettings', 'admin'));
    $temp->add(new admin_setting_configcheckbox('autolang', new lang_string('autolang', 'admin'), new lang_string('configautolang', 'admin'), 1));
    $temp->add(new admin_setting_configselect('lang', new lang_string('lang', 'admin'), new lang_string('configlang', 'admin'), current_language(), get_string_manager()->get_list_of_translations())); // $CFG->lang might be set in installer already, default en is in setup.php
-    $temp->add(new admin_setting_configcheckbox('autolangusercreation', new lang_string('autolangusercreation', 'admin'),
-        new lang_string('configautolangusercreation', 'admin'), 1));
    $temp->add(new admin_setting_configcheckbox('langmenu', new lang_string('langmenu', 'admin'), new lang_string('configlangmenu', 'admin'), 1));
    $temp->add(new admin_setting_langlist());
    $temp->add(new admin_setting_configcheckbox('langcache', new lang_string('langcache', 'admin'), new lang_string('langcache_desc', 'admin'), 1));
@@ -1,45 +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 defines the settings pages for licenses.
- *
- * @package    core
- * @copyright  2020 Tom Dickman <tomdickman@catalyst-au.net>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir . '/licenselib.php');
-
-if ($hassiteconfig) {
-
-    $temp = new admin_settingpage('licensesettings', new lang_string('licensesettings', 'admin'));
-
-    $licenses = license_manager::get_active_licenses_as_array();
-
-    $temp->add(new admin_setting_configselect('sitedefaultlicense',
-        new lang_string('configsitedefaultlicense', 'admin'),
-        new lang_string('configsitedefaultlicensehelp', 'admin'),
-        'unknown',
-        $licenses));
-    $temp->add(new admin_setting_configcheckbox('rememberuserlicensepref',
-        new lang_string('rememberuserlicensepref', 'admin'),
-        new lang_string('rememberuserlicensepref_help', 'admin'),
-        1));
-    $ADMIN->add('license', $temp);
-}
@@ -1,57 +1,21 @@
 <?php
-// This file is part of Moodle - https://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/>.

-/**
- * Define administration settings on the Location settings page.
- *
- * @package     core
- * @category    admin
- * @copyright   2006 Martin Dougiamas <martin@moodle.com>
- * @license     https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

-defined('MOODLE_INTERNAL') || die();
+    // "locations" settingpage
+    $temp = new admin_settingpage('locationsettings', new lang_string('locationsettings', 'admin'));
+    $temp->add(new admin_setting_servertimezone());
+    $temp->add(new admin_setting_forcetimezone());
+    $temp->add(new admin_settings_country_select('country', new lang_string('country', 'admin'), new lang_string('configcountry', 'admin'), 0));
+    $temp->add(new admin_setting_configtext('defaultcity', new lang_string('defaultcity', 'admin'), new lang_string('defaultcity_help', 'admin'), ''));

-if ($hassiteconfig) {
-    $temp = new admin_settingpage('locationsettings', new lang_string('locationsettings', 'core_admin'));
+    $temp->add(new admin_setting_heading('iplookup', new lang_string('iplookup', 'admin'), new lang_string('iplookupinfo', 'admin')));
+    $temp->add(new admin_setting_configfile('geoip2file', new lang_string('geoipfile', 'admin'),
+        new lang_string('configgeoipfile', 'admin', $CFG->dataroot.'/geoip/'), $CFG->dataroot.'/geoip/GeoLite2-City.mmdb'));
+    $temp->add(new admin_setting_configtext('googlemapkey3', new lang_string('googlemapkey3', 'admin'), new lang_string('googlemapkey3_help', 'admin'), '', PARAM_RAW, 60));

-    if ($ADMIN->fulltree) {
-        $temp->add(new admin_setting_servertimezone());
-
-        $temp->add(new admin_setting_forcetimezone());
-
-        $temp->add(new admin_settings_country_select('country', new lang_string('country', 'core_admin'),
-            new lang_string('configcountry', 'core_admin'), 0));
-
-        $temp->add(new admin_setting_configtext('defaultcity', new lang_string('defaultcity', 'core_admin'),
-            new lang_string('defaultcity_help', 'core_admin'), ''));
-
-        $temp->add(new admin_setting_heading('iplookup', new lang_string('iplookup', 'core_admin'),
-            new lang_string('iplookupinfo', 'core_admin')));
-
-        $temp->add(new admin_setting_configfile('geoip2file', new lang_string('geoipfile', 'core_admin'),
-            new lang_string('configgeoipfile', 'core_admin', $CFG->dataroot . '/geoip/'),
-            $CFG->dataroot . '/geoip/GeoLite2-City.mmdb'));
-
-        $temp->add(new admin_setting_configtext('googlemapkey3', new lang_string('googlemapkey3', 'core_admin'),
-            new lang_string('googlemapkey3_help', 'core_admin'), '', PARAM_RAW, 60));
-
-        $temp->add(new admin_setting_countrycodes('allcountrycodes', new lang_string('allcountrycodes', 'core_admin'),
-            new lang_string('configallcountrycodes', 'core_admin')));
-    }
+    $temp->add(new admin_setting_configtext('allcountrycodes', new lang_string('allcountrycodes', 'admin'), new lang_string('configallcountrycodes', 'admin'), '', '/^(?:\w+(?:,\w+)*)?$/'));

    $ADMIN->add('location', $temp);
-}
+
+} // end of speedup
@@ -1,29 +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 payments links to the admin tree
- *
- * @package    core
- * @copyright  2020 Marina Glancy
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-$ADMIN->add('payment', new admin_externalpage(
-    'paymentaccounts',
-    new lang_string('paymentaccounts', 'payment'),
-    new moodle_url("/payment/accounts.php"),
-    ['moodle/payment:manageaccounts', 'moodle/payment:viewpayments']));
@@ -167,42 +167,6 @@ if ($hassiteconfig) {
    $ADMIN->add('modules', new admin_category('antivirussettings', new lang_string('antiviruses', 'antivirus')));
    $temp = new admin_settingpage('manageantiviruses', new lang_string('antivirussettings', 'antivirus'));
    $temp->add(new admin_setting_manageantiviruses());
-
-    // Common settings.
-    $temp->add(new admin_setting_heading('antiviruscommonsettings', new lang_string('antiviruscommonsettings', 'antivirus'), ''));
-
-    // Alert email.
-    $temp->add(
-        new admin_setting_configtext(
-            'antivirus/notifyemail',
-            new lang_string('notifyemail', 'antivirus'),
-            new lang_string('notifyemail_help', 'antivirus'),
-            '',
-            PARAM_EMAIL
-        )
-    );
-
-    // Enable quarantine.
-    $temp->add(
-        new admin_setting_configcheckbox(
-            'antivirus/enablequarantine',
-            new lang_string('enablequarantine', 'antivirus'),
-            new lang_string('enablequarantine_help', 'antivirus',
-            \core\antivirus\quarantine::DEFAULT_QUARANTINE_FOLDER),
-            0
-        )
-    );
-
-    // Quarantine time.
-    $temp->add(
-        new admin_setting_configduration(
-            'antivirus/quarantinetime',
-            new lang_string('quarantinetime', 'antivirus'),
-            new lang_string('quarantinetime_desc', 'antivirus'),
-            \core\antivirus\quarantine::DEFAULT_QUARANTINE_TIME
-        )
-    );
-
    $ADMIN->add('antivirussettings', $temp);
    $plugins = core_plugin_manager::instance()->get_plugins_of_type('antivirus');
    core_collator::asort_objects_by_property($plugins, 'displayname');
@@ -218,6 +182,20 @@ if ($hassiteconfig) {
        $plugin->load_settings($ADMIN, 'mlbackendsettings', $hassiteconfig);
    }

+/// License types
+    $ADMIN->add('modules', new admin_category('licensesettings', new lang_string('licenses')));
+    $temp = new admin_settingpage('managelicenses', new lang_string('managelicenses', 'admin'));
+
+    require_once($CFG->libdir . '/licenselib.php');
+    $licenses = array();
+    $array = explode(',', $CFG->licenses);
+    foreach ($array as $value) {
+        $licenses[$value] = new lang_string($value, 'license');
+    }
+    $temp->add(new admin_setting_configselect('sitedefaultlicense', new lang_string('configsitedefaultlicense','admin'), new lang_string('configsitedefaultlicensehelp','admin'), 'allrightsreserved', $licenses));
+    $temp->add(new admin_setting_managelicenses());
+    $ADMIN->add('licensesettings', $temp);
+
 /// Filter plugins
    $ADMIN->add('modules', new admin_category('filtersettings', new lang_string('managefilters')));

@@ -231,9 +209,6 @@ if ($hassiteconfig) {
                array('0' => new lang_string('none'), '1' => new lang_string('allfiles'), '2' => new lang_string('htmlfilesonly')));
        $items[] = new admin_setting_configcheckbox('filtermatchoneperpage', new lang_string('filtermatchoneperpage', 'admin'), new lang_string('configfiltermatchoneperpage', 'admin'), 0);
        $items[] = new admin_setting_configcheckbox('filtermatchonepertext', new lang_string('filtermatchonepertext', 'admin'), new lang_string('configfiltermatchonepertext', 'admin'), 0);
-        $items[] = new admin_setting_configcheckbox('filternavigationwithsystemcontext',
-                new lang_string('filternavigationwithsystemcontext', 'admin'),
-                new lang_string('configfilternavigationwithsystemcontext', 'admin'), 0);
        foreach ($items as $item) {
            $item->set_updatedcallback('reset_text_filters_cache');
            $temp->add($item);
@@ -283,38 +258,12 @@ if ($hassiteconfig) {
        $plugin->load_settings($ADMIN, 'mediaplayers', $hassiteconfig);
    }

-    // Payment gateway plugins.
-    $ADMIN->add('modules', new admin_category('paymentgateways', new lang_string('type_paygw_plural', 'plugin')));
-    $temp = new admin_settingpage('managepaymentgateways', new lang_string('type_paygwmanage', 'plugin'));
-    $temp->add(new \core_admin\local\settings\manage_payment_gateway_plugins());
-    $temp->add(new admin_setting_description(
-        'managepaymentgatewayspostfix',
-        '',
-        new lang_string('gotopaymentaccounts', 'payment',
-            html_writer::link(new moodle_url('/payment/accounts.php'), get_string('paymentaccounts', 'payment')))
-    ));
-    $ADMIN->add('paymentgateways', $temp);
-
-    $plugins = core_plugin_manager::instance()->get_plugins_of_type('paygw');
-    core_collator::asort_objects_by_property($plugins, 'displayname');
-    foreach ($plugins as $plugin) {
-        /** @var \core\plugininfo\paygw $plugin */
-        $plugin->load_settings($ADMIN, 'paymentgateways', $hassiteconfig);
-    }
-
    // Data format settings.
    $ADMIN->add('modules', new admin_category('dataformatsettings', new lang_string('dataformats')));
    $temp = new admin_settingpage('managedataformats', new lang_string('managedataformats'));
    $temp->add(new admin_setting_managedataformats());
    $ADMIN->add('dataformatsettings', $temp);

-    $plugins = core_plugin_manager::instance()->get_plugins_of_type('dataformat');
-    core_collator::asort_objects_by_property($plugins, 'displayname');
-    foreach ($plugins as $plugin) {
-        /** @var \core\plugininfo\dataformat $plugin */
-        $plugin->load_settings($ADMIN, 'dataformatsettings', $hassiteconfig);
-    }
-
    //== Portfolio settings ==
    require_once($CFG->libdir. '/portfoliolib.php');
    $catname = new lang_string('portfolios', 'portfolio');
@@ -411,6 +360,55 @@ if ($hassiteconfig) {
        /** @var \core\plugininfo\repository $plugin */
        $plugin->load_settings($ADMIN, 'repositorysettings', $hassiteconfig);
    }
+
+/// Web services
+    $ADMIN->add('modules', new admin_category('webservicesettings', new lang_string('webservices', 'webservice')));
+
+    /// overview page
+    $temp = new admin_settingpage('webservicesoverview', new lang_string('webservicesoverview', 'webservice'));
+    $temp->add(new admin_setting_webservicesoverview());
+    $ADMIN->add('webservicesettings', $temp);
+    //API documentation
+    $ADMIN->add('webservicesettings', new admin_externalpage('webservicedocumentation', new lang_string('wsdocapi', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/documentation.php", 'moodle/site:config', false));
+    /// manage service
+    $temp = new admin_settingpage('externalservices', new lang_string('externalservices', 'webservice'));
+    $temp->add(new admin_setting_heading('manageserviceshelpexplaination', new lang_string('information', 'webservice'), new lang_string('servicehelpexplanation', 'webservice')));
+    $temp->add(new admin_setting_manageexternalservices());
+    $ADMIN->add('webservicesettings', $temp);
+    $ADMIN->add('webservicesettings', new admin_externalpage('externalservice', new lang_string('editaservice', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/service.php", 'moodle/site:config', true));
+    $ADMIN->add('webservicesettings', new admin_externalpage('externalservicefunctions', new lang_string('externalservicefunctions', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/service_functions.php", 'moodle/site:config', true));
+    $ADMIN->add('webservicesettings', new admin_externalpage('externalserviceusers', new lang_string('externalserviceusers', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/service_users.php", 'moodle/site:config', true));
+    $ADMIN->add('webservicesettings', new admin_externalpage('externalserviceusersettings', new lang_string('serviceusersettings', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/service_user_settings.php", 'moodle/site:config', true));
+    /// manage protocol page link
+    $temp = new admin_settingpage('webserviceprotocols', new lang_string('manageprotocols', 'webservice'));
+    $temp->add(new admin_setting_managewebserviceprotocols());
+    if (empty($CFG->enablewebservices)) {
+        $temp->add(new admin_setting_heading('webservicesaredisabled', '', new lang_string('disabledwarning', 'webservice')));
+    }
+
+    // We cannot use $OUTPUT this early, doing so means that we lose the ability
+    // to set the page layout on all admin pages.
+    // $wsdoclink = $OUTPUT->doc_link('How_to_get_a_security_key');
+    $url = new moodle_url(get_docs_url('How_to_get_a_security_key'));
+    $wsdoclink = html_writer::tag('a', new lang_string('supplyinfo', 'webservice'), array('href'=>$url));
+    $temp->add(new admin_setting_configcheckbox('enablewsdocumentation', new lang_string('enablewsdocumentation',
+                        'admin'), new lang_string('configenablewsdocumentation', 'admin', $wsdoclink), false));
+    $ADMIN->add('webservicesettings', $temp);
+    /// links to protocol pages
+    $plugins = core_plugin_manager::instance()->get_plugins_of_type('webservice');
+    core_collator::asort_objects_by_property($plugins, 'displayname');
+    foreach ($plugins as $plugin) {
+        /** @var \core\plugininfo\webservice $plugin */
+        $plugin->load_settings($ADMIN, 'webservicesettings', $hassiteconfig);
+    }
+    /// manage token page link
+    $ADMIN->add('webservicesettings', new admin_externalpage('addwebservicetoken', new lang_string('managetokens', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/tokens.php", 'moodle/site:config', true));
+    $temp = new admin_settingpage('webservicetokens', new lang_string('managetokens', 'webservice'));
+    $temp->add(new admin_setting_managewebservicetokens());
+    if (empty($CFG->enablewebservices)) {
+        $temp->add(new admin_setting_heading('webservicesaredisabled', '', new lang_string('disabledwarning', 'webservice')));
+    }
+    $ADMIN->add('webservicesettings', $temp);
 }

 // Question type settings
@@ -492,10 +490,7 @@ if ($hassiteconfig && !empty($CFG->enableplagiarism)) {
        $plugin->load_settings($ADMIN, 'plagiarism', $hassiteconfig);
    }
 }
-
-// Comments report, note this page is really just a means to delete comments so check that.
-$ADMIN->add('reports', new admin_externalpage('comments', new lang_string('comments'), $CFG->wwwroot . '/comment/index.php',
-    'moodle/comment:delete'));
+$ADMIN->add('reports', new admin_externalpage('comments', new lang_string('comments'), $CFG->wwwroot.'/comment/', 'moodle/site:viewreports'));

 // Course reports settings
 if ($hassiteconfig) {
@@ -568,19 +563,8 @@ if ($hassiteconfig) {

    // Search engine selection.
    $temp->add(new admin_setting_heading('searchengineheading', new lang_string('searchengine', 'admin'), ''));
-    $searchengineselect = new admin_setting_configselect('searchengine',
-            new lang_string('selectsearchengine', 'admin'), '', 'simpledb', $engines);
-    $searchengineselect->set_validate_function(function(string $value): string {
-        global $CFG;
-
-        // Check nobody's setting the indexing and query-only server to the same one.
-        if (isset($CFG->searchenginequeryonly) && $CFG->searchenginequeryonly === $value) {
-            return get_string('searchenginequeryonlysame', 'admin');
-        } else {
-            return '';
-        }
-    });
-    $temp->add($searchengineselect);
+    $temp->add(new admin_setting_configselect('searchengine',
+                                new lang_string('selectsearchengine', 'admin'), '', 'simpledb', $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'),
@@ -620,43 +604,6 @@ if ($hassiteconfig) {
        new lang_string('searchhideallcategory_desc', 'admin'),
        0));

-    $temp->add(new admin_setting_heading('searchmanagement', new lang_string('searchmanagement', 'admin'),
-            new lang_string('searchmanagement_desc', 'admin')));
-
-    // Get list of search engines including those with alternate settings.
-    $searchenginequeryonlyselect = new admin_setting_configselect('searchenginequeryonly',
-            new lang_string('searchenginequeryonly', 'admin'),
-            new lang_string('searchenginequeryonly_desc', 'admin'), '', function() use($engines) {
-                $options = ['' => new lang_string('searchenginequeryonly_none', 'admin')];
-                foreach ($engines as $name => $display) {
-                    $options[$name] = $display;
-
-                    $classname = '\search_' . $name . '\engine';
-                    $engine = new $classname;
-                    if ($engine->has_alternate_configuration()) {
-                        $options[$name . '-alternate'] =
-                                new lang_string('searchenginealternatesettings', 'admin', $display);
-                    }
-                }
-                return $options;
-            });
-    $searchenginequeryonlyselect->set_validate_function(function(string $value): string {
-        global $CFG;
-
-        // Check nobody's setting the indexing and query-only server to the same one.
-        if (isset($CFG->searchengine) && $CFG->searchengine === $value) {
-            return get_string('searchenginequeryonlysame', 'admin');
-        } else {
-            return '';
-        }
-    });
-    $temp->add($searchenginequeryonlyselect);
-    $temp->add(new admin_setting_configcheckbox('searchbannerenable',
-            new lang_string('searchbannerenable', 'admin'), new lang_string('searchbannerenable_desc', 'admin'),
-            0));
-    $temp->add(new admin_setting_confightmleditor('searchbanner',
-            new lang_string('searchbanner', 'admin'), '', ''));
-
    $ADMIN->add('searchplugins', $temp);
    $ADMIN->add('searchplugins', new admin_externalpage('searchareas', new lang_string('searchareas', 'admin'),
        new moodle_url('/admin/searchareas.php')));
@@ -710,19 +657,6 @@ if ($hassiteconfig) {
    }
 }

-// Content bank content types.
-if ($hassiteconfig) {
-    $ADMIN->add('modules', new admin_category('contentbanksettings', new lang_string('contentbank')));
-    $temp = new admin_settingpage('managecontentbanktypes', new lang_string('managecontentbanktypes'));
-    $temp->add(new admin_setting_managecontentbankcontenttypes());
-    $ADMIN->add('contentbanksettings', $temp);
-    $plugins = core_plugin_manager::instance()->get_plugins_of_type('contenttype');
-    foreach ($plugins as $plugin) {
-        /** @var \core\plugininfo\contentbank $plugin */
-        $plugin->load_settings($ADMIN, 'contentbanksettings', $hassiteconfig);
-    }
-}
-
 /// Add all local plugins - must be always last!
 if ($hassiteconfig) {
    $ADMIN->add('modules', new admin_category('localplugins', new lang_string('localplugins')));
@@ -100,9 +100,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
    $temp->add(new admin_setting_configtext('minpasswordupper', new lang_string('minpasswordupper', 'admin'), new lang_string('configminpasswordupper', 'admin'), 1, PARAM_INT));
    $temp->add(new admin_setting_configtext('minpasswordnonalphanum', new lang_string('minpasswordnonalphanum', 'admin'), new lang_string('configminpasswordnonalphanum', 'admin'), 1, PARAM_INT));
    $temp->add(new admin_setting_configtext('maxconsecutiveidentchars', new lang_string('maxconsecutiveidentchars', 'admin'), new lang_string('configmaxconsecutiveidentchars', 'admin'), 0, PARAM_INT));
-    $temp->add(new admin_setting_configcheckbox('passwordpolicycheckonlogin',
-        new lang_string('passwordpolicycheckonlogin', 'admin'),
-        new lang_string('configpasswordpolicycheckonlogin', 'admin'), 0));

    $temp->add(new admin_setting_configtext('passwordreuselimit',
        new lang_string('passwordreuselimit', 'admin'),
@@ -160,23 +157,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
    $temp->add(new admin_setting_configportlist('curlsecurityallowedport',
               new lang_string('curlsecurityallowedport', 'admin'),
               new lang_string('curlsecurityallowedportsyntax', 'admin'), ""));
-
-    // HTTP Header referrer policy settings.
-    $referreroptions = [
-        'default' => get_string('referrernone', 'admin'),
-        'no-referrer' => 'no-referrer',
-        'no-referrer-when-downgrade' => 'no-referrer-when-downgrade',
-        'origin' => 'origin',
-        'origin-when-cross-origin' => 'origin-when-cross-origin',
-        'same-origin' => 'same-origin',
-        'strict-origin' => 'strict-origin',
-        'strict-origin-when-cross-origin' => 'strict-origin-when-cross-origin',
-        'unsafe-url' => 'unsafe-url',
-    ];
-    $temp->add(new admin_setting_configselect('referrerpolicy',
-            new lang_string('referrerpolicy', 'admin'),
-            new lang_string('referrerpolicydesc', 'admin'), 'default', $referreroptions));
-
    $ADMIN->add('security', $temp);

    // "notifications" settingpage
@@ -1,243 +1,164 @@
 <?php
-// This file is part of Moodle - https://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

-/**
- * Defines settingpages and externalpages under the "server" category.
- *
- * @package     core
- * @category    admin
- * @copyright   2006 Martin Dougiamas
- * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+// This file defines settingpages and externalpages under the "server" category

-defined('MOODLE_INTERNAL') || die();
+if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

-if ($hassiteconfig) {
-    // System paths.
-    $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'), ''));
-    $temp->add(new admin_setting_configexecutable('pathtogs', new lang_string('pathtogs', 'admin'),
-        new lang_string('pathtogs_help', 'admin'), '/usr/bin/gs'));
-    $temp->add(new admin_setting_configexecutable('pathtopdftoppm', new lang_string('pathtopdftoppm', 'admin'),
-        new lang_string('pathtopdftoppm_help', 'admin'), ''));
-    $temp->add(new admin_setting_configexecutable('pathtopython', new lang_string('pathtopython', 'admin'),
-        new lang_string('pathtopythondesc', 'admin'), ''));
-    $ADMIN->add('server', $temp);
+// "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'), ''));
+$temp->add(new admin_setting_configexecutable('pathtogs', new lang_string('pathtogs', 'admin'), new lang_string('pathtogs_help', 'admin'), '/usr/bin/gs'));
+$temp->add(new admin_setting_configexecutable('pathtopython', new lang_string('pathtopython', 'admin'),
+    new lang_string('pathtopythondesc', 'admin'), ''));
+$ADMIN->add('server', $temp);

-    // Support contact.
-    $temp = new admin_settingpage('supportcontact', new lang_string('supportcontact', 'admin'));
-    $primaryadmin = get_admin();
-    if ($primaryadmin) {
-        $primaryadminemail = $primaryadmin->email;
-        $primaryadminname = fullname($primaryadmin, true);
-    } else {
-        // No defaults during installation - admin user must be created first.
-        $primaryadminemail = null;
-        $primaryadminname = null;
-    }
-    $temp->add(new admin_setting_configtext('supportname', new lang_string('supportname', 'admin'),
-        new lang_string('configsupportname', 'admin'), $primaryadminname, PARAM_NOTAGS));
-    $setting = new admin_setting_configtext('supportemail', new lang_string('supportemail', 'admin'),
-        new lang_string('configsupportemail', 'admin'), $primaryadminemail, PARAM_EMAIL);
-    $setting->set_force_ltr(true);
-    $temp->add($setting);
-    $temp->add(new admin_setting_configtext('supportpage', new lang_string('supportpage', 'admin'),
-        new lang_string('configsupportpage', 'admin'), '', PARAM_URL));
-    $ADMIN->add('server', $temp);

-    // Session handling.
-    $temp = new admin_settingpage('sessionhandling', new lang_string('sessionhandling', 'admin'));
-    if (empty($CFG->session_handler_class) and $DB->session_lock_supported()) {
-        $temp->add(new admin_setting_configcheckbox('dbsessions', new lang_string('dbsessions', 'admin'),
-            new lang_string('configdbsessions', 'admin'), 0));
-    }

-    $temp->add(new admin_setting_configduration('sessiontimeout', new lang_string('sessiontimeout', 'admin'),
-        new lang_string('configsessiontimeout', 'admin'), 8 * 60 * 60));
+// "supportcontact" settingpage
+$temp = new admin_settingpage('supportcontact', new lang_string('supportcontact','admin'));
+$primaryadmin = get_admin();
+if ($primaryadmin) {
+    $primaryadminemail = $primaryadmin->email;
+    $primaryadminname  = fullname($primaryadmin, true);
+} else {
+    // no defaults during installation - admin user must be created first
+    $primaryadminemail = NULL;
+    $primaryadminname  = NULL;
+}
+$temp->add(new admin_setting_configtext('supportname', new lang_string('supportname', 'admin'),
+    new lang_string('configsupportname', 'admin'), $primaryadminname, PARAM_NOTAGS));
+$setting = new admin_setting_configtext('supportemail', new lang_string('supportemail', 'admin'),
+    new lang_string('configsupportemail', 'admin'), $primaryadminemail, PARAM_EMAIL);
+$setting->set_force_ltr(true);
+$temp->add($setting);
+$temp->add(new admin_setting_configtext('supportpage', new lang_string('supportpage', 'admin'), new lang_string('configsupportpage', 'admin'), '', PARAM_URL));
+$ADMIN->add('server', $temp);

-    $sessiontimeoutwarning = new admin_setting_configduration('sessiontimeoutwarning',
-        new lang_string('sessiontimeoutwarning', 'admin'),
-        new lang_string('configsessiontimeoutwarning', 'admin'), 20 * 60);

-    $sessiontimeoutwarning->set_validate_function(function(int $value): string {
-        global $CFG;
-        // Check sessiontimeoutwarning is less than sessiontimeout.
-        if ($CFG->sessiontimeout <= $value) {
-            return get_string('configsessiontimeoutwarningcheck', 'admin');
-        } else {
-            return '';
-        }
-    });
+// "sessionhandling" settingpage
+$temp = new admin_settingpage('sessionhandling', new lang_string('sessionhandling', 'admin'));
+if (empty($CFG->session_handler_class) and $DB->session_lock_supported()) {
+    $temp->add(new admin_setting_configcheckbox('dbsessions', new lang_string('dbsessions', 'admin'), new lang_string('configdbsessions', 'admin'), 0));
+}
+$temp->add(new admin_setting_configselect('sessiontimeout', new lang_string('sessiontimeout', 'admin'), new lang_string('configsessiontimeout', 'admin'), 7200, array(14400 => new lang_string('numhours', '', 4),
+                                                                                                                                                      10800 => new lang_string('numhours', '', 3),
+                                                                                                                                                      7200 => new lang_string('numhours', '', 2),
+                                                                                                                                                      5400 => new lang_string('numhours', '', '1.5'),
+                                                                                                                                                      3600 => new lang_string('numminutes', '', 60),
+                                                                                                                                                      2700 => new lang_string('numminutes', '', 45),
+                                                                                                                                                      1800 => new lang_string('numminutes', '', 30),
+                                                                                                                                                      900 => new lang_string('numminutes', '', 15),
+                                                                                                                                                      300 => new lang_string('numminutes', '', 5))));
+$temp->add(new admin_setting_configtext('sessioncookie', new lang_string('sessioncookie', 'admin'), new lang_string('configsessioncookie', 'admin'), '', PARAM_ALPHANUM));
+$temp->add(new admin_setting_configtext('sessioncookiepath', new lang_string('sessioncookiepath', 'admin'), new lang_string('configsessioncookiepath', 'admin'), '', PARAM_RAW));
+$temp->add(new admin_setting_configtext('sessioncookiedomain', new lang_string('sessioncookiedomain', 'admin'), new lang_string('configsessioncookiedomain', 'admin'), '', PARAM_RAW, 50));
+$ADMIN->add('server', $temp);

-    $temp->add($sessiontimeoutwarning);

-    $temp->add(new admin_setting_configtext('sessioncookie', new lang_string('sessioncookie', 'admin'),
-        new lang_string('configsessioncookie', 'admin'), '', PARAM_ALPHANUM));
-    $temp->add(new admin_setting_configtext('sessioncookiepath', new lang_string('sessioncookiepath', 'admin'),
-        new lang_string('configsessioncookiepath', 'admin'), '', PARAM_RAW));
-    $temp->add(new admin_setting_configtext('sessioncookiedomain', new lang_string('sessioncookiedomain', 'admin'),
-        new lang_string('configsessioncookiedomain', 'admin'), '', PARAM_RAW, 50));
-    $ADMIN->add('server', $temp);
+// "stats" settingpage
+$temp = new admin_settingpage('stats', new lang_string('stats'), 'moodle/site:config', empty($CFG->enablestats));
+$temp->add(new admin_setting_configselect('statsfirstrun', new lang_string('statsfirstrun', 'admin'), new lang_string('configstatsfirstrun', 'admin'), 'none', array('none' => new lang_string('none'),
+                                                                                                                                                           60*60*24*7 => new lang_string('numweeks','moodle',1),
+                                                                                                                                                           60*60*24*14 => new lang_string('numweeks','moodle',2),
+                                                                                                                                                           60*60*24*21 => new lang_string('numweeks','moodle',3),
+                                                                                                                                                           60*60*24*28 => new lang_string('nummonths','moodle',1),
+                                                                                                                                                           60*60*24*56 => new lang_string('nummonths','moodle',2),
+                                                                                                                                                           60*60*24*84 => new lang_string('nummonths','moodle',3),
+                                                                                                                                                           60*60*24*112 => new lang_string('nummonths','moodle',4),
+                                                                                                                                                           60*60*24*140 => new lang_string('nummonths','moodle',5),
+                                                                                                                                                           60*60*24*168 => new lang_string('nummonths','moodle',6),
+                                                                                                                                                           'all' => new lang_string('all') )));
+$temp->add(new admin_setting_configselect('statsmaxruntime', new lang_string('statsmaxruntime', 'admin'), new lang_string('configstatsmaxruntime3', 'admin'), 0, array(0 => new lang_string('untilcomplete'),
+                                                                                                                                                            60*30 => '10 '.new lang_string('minutes'),
+                                                                                                                                                            60*30 => '30 '.new lang_string('minutes'),
+                                                                                                                                                            60*60 => '1 '.new lang_string('hour'),
+                                                                                                                                                            60*60*2 => '2 '.new lang_string('hours'),
+                                                                                                                                                            60*60*3 => '3 '.new lang_string('hours'),
+                                                                                                                                                            60*60*4 => '4 '.new lang_string('hours'),
+                                                                                                                                                            60*60*5 => '5 '.new lang_string('hours'),
+                                                                                                                                                            60*60*6 => '6 '.new lang_string('hours'),
+                                                                                                                                                            60*60*7 => '7 '.new lang_string('hours'),
+                                                                                                                                                            60*60*8 => '8 '.new lang_string('hours') )));
+$temp->add(new admin_setting_configtext('statsruntimedays', new lang_string('statsruntimedays', 'admin'), new lang_string('configstatsruntimedays', 'admin'), 31, PARAM_INT));
+$temp->add(new admin_setting_configtext('statsuserthreshold', new lang_string('statsuserthreshold', 'admin'), new lang_string('configstatsuserthreshold', 'admin'), 0, PARAM_INT));
+$ADMIN->add('server', $temp);

-    // Statistics.
-    $temp = new admin_settingpage('stats', new lang_string('stats'), 'moodle/site:config', empty($CFG->enablestats));
-    $temp->add(new admin_setting_configselect('statsfirstrun', new lang_string('statsfirstrun', 'admin'),
-        new lang_string('configstatsfirstrun', 'admin'), 'none',
-        [
-            'none' => new lang_string('none'),
-            60 * 60 * 24 * 7 => new lang_string('numweeks', 'moodle', 1),
-            60 * 60 * 24 * 14 => new lang_string('numweeks', 'moodle', 2),
-            60 * 60 * 24 * 21 => new lang_string('numweeks', 'moodle', 3),
-            60 * 60 * 24 * 28 => new lang_string('nummonths', 'moodle', 1),
-            60 * 60 * 24 * 56 => new lang_string('nummonths', 'moodle', 2),
-            60 * 60 * 24 * 84 => new lang_string('nummonths', 'moodle', 3),
-            60 * 60 * 24 * 112 => new lang_string('nummonths', 'moodle', 4),
-            60 * 60 * 24 * 140 => new lang_string('nummonths', 'moodle', 5),
-            60 * 60 * 24 * 168 => new lang_string('nummonths', 'moodle', 6),
-            'all' => new lang_string('all')
-        ]
-    ));
-    $temp->add(new admin_setting_configselect('statsmaxruntime', new lang_string('statsmaxruntime', 'admin'),
-        new lang_string('configstatsmaxruntime3', 'admin'), 0,
-        [
-            0 => new lang_string('untilcomplete'),
-            60 * 30 => '10 ' . new lang_string('minutes'),
-            60 * 30 => '30 ' . new lang_string('minutes'),
-            60 * 60 => '1 ' . new lang_string('hour'),
-            60 * 60 * 2 => '2 ' . new lang_string('hours'),
-            60 * 60 * 3 => '3 ' . new lang_string('hours'),
-            60 * 60 * 4 => '4 ' . new lang_string('hours'),
-            60 * 60 * 5 => '5 ' . new lang_string('hours'),
-            60 * 60 * 6 => '6 ' . new lang_string('hours'),
-            60 * 60 * 7 => '7 ' . new lang_string('hours'),
-            60 * 60 * 8 => '8 ' . new lang_string('hours'),
-        ]
-    ));
-    $temp->add(new admin_setting_configtext('statsruntimedays', new lang_string('statsruntimedays', 'admin'),
-        new lang_string('configstatsruntimedays', 'admin'), 31, PARAM_INT));
-    $temp->add(new admin_setting_configtext('statsuserthreshold', new lang_string('statsuserthreshold', 'admin'),
-        new lang_string('configstatsuserthreshold', 'admin'), 0, PARAM_INT));
-    $ADMIN->add('server', $temp);

-    // HTTP.
-    $temp = new admin_settingpage('http', new lang_string('http', 'admin'));
-    $temp->add(new admin_setting_configcheckbox('slasharguments', new lang_string('slasharguments', 'admin'),
-        new lang_string('configslasharguments', 'admin'), 1));
-    $temp->add(new admin_setting_heading('reverseproxy', new lang_string('reverseproxy', 'admin'), '', ''));
-    $options = [
-        0 => 'HTTP_CLIENT_IP, HTTP_X_FORWARDED_FOR, REMOTE_ADDR',
-        GETREMOTEADDR_SKIP_HTTP_CLIENT_IP => 'HTTP_X_FORWARDED_FOR, REMOTE_ADDR',
-        GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR => 'HTTP_CLIENT, REMOTE_ADDR',
-        GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR | GETREMOTEADDR_SKIP_HTTP_CLIENT_IP => 'REMOTE_ADDR'
-    ];
-    $temp->add(new admin_setting_configselect('getremoteaddrconf', new lang_string('getremoteaddrconf', 'admin'),
-        new lang_string('configgetremoteaddrconf', 'admin'),
-        GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR | GETREMOTEADDR_SKIP_HTTP_CLIENT_IP, $options));
-    $temp->add(new admin_setting_configtext('reverseproxyignore', new lang_string('reverseproxyignore', 'admin'),
-        new lang_string('configreverseproxyignore', 'admin'), ''));
+// "http" settingpage
+$temp = new admin_settingpage('http', new lang_string('http', 'admin'));
+$temp->add(new admin_setting_configcheckbox('slasharguments', new lang_string('slasharguments', 'admin'), new lang_string('configslasharguments', 'admin'), 1));
+$temp->add(new admin_setting_heading('reverseproxy', new lang_string('reverseproxy', 'admin'), '', ''));
+$options = array(
+    0 => 'HTTP_CLIENT_IP, HTTP_X_FORWARDED_FOR, REMOTE_ADDR',
+    GETREMOTEADDR_SKIP_HTTP_CLIENT_IP => 'HTTP_X_FORWARDED_FOR, REMOTE_ADDR',
+    GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR => 'HTTP_CLIENT, REMOTE_ADDR',
+    GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR|GETREMOTEADDR_SKIP_HTTP_CLIENT_IP => 'REMOTE_ADDR');
+$temp->add(new admin_setting_configselect('getremoteaddrconf', new lang_string('getremoteaddrconf', 'admin'), new lang_string('configgetremoteaddrconf', 'admin'), 0, $options));

-    $temp->add(new admin_setting_heading('webproxy', new lang_string('webproxy', 'admin'),
-        new lang_string('webproxyinfo', 'admin')));
-    $temp->add(new admin_setting_configtext('proxyhost', new lang_string('proxyhost', 'admin'),
-        new lang_string('configproxyhost', 'admin'), '', PARAM_HOST));
-    $temp->add(new admin_setting_configtext('proxyport', new lang_string('proxyport', 'admin'),
-        new lang_string('configproxyport', 'admin'), 0, PARAM_INT));
-    $options = ['HTTP' => 'HTTP'];
-    if (defined('CURLPROXY_SOCKS5')) {
-        $options['SOCKS5'] = 'SOCKS5';
-    }
-    $temp->add(new admin_setting_configselect('proxytype', new lang_string('proxytype', 'admin'),
-        new lang_string('configproxytype', 'admin'), 'HTTP', $options));
-    $temp->add(new admin_setting_configtext('proxyuser', new lang_string('proxyuser', 'admin'),
-        new lang_string('configproxyuser', 'admin'), ''));
-    $temp->add(new admin_setting_configpasswordunmask('proxypassword', new lang_string('proxypassword', 'admin'),
-        new lang_string('configproxypassword', 'admin'), ''));
-    $temp->add(new admin_setting_configtext('proxybypass', new lang_string('proxybypass', 'admin'),
-        new lang_string('configproxybypass', 'admin'), 'localhost, 127.0.0.1'));
-    $ADMIN->add('server', $temp);
+$temp->add(new admin_setting_heading('webproxy', new lang_string('webproxy', 'admin'), new lang_string('webproxyinfo', 'admin')));
+$temp->add(new admin_setting_configtext('proxyhost', new lang_string('proxyhost', 'admin'), new lang_string('configproxyhost', 'admin'), '', PARAM_HOST));
+$temp->add(new admin_setting_configtext('proxyport', new lang_string('proxyport', 'admin'), new lang_string('configproxyport', 'admin'), 0, PARAM_INT));
+$options = array('HTTP'=>'HTTP');
+if (defined('CURLPROXY_SOCKS5')) {
+    $options['SOCKS5'] = 'SOCKS5';
+}
+$temp->add(new admin_setting_configselect('proxytype', new lang_string('proxytype', 'admin'), new lang_string('configproxytype','admin'), 'HTTP', $options));
+$temp->add(new admin_setting_configtext('proxyuser', new lang_string('proxyuser', 'admin'), new lang_string('configproxyuser', 'admin'), ''));
+$temp->add(new admin_setting_configpasswordunmask('proxypassword', new lang_string('proxypassword', 'admin'), new lang_string('configproxypassword', 'admin'), ''));
+$temp->add(new admin_setting_configtext('proxybypass', new lang_string('proxybypass', 'admin'), new lang_string('configproxybypass', 'admin'), 'localhost, 127.0.0.1'));
+$ADMIN->add('server', $temp);

-    $temp = new admin_settingpage('maintenancemode', new lang_string('sitemaintenancemode', 'admin'));
-    $options = [0 => new lang_string('disable'), 1 => new lang_string('enable')];
-    $temp->add(new admin_setting_configselect('maintenance_enabled', new lang_string('sitemaintenancemode', 'admin'),
-        new lang_string('helpsitemaintenance', 'admin'), 0, $options));
-    $temp->add(new admin_setting_confightmleditor('maintenance_message', new lang_string('optionalmaintenancemessage', 'admin'),
-        '', ''));
-    $ADMIN->add('server', $temp);
+$temp = new admin_settingpage('maintenancemode', new lang_string('sitemaintenancemode', 'admin'));
+$options = array(0=>new lang_string('disable'), 1=>new lang_string('enable'));
+$temp->add(new admin_setting_configselect('maintenance_enabled', new lang_string('sitemaintenancemode', 'admin'),
+                                          new lang_string('helpsitemaintenance', 'admin'), 0, $options));
+$temp->add(new admin_setting_confightmleditor('maintenance_message', new lang_string('optionalmaintenancemessage', 'admin'),
+                                              '', ''));
+$ADMIN->add('server', $temp);

-    // Cleanup.
-    $temp = new admin_settingpage('cleanup', new lang_string('cleanup', 'admin'));
-    $temp->add(new admin_setting_configselect('deleteunconfirmed', new lang_string('deleteunconfirmed', 'admin'),
-        new lang_string('configdeleteunconfirmed', 'admin'), 168,
-        [
-            0 => new lang_string('never'),
-            168 => new lang_string('numdays', '', 7),
-            144 => new lang_string('numdays', '', 6),
-            120 => new lang_string('numdays', '', 5),
-            96 => new lang_string('numdays', '', 4),
-            72 => new lang_string('numdays', '', 3),
-            48 => new lang_string('numdays', '', 2),
-            24 => new lang_string('numdays', '', 1),
-            12 => new lang_string('numhours', '', 12),
-            6 => new lang_string('numhours', '', 6),
-            1 => new lang_string('numhours', '', 1),
-        ]
-    ));
+$temp = new admin_settingpage('cleanup', new lang_string('cleanup', 'admin'));
+$temp->add(new admin_setting_configselect('deleteunconfirmed', new lang_string('deleteunconfirmed', 'admin'), new lang_string('configdeleteunconfirmed', 'admin'), 168, array(0 => new lang_string('never'),
+                                                                                                                                                                    168 => new lang_string('numdays', '', 7),
+                                                                                                                                                                    144 => new lang_string('numdays', '', 6),
+                                                                                                                                                                    120 => new lang_string('numdays', '', 5),
+                                                                                                                                                                    96 => new lang_string('numdays', '', 4),
+                                                                                                                                                                    72 => new lang_string('numdays', '', 3),
+                                                                                                                                                                    48 => new lang_string('numdays', '', 2),
+                                                                                                                                                                    24 => new lang_string('numdays', '', 1),
+                                                                                                                                                                    12 => new lang_string('numhours', '', 12),
+                                                                                                                                                                    6 => new lang_string('numhours', '', 6),
+                                                                                                                                                                    1 => new lang_string('numhours', '', 1))));

-    $temp->add(new admin_setting_configselect('deleteincompleteusers', new lang_string('deleteincompleteusers', 'admin'),
-        new lang_string('configdeleteincompleteusers', 'admin'), 0,
-        [
-            0 => new lang_string('never'),
-            168 => new lang_string('numdays', '', 7),
-            144 => new lang_string('numdays', '', 6),
-            120 => new lang_string('numdays', '', 5),
-            96 => new lang_string('numdays', '', 4),
-            72 => new lang_string('numdays', '', 3),
-            48 => new lang_string('numdays', '', 2),
-            24 => new lang_string('numdays', '', 1),
-        ]
-    ));
+$temp->add(new admin_setting_configselect('deleteincompleteusers', new lang_string('deleteincompleteusers', 'admin'), new lang_string('configdeleteincompleteusers', 'admin'), 0, array(0 => new lang_string('never'),
+                                                                                                                                                                    168 => new lang_string('numdays', '', 7),
+                                                                                                                                                                    144 => new lang_string('numdays', '', 6),
+                                                                                                                                                                    120 => new lang_string('numdays', '', 5),
+                                                                                                                                                                    96 => new lang_string('numdays', '', 4),
+                                                                                                                                                                    72 => new lang_string('numdays', '', 3),
+                                                                                                                                                                    48 => new lang_string('numdays', '', 2),
+                                                                                                                                                                    24 => new lang_string('numdays', '', 1))));

-    $temp->add(new admin_setting_configcheckbox('disablegradehistory', new lang_string('disablegradehistory', 'grades'),
-        new lang_string('disablegradehistory_help', 'grades'), 0));

-    $temp->add(new admin_setting_configselect('gradehistorylifetime', new lang_string('gradehistorylifetime', 'grades'),
-        new lang_string('gradehistorylifetime_help', 'grades'), 0,
-        [
-            0 => new lang_string('neverdeletehistory', 'grades'),
-            1000 => new lang_string('numdays', '', 1000),
-            365 => new lang_string('numdays', '', 365),
-            180 => new lang_string('numdays', '', 180),
-            150 => new lang_string('numdays', '', 150),
-            120 => new lang_string('numdays', '', 120),
-            90 => new lang_string('numdays', '', 90),
-            60 => new lang_string('numdays', '', 60),
-            30 => new lang_string('numdays', '', 30),
-        ]
-    ));
+$temp->add(new admin_setting_configcheckbox('disablegradehistory', new lang_string('disablegradehistory', 'grades'),
+                                            new lang_string('disablegradehistory_help', 'grades'), 0));

-    $temp->add(new admin_setting_configselect('tempdatafoldercleanup', new lang_string('tempdatafoldercleanup', 'admin'),
-        new lang_string('configtempdatafoldercleanup', 'admin'), 168,
-        [
+$temp->add(new admin_setting_configselect('gradehistorylifetime', new lang_string('gradehistorylifetime', 'grades'),
+                                          new lang_string('gradehistorylifetime_help', 'grades'), 0, array(0 => new lang_string('neverdeletehistory', 'grades'),
+                                                                                                   1000 => new lang_string('numdays', '', 1000),
+                                                                                                    365 => new lang_string('numdays', '', 365),
+                                                                                                    180 => new lang_string('numdays', '', 180),
+                                                                                                    150 => new lang_string('numdays', '', 150),
+                                                                                                    120 => new lang_string('numdays', '', 120),
+                                                                                                     90 => new lang_string('numdays', '', 90),
+                                                                                                     60 => new lang_string('numdays', '', 60),
+                                                                                                     30 => new lang_string('numdays', '', 30))));
+
+$temp->add(new admin_setting_configselect('tempdatafoldercleanup', new lang_string('tempdatafoldercleanup', 'admin'),
+        new lang_string('configtempdatafoldercleanup', 'admin'), 168, array(
            1 => new lang_string('numhours', '', 1),
            3 => new lang_string('numhours', '', 3),
            6 => new lang_string('numhours', '', 6),
@@ -247,366 +168,224 @@ if ($hassiteconfig) {
            24 => new lang_string('numhours', '', 24),
            48 => new lang_string('numdays', '', 2),
            168 => new lang_string('numdays', '', 7),
-        ]
-    ));
+)));

-    $ADMIN->add('server', $temp);
+$ADMIN->add('server', $temp);

    $temp->add(new admin_setting_configduration('filescleanupperiod',
        new lang_string('filescleanupperiod', 'admin'),
        new lang_string('filescleanupperiod_help', 'admin'),
        86400));

-    // Environment.
-    $ADMIN->add('server', new admin_externalpage('environment', new lang_string('environment', 'admin'),
-        "{$CFG->wwwroot}/{$CFG->admin}/environment.php"));
+$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));

-    // PHP info.
-    $ADMIN->add('server', new admin_externalpage('phpinfo', new lang_string('phpinfo'),
-        "{$CFG->wwwroot}/{$CFG->admin}/phpinfo.php"));

-    // Test outgoing mail configuration (hidden, accessed via direct link from the settings page).
-    $ADMIN->add('server', new admin_externalpage('testoutgoingmailconf', new lang_string('testoutgoingmailconf', 'admin'),
-        new moodle_url('/admin/testoutgoingmailconf.php'), 'moodle/site:config', true));
+// "performance" settingpage
+$temp = new admin_settingpage('performance', new lang_string('performance', 'admin'));

-    // Performance.
-    $temp = new admin_settingpage('performance', new lang_string('performance', 'admin'));
+// Memory limit options for large administration tasks.
+$memoryoptions = array(
+    '64M' => '64M',
+    '128M' => '128M',
+    '256M' => '256M',
+    '512M' => '512M',
+    '1024M' => '1024M',
+    '2048M' => '2048M');

-    // Memory limit options for large administration tasks.
-    $memoryoptions = [
-        '64M' => '64M',
-        '128M' => '128M',
-        '256M' => '256M',
-        '512M' => '512M',
-        '1024M' => '1024M',
-        '2048M' => '2048M',
-    ];
+// Allow larger memory usage for 64-bit sites only.
+if (PHP_INT_SIZE === 8) {
+    $memoryoptions['3072M'] = '3072M';
+    $memoryoptions['4096M'] = '4096M';
+}

-    // Allow larger memory usage for 64-bit sites only.
-    if (PHP_INT_SIZE === 8) {
-        $memoryoptions['3072M'] = '3072M';
-        $memoryoptions['4096M'] = '4096M';
-    }
-
-    $temp->add(new admin_setting_configselect('extramemorylimit', new lang_string('extramemorylimit', 'admin'),
-        new lang_string('configextramemorylimit', 'admin'), '512M', $memoryoptions));
-
-    $temp->add(new admin_setting_configtext('maxtimelimit', new lang_string('maxtimelimit', 'admin'),
+$temp->add(new admin_setting_configselect('extramemorylimit', new lang_string('extramemorylimit', 'admin'),
+                                          new lang_string('configextramemorylimit', 'admin'), '512M',
+                                          $memoryoptions));
+$temp->add(new admin_setting_configtext('maxtimelimit', new lang_string('maxtimelimit', 'admin'),
        new lang_string('maxtimelimit_desc', 'admin'), 0, PARAM_INT));

-    $temp->add(new admin_setting_configtext('curlcache', new lang_string('curlcache', 'admin'),
-        new lang_string('configcurlcache', 'admin'), 120, PARAM_INT));
+$temp->add(new admin_setting_configtext('curlcache', new lang_string('curlcache', 'admin'),
+                                        new lang_string('configcurlcache', 'admin'), 120, PARAM_INT));

-    $temp->add(new admin_setting_configtext('curltimeoutkbitrate', new lang_string('curltimeoutkbitrate', 'admin'),
-        new lang_string('curltimeoutkbitrate_help', 'admin'), 56, PARAM_INT));
+$temp->add(new admin_setting_configtext('curltimeoutkbitrate', new lang_string('curltimeoutkbitrate', 'admin'),
+                                        new lang_string('curltimeoutkbitrate_help', 'admin'), 56, PARAM_INT));

-    $ADMIN->add('server', $temp);
+$ADMIN->add('server', $temp);

-    // Tasks.
-    $ADMIN->add('server', new admin_category('taskconfig', new lang_string('taskadmintitle', 'admin')));

-    // Task processing.
-    $temp = new admin_settingpage('taskprocessing', new lang_string('taskprocessing', 'admin'));
+$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
+    )
+);

-    $setting = new admin_setting_configcheckbox(
-        'cron_enabled',
-        new lang_string('cron_enabled', 'admin'),
-        new lang_string('cron_enabled_desc', 'admin'),
+$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'),
+        ]
+    )
+);
+$temp->add(
+    new admin_setting_configcheckbox(
+        'task_logtostdout',
+        new lang_string('task_logtostdout', 'admin'),
+        new lang_string('task_logtostdout_desc', 'admin'),
        1
-    );
-    $setting->set_updatedcallback('theme_reset_static_caches');
-    $temp->add($setting);
-
-    $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
-        )
-    );
+    )
+);

+if (\core\task\logmanager::uses_standard_settings()) {
    $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
+            'task_logretention',
+            new \lang_string('task_logretention', 'admin'),
+            new \lang_string('task_logretention_desc', 'admin'),
+            28 * DAYSECS
        )
    );

    $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,
+            'task_logretainruns',
+            new \lang_string('task_logretainruns', 'admin'),
+            new \lang_string('task_logretainruns_desc', 'admin'),
+            20,
            PARAM_INT
        )
    );
+}
+$ADMIN->add('taskconfig', $temp);

-    $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);
+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"
+    ));
+}

-    // Task log configuration.
-    $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'),
-            ]
-        )
-    );
-    $temp->add(
-        new admin_setting_configcheckbox(
-            'task_logtostdout',
-            new lang_string('task_logtostdout', 'admin'),
-            new lang_string('task_logtostdout_desc', 'admin'),
-            1
-        )
-    );
+// E-mail settings.
+$ADMIN->add('server', new admin_category('email', new lang_string('categoryemail', '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 = new admin_settingpage('outgoingmailconfig', new lang_string('outgoingmailconfig', 'admin'));

-        $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);
-
-    // Task logs.
-    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"
-        ));
-    }
-
-    // Email.
-    $ADMIN->add('server', new admin_category('email', new lang_string('categoryemail', 'admin')));
-
-    // Outgoing mail configuration.
-    $temp = new admin_settingpage('outgoingmailconfig', new lang_string('outgoingmailconfig', 'admin'));
-
-    $temp->add(new admin_setting_heading('smtpheading', new lang_string('smtp', 'admin'),
-        new lang_string('smtpdetail', 'admin')));
-
-    $temp->add(new admin_setting_configtext('smtphosts', new lang_string('smtphosts', 'admin'),
-        new lang_string('configsmtphosts', 'admin'), '', PARAM_RAW));
-
-    $options = [
-        '' => new lang_string('none', 'admin'),
-        'ssl' => 'SSL',
-        'tls' => 'TLS',
-    ];
-
-    $temp->add(new admin_setting_configselect('smtpsecure', new lang_string('smtpsecure', 'admin'),
-        new lang_string('configsmtpsecure', 'admin'), '', $options));
-
-    $authtypeoptions = [
-        'LOGIN' => 'LOGIN',
-        'PLAIN' => 'PLAIN',
-        'NTLM' => 'NTLM',
-        'CRAM-MD5' => 'CRAM-MD5',
-    ];
-
-    $temp->add(new admin_setting_configselect('smtpauthtype', new lang_string('smtpauthtype', 'admin'),
-        new lang_string('configsmtpauthtype', 'admin'), 'LOGIN', $authtypeoptions));
-
-    $temp->add(new admin_setting_configtext('smtpuser', new lang_string('smtpuser', 'admin'),
-        new lang_string('configsmtpuser', 'admin'), '', PARAM_NOTAGS));
-
-    $temp->add(new admin_setting_configpasswordunmask('smtppass', new lang_string('smtppass', 'admin'),
-        new lang_string('configsmtpuser', 'admin'), ''));
-
-    $temp->add(new admin_setting_configtext('smtpmaxbulk', new lang_string('smtpmaxbulk', 'admin'),
-        new lang_string('configsmtpmaxbulk', 'admin'), 1, PARAM_INT));
-
-    $temp->add(new admin_setting_heading('noreplydomainheading', new lang_string('noreplydomain', 'admin'),
+$temp->add(new admin_setting_heading('smtpheading', new lang_string('smtp', 'admin'),
+            new lang_string('smtpdetail', 'admin')));
+$temp->add(new admin_setting_configtext('smtphosts', new lang_string('smtphosts', 'admin'),
+            new lang_string('configsmtphosts', 'admin'), '', PARAM_RAW));
+$options = array('' => new lang_string('none', 'admin'), 'ssl' => 'SSL', 'tls' => 'TLS');
+$temp->add(new admin_setting_configselect('smtpsecure', new lang_string('smtpsecure', 'admin'),
+            new lang_string('configsmtpsecure', 'admin'), '', $options));
+$authtypeoptions = array('LOGIN' => 'LOGIN', 'PLAIN' => 'PLAIN', 'NTLM' => 'NTLM', 'CRAM-MD5' => 'CRAM-MD5');
+$temp->add(new admin_setting_configselect('smtpauthtype', new lang_string('smtpauthtype', 'admin'),
+            new lang_string('configsmtpauthtype', 'admin'), 'LOGIN', $authtypeoptions));
+$temp->add(new admin_setting_configtext('smtpuser', new lang_string('smtpuser', 'admin'),
+            new lang_string('configsmtpuser', 'admin'), '', PARAM_NOTAGS));
+$temp->add(new admin_setting_configpasswordunmask('smtppass', new lang_string('smtppass', 'admin'),
+            new lang_string('configsmtpuser', 'admin'), ''));
+$temp->add(new admin_setting_configtext('smtpmaxbulk', new lang_string('smtpmaxbulk', 'admin'),
+           new lang_string('configsmtpmaxbulk', 'admin'), 1, PARAM_INT));
+$temp->add(new admin_setting_heading('noreplydomainheading', new lang_string('noreplydomain', 'admin'),
        new lang_string('noreplydomaindetail', 'admin')));
-
-    $temp->add(new admin_setting_configtext('noreplyaddress', new lang_string('noreplyaddress', 'admin'),
-        new lang_string('confignoreplyaddress', 'admin'), 'noreply@' . get_host_from_url($CFG->wwwroot), PARAM_EMAIL));
-
-    $temp->add(new admin_setting_configtextarea('allowedemaildomains',
+$temp->add(new admin_setting_configtext('noreplyaddress', new lang_string('noreplyaddress', 'admin'),
+          new lang_string('confignoreplyaddress', 'admin'), 'noreply@' . get_host_from_url($CFG->wwwroot), PARAM_EMAIL));
+$temp->add(new admin_setting_configtextarea('allowedemaildomains',
        new lang_string('allowedemaildomains', 'admin'),
        new lang_string('configallowedemaildomains', 'admin'),
        ''));
-
-    $temp->add(new admin_setting_heading('divertallemailsheading', new lang_string('divertallemails', 'admin'),
-        new lang_string('divertallemailsdetail', 'admin')));
-    $temp->add(new admin_setting_configtext('divertallemailsto',
-        new lang_string('divertallemailsto', 'admin'),
-        new lang_string('divertallemailsto_desc', 'admin'),
-        ''));
-    $temp->add(new admin_setting_configtextarea('divertallemailsexcept',
-        new lang_string('divertallemailsexcept', 'admin'),
-        new lang_string('divertallemailsexcept_desc', 'admin'),
-        '', PARAM_RAW, '50', '4'));
-
-    $noreplyaddress = isset($CFG->noreplyaddress) ? $CFG->noreplyaddress : 'noreply@example.com';
-    $dkimdomain = substr(strrchr($noreplyaddress, "@"), 1);
-    $dkimselector = empty($CFG->emaildkimselector) ? '[selector]' : $CFG->emaildkimselector;
-    $pempath = "\$CFG->dataroot/dkim/{$dkimdomain}/{$dkimselector}.private";
-    $temp->add(new admin_setting_heading('emaildkim', new lang_string('emaildkim', 'admin'),
-        new lang_string('emaildkiminfo', 'admin', ['path' => $pempath, 'docs' => \get_docs_url('Mail_configuration#DKIM')])));
-    $temp->add(new admin_setting_configtext('emaildkimselector', new lang_string('emaildkimselector', 'admin'),
-        new lang_string('configemaildkimselector', 'admin'), '', PARAM_FILE));
-
-    $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'),
+$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'),
+$temp->add(new admin_setting_heading('emaildoesnotfit', new lang_string('doesnotfit', 'admin'),
        new lang_string('doesnotfitdetail', 'admin')));
+$charsets = get_list_of_charsets();
+unset($charsets['UTF-8']); // Not needed here.
+$options = array();
+$options['0'] = 'UTF-8';
+$options = array_merge($options, $charsets);
+$temp->add(new admin_setting_configselect('sitemailcharset', new lang_string('sitemailcharset', 'admin'),
+          new lang_string('configsitemailcharset','admin'), '0', $options));
+$temp->add(new admin_setting_configcheckbox('allowusermailcharset', new lang_string('allowusermailcharset', 'admin'),
+          new lang_string('configallowusermailcharset', 'admin'), 0));
+$temp->add(new admin_setting_configcheckbox('allowattachments', new lang_string('allowattachments', 'admin'),
+          new lang_string('configallowattachments', 'admin'), 1));
+$options = array('LF' => 'LF', 'CRLF' => 'CRLF');
+$temp->add(new admin_setting_configselect('mailnewline', new lang_string('mailnewline', 'admin'),
+          new lang_string('configmailnewline', 'admin'), 'LF', $options));

-    $charsets = get_list_of_charsets();
-    unset($charsets['UTF-8']);
-    $options = [
-        '0' => 'UTF-8',
-    ];
-    $options = array_merge($options, $charsets);
-    $temp->add(new admin_setting_configselect('sitemailcharset', new lang_string('sitemailcharset', 'admin'),
-        new lang_string('configsitemailcharset', 'admin'), '0', $options));
-
-    $temp->add(new admin_setting_configcheckbox('allowusermailcharset', new lang_string('allowusermailcharset', 'admin'),
-        new lang_string('configallowusermailcharset', 'admin'), 0));
-
-    $temp->add(new admin_setting_configcheckbox('allowattachments', new lang_string('allowattachments', 'admin'),
-        new lang_string('configallowattachments', 'admin'), 1));
-
-    $options = [
-        'LF' => 'LF',
-        'CRLF' => 'CRLF',
-    ];
-    $temp->add(new admin_setting_configselect('mailnewline', new lang_string('mailnewline', 'admin'),
-        new lang_string('configmailnewline', 'admin'), 'LF', $options));
-
-    $choices = [
-        new lang_string('never', 'admin'),
-        new lang_string('always', '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));
-
+$choices = array(new lang_string('never', 'admin'),
+                 new lang_string('always', '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));

-    $temp->add(new admin_setting_configtextarea('emailheaders', new lang_string('emailheaders', 'admin'),
-        new lang_string('configemailheaders', 'admin'), '', PARAM_RAW, '50', '3'));
+$ADMIN->add('email', $temp);

-    $ADMIN->add('email', $temp);
-
-    // Update notifications.
-    if (empty($CFG->disableupdatenotifications)) {
-        $temp = new admin_settingpage('updatenotifications', new lang_string('updatenotifications', 'core_admin'));
-        $temp->add(new admin_setting_configcheckbox('updateautocheck', new lang_string('updateautocheck', 'core_admin'),
-            new lang_string('updateautocheck_desc', 'core_admin'), 1));
-        $temp->add(new admin_setting_configselect('updateminmaturity', new lang_string('updateminmaturity', 'core_admin'),
-            new lang_string('updateminmaturity_desc', 'core_admin'), MATURITY_STABLE,
-            [
-                MATURITY_ALPHA => new lang_string('maturity'.MATURITY_ALPHA, 'core_admin'),
-                MATURITY_BETA => new lang_string('maturity'.MATURITY_BETA, 'core_admin'),
-                MATURITY_RC => new lang_string('maturity'.MATURITY_RC, 'core_admin'),
-                MATURITY_STABLE => new lang_string('maturity'.MATURITY_STABLE, 'core_admin'),
-            ]
-        ));
-        $temp->add(new admin_setting_configcheckbox('updatenotifybuilds', new lang_string('updatenotifybuilds', 'core_admin'),
-            new lang_string('updatenotifybuilds_desc', 'core_admin'), 0));
-        $ADMIN->add('server', $temp);
-    }
-
-    // Web services.
-    $ADMIN->add('server', new admin_category('webservicesettings', new lang_string('webservices', 'webservice')));
-
-    // Web services > Overview.
-    $temp = new admin_settingpage('webservicesoverview', new lang_string('webservicesoverview', 'webservice'));
-    $temp->add(new admin_setting_webservicesoverview());
-    $ADMIN->add('webservicesettings', $temp);
-
-    // Web services > API documentation.
-    $ADMIN->add('webservicesettings', new admin_externalpage('webservicedocumentation', new lang_string('wsdocapi', 'webservice'),
-        "{$CFG->wwwroot}/{$CFG->admin}/webservice/documentation.php", 'moodle/site:config', false));
-
-    // Web services > External services.
-    $temp = new admin_settingpage('externalservices', new lang_string('externalservices', 'webservice'));
-
-    $temp->add(new admin_setting_heading('manageserviceshelpexplaination', new lang_string('information', 'webservice'),
-        new lang_string('servicehelpexplanation', 'webservice')));
-
-    $temp->add(new admin_setting_manageexternalservices());
-
-    $ADMIN->add('webservicesettings', $temp);
-
-    $ADMIN->add('webservicesettings', new admin_externalpage('externalservice', new lang_string('editaservice', 'webservice'),
-        "{$CFG->wwwroot}/{$CFG->admin}/webservice/service.php", 'moodle/site:config', true));
-
-    $ADMIN->add('webservicesettings', new admin_externalpage('externalservicefunctions',
-        new lang_string('externalservicefunctions', 'webservice'), "{$CFG->wwwroot}/{$CFG->admin}/webservice/service_functions.php",
-        'moodle/site:config', true));
-
-    $ADMIN->add('webservicesettings', new admin_externalpage('externalserviceusers',
-        new lang_string('externalserviceusers', 'webservice'), "{$CFG->wwwroot}/{$CFG->admin}/webservice/service_users.php",
-        'moodle/site:config', true));
-
-    $ADMIN->add('webservicesettings', new admin_externalpage('externalserviceusersettings',
-        new lang_string('serviceusersettings', 'webservice'), "{$CFG->wwwroot}/{$CFG->admin}/webservice/service_user_settings.php",
-        'moodle/site:config', true));
-
-    // Web services > Manage protocols.
-    $temp = new admin_settingpage('webserviceprotocols', new lang_string('manageprotocols', 'webservice'));
-    $temp->add(new admin_setting_managewebserviceprotocols());
-    if (empty($CFG->enablewebservices)) {
-        $temp->add(new admin_setting_heading('webservicesaredisabled', '', new lang_string('disabledwarning', 'webservice')));
-    }
-
-    // We cannot use $OUTPUT->doc_link() this early, we would lose the ability to set the page layout on all admin pages.
-    $url = new moodle_url(get_docs_url('How_to_get_a_security_key'));
-    $wsdoclink = html_writer::link($url, new lang_string('supplyinfo', 'webservice'), ['target' => '_blank']);
-    $temp->add(new admin_setting_configcheckbox('enablewsdocumentation', new lang_string('enablewsdocumentation', 'admin'),
-        new lang_string('configenablewsdocumentation', 'admin', $wsdoclink), false));
-
-    $ADMIN->add('webservicesettings', $temp);
-
-    $plugins = core_plugin_manager::instance()->get_plugins_of_type('webservice');
-    core_collator::asort_objects_by_property($plugins, 'displayname');
-    foreach ($plugins as $plugin) {
-        /** @var \core\plugininfo\webservice $plugin */
-        $plugin->load_settings($ADMIN, 'webservicesettings', $hassiteconfig);
-    }
-
-    // Web services > Manage tokens.
-    $ADMIN->add('webservicesettings', new admin_externalpage('webservicetokens', new lang_string('managetokens', 'webservice'),
-        new moodle_url('/admin/webservice/tokens.php')));
+// "update notifications" settingpage
+if (empty($CFG->disableupdatenotifications)) {
+    $temp = new admin_settingpage('updatenotifications', new lang_string('updatenotifications', 'core_admin'));
+    $temp->add(new admin_setting_configcheckbox('updateautocheck', new lang_string('updateautocheck', 'core_admin'),
+                                                new lang_string('updateautocheck_desc', 'core_admin'), 1));
+    $temp->add(new admin_setting_configselect('updateminmaturity', new lang_string('updateminmaturity', 'core_admin'),
+                                              new lang_string('updateminmaturity_desc', 'core_admin'), MATURITY_STABLE,
+                                              array(
+                                                  MATURITY_ALPHA  => new lang_string('maturity'.MATURITY_ALPHA, 'core_admin'),
+                                                  MATURITY_BETA   => new lang_string('maturity'.MATURITY_BETA, 'core_admin'),
+                                                  MATURITY_RC     => new lang_string('maturity'.MATURITY_RC, 'core_admin'),
+                                                  MATURITY_STABLE => new lang_string('maturity'.MATURITY_STABLE, 'core_admin'),
+                                              )));
+    $temp->add(new admin_setting_configcheckbox('updatenotifybuilds', new lang_string('updatenotifybuilds', 'core_admin'),
+                                                new lang_string('updatenotifybuilds_desc', 'core_admin'), 0));
+    $ADMIN->add('server', $temp);
 }
+
+} // end of speedup
@@ -20,9 +20,6 @@ $moodleservices = new admin_settingpage('moodleservices', new lang_string('moodl
    'admin'));
 $ADMIN->add('root', $moodleservices);

-$userfeedback = new admin_settingpage('userfeedback', new lang_string('feedbacksettings', 'admin'));
-$ADMIN->add('root', $userfeedback);
-
 if ($hassiteconfig) {
    $optionalsubsystems = new admin_settingpage('optionalsubsystems', new lang_string('advancedfeatures', 'admin'));
    $ADMIN->add('root', $optionalsubsystems);
@@ -35,11 +32,9 @@ $ADMIN->add('root', new admin_category('analytics', new lang_string('analytics',
 $ADMIN->add('root', new admin_category('competencies', new lang_string('competencies', 'core_competency')));
 $ADMIN->add('root', new admin_category('badges', new lang_string('badges'), empty($CFG->enablebadges)));
 $ADMIN->add('root', new admin_category('h5p', new lang_string('h5p', 'core_h5p')));
-$ADMIN->add('root', new admin_category('license', new lang_string('license')));
 $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('payment', new lang_string('payments', 'payment')));
 $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')));
@@ -1,49 +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 contains call to feedback settings
- *
- * @package    core
- * @copyright  2020 Shamim Rezaie <shamim@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-if ($hassiteconfig) {
-
-    $userfeedback->add(new admin_setting_configcheckbox('enableuserfeedback',
-            new lang_string('enableuserfeedback', 'admin'),
-            new lang_string('enableuserfeedback_desc', 'admin'), 0, 1, 0));
-
-    $options = [
-        core_userfeedback::REMIND_AFTER_UPGRADE => new lang_string('userfeedbackafterupgrade', 'admin'),
-        core_userfeedback::REMIND_PERIODICALLY => new lang_string('userfeedbackperiodically', 'admin'),
-        core_userfeedback::REMIND_NEVER => new lang_string('never'),
-    ];
-    $userfeedback->add(new admin_setting_configselect('userfeedback_nextreminder',
-            new lang_string('userfeedbacknextreminder', 'admin'),
-            new lang_string('userfeedbacknextreminder_desc', 'admin'), 1, $options));
-    $userfeedback->hide_if('userfeedback_nextreminder', 'enableuserfeedback');
-
-    $userfeedback->add(new admin_setting_configtext('userfeedback_remindafter',
-            new lang_string('userfeedbackremindafter', 'admin'),
-            new lang_string('userfeedbackremindafter_desc', 'admin'), 90, PARAM_INT));
-    $userfeedback->hide_if('userfeedback_remindafter', 'enableuserfeedback');
-    $userfeedback->hide_if('userfeedback_remindafter', 'userfeedback_nextreminder', 'eq', 3);
-
-}
@@ -87,14 +87,6 @@ if ($hassiteconfig
        $choices['1'] = new lang_string('trackforumsyes');
        $temp->add(new admin_setting_configselect('defaultpreference_trackforums', new lang_string('trackforums'),
            '', 0, $choices));
-
-        $choices = [];
-        $choices[\core_contentbank\content::VISIBILITY_PUBLIC] = new lang_string('visibilitychoicepublic', 'core_contentbank');
-        $choices[\core_contentbank\content::VISIBILITY_UNLISTED] = new lang_string('visibilitychoiceunlisted', 'core_contentbank');
-        $temp->add(new admin_setting_configselect('defaultpreference_core_contentbank_visibility',
-            new lang_string('visibilitypref', 'core_contentbank'),
-            new lang_string('visibilitypref_help', 'core_contentbank'),
-            \core_contentbank\content::VISIBILITY_PUBLIC, $choices));
    }
    $ADMIN->add('accounts', $temp);

@@ -194,8 +186,13 @@ if ($hassiteconfig
                             'email' => new lang_string('email'),
                             'city' => new lang_string('city'),
                             'country' => new lang_string('country'),
-                             'moodlenetprofile' => new lang_string('moodlenetprofile', 'user'),
                             'timezone' => new lang_string('timezone'),
+                             'webpage' => new lang_string('webpage'),
+                             'icqnumber' => new lang_string('icqnumber'),
+                             'skypeid' => new lang_string('skypeid'),
+                             'yahooid' => new lang_string('yahooid'),
+                             'aimid' => new lang_string('aimid'),
+                             'msnid' => new lang_string('msnid'),
                             'firstaccess' => new lang_string('firstaccess'),
                             'lastaccess' => new lang_string('lastaccess'),
                             'lastip' => new lang_string('lastip'),
@@ -208,40 +205,21 @@ if ($hassiteconfig
        // with moodle/site:viewuseridentity).
        // 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') and any custom profile fields.
+        // Smith from Science faculty').
+        // 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'), ['email' => 1],
-                function() {
-                    global $CFG;
-                    require_once($CFG->dirroot.'/user/profile/lib.php');
-
-                    // Basic fields available in user table.
-                    $fields = [
-                        'username'    => new lang_string('username'),
-                        'idnumber'    => new lang_string('idnumber'),
-                        'email'       => new lang_string('email'),
-                        'phone1'      => new lang_string('phone1'),
-                        'phone2'      => new lang_string('phone2'),
-                        'department'  => new lang_string('department'),
-                        'institution' => new lang_string('institution'),
-                        'city'        => new lang_string('city'),
-                        'country'     => new lang_string('country'),
-                    ];
-
-                    // Custom profile fields.
-                    $profilefields = profile_get_custom_fields();
-                    foreach ($profilefields as $field) {
-                        // Only reasonable-length text fields can be used as identity fields.
-                        if ($field->param2 > 255 || $field->datatype != 'text') {
-                            continue;
-                        }
-                        $fields['profile_field_' . $field->shortname] = format_string($field->name, true,
-                            ['context' => context_system::instance()]) . ' *';
-                    }
-
-                    return $fields;
-                }));
+                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'),
+                    'phone2'      => new lang_string('phone2'),
+                    'department'  => new lang_string('department'),
+                    'institution' => new lang_string('institution'),
+                    'city'        => new lang_string('city'),
+                    'country'     => new lang_string('country'),
+                )));
        $setting = new admin_setting_configtext('fullnamedisplay', new lang_string('fullnamedisplay', 'admin'),
            new lang_string('configfullnamedisplay', 'admin'), 'language', PARAM_TEXT, 50);
        $setting->set_force_ltr(true);
@@ -282,28 +260,10 @@ if ($hassiteconfig) {
    $temp->add($setting);

    // See {@link https://gdpr-info.eu/art-8-gdpr/}.
-    // See {@link https://www.betterinternetforkids.eu/web/portal/practice/awareness/detail?articleId=3017751}.
    $ageofdigitalconsentmap = implode(PHP_EOL, [
        '*, 16',
        'AT, 14',
-        'BE, 13',
-        'BG, 14',
-        'CY, 14',
-        'CZ, 15',
-        'DK, 13',
-        'EE, 13',
        'ES, 14',
-        'FI, 13',
-        'FR, 15',
-        'GB, 13',
-        'GR, 15',
-        'IT, 14',
-        'LT, 14',
-        'LV, 13',
-        'MT, 13',
-        'NO, 13',
-        'PT, 13',
-        'SE, 13',
        'US, 13'
    ]);
    $setting = new admin_setting_agedigitalconsentmap('agedigitalconsentmap',
@@ -32,7 +32,6 @@ $result = optional_param('result', null, PARAM_INT);

 $pageurl = new \moodle_url('/admin/tasklogs.php');
 $pageurl->param('filter', $filter);
-$pageurl->param('result', $result);

 $PAGE->set_url($pageurl);
 $PAGE->set_context(context_system::instance());
@@ -63,11 +62,9 @@ if (null !== $logid) {
 $renderer = $PAGE->get_renderer('tool_task');

 echo $OUTPUT->header();
-
-// Output the search form.
 echo $OUTPUT->render_from_template('core_admin/tasklogs', (object) [
    'action' => $pageurl->out(),
-    'filter' => htmlentities($filter),
+    'filter' => $filter,
    'resultfilteroptions' => [
        (object) [
            'value' => -1,
@@ -87,7 +84,6 @@ echo $OUTPUT->render_from_template('core_admin/tasklogs', (object) [
    ],
 ]);

-// Output any matching logs.
 $table = new \core_admin\task_log_table($filter, $result);
 $table->baseurl = $pageurl;
 $table->out(100, false);
@@ -1,87 +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\local\settings\autocomplete
-
-    Admin setting auto complete.
-
-    Context variables required for this template:
-    * name - element name
-    * id - element id
-    * options - choices
-    * multiple - is multiple choices?
-    * manageurl - url to manage choices
-    * managetext - string to display manage url
-    * tags - Should we allow typing new entries to the field?
-    * ajax - Name of an AMD module to send/process ajax requests
-    * placeholder - Placeholder text for an empty list
-    * casesensitive - Whether the search has to be case-sensitive
-    * showsuggestions - Show suggestions by default - but this can be turned off
-    * noselectionstring - String that is shown when there are no selections
-
-
-    Example context (json):
-    {
-        "name": "name0",
-        "id": "id0",
-        "options": [{
-            "value": "1",
-            "text": "option 1",
-            "selected": true,
-            "disabled": false
-        }],
-        "multiple": true,
-        "manageurl": "",
-        "managetext": "",
-        "tags": false,
-        "ajax": "",
-        "placeholder": "",
-        "casesensitive": false,
-        "showsuggestions": true,
-        "noselectionstring": ""
-    }
-}}
-{{!
-    Setting autocomplete.
-}}
-
-<div class="form-select defaultsnext">
-    <input type="hidden" name="{{name}}[xxxxx]" value="_qf__force_multiselect_submission">
-    <select class="custom-select" name="{{name}}[]"
-            id="{{id}}"
-            {{#multiple}}multiple{{/multiple}}>
-        {{#options}}
-            <option value="{{value}}" {{#selected}}selected{{/selected}}>{{{text}}}</option>
-        {{/options}}
-    </select>
-    {{#manageurl}}
-        <a href="{{manageurl}}">{{managetext}}</a>
-    {{/manageurl}}
-</div>
-<br/>
-
-{{#js}}
-    require(['core/form-autocomplete'], function(module) {
-        module.enhance({{#quote}}#{{id}}{{/quote}},
-        {{tags}},
-        {{#quote}}{{ajax}}{{/quote}},
-        {{#quote}}{{placeholder}}{{/quote}},
-        {{casesensitive}},
-        {{showsuggestions}},
-        {{#quote}}{{noselectionstring}}{{/quote}});
-    });
-{{/js}}
--- a/Show More
+++ b/Show More