Moodle release 3.9.4

- PHP 7.3 required.
- Moodle 3.6 required.
- SQL*Server 2017 (aka, 14.0) required.
- Sodium PHP extension required.

.eslintignore

@@ -1,5 +1,4 @@
 # Generated by "grunt ignorefiles"
-!/.grunt
 */**/yui/src/*/meta/
 */**/build/
 node_modules/
@@ -20,7 +19,6 @@ lib/editor/tinymce/plugins/spellchecker/rpc.php
 lib/editor/tinymce/tiny_mce/
 lib/mlbackend/php/phpml/
 lib/adodb/
-lib/behat/axe/
 lib/bennu/
 lib/evalmath/
 lib/phpspreadsheet/
@@ -68,9 +66,6 @@ lib/babel-polyfill/
 lib/polyfills/
 lib/emoji-data/
 lib/plist/
-lib/zipstream/
-lib/php-enum/
-lib/http-message/
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/
@@ -84,6 +79,7 @@ theme/boost/amd/src/bootstrap/button.js
 theme/boost/amd/src/bootstrap/carousel.js
 theme/boost/amd/src/bootstrap/collapse.js
 theme/boost/amd/src/bootstrap/dropdown.js
+theme/boost/amd/src/bootstrap/index.js
 theme/boost/amd/src/bootstrap/modal.js
 theme/boost/amd/src/bootstrap/popover.js
 theme/boost/amd/src/bootstrap/tools/sanitizer.js
@@ -92,5 +88,5 @@ theme/boost/amd/src/bootstrap/tab.js
 theme/boost/amd/src/bootstrap/toast.js
 theme/boost/amd/src/bootstrap/tooltip.js
 theme/boost/amd/src/bootstrap/util.js
-theme/boost/amd/src/index.js
-theme/boost/scss/fontawesome/
+theme/boost/amd/src/tether.js
+theme/boost/scss/fontawesome/

.eslintrc

@@ -204,7 +204,7 @@
       }
     },
     {
-      files: ["**/amd/src/*.js", "**/amd/src/**/*.js", "Gruntfile.js", ".grunt/*.js", ".grunt/tasks/*.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

.github/workflows/push.yml

@@ -1,15 +1,9 @@
 name: Core
 
-on:
-  push:
-    branches-ignore:
-      - master
-      - MOODLE_[0-9]+_STABLE
-    tags-ignore:
-      - v[0-9]+.[0-9]+.[0-9]+*
+on: [push]
 
 env:
-  php: 8.0
+  php: 7.4
 
 jobs:
   Grunt:
@@ -54,13 +48,11 @@ jobs:
       matrix:
         include:
           - os: ubuntu-18.04
-            php: 7.3
-            extensions:
+            php: 7.2
             db: mysqli
           - os: ubuntu-18.04
-            php: 8.0
+            php: 7.4
             db: pgsql
-            extensions: xmlrpc-beta
 
     steps:
       - name: Setting up DB mysql
@@ -90,8 +82,6 @@ jobs:
         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 }}

.gitignore

@@ -33,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
@@ -45,5 +44,3 @@ composer.phar
 /lib/yuilib/*/*/*-coverage.js
 atlassian-ide-plugin.xml
 /node_modules/
-/.vscode/
-moodle-plugin-ci.phar

.grunt/tasks/eslint.js

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

.grunt/tasks/gherkinlint.js

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

.grunt/tasks/ignorefiles.js

@@ -1,59 +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');
-        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',
-        ].concat(thirdPartyPaths);
-        grunt.file.write('.stylelintignore', stylelintIgnores.join('\n') + '\n');
-    };
-
-    grunt.registerTask('ignorefiles', 'Generate ignore files for linters', handler);
-
-    return handler;
-};

.grunt/tasks/javascript.js

@@ -1,141 +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 Shifter tasks.
-    require('./shifter')(grunt);
-
-    // Load ESLint.
-    require('./eslint')(grunt);
-
-    const path = require('path');
-
-    // Register JS tasks.
-    grunt.registerTask('yui', ['eslint:yui', 'shifter']);
-    grunt.registerTask('amd', ['eslint:amd', 'babel']);
-    grunt.registerTask('js', ['amd', 'yui']);
-
-    // Register NPM tasks.
-    grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-contrib-watch');
-
-    // Load the Babel tasks and config.
-    grunt.loadNpmTasks('grunt-babel');
-    grunt.config.merge({
-        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('.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: [
-                    ['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: 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('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();
-    });
-
-    return {
-        babelRename,
-    };
-};

.grunt/tasks/sass.js

@@ -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/"]
-            }
-        },
-    });
-};

.grunt/tasks/shifter.js

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

.grunt/tasks/startup.js

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

.grunt/tasks/style.js

@@ -1,29 +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 Style Lint tasks.
-    require('./stylelint')(grunt);
-
-    // Load the SASS tasks.
-    require('./sass')(grunt);
-};

.grunt/tasks/stylelint.js

@@ -1,181 +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');
-        }
-
-        const cssTasks = [];
-        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',
-                ],
-                tasks: ['rawcss']
-            },
-            scss: {
-                files: getCoreThemeMatches(),
-                tasks: ['scss']
-            },
-        },
-    });
-};

.grunt/tasks/watch.js

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

.stylelintignore

@@ -20,7 +20,6 @@ lib/editor/tinymce/plugins/spellchecker/rpc.php
 lib/editor/tinymce/tiny_mce/
 lib/mlbackend/php/phpml/
 lib/adodb/
-lib/behat/axe/
 lib/bennu/
 lib/evalmath/
 lib/phpspreadsheet/
@@ -68,9 +67,6 @@ lib/babel-polyfill/
 lib/polyfills/
 lib/emoji-data/
 lib/plist/
-lib/zipstream/
-lib/php-enum/
-lib/http-message/
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/
@@ -84,6 +80,7 @@ theme/boost/amd/src/bootstrap/button.js
 theme/boost/amd/src/bootstrap/carousel.js
 theme/boost/amd/src/bootstrap/collapse.js
 theme/boost/amd/src/bootstrap/dropdown.js
+theme/boost/amd/src/bootstrap/index.js
 theme/boost/amd/src/bootstrap/modal.js
 theme/boost/amd/src/bootstrap/popover.js
 theme/boost/amd/src/bootstrap/tools/sanitizer.js
@@ -92,5 +89,5 @@ theme/boost/amd/src/bootstrap/tab.js
 theme/boost/amd/src/bootstrap/toast.js
 theme/boost/amd/src/bootstrap/tooltip.js
 theme/boost/amd/src/bootstrap/util.js
-theme/boost/amd/src/index.js
-theme/boost/scss/fontawesome/
+theme/boost/amd/src/tether.js
+theme/boost/scss/fontawesome/

.travis.yml

@@ -19,12 +19,6 @@ services:
 addons:
   postgresql: "9.6"
 
-branches:
-  except:
-    - master
-    - /MOODLE_[0-9]+_STABLE/
-    - /^v[0-9]+\.[0-9]+\.[0-9]+.*/
-
 jobs:
     # Enable fast finish.
     # This will fail the build if a single job fails (except those in allow_failures).
@@ -32,34 +26,34 @@ jobs:
     fast_finish: true
 
     include:
-        # First all the lowest php ones (7.3)
-        - php: 7.3
+        # First all the lowest php ones (7.2)
+        - php: 7.2
           env: DB=none     TASK=CITEST
-        - php: 7.3
+        - php: 7.2
           env: DB=none     TASK=GRUNT    NVM_VERSION='lts/carbon'
 
         - if: env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present
-          php: 7.3
+          php: 7.2
           env: DB=pgsql    TASK=PHPUNIT
 
         - if: env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all"
-          php: 7.3
+          php: 7.2
           env: DB=mysqli   TASK=PHPUNIT
 
-        # Then, conditionally, all the highest php ones (8.0)
+        # Then, conditionally, all the highest php ones (7.4)
         - if: env(MOODLE_PHP) = "all"
-          php: 8.0
+          php: 7.4
           env: DB=none     TASK=CITEST
         - if: env(MOODLE_PHP) = "all"
-          php: 8.0
+          php: 7.4
           env: DB=none     TASK=GRUNT    NVM_VERSION='lts/carbon'
 
         - 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
+          php: 7.4
           env: DB=pgsql    TASK=PHPUNIT
 
         - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all")
-          php: 8.0
+          php: 7.4
           env: DB=mysqli   TASK=PHPUNIT
 
 cache:
@@ -118,8 +112,6 @@ 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' ];
@@ -189,9 +181,10 @@ before_script:
         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 +214,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_39_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`

Gruntfile.js

@@ -16,129 +16,147 @@
 /* eslint-env node */
 
 /**
- * Grunt configuration for Moodle.
- *
  * @copyright  2014 Andrew Nicols
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+/* eslint-env node */
+
 /**
- * Setup the Grunt Moodle environment.
+ * Calculate the cwd, taking into consideration the `root` option (for Windows).
  *
- * @param   {Grunt} grunt
- * @returns {Object}
+ * @param {Object} grunt
+ * @returns {String} The current directory as best we can determine
  */
-const setupMoodleEnvironment = grunt => {
+const getCwd = 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('..');
+    let cwd = fs.realpathSync(process.env.PWD || process.cwd());
 
-        // Globbing pattern for matching all AMD JS source files.
-        let amdSrc = [];
-        if (inComponent) {
-            amdSrc.push(
-                componentDirectory + "/amd/src/*.js",
-                componentDirectory + "/amd/src/**/*.js"
-            );
+    // 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 {
-            amdSrc = ComponentList.getAmdSrcGlobList();
+            grunt.fail.fatal('Setting root to ' + root + ' failed - path does not exist');
         }
+    }
 
+    return cwd;
+};
+
+/**
+ * Register any stylelint tasks.
+ *
+ * @param {Object} grunt
+ * @param {Array} files
+ * @param {String} fullRunDir
+ */
+const registerStyleLintTasks = (grunt, files, fullRunDir) => {
+    const getCssConfigForFiles = files => {
         return {
-            inAMD,
-            amdSrc,
+            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 getYuiConfiguration = () => {
-        let yuiSrc = [];
-        if (inComponent) {
-            yuiSrc.push(componentDirectory + "/yui/src/**/*.js");
+    const getScssConfigForFiles = files => {
+        return {
+            stylelint: {
+                scss: {
+                    options: {syntax: 'scss'},
+                    src: files,
+                },
+            },
+        };
+    };
+
+    let hasCss = true;
+    let hasScss = true;
+
+    if (files) {
+        // Specific files were passed. Just set them up.
+        grunt.config.merge(getCssConfigForFiles(files));
+        grunt.config.merge(getScssConfigForFiles(files));
+    } else {
+        // The stylelint system does not handle the case where there was no file to lint.
+        // Check whether there are any files to lint in the current directory.
+        const glob = require('glob');
+
+        const scssSrc = [];
+        glob.sync(`${fullRunDir}/**/*.scss`).forEach(path => scssSrc.push(path));
+
+        if (scssSrc.length) {
+            grunt.config.merge(getScssConfigForFiles(scssSrc));
         } else {
-            yuiSrc = ComponentList.getYuiSrcGlobList(gruntFilePath + '/');
+            hasScss = false;
         }
 
-        return {
-            yuiSrc,
-        };
-    };
+        const cssSrc = [];
+        glob.sync(`${fullRunDir}/**/*.css`).forEach(path => cssSrc.push(path));
 
-    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);
+        if (cssSrc.length) {
+            grunt.config.merge(getCssConfigForFiles(cssSrc));
         } else {
-            ComponentList.getComponentPaths(`${gruntFilePath}/`).forEach(componentPath => {
-                checkComponentDirectory(componentPath);
-            });
+            hasCss = false;
         }
+    }
 
-        return {
-            cssSrc,
-            scssSrc,
-        };
-    };
+    const scssTasks = ['sass'];
+    if (hasScss) {
+        scssTasks.unshift('stylelint:scss');
+    }
+    grunt.registerTask('scss', scssTasks);
 
-    /**
-     * 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());
+    const cssTasks = [];
+    if (hasCss) {
+        cssTasks.push('stylelint:css');
+    }
+    grunt.registerTask('rawcss', cssTasks);
 
-        // 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');
-            }
-        }
+    grunt.registerTask('css', ['scss', 'rawcss']);
+};
 
-        return cwd;
-    };
+/**
+ * Grunt configuration.
+ *
+ * @param {Object} grunt
+ */
+module.exports = function(grunt) {
+    const path = require('path');
+    const tasks = {};
+    const async = require('async');
+    const DOMParser = require('xmldom').DOMParser;
+    const xpath = require('xpath');
+    const semver = require('semver');
+    const watchman = require('fb-watchman');
+    const watchmanClient = new watchman.Client();
+    const fs = require('fs');
+    const ComponentList = require(path.resolve('GruntfileComponents.js'));
+    const sass = require('node-sass');
+
+    // Verify the node version is new enough.
+    var expected = semver.validRange(grunt.file.readJSON('package.json').engines.node);
+    var actual = semver.valid(process.version);
+    if (!semver.satisfies(actual, expected)) {
+        grunt.fail.fatal('Node version not satisfied. Require ' + expected + ', version installed: ' + actual);
+    }
 
     // Detect directories:
     // * gruntFilePath          The real path on disk to this Gruntfile.js
@@ -153,19 +171,8 @@ const setupMoodleEnvironment = 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}`);
@@ -185,77 +192,667 @@ const setupMoodleEnvironment = grunt => {
         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');
-
-    // Verify the node version is new enough.
-    var expected = semver.validRange(grunt.file.readJSON('package.json').engines.node);
-    var actual = semver.valid(process.version);
-    if (!semver.satisfies(actual, expected)) {
-        grunt.fail.fatal('Node version not satisfied. Require ' + expected + ', version installed: ' + actual);
+    let files = null;
+    if (grunt.option('files')) {
+        // Accept a comma separated list of files to process.
+        files = grunt.option('files').split(',');
     }
-};
 
-/**
- * Grunt configuration.
- *
- * @param {Grunt} grunt
- */
-module.exports = function(grunt) {
-    // Verify that the Node version meets our requirements.
-    verifyNodeVersion(grunt);
+    // 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 ..
+    const inAMD = !path.relative(`${componentDirectory}/amd`, cwd).startsWith('..');
 
-    // Setup the Moodle environemnt within the Grunt object.
-    grunt.moodleEnv = setupMoodleEnvironment(grunt);
+    // Globbing pattern for matching all AMD JS source files.
+    let amdSrc = [];
+    if (inComponent) {
+        amdSrc.push(componentDirectory + "/amd/src/*.js");
+        amdSrc.push(componentDirectory + "/amd/src/**/*.js");
+    } else {
+        amdSrc = ComponentList.getAmdSrcGlobList();
+    }
+
+    let yuiSrc = [];
+    if (inComponent) {
+        yuiSrc.push(componentDirectory + "/yui/src/**/*.js");
+    } else {
+        yuiSrc = ComponentList.getYuiSrcGlobList(gruntFilePath + '/');
+    }
 
     /**
-     * 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() {
+        const thirdpartyfiles = ComponentList.getThirdPartyLibsList(gruntFilePath + '/');
+        const libs = ['node_modules/', 'vendor/'];
 
-    // Add Moodle task configuration.
-    addTask('gherkinlint', grunt);
-    addTask('ignorefiles', grunt);
+        thirdpartyfiles.forEach(function(file) {
+            const dirname = path.dirname(file);
 
-    addTask('javascript', grunt);
-    addTask('style', grunt);
+            const doc = new DOMParser().parseFromString(grunt.file.read(file));
+            const nodes = xpath.select("/libraries/library/location/text()", doc);
 
-    addTask('watch', grunt);
-    addTask('startup', grunt);
+            nodes.forEach(function(node) {
+                let lib = path.posix.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;
+    };
+
+    /**
+     * Get the list of feature files to pass to the gherkin linter.
+     *
+     * @returns {Array}
+     */
+    const getGherkinLintTargets = () => {
+        if (files) {
+            // Specific files were requested. Only check these.
+            return files;
+        }
+
+        if (inComponent) {
+            return [`${runDir}/tests/behat/*.feature`];
+        }
+
+        return ['**/tests/behat/*.feature'];
+    };
+
+    // 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.
+            // 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)
+            },
+            amd: {src: files ? files : amdSrc},
+            // Check YUI module source files.
+            yui: {src: files ? files : yuiSrc},
+        },
+        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: {
+                implementation: sass,
+                includePaths: ["theme/boost/scss/", "theme/classic/scss/"]
+            }
+        },
+        watch: {
+            options: {
+                nospawn: true // We need not to spawn so config can be changed dynamically.
+            },
+            amd: {
+                files: inComponent
+                    ? ['amd/src/*.js', 'amd/src/**/*.js']
+                    : ['**/amd/src/**/*.js'],
+                tasks: ['amd']
+            },
+            boost: {
+                files: [inComponent ? 'scss/**/*.scss' : 'theme/boost/scss/**/*.scss'],
+                tasks: ['scss']
+            },
+            rawcss: {
+                files: [
+                    '**/*.css',
+                ],
+                excludes: [
+                    '**/moodle.css',
+                    '**/editor.css',
+                ],
+                tasks: ['rawcss']
+            },
+            yui: {
+                files: inComponent
+                    ? ['yui/src/*.json', 'yui/src/**/*.js']
+                    : ['**/yui/src/**/*.js'],
+                tasks: ['yui']
+            },
+            gherkinlint: {
+                files: [inComponent ? 'tests/behat/*.feature' : '**/tests/behat/*.feature'],
+                tasks: ['gherkinlint']
+            }
+        },
+        shifter: {
+            options: {
+                recursive: true,
+                // Shifter takes a relative path.
+                paths: files ? files : [runDir]
+            }
+        },
+        gherkinlint: {
+            options: {
+                files: getGherkinLintTargets(),
+            }
+        },
+    });
+
+    /**
+     * Generate ignore files (utilising thirdpartylibs.xml data)
+     */
+    tasks.ignorefiles = function() {
+        // An array of paths to third party directories.
+        const thirdPartyPaths = getThirdPartyPathsFromXML();
+        // Generate .eslintignore.
+        const eslintIgnores = [
+            '# Generated by "grunt ignorefiles"',
+            '*/**/yui/src/*/meta/',
+            '*/**/build/',
+        ].concat(thirdPartyPaths);
+        grunt.file.write('.eslintignore', eslintIgnores.join('\n'));
+
+        // Generate .stylelintignore.
+        const 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() {
+        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
+    };
+
+    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: 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 = 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(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', 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 ' + fullRunDir);
+                });
+            });
+        });
+    };
+
+    // 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 tasks.
+    registerStyleLintTasks(grunt, files, fullRunDir);
+
+    // 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']);

GruntfileComponents.js

@@ -92,16 +92,6 @@ const fetchComponentData = () => {
     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.
  *
@@ -150,49 +140,6 @@ const getThirdPartyLibsList = relativeTo => {
         .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.
  *
@@ -235,9 +182,7 @@ const getOwningComponentDirectory = checkPath => {
 module.exports = {
     getAmdSrcGlobList,
     getComponentFromPath,
-    getComponentPaths,
     getOwningComponentDirectory,
     getYuiSrcGlobList,
     getThirdPartyLibsList,
-    getThirdPartyPaths,
 };

TRADEMARK.txt

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

admin/admin_settings_search_form.php

@@ -15,41 +15,34 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Clientside filter base.
+ * Admin settings search form
  *
- * @package    tool_usertours
- * @copyright  2020 The Open University
+ * @package    admin
+ * @copyright  2016 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-namespace tool_usertours\local\clientside_filter;
-
 defined('MOODLE_INTERNAL') || die();
 
-use stdClass;
-use tool_usertours\local\filter\base;
-use tool_usertours\tour;
+require_once $CFG->libdir.'/formslib.php';
 
 /**
- * Clientside filter base.
+ * Admin settings search form
  *
- * @copyright  2020 The Open University
+ * @package    admin
+ * @copyright  2016 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-abstract class clientside_filter extends base {
-    /**
-     * Returns the filter values needed for client side filtering.
-     *
-     * @param   tour            $tour       The tour to find the filter values for
-     * @return  stdClass
-     */
-    public static function get_client_side_values(tour $tour): stdClass {
-        $data = (object) [];
+class admin_settings_search_form extends moodleform {
+    function definition () {
+        $mform = $this->_form;
 
-        if (is_a(static::class, clientside_filter::class, true)) {
-            $data->filterdata = $tour->get_filter_values(static::get_filter_name());
-        }
-
-        return $data;
+        //$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));
     }
-}
+}

admin/auth.php

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

admin/auth_config.php

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

admin/classes/form/testoutgoingmailconf_form.php

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

admin/classes/local/externalpage/accesscallback.php

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

admin/classes/local/settings/autocomplete.php

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

admin/classes/local/settings/manage_payment_gateway_plugins.php

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

admin/classes/task_log_table.php

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

admin/cli/adhoc_task.php

@@ -37,13 +37,11 @@ list($options, $unrecognized) = cli_get_params(
         'showsql' => false,
         'showdebugging' => false,
         'ignorelimits' => false,
-        'force' => false,
     ], [
         'h' => 'help',
         'e' => 'execute',
         'k' => 'keep-alive',
         'i' => 'ignorelimits',
-        'f' => 'force',
     ]
 );
 
@@ -63,7 +61,6 @@ Options:
  -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
@@ -95,12 +92,6 @@ if (moodle_needs_upgrading()) {
 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;
 }

admin/cli/cron.php

@@ -36,23 +36,14 @@ require_once($CFG->libdir.'/cronlib.php');
 
 // now get cli options
 list($options, $unrecognized) = cli_get_params(
-    [
+    array(
         'help' => false,
         'stop' => false,
-        'list' => false,
-        'force' => false,
-        'enable' => false,
-        'disable' => false,
-        'disable-wait' => false,
-    ], [
+    ),
+    array(
         'h' => 'help',
         's' => 'stop',
-        'l' => 'list',
-        'f' => 'force',
-        'e' => 'enable',
-        'd' => 'disable',
-        'w' => 'disable-wait',
-    ]
+    )
 );
 
 if ($unrecognized) {
@@ -65,13 +56,8 @@ 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
+-s, --stop            Notify all other running cron processes to stop after the current task
 
 Example:
 \$sudo -u www-data /usr/bin/php admin/cli/cron.php
@@ -88,91 +74,6 @@ if ($options['stop']) {
     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();

admin/cli/dashboard_reset.php

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

admin/cli/fix_orphaned_calendar_events.php

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

admin/cli/generate_key.php

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

admin/cli/install_database.php

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

admin/cli/mysql_collation.php

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

admin/cli/mysql_compressed_rows.php

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

admin/cli/restore_backup.php

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

admin/cli/scheduled_task.php

@@ -30,17 +30,8 @@ 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',
-    ]
+    array('help' => false, 'list' => false, 'execute' => false, 'showsql' => false, 'showdebugging' => false),
+    array('h' => 'help')
 );
 
 if ($unrecognized) {
@@ -58,7 +49,6 @@ if ($options['help'] or (!$options['list'] and !$options['execute'])) {
     --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
@@ -131,13 +121,6 @@ if ($execute = $options['execute']) {
         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);
 

admin/cli/svgtool.php

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

admin/cli/uninstall_plugins.php

@@ -39,8 +39,6 @@ Options:
     --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:
 
@@ -74,8 +72,6 @@ list($options, $unrecognised) = cli_get_params([
     'purge-missing' => false,
     'plugins' => false,
     'run' => false,
-    'showsql' => false,
-    'showdebugging' => false,
 ], [
     'h' => 'help'
 ]);
@@ -90,14 +86,6 @@ 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();
 

admin/cli/upgrade.php

@@ -135,15 +135,6 @@ 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)) {

admin/environment.xml

@@ -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>
@@ -3179,7 +3177,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>
@@ -3447,7 +3444,7 @@
       </PHP_EXTENSION>
       <PHP_EXTENSION name="hash" level="required"/>
       <PHP_EXTENSION name="fileinfo" level="required"/>
-      <PHP_EXTENSION name="sodium" level="optional"/>
+      <PHP_EXTENSION name="sodium" level="required"/>
     </PHP_EXTENSIONS>
     <PHP_SETTINGS>
       <PHP_SETTING name="memory_limit" value="96M" level="required">
@@ -3527,8 +3524,6 @@
           <ON_CHECK message="sixtyfourbitswarning" />
         </FEEDBACK>
       </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
-      </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/message.php

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

admin/oauth2callback.php

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

admin/purgecaches.php

@@ -52,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.

admin/roles/assign.php

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

admin/roles/tests/privacy_test.php

@@ -536,7 +536,7 @@ class core_role_privacy_testcase extends provider_testcase {
             $user1->id,
             $admin->id
         ];
-        $this->assertEqualsCanonicalizing($expected, $userlist2->get_userids());
+        $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);
@@ -547,7 +547,7 @@ class core_role_privacy_testcase extends provider_testcase {
             $user2->id,
             $admin->id
         ];
-        $this->assertEqualsCanonicalizing($expected, $userlist3->get_userids());
+        $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);
@@ -557,7 +557,7 @@ class core_role_privacy_testcase extends provider_testcase {
             $user2->id,
             $admin->id
         ];
-        $this->assertEqualsCanonicalizing($expected, $userlist4->get_userids());
+        $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);
@@ -567,7 +567,7 @@ class core_role_privacy_testcase extends provider_testcase {
             $user1->id,
             $admin->id
         ];
-        $this->assertEqualsCanonicalizing($expected, $userlist6->get_userids());
+        $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);
@@ -578,7 +578,7 @@ class core_role_privacy_testcase extends provider_testcase {
             $user2->id,
             $admin->id
         ];
-        $this->assertEqualsCanonicalizing($expected, $userlist7->get_userids());
+        $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);
@@ -588,7 +588,7 @@ class core_role_privacy_testcase extends provider_testcase {
             $user1->id,
             $admin->id
         ];
-        $this->assertEqualsCanonicalizing($expected, $userlist8->get_userids());
+        $this->assertEquals($expected, $userlist8->get_userids(), '', 0.0, 10, true);
     }
 
     /**
@@ -744,4 +744,4 @@ class core_role_privacy_testcase extends provider_testcase {
         }
         return $rolesnames;
     }
-}
+}

admin/search.php

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

admin/settings/analytics.php

@@ -144,20 +144,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));
-
-
     }
 }

admin/settings/appearance.php

@@ -269,6 +269,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.

admin/settings/badges.php

@@ -57,14 +57,20 @@ if (($hassiteconfig || has_any_capability(array(
             new lang_string('badgesalt_desc', 'badges'),
             'badges' . $SITE->timecreated, PARAM_ALPHANUM));
 
+    $backpacks = badges_get_site_backpacks();
+    $choices = array();
+    $defaultchoice = 0;
+    foreach ($backpacks as $backpack) {
+        $choices[$backpack->id] = $backpack->backpackweburl;
+        if ($backpack->backpackweburl == BADGRIO_BACKPACKWEBURL) {
+            $defaultchoice = $backpack->id;
+        }
+    }
+
     $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 +97,19 @@ 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'),
+            $defaultchoice, $choices));
+
+    $ADMIN->add('badges', $backpacksettings);
 
     $ADMIN->add('badges',
         new admin_externalpage('managebackpacks',

admin/settings/courses.php

@@ -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',
@@ -228,7 +184,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     // 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',
@@ -242,31 +197,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
             ]
         )
     );
-
-    // 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'),
@@ -329,9 +259,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
         ['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 +270,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)));
@@ -363,9 +285,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
         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);
 
@@ -492,10 +411,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
         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 +437,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)));
@@ -561,9 +473,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $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'), ''));

admin/settings/development.php

@@ -41,13 +41,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $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);

admin/settings/language.php

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

admin/settings/payment.php

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

admin/settings/plugins.php

@@ -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');
@@ -280,25 +244,6 @@ 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'));
@@ -401,6 +346,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
@@ -555,19 +549,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'),
@@ -607,43 +590,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')));

admin/settings/security.php

@@ -160,23 +160,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

admin/settings/server.php

@@ -1,243 +1,162 @@
 <?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($sessiontimeoutwarning);
+$temp->add(new admin_setting_configduration('sessiontimeout', new lang_string('sessiontimeout', 'admin'),
+    new lang_string('configsessiontimeout', 'admin'), 8 * 60 * 60));
 
-    $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(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);
 
-    // 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'), ''));
+// "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);
 
-    $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 = 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);
+// "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'),
+    GETREMOTEADDR_SKIP_DEFAULT, $options));
+$temp->add(new admin_setting_configtext('reverseproxyignore', new lang_string('reverseproxyignore', 'admin'), new lang_string('configreverseproxyignore', 'admin'), ''));
 
-    // 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->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->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 = 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);
 
-    $temp->add(new admin_setting_configcheckbox('disablegradehistory', new lang_string('disablegradehistory', 'grades'),
-        new lang_string('disablegradehistory_help', 'grades'), 0));
+$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('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_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_configselect('tempdatafoldercleanup', new lang_string('tempdatafoldercleanup', 'admin'),
-        new lang_string('configtempdatafoldercleanup', 'admin'), 168,
-        [
+
+$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, 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 +166,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

admin/settings/top.php

@@ -39,7 +39,6 @@ $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')));

admin/settings/users.php

@@ -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);
 
@@ -196,6 +188,12 @@ if ($hassiteconfig
                              '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,39 +206,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] = $field->name . ' *';
-                    }
-
-                    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);

admin/templates/local/settings/autocomplete.mustache

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

admin/templates/setting_encryptedpassword.mustache

@@ -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/>.
-}}
-{{!
-    @template core_admin/admin_setting_encryptedpassword
-
-    Admin encrypted password template.
-
-    Context variables required for this template:
-    * name - form element name
-    * set - whether it is set or empty
-    * id - element id
-
-    Example context (json):
-    {
-        "name": "test",
-        "id": "test0",
-        "set": true
-    }
-}}
-<div class="core_admin_encryptedpassword" data-encryptedpasswordid="{{ id }}"
-        {{#novalue}}data-novalue="y"{{/novalue}}>
-    {{#set}}
-        <span>{{# str }} encryptedpassword_set, admin {{/ str }}</span>
-    {{/set}}
-    {{^set}}
-        <a href="#" title="{{# str }} encryptedpassword_edit, admin {{/ str }}">
-            <span>{{# str }} novalueclicktoset, form {{/ str }}</span>
-            {{# pix }} t/passwordunmask-edit, core, {{# str }} passwordunmaskedithint, form {{/ str }}{{/ pix }}
-        </a>
-    {{/set}}
-    <input style="display: none" type="password" name="{{name}}" disabled>
-    {{!
-        Using buttons instead of links here allows them to be connected to the label, so the button
-        works if you click the label.
-    }}
-    {{#set}}
-        <button type="button" id="{{id}}" title="{{# str }} encryptedpassword_edit, admin {{/ str }}" class="btn btn-link" data-editbutton>
-            {{# pix }} t/passwordunmask-edit, core, {{/ pix }}
-        </button>
-    {{/set}}
-    <button type="button" style="display: none" title="{{# str }} cancel {{/ str }}" class="btn btn-link" data-cancelbutton>
-        <i class="icon fa fa-times"></i>
-    </button>
-</div>
-
-{{#js}}
-require(['core_form/encryptedpassword'], function(encryptedpassword) {
-    new encryptedpassword.EncryptedPassword("{{ id }}");
-});
-{{/js}}

admin/tests/behat/behat_admin.php

@@ -56,7 +56,7 @@ class behat_admin extends behat_base {
             $this->execute('behat_navigation::i_select_from_flat_navigation_drawer', [get_string('administrationsite')]);
 
             // Search by label.
-            $this->execute('behat_forms::i_set_the_field_to', [get_string('search'), $label]);
+            $this->execute('behat_forms::i_set_the_field_to', [get_string('query', 'admin'), $label]);
             $this->execute("behat_forms::press_button", get_string('search', 'admin'));
 
             // Admin settings does not use the same DOM structure than other moodle forms
@@ -89,7 +89,7 @@ class behat_admin extends behat_base {
     }
 
     /**
-     * Sets the specified site settings. A table with | config | value | (optional)plugin | (optional)encrypted | is expected.
+     * Sets the specified site settings. A table with | config | value | (optional)plugin | is expected.
      *
      * @Given /^the following config values are set as admin:$/
      * @param TableNode $table
@@ -103,20 +103,11 @@ class behat_admin extends behat_base {
         foreach ($data as $config => $value) {
             // Default plugin value is null.
             $plugin = null;
-            $encrypted = false;
 
             if (is_array($value)) {
                 $plugin = $value[1];
-                if (array_key_exists(2, $value)) {
-                    $encrypted = $value[2] === 'encrypted';
-                }
                 $value = $value[0];
             }
-
-            if ($encrypted) {
-                $value = \core\encryption::encrypt($value);
-            }
-
             set_config($config, $value, $plugin);
         }
     }

admin/tests/behat/browse_users.feature

@@ -1,50 +0,0 @@
-@core @core_admin
-Feature: An administrator can browse user accounts
-  In order to find the user accounts I am looking for
-  As an admin
-  I can browse users and see their basic information
-
-  Background:
-    Given the following "custom profile fields" exist:
-      | datatype | shortname | name           |
-      | text     | frog      | Favourite frog |
-    And the following "users" exist:
-      | username | firstname | lastname | email           | department | profile_field_frog | firstnamephonetic |
-      | user1    | User      | One      | one@example.com | Attack     | Kermit             | Yewzer            |
-      | user2    | User      | Two      | two@example.com | Defence    | Tree               | Yoozare           |
-    And I log in as "admin"
-
-  Scenario: User accounts display default fields
-    When I navigate to "Users > Accounts > Browse list of users" in site administration
-    # Name field always present, email field is default for showidentity.
-    Then the following should exist in the "users" table:
-      | First name / Surname | Email address   |
-      | User One             | one@example.com |
-      | User Two             | two@example.com |
-    # Should not see other identity fields or non-default name fields.
-    And I should not see "Department" in the "table" "css_element"
-    And I should not see "Attack"
-    And I should not see "Favourite frog" in the "table" "css_element"
-    And I should not see "Kermit"
-    And I should not see "First name - phonetic" in the "table" "css_element"
-    And I should not see "Yoozare"
-
-  Scenario: User accounts with extra name fields
-    Given the following config values are set as admin:
-      | alternativefullnameformat | firstnamephonetic lastname |
-    When I navigate to "Users > Accounts > Browse list of users" in site administration
-    Then the following should exist in the "users" table:
-      | First name - phonetic / Surname | Email address   |
-      | Yewzer One                      | one@example.com |
-      | Yoozare Two                     | two@example.com |
-
-  Scenario: User accounts with specified identity fields
-    Given the following config values are set as admin:
-      | showuseridentity | department,profile_field_frog |
-    When I navigate to "Users > Accounts > Browse list of users" in site administration
-    Then the following should exist in the "users" table:
-      | First name / Surname | Favourite frog  | Department |
-      | User One             | Kermit          | Attack     |
-      | User Two             | Tree            | Defence    |
-    And I should not see "Email address" in the "table" "css_element"
-    And I should not see "one@example.com"

admin/tests/behat/filter_users.feature

@@ -5,16 +5,12 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
   I need to filter the users account list using different filter
 
   Background:
-    Given the following "custom profile fields" exist:
-      | datatype | shortname | name           |
-      | text     | frog      | Favourite frog |
-      | text     | undead    | Type of undead |
-    And the following "users" exist:
-      | username | firstname | lastname | email | auth | confirmed | lastip | institution | department | profile_field_frog | profile_field_undead |
-      | user1 | User | One | one@example.com | manual | 0 | 127.0.1.1       | moodle      | red        | Kermit             |                      |
-      | user2 | User | Two | two@example.com | ldap | 1 | 0.0.0.0           | moodle      | blue       | Mr Toad            | Zombie               |
-      | user3 | User | Three | three@example.com | manual | 1 | 0.0.0.0 |                 |            |                    |                      |
-      | user4 | User | Four | four@example.com | ldap | 0 | 127.0.1.2 |                   |            |                    |                      |
+    Given the following "users" exist:
+      | username | firstname | lastname | email | auth | confirmed | lastip | institution | department |
+      | user1 | User | One | one@example.com | manual | 0 | 127.0.1.1       | moodle      | red        |
+      | user2 | User | Two | two@example.com | ldap | 1 | 0.0.0.0           | moodle      | blue       |
+      | user3 | User | Three | three@example.com | manual | 1 | 0.0.0.0 |                 |            |
+      | user4 | User | Four | four@example.com | ldap | 0 | 127.0.1.2 |                   |            |
     And the following "cohorts" exist:
       | name | idnumber |
       | Cohort 1 | CH1 |
@@ -120,20 +116,3 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
     And I press "Add filter"
     And I should see "User One"
     And I should not see "User Two"
-
-  Scenario: Filter users by custom profile field (specific or any)
-    When I set the field "id_profile_fld" to "Favourite frog"
-    And I set the field "id_profile" to "Kermit"
-    And I press "Add filter"
-    Then I should see "User One"
-    And I should not see "User Two"
-    And I should not see "User Three"
-    And I should not see "User Four"
-    And I press "Remove all filters"
-    And I set the field "id_profile_fld" to "any field"
-    And I set the field "id_profile" to "Zombie"
-    And I press "Add filter"
-    And I should see "User Two"
-    And I should not see "User One"
-    And I should not see "User Three"
-    And I should not see "User Four"

admin/tests/behat/manage_tokens.feature

@@ -1,76 +1,27 @@
 @core @core_admin
-Feature: Manage external services tokens
-  In order to manage external service usage
+Feature: Manage tokens
+  In order to manage webservice usage
   As an admin
-  I need to be able to create, filter and delete tokens
+  I need to be able to create and delete tokens
 
   Background:
     Given the following "users" exist:
-      | username  | password  | firstname     | lastname    |
-      | user1     | user1     | Firstname1    | Lastname1   |
-      | user2     | user2     | Firstname2    | Lastname2   |
-      | user3     | user3     | Firstname3    | Lastname3   |
-      | user4     | user4     | Firstname4    | Lastname4   |
+    | username  | password  | firstname | lastname |
+    | testuser  | testuser  | Joe | Bloggs |
+    | testuser2 | testuser2 | TestFirstname | TestLastname |
     And I change window size to "small"
+    And I log in as "admin"
+    And I am on site homepage
 
   @javascript
-  Scenario: Add a token to user identified by name and then delete that token
-    Given I log in as "admin"
-    And I am on site homepage
-    And I navigate to "Server > Web services > Manage tokens" in site administration
-    And I press "Create token"
-    And I set the field "User" to "Firstname1 Lastname1"
-    And I set the field "Service" to "Moodle mobile web service"
+  Scenario: Add & delete a token
+    Given I navigate to "Plugins > Web services > Manage tokens" in site administration
+    And I follow "Add"
+    And I set the field "User" to "Joe Bloggs"
     And I set the field "IP restriction" to "127.0.0.1"
     When I press "Save changes"
-    Then I should see "Moodle mobile web service" in the "Firstname1 Lastname1" "table_row"
-    And I should see "127.0.0.1" in the "Firstname1 Lastname1" "table_row"
-    And I click on "Delete" "link" in the "Firstname1 Lastname1" "table_row"
-    And I should see "Do you really want to delete this web service token for Firstname1 Lastname1 on the service Moodle mobile web service?"
+    Then I should see "Joe Bloggs"
+    And I should see "127.0.0.1"
+    And I follow "Delete"
     And I press "Delete"
-    And "Firstname1 Lastname1" "table_row" should not exist
-
-  @javascript
-  Scenario: Tokens can be filtered by user and by service
-    Given the following "core_webservice > Service" exists:
-      | name      | Site information              |
-      | shortname | siteinfo                      |
-      | enabled   | 1                             |
-    And the following "core_webservice > Service function" exists:
-      | service   | siteinfo                      |
-      | functions | core_webservice_get_site_info |
-    And the following "core_webservice > Tokens" exist:
-      | user      | service                       |
-      | user2     | siteinfo                      |
-      | user3     | moodle_mobile_app             |
-      | user4     | siteinfo                      |
-    When I log in as "admin"
-    And I navigate to "Server > Web services > Manage tokens" in site administration
-
-    # All created tokens are shown by default.
-    And "Firstname1 Lastname1" "table_row" should not exist
-    And I should see "Site information" in the "Firstname2 Lastname2" "table_row"
-    And I should see "Moodle mobile web service" in the "Firstname3 Lastname3" "table_row"
-    And I should see "Site information" in the "Firstname4 Lastname4" "table_row"
-
-    # Filter tokens by user (note we can select the user by the identity field here).
-    When I click on "Tokens filter" "link"
-    And I set the field "User" to "user2@example.com"
-    And I press "Show only matching tokens"
-    Then "Firstname3 Lastname3" "table_row" should not exist
-    And "Firstname4 Lastname4" "table_row" should not exist
-    And I should see "Site information" in the "Firstname2 Lastname2" "table_row"
-
-    # Reset the filter.
-    And I press "Show all tokens"
-    And I should see "Site information" in the "Firstname2 Lastname2" "table_row"
-    And I should see "Moodle mobile web service" in the "Firstname3 Lastname3" "table_row"
-    And I should see "Site information" in the "Firstname4 Lastname4" "table_row"
-
-    # Filter tokens by service.
-    And I click on "Tokens filter" "link"
-    And I set the field "Service" to "Site information"
-    And I press "Show only matching tokens"
-    And I should see "Site information" in the "Firstname2 Lastname2" "table_row"
-    And I should see "Site information" in the "Firstname4 Lastname4" "table_row"
-    And "Firstname3 Lastname3" "table_row" should not exist
+    And I should not see "Joe Bloggs"

admin/tests/behat/webservice_users.feature

@@ -1,31 +0,0 @@
-@core @core_admin
-Feature: Web service user settings
-  In order to configure authorised users for a web service
-  As an admin
-  I need to use the page that lets you do that
-
-  Background:
-    # Include a custom profile field so we can check it gets displayed
-    Given the following "custom profile fields" exist:
-      | datatype | shortname | name           | param2 |
-      | text     | frog      | Favourite frog | 100    |
-    And the following config values are set as admin:
-      | showuseridentity | email,profile_field_frog |
-    And the following "users" exist:
-      | username | firstname | lastname | email         | profile_field_frog |
-      | user1    | User      | One      | 1@example.org | Kermit             |
-    And the following "core_webservice > Service" exists:
-      | name            | Silly service |
-      | shortname       | silly         |
-      | restrictedusers | 1             |
-      | enabled         | 1             |
-
-  Scenario: Add a user to a web service
-    When I log in as "admin"
-    And I navigate to "Server > Web services > External services" in site administration
-    And I click on "Authorised users" "link" in the "Silly service" "table_row"
-    And I set the field "Not authorised users" to "User One"
-    And I press "Add"
-    Then I should see "User One" in the ".alloweduserlist" "css_element"
-    And I should see "1@example.org" in the ".alloweduserlist" "css_element"
-    And I should see "Kermit" in the ".alloweduserlist" "css_element"

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

@@ -64,7 +64,7 @@ class models_list implements \renderable, \templatable {
         $data = new \stdClass();
 
         $newmodelmenu = new \action_menu();
-        $newmodelmenu->set_menu_trigger(get_string('newmodel', 'tool_analytics'), 'btn btn-secondary');
+        $newmodelmenu->set_menu_trigger(get_string('newmodel', 'tool_analytics'), 'btn btn-default');
         $newmodelmenu->set_alignment(\action_menu::TL, \action_menu::BL);
 
         $newmodelmenu->add(new \action_menu_link(

admin/tool/analytics/templates/evaluation_options.mustache

@@ -57,10 +57,10 @@
 {{/trainedexternally}}
 
 {{! Hidden by default if #trainedexternally as the default option is trainedmodel in this case.}}
-<div id="id-evaluation-timesplitting-container" class="mt-3 {{#trainedexternally}}hidden{{/trainedexternally}}">
+<div id="id-evaluation-timesplitting-container" class="m-t-1 {{#trainedexternally}}hidden{{/trainedexternally}}">
     {{#str}} selecttimesplittingforevaluation, tool_analytics {{/str}}
     <div>
-        <select id="id-evaluation-timesplitting" name="timesplitting" class="custom-select mt-3">
+        <select id="id-evaluation-timesplitting" name="timesplitting" class="custom-select m-t-1">
             {{#timesplittingmethods}}
                 <option value="{{id}}">{{text}}</option>
             {{/timesplittingmethods}}

admin/tool/analytics/templates/export_options.mustache

@@ -39,7 +39,7 @@
     <input class="custom-control-input" type="radio" name="exportoption" id="id-mode-exportmodel" value="exportmodel" checked>
     <label class="custom-control-label" for="id-mode-exportmodel">{{#str}} exportmodel, tool_analytics {{/str}}</label>
 </div>
-<div class="custom-control custom-checkbox ml-5" id="id-includeweights-container">
+<div class="custom-control custom-checkbox m-l-2" id="id-includeweights-container">
   <input class="custom-control-input" type="checkbox" id="id-includeweights" value="1" checked>
   <label class="custom-control-label" for="id-includeweights">{{#str}} exportincludeweights, tool_analytics {{/str}}</label>
 </div>

admin/tool/analytics/tests/external_test.php

@@ -66,6 +66,8 @@ class tool_analytics_external_testcase extends externallib_advanced_testcase {
 
     /**
      * test_potential_contexts description
+     *
+     * @expectedException required_capability_exception
      */
     public function test_potential_contexts_no_manager() {
         $this->resetAfterTest();
@@ -73,7 +75,6 @@ class tool_analytics_external_testcase extends externallib_advanced_testcase {
         $user = $this->getDataGenerator()->create_user();
         $this->setUser($user);
 
-        $this->expectException(required_capability_exception::class);
         $this->assertCount(2, \tool_analytics\external::potential_contexts());
     }
 }

admin/tool/analytics/version.php

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

admin/tool/availabilityconditions/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2021051700;
-$plugin->requires = 2021051100;
+$plugin->version = 2020061500;
+$plugin->requires = 2020060900;
 $plugin->component = 'tool_availabilityconditions';

admin/tool/behat/cli/init.php

@@ -49,10 +49,6 @@ list($options, $unrecognized) = cli_get_params(
         'torun'    => 0,
         'optimize-runs' => '',
         'add-core-features-to-theme' => false,
-        'axe'      => false,
-        'disable-composer' => false,
-        'composer-upgrade' => true,
-        'composer-self-update' => true,
     ),
     array(
         'j' => 'parallel',
@@ -68,36 +64,18 @@ $help = "
 Behat utilities to initialise behat tests
 
 Usage:
-  php init.php      [--parallel=value [--maxruns=value] [--fromrun=value --torun=value]]
-                    [--axe] [-o | --optimize-runs] [-a | --add-core-features-to-theme]
-                    [--no-composer-self-update] [--no-composer-upgrade]
-                    [--disable-composer]
-                    [--help]
+  php init.php [--parallel=value [--maxruns=value] [--fromrun=value --torun=value]] [--help]
 
 Options:
--j, --parallel      Number of parallel behat run to initialise
--m, --maxruns       Max parallel processes to be executed at one time
---fromrun           Execute run starting from (Used for parallel runs on different vms)
---torun             Execute run till (Used for parallel runs on different vms)
---axe               Include axe accessibility tests
+-j, --parallel   Number of parallel behat run to initialise
+-m, --maxruns    Max parallel processes to be executed at one time.
+--fromrun        Execute run starting from (Used for parallel runs on different vms)
+--torun          Execute run till (Used for parallel runs on different vms)
 
--o, --optimize-runs
-                    Split features with specified tags in all parallel runs.
+-o, --optimize-runs Split features with specified tags in all parallel runs.
+-a, --add-core-features-to-theme Add all core features to specified theme's
 
--a, --add-core-features-to-theme
-                    Add all core features to specified theme's
-
---no-composer-self-update
-                    Prevent upgrade of the composer utility using its self-update command
-
---no-composer-upgrade
-                    Prevent update development dependencies using composer
-
---disable-composer
-                    A shortcut to disable composer self-update and dependency update
-                    Note: Installation of composer and/or dependencies will still happen as required
-
--h, --help          Print out this help
+-h, --help     Print out this help
 
 Example from Moodle root directory:
 \$ php admin/tool/behat/cli/init.php --parallel=2
@@ -124,10 +102,7 @@ if ($options['parallel'] && $options['parallel'] > 1) {
     }
 } else {
     // Only sanitize options for single run.
-    $cmdoptionsforsinglerun = [
-        'add-core-features-to-theme',
-        'axe',
-    ];
+    $cmdoptionsforsinglerun = array('add-core-features-to-theme');
 
     foreach ($cmdoptionsforsinglerun as $option) {
         if (!empty($options[$option])) {
@@ -140,15 +115,8 @@ if ($options['parallel'] && $options['parallel'] > 1) {
 $cwd = getcwd();
 $output = null;
 
-if ($options['disable-composer']) {
-    // Disable self-update and upgrade easily.
-    // Note: Installation will still occur regardless of this setting.
-    $options['composer-self-update'] = false;
-    $options['composer-upgrade'] = false;
-}
-
-// Install and update composer and dependencies as required.
-testing_update_composer_dependencies($options['composer-self-update'], $options['composer-upgrade']);
+// If behat dependencies not downloaded then do it first, else symfony/process can't be used.
+testing_update_composer_dependencies();
 
 // Check whether the behat test environment needs to be updated.
 chdir(__DIR__);

admin/tool/behat/cli/run.php

@@ -45,7 +45,7 @@ list($options, $unrecognised) = cli_get_params(
     array(
         'stop-on-failure' => 0,
         'verbose'  => false,
-        'replace'  => '',
+        'replace'  => false,
         'help'     => false,
         'tags'     => '',
         'profile'  => '',
@@ -70,7 +70,7 @@ $help = "
 Behat utilities to run behat tests in parallel
 
 Usage:
-  php run.php [--BEHAT_OPTION=\"value\"] [--feature=\"value\"] [--replace=\"{run}\"] [--fromrun=value --torun=value] [--help]
+  php run.php [--BEHAT_OPTION=\"value\"] [--feature=\"value\"] [--replace] [--fromrun=value --torun=value] [--help]
 
 Options:
 --BEHAT_OPTION     Any combination of behat option specified in http://behat.readthedocs.org/en/v2.5/guides/6.cli.html
@@ -144,10 +144,9 @@ $extraopts = $unrecognised;
 if ($options['profile']) {
     $profile = $options['profile'];
 
-    // If profile passed is not set, then exit (note we skip if the 'replace' option is found within the 'profile' value).
+    // If profile passed is not set, then exit.
     if (!isset($CFG->behat_config[$profile]) && !isset($CFG->behat_profiles[$profile]) &&
-            !($options['replace'] && (strpos($profile, (string) $options['replace']) !== false))) {
-
+        !(isset($options['replace']) && (strpos($options['profile'], $options['replace']) >= 0 ))) {
         echo "Invalid profile passed: " . $profile . PHP_EOL;
         exit(1);
     }

admin/tool/behat/cli/util.php

@@ -54,7 +54,6 @@ list($options, $unrecognized) = cli_get_params(
         'torun'       => 0,
         'optimize-runs' => '',
         'add-core-features-to-theme' => false,
-        'axe'         => false,
     ),
     array(
         'h' => 'help',
@@ -70,7 +69,7 @@ $help = "
 Behat utilities to manage the test environment
 
 Usage:
-  php util.php [--install|--drop|--enable|--disable|--diag|--updatesteps|--axe|--help] [--parallel=value [--maxruns=value]]
+  php util.php [--install|--drop|--enable|--disable|--diag|--updatesteps|--help] [--parallel=value [--maxruns=value]]
 
 Options:
 --install      Installs the test environment for acceptance tests
@@ -79,7 +78,6 @@ Options:
 --disable      Disables test environment
 --diag         Get behat test environment status code
 --updatesteps  Update feature step file.
---axe          Include axe accessibility tests
 
 -j, --parallel Number of parallel behat run operation
 -m, --maxruns Max parallel processes to be executed at one time.

admin/tool/behat/cli/util_single_run.php

@@ -49,7 +49,6 @@ list($options, $unrecognized) = cli_get_params(
         'updatesteps' => false,
         'optimize-runs' => '',
         'add-core-features-to-theme' => false,
-        'axe'         => false,
     ),
     array(
         'h' => 'help',
@@ -76,7 +75,6 @@ Options:
 --disable        Disables test environment
 --diag           Get behat test environment status code
 --updatesteps    Update feature step file.
---axe            Include axe accessibility tests
 
 -o, --optimize-runs Split features with specified tags in all parallel runs.
 -a, --add-core-features-to-theme Add all core features to specified theme's
@@ -183,17 +181,11 @@ if ($options['install']) {
         behat_config_manager::set_behat_run_config_value('behatsiteenabled', 1);
     }
 
-    // Define whether to run Behat with axe tests.
-    behat_config_manager::set_behat_run_config_value('axe', $options['axe']);
-
     // Enable test mode.
-    $timestart = microtime(true);
-    mtrace('Creating Behat configuration ...', '');
     behat_util::start_test_mode($options['add-core-features-to-theme'], $options['optimize-runs'], $parallel, $run);
-    mtrace(' done in ' . round(microtime(true) - $timestart, 2) . ' seconds.');
 
     // Themes are only built in the 'enable' command.
-    behat_util::build_themes(true);
+    behat_util::build_themes();
     mtrace("Testing environment themes built");
 
     // This is only displayed once for parallel install.

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

@@ -46,7 +46,6 @@ $string['stepsdefinitionstype'] = 'Type';
 $string['theninfo'] = 'Then. Checkings to ensure the outcomes are the expected ones';
 $string['unknownexceptioninfo'] = 'There was a problem with Selenium or your browser. Please ensure you are using the latest version of Selenium. Error:';
 $string['viewsteps'] = 'Filter';
-$string['warndirrootconfigfound'] = 'A configuration file was found at {$a}. This file is not automatically updated and may become stale. We recommend removing this file.';
 $string['wheninfo'] = 'When. Action that provokes an event';
 $string['wrongbehatsetup'] = 'Something is wrong with the behat setup and so step definitions cannot be listed: <b>{$a->errormsg}</b><br/><br/>Please check:<ul>
 <li>$CFG->behat_dataroot, $CFG->behat_prefix and $CFG->behat_wwwroot are set in config.php with different values from $CFG->dataroot, $CFG->prefix and $CFG->wwwroot.</li>

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

@@ -156,7 +156,7 @@ Feature: Set up contextual data for tests
     And I log in as "user5"
     And I should see "You are logged in as"
     And I am on "Course 1" course homepage
-    And I should see "You cannot enrol yourself in this course."
+    And I should see "You can not enrol yourself in this course."
 
   Scenario: Add modules
     Given the following "courses" exist:

admin/tool/behat/tests/behat/datetime_strings.feature

@@ -21,5 +21,5 @@ Feature: Transform date time string arguments
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
     And I follow "Test assignment name"
-    And I should see "##yesterday##%d %B %Y##"
+    And I should see "##yesterday##l, j F Y##"
     And I log out

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

@@ -49,14 +49,10 @@ Feature: Edit capabilities
 
   Scenario: Module capabilities overrides
     Given I log in as "teacher1"
-    And the following "activity" exists:
-      | activity | forum                |
-      | course   | C1                   |
-      | idnumber | 00001                |
-      | name     | I'm the name         |
-      | intro    | I'm the introduction |
-      | section  | 1                    |
     And I am on "Course 1" course homepage with editing mode on
+    And I add a "Forum" to section "1" and I fill the form with:
+      | Forum name | I'm the name |
+      | Description | I'm the introduction |
     And I follow "I'm the name"
     And I navigate to "Permissions" in current page administration
     And I override the system permissions of "Student" role with:
@@ -79,9 +75,9 @@ Feature: Edit capabilities
       | Your word for 'Student'             | Studier & 'learner' |
     And I press "Save and display"
     And I navigate to course participants
-    Then I should see "Teacher >= editing (Teacher)" in the "Teacher 1" "table_row"
-    And I should see "Teacher < \"editing\" (Non-editing teacher)" in the "Teaching Assistant" "table_row"
-    And I should see "Studier & 'learner' (Student)" in the "Student One" "table_row"
+    Then I should see "Teacher >= editing" in the "Teacher 1" "table_row"
+    And I should see "Teacher < \"editing\"" in the "Teaching Assistant" "table_row"
+    And I should see "Studier & 'learner'" in the "Student One" "table_row"
     And I navigate to "Users > Permissions" in current page administration
     And I should see "Teacher >= editing" in the "mod/forum:replypost" "table_row"
     And I should see "Teacher < \"editing\"" in the "mod/forum:replypost" "table_row"

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

@@ -115,24 +115,15 @@ Feature: Verify that all form fields values can be get and set
       | Wiki name | Test this one baby |
       | Default format | HTML |
     And I press "Cancel"
+    And I am on "Course 1" course homepage
     # Radio - Checking "I set the field" and "the field matches value".
-    And the following "activity" exists:
-      | activity         | choice                       |
-      | course           | C1                           |
-      | idnumber         | choice1                      |
-      | intro            | Test choice description      |
-      | name             | Test choice name             |
-      | choice1          | Option 1, Option 2, Option 3 |
-      | section          | 1                            |
-      | allowupdate      | 1                            |
-    And I am on "Course 1" course homepage
-    And I follow "Test choice name"
-    And I navigate to "Edit settings" in current page administration
-    And I set the field "Option 1" to "one"
-    And I set the field "Option 2" to "two"
-    And I set the field "Option 3" to "three"
-    And I press "Save and return to course"
-    And I am on "Course 1" course homepage
+    And I add a "Choice" to section "1" and I fill the form with:
+      | Choice name | Test choice name |
+      | Description | Test choice description |
+      | Allow choice to be updated | Yes |
+      | Option 1 | one |
+      | Option 2 | two |
+      | Option 3 | three |
     And I follow "Test choice name"
     And I set the field "one" to "1"
     And I press "Save my choice"

admin/tool/behat/tests/behat/manipulate_forms.feature

@@ -14,6 +14,8 @@ Feature: Forms manipulation
     Then the field "First name" matches value "Field value"
     And the "Select a country" select box should contain "Japan"
     And the field "New password" matches value "TestPass"
+    And I take focus off "Update profile" "button"
+    And I press "Update profile"
 
   @javascript
   Scenario: Expand all fieldsets and advanced elements

admin/tool/behat/tests/manager_util_test.php

@@ -87,7 +87,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
     /**
      * Setup test.
      */
-    public function setUp(): void {
+    public function setup() {
         global $CFG;
 
         $this->resetAfterTest();
@@ -149,7 +149,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
     public function test_get_config_file_contents_with_single_run() {
 
         $mockbuilder = $this->getMockBuilder('behat_config_util');
-        $mockbuilder->onlyMethods(array('get_theme_test_directory', 'get_list_of_themes', 'get_default_theme', 'get_theme_config'));
+        $mockbuilder->setMethods(array('get_theme_test_directory', 'get_list_of_themes', 'get_default_theme', 'get_theme_config'));
 
         $behatconfigutil = $mockbuilder->getMock();
 
@@ -165,7 +165,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
             $this->assertCount(count($paths), $suites[$themename]['paths']);
 
             foreach ($paths as $key => $feature) {
-                $this->assertStringContainsString($feature, $suites[$themename]['paths'][$key]);
+                $this->assertContains($feature, $suites[$themename]['paths'][$key]);
             }
         }
 
@@ -188,7 +188,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
     public function test_get_config_file_contents_with_single_run_no_theme() {
 
         $mockbuilder = $this->getMockBuilder('behat_config_util');
-        $mockbuilder->onlyMethods(array('get_theme_test_directory', 'get_list_of_themes', 'get_default_theme', 'get_theme_config'));
+        $mockbuilder->setMethods(array('get_theme_test_directory', 'get_list_of_themes', 'get_default_theme', 'get_theme_config'));
 
         $behatconfigutil = $mockbuilder->getMock();
 
@@ -219,7 +219,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
             $this->assertCount(count($paths), $suites[$themename]['paths']);
 
             foreach ($paths as $key => $feature) {
-                $this->assertStringContainsString($feature, $suites[$themename]['paths'][$key]);
+                $this->assertContains($feature, $suites[$themename]['paths'][$key]);
             }
         }
 
@@ -242,7 +242,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
     public function test_get_config_file_contents_with_parallel_run() {
 
         $mockbuilder = $this->getMockBuilder('behat_config_util');
-        $mockbuilder->onlyMethods(array('get_theme_test_directory', 'get_list_of_themes', 'get_default_theme', 'get_theme_config'));
+        $mockbuilder->setMethods(array('get_theme_test_directory', 'get_list_of_themes', 'get_default_theme', 'get_theme_config'));
 
         $behatconfigutil = $mockbuilder->getMock();
 
@@ -264,7 +264,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
             $this->assertCount(count($paths), $suites[$themename]['paths']);
 
             foreach ($paths as $key => $feature) {
-                $this->assertStringContainsString($feature, $suites[$themename]['paths'][$key]);
+                $this->assertContains($feature, $suites[$themename]['paths'][$key]);
             }
         }
 
@@ -295,7 +295,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
             $this->assertCount(count($paths), $suites[$themename]['paths']);
 
             foreach ($paths as $key => $feature) {
-                $this->assertStringContainsString($feature, $suites[$themename]['paths'][$key]);
+                $this->assertContains($feature, $suites[$themename]['paths'][$key]);
             }
         }
         // Check contexts.
@@ -324,7 +324,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
             $this->assertCount(count($paths), $suites[$themename]['paths']);
 
             foreach ($paths as $key => $feature) {
-                $this->assertStringContainsString($feature, $suites[$themename]['paths'][$key]);
+                $this->assertContains($feature, $suites[$themename]['paths'][$key]);
             }
         }
         // Check contexts.
@@ -345,7 +345,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
     public function test_get_config_file_contents_with_parallel_run_optimize_tags() {
 
         $mockbuilder = $this->getMockBuilder('behat_config_util');
-        $mockbuilder->onlyMethods(array('get_theme_test_directory', 'get_list_of_themes', 'get_default_theme', 'get_theme_config'));
+        $mockbuilder->setMethods(array('get_theme_test_directory', 'get_list_of_themes', 'get_default_theme', 'get_theme_config'));
 
         $behatconfigutil = $mockbuilder->getMock();
 
@@ -368,7 +368,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
             $this->assertCount(count($paths), $suites[$themename]['paths']);
 
             foreach ($paths as $key => $feature) {
-                $this->assertStringContainsString($feature, $suites[$themename]['paths'][$key]);
+                $this->assertContains($feature, $suites[$themename]['paths'][$key]);
             }
         }
         // Check contexts.
@@ -399,7 +399,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
             $this->assertCount(count($paths), $suites[$themename]['paths']);
 
             foreach ($paths as $key => $feature) {
-                $this->assertStringContainsString($feature, $suites[$themename]['paths'][$key]);
+                $this->assertContains($feature, $suites[$themename]['paths'][$key]);
             }
         }
         // Check contexts.
@@ -428,7 +428,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
             $this->assertCount(count($paths), $suites[$themename]['paths']);
 
             foreach ($paths as $key => $feature) {
-                $this->assertStringContainsString($feature, $suites[$themename]['paths'][$key]);
+                $this->assertContains($feature, $suites[$themename]['paths'][$key]);
             }
         }
         // Check contexts.
@@ -489,7 +489,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
     public function test_get_config_file_contents_with_blacklisted_tags() {
 
         $mockbuilder = $this->getMockBuilder('behat_config_util');
-        $mockbuilder->onlyMethods(array('get_theme_test_directory', 'get_list_of_themes', 'get_blacklisted_tests_for_theme',
+        $mockbuilder->setMethods(array('get_theme_test_directory', 'get_list_of_themes', 'get_blacklisted_tests_for_theme',
             'get_default_theme', 'get_theme_config'));
 
         $behatconfigutil = $mockbuilder->getMock();
@@ -532,7 +532,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
             $this->assertCount(count($paths), $suites[$themename]['paths']);
 
             foreach ($paths as $key => $feature) {
-                $this->assertStringContainsString($feature, $suites[$themename]['paths'][$key]);
+                $this->assertContains($feature, $suites[$themename]['paths'][$key]);
             }
         }
         // Check contexts.
@@ -553,7 +553,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
     public function test_get_config_file_contents_with_blacklisted_features_contexts() {
 
         $mockbuilder = $this->getMockBuilder('behat_config_util');
-        $mockbuilder->onlyMethods(array('get_theme_test_directory', 'get_list_of_themes', 'get_blacklisted_tests_for_theme',
+        $mockbuilder->setMethods(array('get_theme_test_directory', 'get_list_of_themes', 'get_blacklisted_tests_for_theme',
             'get_default_theme', 'get_theme_config'));
 
         $behatconfigutil = $mockbuilder->getMock();
@@ -611,7 +611,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
             $this->assertCount(count($paths), $suites[$themename]['paths']);
 
             foreach ($paths as $key => $feature) {
-                $this->assertStringContainsString($feature, $suites[$themename]['paths'][$key]);
+                $this->assertContains($feature, $suites[$themename]['paths'][$key]);
             }
         }
         // Check contexts.
@@ -632,7 +632,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
     public function test_core_features_to_include_in_specified_theme() {
 
         $mockbuilder = $this->getMockBuilder('behat_config_util');
-        $mockbuilder->onlyMethods(array('get_theme_test_directory', 'get_list_of_themes', 'get_default_theme', 'get_theme_config'));
+        $mockbuilder->setMethods(array('get_theme_test_directory', 'get_list_of_themes', 'get_default_theme', 'get_theme_config'));
 
         $behatconfigutil = $mockbuilder->getMock();
 
@@ -646,7 +646,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
             $this->assertCount(count($paths), $suites[$themename]['paths']);
 
             foreach ($paths as $key => $feature) {
-                $this->assertStringContainsString($feature, $suites[$themename]['paths'][$key]);
+                $this->assertContains($feature, $suites[$themename]['paths'][$key]);
             }
         }
 
@@ -662,7 +662,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
             $this->assertCount(count($paths), $suites[$themename]['paths']);
 
             foreach ($paths as $key => $feature) {
-                $this->assertStringContainsString($feature, $suites[$themename]['paths'][$key]);
+                $this->assertContains($feature, $suites[$themename]['paths'][$key]);
             }
         }
 
@@ -678,7 +678,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
             $this->assertCount(count($paths), $suites[$themename]['paths']);
 
             foreach ($paths as $key => $feature) {
-                $this->assertStringContainsString($feature, $suites[$themename]['paths'][$key]);
+                $this->assertContains($feature, $suites[$themename]['paths'][$key]);
             }
         }
 
@@ -693,7 +693,7 @@ class tool_behat_manager_util_testcase extends advanced_testcase {
             $this->assertCount(count($paths), $suites[$themename]['paths']);
 
             foreach ($paths as $key => $feature) {
-                $this->assertStringContainsString($feature, $suites[$themename]['paths'][$key]);
+                $this->assertContains($feature, $suites[$themename]['paths'][$key]);
             }
         }
     }

admin/tool/behat/version.php

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

admin/tool/brickfield/LICENSE_QUAIL.txt

@@ -1,219 +0,0 @@
-PLEASE NOTE:
-
-There are included libraries in the directory quail/common/services which might have different (but compatible) licenses than the one covered in this file. Current licenses include:
-    *The current BSD:
-        *services/readability/php-text-statistics
-    *The MIT License:
-        *common/css.php The function parseSelector is from the PHPQuery project:
-            *http://code.google.com/p/phpquery
-
-GNU GENERAL PUBLIC LICENSE
-
-Version 3, 29 June 2007
-
-Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
-
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-Preamble
-
-The GNU General Public License is a free, copyleft license for software and other kinds of works.
-
-The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things.
-
-To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others.
-
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
-
-Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it.
-
-For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions.
-
-Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users.
-
-Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free.
-
-The precise terms and conditions for copying, distribution and modification follow.
-TERMS AND CONDITIONS
-0. Definitions.
-
-ÒThis LicenseÓ refers to version 3 of the GNU General Public License.
-
-ÒCopyrightÓ also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.
-
-ÒThe ProgramÓ refers to any copyrightable work licensed under this License. Each licensee is addressed as ÒyouÓ. ÒLicenseesÓ and ÒrecipientsÓ may be individuals or organizations.
-
-To ÒmodifyÓ a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a Òmodified versionÓ of the earlier work or a work Òbased onÓ the earlier work.
-
-A Òcovered workÓ means either the unmodified Program or a work based on the Program.
-
-To ÒpropagateÓ a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.
-
-To ÒconveyÓ a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.
-
-An interactive user interface displays ÒAppropriate Legal NoticesÓ to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
-1. Source Code.
-
-The Òsource codeÓ for a work means the preferred form of the work for making modifications to it. ÒObject codeÓ means any non-source form of a work.
-
-A ÒStandard InterfaceÓ means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.
-
-The ÒSystem LibrariesÓ of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A ÒMajor ComponentÓ, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.
-
-The ÒCorresponding SourceÓ for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.
-
-The Corresponding Source for a work in source code form is that same work.
-2. Basic Permissions.
-
-All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.
-
-You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.
-
-When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
-4. Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
-5. Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:
-
-    * a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
-    * b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to Òkeep intact all noticesÓ.
-    * c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
-    * d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
-
-A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an ÒaggregateÓ if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
-6. Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:
-
-    * a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
-    * b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
-    * c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
-    * d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
-    * e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
-
-A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.
-
-A ÒUser ProductÓ is either (1) a Òconsumer productÓ, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, Ònormally usedÓ refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.
-
-ÒInstallation InformationÓ for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.
-
-If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).
-
-The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.
-
-Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
-7. Additional Terms.
-
-ÒAdditional permissionsÓ are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:
-
-    * a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
-    * b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
-    * c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
-    * d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
-    * e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
-    * f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
-
-All other non-permissive additional terms are considered Òfurther restrictionsÓ within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
-8. Termination.
-
-You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).
-
-However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.
-
-Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
-9. Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
-10. Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.
-
-An Òentity transactionÓ is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
-11. Patents.
-
-A ÒcontributorÓ is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's Òcontributor versionÓ.
-
-A contributor's Òessential patent claimsÓ are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, ÒcontrolÓ includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.
-
-In the following three paragraphs, a Òpatent licenseÓ is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To ÒgrantÓ such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. ÒKnowingly relyingÓ means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.
-
-A patent license is ÒdiscriminatoryÓ if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
-12. No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
-13. Use with the GNU Affero General Public License.
-
-Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
-14. Revised Versions of this License.
-
-The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License Òor any later versionÓ applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.
-
-If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.
-
-Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
-15. Disclaimer of Warranty.
-
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM ÒAS ISÓ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-16. Limitation of Liability.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-17. Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.
-
-END OF TERMS AND CONDITIONS FOR QUAIL LIBRARY
-
-
-THE FOLLOWING LICENSE COVERS PORTIONS OF THE FILE LOCATED AT common/css.php, NAMELY THE FUNCTION parseSelector:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

admin/tool/brickfield/README.md

@@ -1,23 +0,0 @@
-# Brickfield accessibility tool plugin #
-
-Copyright (C) 2021 [Brickfield Education Labs](https://www.brickfield.ie/)
-
-The Accessibility admin tool plugin provides a simple means of checking content for any accessibility issues.
-
-Created by an enthusiastic team from Brickfield Education Labs, including:
-* Karen Holland
-* Gavin Henrick
-* Mike Churchward
-* Renée Mackey
-* Laia Joana Canet
-* Jay Churchward
-* Paul Ffrench
-* Holly Lynn
-* Michael Pound
-* Max Larkin
-
-with a little help from our friends.
-
-Portions of the htmlchecker files were derived from the ["Quail PHP Accessibility Library"](https://code.google.com/archive/p/quail-lib/).
-The Quail library (Copyright (C) 2009 Kevin Miller) is licensed under [GNU GPL v3](http://www.gnu.org/licenses/gpl.html).
-See the LICENSE_QUAIL.txt file in this directory for original Quail license information.

admin/tool/brickfield/classes/accessibility.php

@@ -1,576 +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/>.
-
-namespace tool_brickfield;
-
-use context_system;
-use moodle_exception;
-use moodle_url;
-use stdClass;
-use tool_brickfield\local\tool\filter;
-
-/**
- * Provides the Brickfield Accessibility toolkit API.
- *
- * @package    tool_brickfield
- * @copyright  2020 onward Brickfield Education Labs Ltd, https://www.brickfield.ie
- * @author     Mike Churchward (mike@brickfieldlabs.ie)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class accessibility {
-
-    /** @var string The component sub path */
-    private static $pluginpath = 'tool/brickfield';
-
-    /** @var string Supported format of topics */
-    const TOOL_BRICKFIELD_FORMAT_TOPIC = 'topics';
-
-    /** @var string Supported format of weeks */
-    const TOOL_BRICKFIELD_FORMAT_WEEKLY = 'weeks';
-
-    /**
-     * Return the state of the site enable condition.
-     * @return bool
-     */
-    public static function is_accessibility_enabled(): bool {
-        global $CFG;
-
-        if (isset($CFG->enableaccessibilitytools)) {
-            return $CFG->enableaccessibilitytools;
-        }
-
-        // Enabled by default.
-        return true;
-    }
-
-    /**
-     * Throw an error if the toolkit is not enabled.
-     * @return bool
-     * @throws moodle_exception
-     */
-    public static function require_accessibility_enabled(): bool {
-        if (!static::is_accessibility_enabled()) {
-            throw new moodle_exception('accessibilitydisabled', manager::PLUGINNAME);
-        }
-        return true;
-    }
-
-    /**
-     * Get a URL for a page within the plugin.
-     *
-     * This takes into account the value of the admin config value.
-     *
-     * @param   string $url The URL within the plugin
-     * @return  moodle_url
-     */
-    public static function get_plugin_url(string $url = ''): moodle_url {
-        $url = ($url == '') ? 'index.php' : $url;
-        $pluginpath = self::$pluginpath;
-        return new moodle_url("/admin/{$pluginpath}/{$url}");
-    }
-
-    /**
-     * Get a file path for a file within the plugin.
-     *
-     * This takes into account the value of the admin config value.
-     *
-     * @param   string $path The path within the plugin
-     * @return  string
-     */
-    public static function get_file_path(string $path): string {
-        global $CFG;
-
-        return implode(DIRECTORY_SEPARATOR, [$CFG->dirroot, $CFG->admin, self::$pluginpath, $path, ]);
-    }
-
-    /**
-     * Get the canonicalised name of a capability.
-     *
-     * @param   string $capability
-     * @return  string
-     */
-    public static function get_capability_name(string $capability): string {
-        return self::$pluginpath . ':' . $capability;
-    }
-
-    /**
-     * Get the relevant title.
-     * @param filter $filter
-     * @param int $countdata
-     * @return string
-     * @throws \coding_exception
-     * @throws \dml_exception
-     * @throws \moodle_exception
-     */
-    public static function get_title(filter $filter, int $countdata): string {
-        global $DB;
-
-        $tmp = new \stdClass();
-        $tmp->count = $countdata;
-        $langstr = 'title' . $filter->tab . 'partial';
-
-        if ($filter->courseid != 0) {
-            $thiscourse = get_fast_modinfo($filter->courseid)->get_course();
-            $tmp->name = $thiscourse->fullname;
-        } else {
-            $langstr = 'title' . $filter->tab . 'all';
-        }
-        return get_string($langstr, manager::PLUGINNAME, $tmp);
-    }
-
-    /**
-     * Function to be run periodically according to the scheduled task.
-     * Return true if a process was completed. False if no process executed.
-     * Finds all unprocessed courses for bulk batch processing and completes them.
-     * @param int $batch
-     * @return bool
-     * @throws \ReflectionException
-     * @throws \coding_exception
-     * @throws \ddl_exception
-     * @throws \ddl_table_missing_exception
-     * @throws \dml_exception
-     */
-    public static function bulk_process_courses_cron(int $batch = 0): bool {
-        global $PAGE;
-
-        // Run a registration check.
-        if (!(new registration())->validate()) {
-            return false;
-        }
-
-        if (analysis::is_enabled()) {
-            $PAGE->set_context(context_system::instance());
-            mtrace("Starting cron for bulk_process_courses");
-            // Do regular processing. True if full deployment type isn't selected as well.
-            static::bulk_processing($batch);
-            mtrace("Ending cron for bulk_process_courses");
-            return true;
-        } else {
-            mtrace('Content analysis is currently disabled in settings.');
-            return false;
-        }
-    }
-
-    /**
-     * Bulk processing.
-     * @param int $batch
-     * @return bool
-     */
-    protected static function bulk_processing(int $batch = 0): bool {
-        manager::check_course_updates();
-        mtrace("check_course_updates completed at " . time());
-        $recordsprocessed = manager::check_scheduled_areas($batch);
-        mtrace("check_scheduled_areas completed at " . time());
-        manager::check_scheduled_deletions();
-        mtrace("check_scheduled_deletions completed at " . time());
-        manager::delete_historical_data();
-        mtrace("delete_historical_data completed at " . time());
-        return $recordsprocessed;
-    }
-
-    /**
-     * Function to be run periodically according to the scheduled task.
-     * Finds all unprocessed courses for cache processing and completes them.
-     */
-    public static function bulk_process_caches_cron() {
-        global $DB;
-
-        // Run a registration check.
-        if (!(new registration())->validate()) {
-            return;
-        }
-
-        if (analysis::is_enabled()) {
-            mtrace("Starting cron for bulk_process_caches");
-            // Monitor ongoing caching requests.
-            $fields = 'DISTINCT courseid';
-            $reruns = $DB->get_records(manager::DB_PROCESS, ['item' => 'cache'], '', $fields);
-            foreach ($reruns as $rerun) {
-                mtrace("Running rerun caching for Courseid " . $rerun->courseid);
-                manager::store_result_summary($rerun->courseid);
-                mtrace("rerun cache completed at " . time());
-                $DB->delete_records(manager::DB_PROCESS, ['courseid' => $rerun->courseid, 'item' => 'cache']);
-            }
-            mtrace("Ending cron for bulk_process_caches at " . time());
-        } else {
-            mtrace('Content analysis is currently disabled in settings.');
-        }
-    }
-
-    /**
-     * This function runs the checks on the html item
-     *
-     * @param string $html The html string to be analysed; might be NULL.
-     * @param int $contentid The content area ID
-     * @param int $processingtime
-     * @param int $resultstime
-     */
-    public static function run_check(string $html, int $contentid, int &$processingtime, int &$resultstime) {
-        global $DB;
-
-        // Change the limit if 10,000 is not appropriate.
-        $bulkrecordlimit = manager::BULKRECORDLIMIT;
-        $bulkrecordcount = 0;
-
-        $checkids = static::checkids();
-        $checknameids = array_flip($checkids);
-
-        $testname = 'brickfield';
-
-        $stime = time();
-
-        // Swapping in new library.
-        $htmlchecker = new local\htmlchecker\brickfield_accessibility($html, $testname, 'string');
-        $htmlchecker->run_check();
-        $tests = $htmlchecker->guideline->get_tests();
-        $report = $htmlchecker->get_report();
-        $processingtime += (time() - $stime);
-
-        $records = [];
-        foreach ($tests as $test) {
-            $records[$test]['count'] = 0;
-            $records[$test]['errors'] = [];
-        }
-
-        foreach ($report['report'] as $a) {
-            if (!isset($a['type'])) {
-                continue;
-            }
-            $type = $a['type'];
-            $records[$type]['errors'][] = $a;
-            if (!isset($records[$type]['count'])) {
-                $records[$type]['count'] = 0;
-            }
-            $records[$type]['count']++;
-        }
-
-        $stime = time();
-        $returnchecks = [];
-        $errors = [];
-
-        // Build up records for inserting.
-        foreach ($records as $key => $rec) {
-            $recordres = new stdClass();
-            // Handling if checkid is unknown.
-            $checkid = (isset($checknameids[$key])) ? $checknameids[$key] : 0;
-            $recordres->contentid = $contentid;
-            $recordres->checkid = $checkid;
-            $recordres->errorcount = $rec['count'];
-
-            // Build error inserts if needed.
-            if ($rec['count'] > 0) {
-                foreach ($rec['errors'] as $tmp) {
-                    $error = new stdClass();
-                    $error->resultid = 0;
-                    $error->linenumber = $tmp['lineNo'];
-                    $error->htmlcode = $tmp['html'];
-                    $error->errordescription = $tmp['title'];
-                    // Add contentid and checkid so that we can query for the results record id later.
-                    $error->contentid = $contentid;
-                    $error->checkid = $checkid;
-                    $errors[] = $error;
-                }
-            }
-            $returnchecks[] = $recordres;
-            $bulkrecordcount++;
-
-            // If we've hit the bulk limit, write the results records and reset.
-            if ($bulkrecordcount > $bulkrecordlimit) {
-                $DB->insert_records(manager::DB_RESULTS, $returnchecks);
-                $bulkrecordcount = 0;
-                $returnchecks = [];
-                // Get the results id value for each error record and write the errors.
-                foreach ($errors as $key2 => $error) {
-                    $errors[$key2]->resultid = $DB->get_field(manager::DB_RESULTS, 'id',
-                        ['contentid' => $error->contentid, 'checkid' => $error->checkid]);
-                    unset($errors[$key2]->contentid);
-                    unset($errors[$key2]->checkid);
-                }
-                $DB->insert_records(manager::DB_ERRORS, $errors);
-                $errors = [];
-            }
-        }
-
-        // Write any leftover records.
-        if ($bulkrecordcount > 0) {
-            $DB->insert_records(manager::DB_RESULTS, $returnchecks);
-            // Get the results id value for each error record and write the errors.
-            foreach ($errors as $key => $error) {
-                $errors[$key]->resultid = $DB->get_field(manager::DB_RESULTS, 'id',
-                    ['contentid' => $error->contentid, 'checkid' => $error->checkid]);
-                unset($errors[$key]->contentid);
-                unset($errors[$key]->checkid);
-            }
-            $DB->insert_records(manager::DB_ERRORS, $errors);
-        }
-
-        $resultstime += (time() - $stime);
-    }
-
-    /**
-     * This function runs one specified check on the html item
-     *
-     * @param string $html The html string to be analysed; might be NULL.
-     * @param int $contentid The content area ID
-     * @param int $errid The error ID
-     * @param string $check The check name to run
-     * @param int $processingtime
-     * @param int $resultstime
-     * @throws \coding_exception
-     * @throws \dml_exception
-     */
-    public static function run_one_check(
-        string $html = null,
-        int $contentid,
-        int $errid,
-        string $check,
-        int &$processingtime,
-        int &$resultstime
-    ) {
-        global $DB;
-
-        $stime = time();
-
-        $checkdata = $DB->get_record(manager::DB_CHECKS, ['shortname' => $check], 'id,shortname,severity');
-
-        $testname = 'brickfield';
-
-        // Swapping in new library.
-        $htmlchecker = new local\htmlchecker\brickfield_accessibility($html, $testname, 'string');
-        $htmlchecker->run_check();
-        $report = $htmlchecker->get_test($check);
-        $processingtime += (time() - $stime);
-
-        $record = [];
-        $record['count'] = 0;
-        $record['errors'] = [];
-
-        foreach ($report as $a) {
-            $a->html = $a->get_html();
-            $record['errors'][] = $a;
-            $record['count']++;
-        }
-
-        // Build up record for inserting.
-        $recordres = new stdClass();
-        // Handling if checkid is unknown.
-        $checkid = (isset($checkdata->id)) ? $checkdata->id : 0;
-        $recordres->contentid = $contentid;
-        $recordres->checkid = $checkid;
-        $recordres->errorcount = $record['count'];
-        if ($exists = $DB->get_record(manager::DB_RESULTS, ['contentid' => $contentid, 'checkid' => $checkid])) {
-            $resultid = $exists->id;
-            $DB->set_field(manager::DB_RESULTS, 'errorcount', $record['count'], ['id' => $resultid]);
-            // Remove old error records for specific resultid, if existing.
-            $DB->delete_records(manager::DB_ERRORS, ['id' => $errid]);
-        } else {
-            $resultid = $DB->insert_record(manager::DB_RESULTS, $recordres);
-        }
-        $errors = [];
-
-        // Build error inserts if needed.
-        if ($record['count'] > 0) {
-            // Reporting all found errors for this check, so need to ignore existing other error records.
-            foreach ($record['errors'] as $tmp) {
-                // Confirm if error is reported separately.
-                if ($DB->record_exists_select(manager::DB_ERRORS,
-                    'resultid = ? AND ' . $DB->sql_compare_text('htmlcode', 255) . ' = ' . $DB->sql_compare_text('?', 255),
-                    [$resultid, html_entity_decode($tmp->html)])) {
-                    continue;
-                }
-                $error = new stdClass();
-                $error->resultid = $resultid;
-                $error->linenumber = $tmp->line;
-                $error->htmlcode = html_entity_decode($tmp->html);
-                $errors[] = $error;
-            }
-
-            $DB->insert_records(manager::DB_ERRORS, $errors);
-        }
-
-        $resultstime += (time() - $stime);
-    }
-
-    /**
-     * Returns all of the id's and shortnames of all of the checks.
-     * @param int $status
-     * @return array
-     * @throws \dml_exception
-     */
-    public static function checkids(int $status = 1): array {
-        global $DB;
-
-        $checks = $DB->get_records_menu(manager::DB_CHECKS, ['status' => $status], 'id ASC', 'id,shortname');
-        return $checks;
-    }
-
-    /**
-     * Returns an array of translations from htmlchecker of all of the checks, and their descriptions.
-     * @return array
-     * @throws \dml_exception
-     */
-    public static function get_translations(): array {
-        global $DB;
-
-        $htmlchecker = new local\htmlchecker\brickfield_accessibility('test', 'brickfield', 'string');
-        $htmlchecker->run_check();
-        ksort($htmlchecker->guideline->translations);
-
-        // Need to limit to active checks.
-        $activechecks = $DB->get_fieldset_select(manager::DB_CHECKS, 'shortname', 'status = :status', ['status' => 1]);
-
-        $translations = [];
-        foreach ($htmlchecker->guideline->translations as $key => $trans) {
-            if (in_array($key, $activechecks)) {
-                $translations[$key] = $trans;
-            }
-        }
-
-        return $translations;
-    }
-
-    /**
-     * Returns an array of all of the course id's for a given category.
-     * @param int $categoryid
-     * @return array|null
-     * @throws \dml_exception
-     */
-    public static function get_category_courseids(int $categoryid): ?array {
-        global $DB;
-
-        if (!$DB->record_exists('course_categories', ['id' => $categoryid])) {
-            return null;
-        }
-
-        $sql = "SELECT {course}.id
-              FROM {course}, {course_categories}
-             WHERE {course}.category = {course_categories}.id
-               AND (
-                " . $DB->sql_like('path', ':categoryid1') . "
-             OR " . $DB->sql_like('path', ':categoryid2') . "
-        )";
-        $params = ['categoryid1' => "%/$categoryid/%", 'categoryid2' => "%/$categoryid"];
-        $courseids = $DB->get_fieldset_sql($sql, $params);
-
-        return $courseids;
-    }
-
-    /**
-     * Get summary data for this site.
-     * @param int $id
-     * @return \stdClass
-     * @throws \dml_exception
-     */
-    public static function get_summary_data(int $id): \stdClass {
-        global $CFG, $DB;
-
-        $components = $DB->get_records(manager::DB_AREAS);
-
-        $summarydata = new \stdClass();
-        $summarydata->siteurl = (substr($CFG->wwwroot, -1) !== '/') ? $CFG->wwwroot . '/' : $CFG->wwwroot;
-        $summarydata->moodlerelease = (preg_match('/^(\d+\.\d.*?)[. ]/', $CFG->release, $matches)) ? $matches[1] : $CFG->release;
-        $summarydata->numcourses = $DB->count_records('course') - 1;
-        $summarydata->numusers = $DB->count_records('user', array('deleted' => 0));
-        $summarydata->numfiles = $DB->count_records('files');
-        $summarydata->numfactivities = $DB->count_records('course_modules');
-        $summarydata->mobileservice = (int)$CFG->enablemobilewebservice === 1 ? true : false;
-        $summarydata->usersmobileregistered = $DB->count_records('user_devices');
-        $summarydata->contenttyperesults = static::get_contenttyperesults($id, $components);
-        $summarydata->contenttypeerrors = static::get_contenttypeerrors();
-        $summarydata->percheckerrors = static::get_percheckerrors();
-        return $summarydata;
-    }
-
-    /**
-     * Get content type results.
-     * @param int $id
-     * @param array $components
-     * @return \stdClass
-     */
-    private static function get_contenttyperesults(int $id, array $components): \stdClass {
-        $contenttyperesults = new \stdClass();
-        $contenttyperesults->id = $id;
-        $datacomponents = array();
-        foreach ($components as $component) {
-            $datacomponents[$component->component][] = $component;
-        }
-        $contenttyperesults->contenttype = new \stdClass();
-        foreach ($datacomponents as $key => $component) {
-            $contenttyperesults->contenttype->$key = count($component);
-        }
-        $contenttyperesults->summarydatastorage = static::get_summary_data_storage();
-        $contenttyperesults->datachecked = time(); // Correct??
-        return $contenttyperesults;
-    }
-
-
-    /**
-     * Get per check errors.
-     * @return stdClass
-     * @throws dml_exception
-     */
-    private static function get_percheckerrors(): stdClass {
-        global $DB;
-
-        $sql = 'SELECT ' . $DB->sql_concat_join("'_'", ['courseid', 'checkid']) . ' as tmpid,
-                       ca.courseid, ca.status, ca.checkid, ch.shortname, ca.checkcount, ca.errorcount
-                  FROM {' . manager::DB_CACHECHECK . '} ca
-            INNER JOIN {' . manager::DB_CHECKS . '} ch on ch.id = ca.checkid
-              ORDER BY courseid, checkid ASC';
-
-        $combo = $DB->get_records_sql($sql);
-
-        return (object) [
-            'percheckerrors' => $combo,
-        ];
-    }
-
-    /**
-     * Get content type errors.
-     * @return stdClass
-     * @throws dml_exception
-     */
-    private static function get_contenttypeerrors(): stdClass {
-        global $DB;
-
-        $fields = 'courseid, status, activities, activitiespassed, activitiesfailed,
-                    errorschecktype1, errorschecktype2, errorschecktype3, errorschecktype4,
-                    errorschecktype5, errorschecktype6, errorschecktype7,
-                    failedchecktype1, failedchecktype2, failedchecktype3, failedchecktype4,
-                    failedchecktype5, failedchecktype6, failedchecktype7,
-                    percentchecktype1, percentchecktype2, percentchecktype3, percentchecktype4,
-                    percentchecktype5, percentchecktype6, percentchecktype7';
-        $combo = $DB->get_records(manager::DB_SUMMARY, null, 'courseid ASC', $fields);
-
-        return (object) [
-            'typeerrors' => $combo,
-        ];
-    }
-
-    /**
-     * Get summary data storage.
-     * @return array
-     * @throws dml_exception
-     */
-    private static function get_summary_data_storage(): array {
-        global $DB;
-
-        $fields = $DB->sql_concat_join("''", ['component', 'courseid']) . ' as tmpid,
-                 courseid, component, errorcount, totalactivities, failedactivities, passedactivities';
-        $combo = $DB->get_records(manager::DB_CACHEACTS, null, 'courseid, component ASC', $fields);
-        return $combo;
-    }
-}

admin/tool/brickfield/classes/analysis.php

@@ -1,95 +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/>.
-
-namespace tool_brickfield;
-
-use tool_brickfield\task\process_analysis_requests;
-
-/**
- * Analysis and deployment class.
- *
- * @package tool_brickfield
- * @copyright  2020 Brickfield Education Labs https://www.brickfield.ie
- * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class analysis {
-
-    /**
-     * Indicates that analysis of content has been enabled.
-     */
-    const ANALYSISDISABLED = '0';
-
-    /**
-     * Indicates that analysis is enabled and using request method.
-     */
-    const ANALYSISBYREQUEST = '1';
-
-    /**
-     * Return the type of analysis being used (currently only request).
-     *
-     * @return false|mixed|object|string|null
-     * @throws \dml_exception
-     */
-    public static function get_type() {
-        // Moodle caches these calls, so it's not expensive.
-        return get_config(manager::PLUGINNAME, 'analysistype');
-    }
-
-    /**
-     * Return true is analysis has been enabled.
-     *
-     * @return bool
-     * @throws \dml_exception
-     */
-    public static function is_enabled(): bool {
-        $analysistype = static::get_type();
-        return ($analysistype !== false) && ($analysistype !== self::ANALYSISDISABLED);
-    }
-
-    /**
-     * Return true if analysis is by request method.
-     *
-     * @return bool
-     * @throws \dml_exception
-     */
-    public static function type_is_byrequest(): bool {
-        return static::get_type() === self::ANALYSISBYREQUEST;
-    }
-
-    /**
-     * Return true if the course has been analyzed.
-     *
-     * @param int $courseid
-     * @return bool
-     * @throws \dml_exception
-     */
-    public static function is_course_analyzed(int $courseid): bool {
-        return scheduler::is_course_analyzed($courseid);
-    }
-
-    /**
-     * Return a redirect message with the earliest time expected for analysis to complete.
-     * @return \lang_string|string
-     * @throws \coding_exception
-     */
-    public static function redirect_message() {
-        $epoch = new process_analysis_requests;
-        $time = userdate($epoch->get_next_scheduled_time(), get_string('strftimetime', 'core_langconfig'));
-        $message = get_string('confirmationmessage', manager::PLUGINNAME, $time);
-
-        return $message;
-    }
-}

admin/tool/brickfield/classes/area_base.php

@@ -1,219 +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/>.
-
-namespace tool_brickfield;
-
-/**
- * Area base class.
- *
- * @package    tool_brickfield
- * @copyright  2020 Brickfield Education Labs https://www.brickfield.ie
- */
-abstract class area_base {
-
-    /**
-     * Defines the unknown for the 'checkgroup' field in the tool_brickfield_checks table.
-     */
-    const CHECKGROUP_UNKNOWN = 0;
-
-    /**
-     * Defines the form for the 'checkgroup' field in the tool_brickfield_checks table.
-     */
-    const CHECKGROUP_FORM = 1;
-
-    /**
-     * Defines the image for the 'checkgroup' field in the tool_brickfield_checks table.
-     */
-    const CHECKGROUP_IMAGE = 2;
-
-    /**
-     * Defines the layout for the 'checkgroup' field in the tool_brickfield_checks table.
-     */
-    const CHECKGROUP_LAYOUT = 3;
-
-    /**
-     * Defines the link for the 'checkgroup' field in the tool_brickfield_checks table.
-     */
-    const CHECKGROUP_LINK = 4;
-
-    /**
-     * Defines the media for the 'checkgroup' field in the tool_brickfield_checks table.
-     */
-    const CHECKGROUP_MEDIA = 5;
-
-    /**
-     * Defines the table for the 'checkgroup' field in the tool_brickfield_checks table.
-     */
-    const CHECKGROUP_TABLE = 6;
-
-    /**
-     * Defines the text for the 'checkgroup' field in the tool_brickfield_checks table.
-     */
-    const CHECKGROUP_TEXT = 7;
-
-    /** @var string[] Array for quick access of string names for 'checkgroups'. */
-    const CHECKGROUP_NAMES = [
-        self::CHECKGROUP_UNKNOWN => 'unknown',
-        self::CHECKGROUP_FORM => 'form',
-        self::CHECKGROUP_IMAGE => 'image',
-        self::CHECKGROUP_LAYOUT => 'layout',
-        self::CHECKGROUP_LINK => 'link',
-        self::CHECKGROUP_MEDIA => 'media',
-        self::CHECKGROUP_TABLE => 'table',
-        self::CHECKGROUP_TEXT => 'text'
-    ];
-
-    /**
-     * Defines field value.
-     */
-    const TYPE_FIELD = 0;
-
-    /**
-     * Defines file value.
-     */
-    const TYPE_FILE = 1;
-
-    /**
-     * Return the name for the specified checkgroup value, or 'unknown' if no valid name for the value. Preferably, use this rather
-     * than direct access to CHECKGROUP_NAMES, since it checks value boundaries.
-     * @param int $checkgroupvalue
-     * @return string
-     */
-    final public static function checkgroup_name(int $checkgroupvalue): string {
-        if (($checkgroupvalue < 0) || ($checkgroupvalue >= count(self::CHECKGROUP_NAMES))) {
-            return self::CHECKGROUP_NAMES[self::CHECKGROUP_UNKNOWN];
-        } else {
-            return self::CHECKGROUP_NAMES[$checkgroupvalue];
-        }
-    }
-
-    /**
-     * Return the value for the specified checkgroup name, or the unknown value if no valid value for the name.
-     * @param string $checkgroupname
-     * @return int
-     */
-    final public static function checkgroup_value(string $checkgroupname): int {
-        $value = array_search($checkgroupname, self::CHECKGROUP_NAMES);
-        return ($value !== false) ? $value : self::CHECKGROUP_UNKNOWN;
-    }
-
-    /**
-     * Return the defined content type.
-     * @return int
-     */
-    protected function get_type(): int {
-        return self::TYPE_FIELD;
-    }
-
-    /**
-     * Return the component from the full class name.
-     * @return mixed|string
-     */
-    public function get_component(): string {
-        $parts = preg_split('|\\\\|', get_class($this));
-        return $parts[3];
-    }
-
-    /**
-     * Check if the system plugin is avaliable.
-     * @return bool
-     */
-    public function is_available(): bool {
-        list($type, $plugin) = \core_component::normalize_component($this->get_component());
-        if ($type === 'core') {
-            // We assume that all core components are defined corretly.
-            return true;
-        }
-        // Some contrib plugins may not be installed.
-        return ($dir = \core_component::get_component_directory($this->get_component()))
-            && file_exists($dir . '/version.php');
-    }
-
-    /**
-     * Return the name of the database table where information is stored
-     * @return string
-     */
-    abstract public function get_tablename(): string;
-
-    /**
-     * Return the name of the reference data table name.
-     * @return string
-     */
-    public function get_ref_tablename(): string {
-        return '';
-    }
-
-    /**
-     * Return the name of the field in the table that has the content
-     * @return string
-     */
-    abstract public function get_fieldname(): string;
-
-    /**
-     * Return a recordset of the relevant areas for the component/module.
-     * @param \core\event\base $event
-     * @return \moodle_recordset|null
-     */
-    abstract public function find_relevant_areas(\core\event\base $event): ?\moodle_recordset;
-
-    /**
-     * Return a recordset of the course areas for the course id.
-     * @param int $courseid
-     * @return \moodle_recordset|null
-     */
-    abstract public function find_course_areas(int $courseid): ?\moodle_recordset;
-
-    /**
-     * Return an array of area objects that contain content at the site and system levels only. Override this where necessary.
-     * @return \moodle_recordset|null
-     */
-    public function find_system_areas(): ?\moodle_recordset {
-        return null;
-    }
-
-    /**
-     * The standard Moodle parameter DML parameter substitution doesn't work on all versions of MySQL or Postgres, so we need to use
-     * inline function substitution to ensure that the left side is a string.
-     * @return string
-     */
-    public function get_standard_area_fields_sql(): string {
-        return '\'' . $this->get_component() . '\' AS component,
-            \'' . $this->get_tablename() . '\' AS tablename,
-            \'' . $this->get_fieldname() . '\' AS fieldorarea, ';
-    }
-
-    /**
-     * The standard Moodle parameter DML parameter substitution doesn't work on all versions of MySQL or Postgres, so we need to use
-     * inline function substitution to ensure that the left side is a string.
-     * @return string
-     */
-    public function get_reftable_field_sql(): string {
-        return '\'' . $this->get_ref_tablename() . '\' AS reftable, ';
-    }
-
-    /**
-     * Processes any sql filtering data. Implement in extensions.
-     *
-     * @return null
-     * @throws \coding_exception
-     * @throws \dml_exception
-     */
-    public function get_courseid_filtering() {
-        $this->filter = '';
-        $this->filterparams = [];
-        return null;
-    }
-}

admin/tool/brickfield/classes/brickfieldconnect.php

@@ -1,258 +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/>.
-
-namespace tool_brickfield;
-
-defined('MOODLE_INTERNAL') || die;
-
-// The curl class is in filelib.
-global $CFG;
-require_once("{$CFG->libdir}/filelib.php");
-
-use curl;
-use moodle_url;
-
-/**
- * Class brickfieldconnect. Contains all function to connect to Brickfield external services.
- *
- * @package     tool_brickfield
- * @author      2020 Onwards Mike Churchward <mike@brickfieldlabs.ie>
- * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL
- */
-class brickfieldconnect extends curl {
-
-    /** @var string The base api uri. */
-    private static $baseapiuri = 'https://api.mybrickfield.ie/moodle/';
-
-    /** @var array Endpoint details for setting and checking a site registration */
-    const ACTION_CHECK_REGISTRATION = [
-        'endpoint' => 'checkRegister',
-        'method' => 'get',
-    ];
-
-    /** @var array Endpoint details for sending site summary data */
-    const ACTION_SEND_SUMMARY = [
-        'endpoint' => 'summary',
-        'method' => 'post',
-    ];
-
-    /**
-     * Object method to test whether site is already registered.
-     * @return bool
-     */
-    public function is_registered(): bool {
-        return !empty($this->get_registration_id_for_credentials());
-    }
-
-    /**
-     * Update registration of this site.
-     * @param   string $apikey The API key to use for the registration attempt
-     * @param   string $secretkey The secret key to use
-     * @return  bool
-     */
-    public function update_registration(string $apikey, string $secretkey): bool {
-        $registrationid = $this->get_registration_id_for_credentials($apikey, $secretkey);
-        if (empty($registrationid)) {
-            return false;
-        }
-
-        (new registration())->set_siteid($registrationid);
-        return true;
-    }
-
-    /**
-     * Send the summary data to Brickfield.
-     * @return bool
-     * @throws \dml_exception
-     */
-    public function send_summary(): bool {
-        // Run a registration check.
-        if (!(new registration())->validate()) {
-            return false;
-        }
-
-        $headers = $this->get_common_headers();
-
-        // Sanity-check $headers 'id' value.
-        if (!isset($headers['id'])) {
-            return false;
-        }
-
-        $this->set_headers($headers);
-        $summary = accessibility::get_summary_data($headers['id']);
-        $body = json_encode($summary, JSON_UNESCAPED_SLASHES);
-        $result = json_decode($this->call(self::ACTION_SEND_SUMMARY, $body));
-        if (is_object($result) && ((int)$result->statusCode === 200)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Get the URL required for the command.
-     *
-     * @param   array $command The command to call, for example see self::ACTION_REGISTER
-     * @return  string The complete URL
-     */
-    protected function get_url_for_command(array $command): string {
-        return $this->get_baseapiuri() . $command['endpoint'];
-    }
-
-    /**
-     * Call the specified command.
-     *
-     * @param array $command The command to call, for example see self::ACTION_REGISTER
-     * @param array|string $params The params provided to the call
-     * @return  string The response body
-     */
-    protected function call(array $command, $params = ''): string {
-        $url = $this->get_url_for_command($command);
-        if ($command['method'] === 'get') {
-            return $this->get($url, $params);
-        }
-
-        if ($command['method'] === 'post') {
-            return $this->post($url, $params);
-        }
-
-        return '';
-    }
-
-    /**
-     * Get the common headers used for all calls to the Brickfields endpoints.
-     *
-     * @return  array
-     */
-    protected function get_common_headers(): array {
-        $headers = [
-            'Cache-Control' => 'no-cache',
-            'Content-Type' => 'application/json',
-            'siteurl' => static::get_siteurl(),
-        ];
-
-        if (static::has_registration_key()) {
-            $registration = new registration();
-            $headers['secret'] = $registration->get_api_key();
-            $headers['userhash'] = $registration->get_secret_key();
-            $headers['id'] = $registration->get_siteid();
-        }
-
-        return $headers;
-    }
-
-    /**
-     * Set headers on the request from the specified list of headers.
-     *
-     * @param   array $headers An array of header name => value
-     */
-    protected function set_headers(array $headers) {
-        foreach ($headers as $key => $value) {
-            $this->setHeader("{$key}: {$value}");
-        }
-    }
-
-    /**
-     * Whether the site currently has a registration key stored.
-     *
-     * @return  bool
-     */
-    protected function has_registration_key(): bool {
-        $registration = new registration();
-        $localkey = $registration->get_api_key();
-        $localhash = $registration->get_secret_key();
-        $localid = $registration->get_siteid();
-
-        if (!$localhash || !$localkey || !$localid) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Get a normalised URL for the site.
-     *
-     * @return  string
-     */
-    protected function get_siteurl(): string {
-        return (new moodle_url('/'))->out(false);
-    }
-
-    /**
-     * Get the registration ID for the given set of credentials.
-     * @param   null|string $apikey The API key to use for the registration attempt
-     * @param   null|string $secretkey The secret key to use
-     * @return  null|string The registration ID if registration was successful, or null if not
-     */
-    protected function get_registration_id_for_credentials(string $apikey = null, string $secretkey = null): string {
-        $headers = $this->get_common_headers();
-        if ($apikey || $secretkey) {
-            $headers['secret'] = $apikey;
-            $headers['userhash'] = $secretkey;
-        } else if (!$this->has_registration_key()) {
-            return '';
-        }
-
-        $this->set_headers($headers);
-        $response = $this->call(self::ACTION_CHECK_REGISTRATION);
-
-        if ((int)$this->info['http_code'] !== 200) {
-            // The response was unsuccessful.
-            return '';
-        }
-
-        $result = json_decode($response);
-        if (!$result) {
-            // The response could not be decoded.
-            return '';
-        }
-
-        if ((int)$result->statusCode !== 200) {
-            // The data from the response suggests a failure.
-            return '';
-        }
-
-        // Decode the actual result.
-        $registrationdata = json_decode($result->body);
-        if (empty($registrationdata) || !is_array($registrationdata)) {
-            // Unable to decode the body of the response.
-            return '';
-        }
-
-        if (!property_exists($registrationdata[0], 'id') || !property_exists($registrationdata[0]->id, 'N')) {
-            // Unable to find a valid id in the response.
-            return '';
-        }
-
-        return $registrationdata[0]->id->N;
-    }
-
-    /**
-     * Get the check registration API URI.
-     * @return string
-     * @throws dml_exception
-     */
-    protected function get_baseapiuri(): string {
-        $baseapiuri = get_config(manager::PLUGINNAME, 'baseapiuri');
-        if (!empty($baseapiuri)) {
-            return $baseapiuri;
-        } else {
-            set_config('baseapiuri', self::$baseapiuri, manager::PLUGINNAME);
-            return self::$baseapiuri;
-        }
-    }
-}

admin/tool/brickfield/classes/event/analysis_requested.php

@@ -1,54 +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/>.
-
-namespace tool_brickfield\event;
-
-use tool_brickfield\manager;
-
-/**
- * Class analysis_requested
- *
- * @package tool_brickfield
- * @copyright 2020 onward Brickfield Education Labs, https://www.brickfield.ie
- * @author Mike Churchward <mike@brickfieldlabs.ie>
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL
- */
-class analysis_requested extends \core\event\base {
-
-    /**
-     * Init function.
-     */
-    protected function init() {
-        $this->data['crud'] = 'c';
-        $this->data['edulevel'] = self::LEVEL_OTHER;
-    }
-
-    /**
-     * Get name.
-     * @return \lang_string|string
-     */
-    public static function get_name() {
-        return get_string('eventanalysis_requested', manager::PLUGINNAME);
-    }
-
-    /**
-     * Get description.
-     * @return \lang_string|string|null
-     */
-    public function get_description() {
-        return get_string('eventanalysis_requesteddesc', manager::PLUGINNAME, $this->other['course']);
-    }
-}

admin/tool/brickfield/classes/event/report_downloaded.php

@@ -1,54 +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/>.
-
-namespace tool_brickfield\event;
-
-use tool_brickfield\manager;
-
-/**
- * Class report_downloaded
- *
- * @package tool_brickfield
- * @copyright 2020 onward Brickfield Education Labs, https://www.brickfield.ie
- * @author Mike Churchward <mike@brickfieldlabs.ie>
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL
- */
-class report_downloaded extends \core\event\base {
-
-    /**
-     * Init function.
-     */
-    protected function init() {
-        $this->data['crud'] = 'r';
-        $this->data['edulevel'] = self::LEVEL_OTHER;
-    }
-
-    /**
-     * Get name.
-     * @return \lang_string|string
-     */
-    public static function get_name() {
-        return get_string('eventreport_downloaded', manager::PLUGINNAME);
-    }
-
-    /**
-     * Get description.
-     * @return \lang_string|string|null
-     */
-    public function get_description() {
-        return get_string('eventreport_downloadeddesc', manager::PLUGINNAME, $this->courseid);
-    }
-}

admin/tool/brickfield/classes/event/report_viewed.php

@@ -1,54 +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/>.
-
-namespace tool_brickfield\event;
-
-use tool_brickfield\manager;
-
-/**
- * Class report_viewed
- *
- * @package tool_brickfield
- * @copyright 2020 onward Brickfield Education Labs, https://www.brickfield.ie
- * @author Mike Churchward <mike@brickfieldlabs.ie>
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL
- */
-class report_viewed extends \core\event\base {
-
-    /**
-     * Init function.
-     */
-    protected function init() {
-        $this->data['crud'] = 'r';
-        $this->data['edulevel'] = self::LEVEL_OTHER;
-    }
-
-    /**
-     * Get name.
-     * @return \lang_string|string
-     */
-    public static function get_name() {
-        return get_string('eventreport_viewed', manager::PLUGINNAME);
-    }
-
-    /**
-     * Get description.
-     * @return \lang_string|string|null
-     */
-    public function get_description() {
-        return get_string('eventreport_vieweddesc', manager::PLUGINNAME, (object)$this->other);
-    }
-}

admin/tool/brickfield/classes/eventobservers.php

@@ -1,438 +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/>.
-
-namespace tool_brickfield;
-
-use core\event\base;
-use stdClass;
-
-/**
- * Observer class containing methods monitoring various events.
- *
- * @package    tool_brickfield
- * @copyright  2020 Brickfield Education Labs https://www.brickfield.ie
- * @license https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- *
- */
-class eventobservers {
-
-    /**
-     * For course events to be handled, the accessibility tool needs to be enabled, and if a courseid is specified, the course
-     * has to have been added to the scheduler.
-     * @param int $courseid
-     * @return bool
-     * @throws \dml_exception
-     */
-    private static function course_event_should_be_handled(int $courseid): bool {
-        return accessibility::is_accessibility_enabled() && analysis::is_enabled() &&
-            (empty($courseid) || (isset($courseid) && scheduler::is_course_in_schedule($courseid)));
-    }
-
-    /**
-     * Content area altered event observer.
-     * @param base $event The area altered event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    private static function area_altered(base $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            manager::find_new_or_updated_areas($event);
-        }
-    }
-
-    /**
-     * Course event observers.
-     * These observer monitors course created / restored / updated events,
-     * then its HTML content is processed with accessibility checking.
-     */
-
-    /**
-     * Course created event observer.
-     * @param \core\event\course_created $event The course created event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function course_created(\core\event\course_created $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            // Need to trigger rerun check for automatically created forum...
-            $data = new stdClass();
-            $data->courseid = $event->courseid;
-            $data->item = 'coursererun';
-            static::observer_insert($data);
-            static::course_altered($event);
-        }
-    }
-
-    /**
-     * Course deleted event observer.
-     * @param \core\event\course_deleted $event The course deleted event.
-     * @throws \dml_exception
-     */
-    public static function course_deleted(\core\event\course_deleted $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            $data = new stdClass();
-            $data->courseid = $event->courseid;
-            $data->contextid = -1;
-            $data->item = 'core_course';
-            static::observer_insert($data);
-        }
-    }
-
-    /**
-     * Course restored event observer.
-     * @param \core\event\course_restored $event The course restored event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function course_restored(\core\event\course_restored $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            $data = new stdClass();
-            $data->courseid = $event->courseid;
-            $data->item = 'coursererun';
-            static::observer_insert($data);
-            static::course_altered($event);
-        }
-    }
-
-    /**
-     * Course update event observer.
-     * @param \core\event\course_updated $event The course updated event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function course_updated(\core\event\course_updated $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            static::course_altered($event);
-        }
-    }
-
-    /**
-     * Course update event observer. This is called on both course_created and course_updated, so use the base class as a type hint.
-     * @param base $event The course updated event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function course_altered(base $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            // Need to rerun caching of allowed courseid, from category white/blacklist.
-            $data = new stdClass();
-            $data->courseid = $data->contextid = $event->courseid;
-            $data->contextid = -1;
-            $data->item = 'category';
-            static::observer_insert($data);
-            static::area_altered($event);
-        }
-    }
-
-    /**
-     * Course section created event observer.
-     * @param \core\event\course_section_created $event The course section created event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function course_section_created(\core\event\course_section_created $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            static::area_altered($event);
-        }
-    }
-
-    /**
-     * Course section deleted event observer.
-     * @param \core\event\course_section_deleted $event The course section deleted event.
-     * @throws \dml_exception
-     */
-    public static function course_section_deleted(\core\event\course_section_deleted $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            $data = new stdClass();
-            $data->courseid = $event->courseid;
-            $data->contextid = -1;
-            $data->innercontextid = $event->objectid;
-            $data->item = 'course_sections';
-            static::observer_insert($data);
-        }
-    }
-
-    /**
-     * Course section update event observer.
-     * @param \core\event\course_section_updated $event The course section updated event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function course_section_updated(\core\event\course_section_updated $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            static::area_altered($event);
-        }
-    }
-
-    /**
-     * Course module event observers.
-     * These observer monitors course module created / restored / updated events,
-     * then its HTML content is processed with accessibility checking.
-     */
-
-    /**
-     * Course module created event observer.
-     * @param \core\event\course_module_created $event The course module created event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function course_module_created(\core\event\course_module_created $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            static::area_altered($event);
-        }
-    }
-
-    /**
-     * Course module deleted event observer.
-     * @param \core\event\course_module_deleted $event The course module deleted event.
-     * @throws \dml_exception
-     */
-    public static function course_module_deleted(\core\event\course_module_deleted $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            $data = new stdClass();
-            $data->courseid = $event->courseid;
-            $data->contextid = -1;
-            $data->innercontextid = $event->other['instanceid'];
-            $data->item = 'mod_' . $event->other['modulename'];
-            static::observer_insert($data);
-        }
-    }
-
-    /**
-     * Course module restored event observer.
-     * @param \core\event\course_module_restored $event The course module restored event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function course_module_restored(\core\event\course_module_restored $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            static::area_altered($event);
-        }
-    }
-
-    /**
-     * Course module updated event observer.
-     * @param \core\event\course_module_updated $event The course module updated event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function course_module_updated(\core\event\course_module_updated $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            static::area_altered($event);
-        }
-    }
-
-    /**
-     * course_category created event observer.
-     * @param \core\event\course_category_created $event The course_category created event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function course_category_created(\core\event\course_category_created $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            static::area_altered($event);
-        }
-    }
-
-    /**
-     * course_category deleted event observer.
-     * @param \core\event\course_category_deleted $event The course_category deleted event.
-     * @throws \dml_exception
-     */
-    public static function course_category_deleted(\core\event\course_category_deleted $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            $data = new stdClass();
-            $data->contextid = $data->courseid = -1;
-            $data->innercontextid = $event->objectid;
-            $data->item = 'course_categories';
-            static::observer_insert($data);
-        }
-    }
-
-    /**
-     * course_category update event observer.
-     * @param \core\event\course_category_updated $event The course_category updated event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function course_category_updated(\core\event\course_category_updated $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            static::area_altered($event);
-        }
-    }
-
-    /**
-     * mod_lesson_page created event observer.
-     * @param \mod_lesson\event\page_created $event The mod_lesson page created event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function mod_lesson_page_created(\mod_lesson\event\page_created $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            static::area_altered($event);
-        }
-    }
-
-    /**
-     * mod_lesson_page deleted event observer.
-     * @param \mod_lesson\event\page_deleted $event The mod_lesson page deleted event.
-     * @throws \dml_exception
-     */
-    public static function mod_lesson_page_deleted(\mod_lesson\event\page_deleted $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            $data = new stdClass();
-            $data->courseid = $event->courseid;
-            $data->contextid = -1;
-            $data->innercontextid = $event->objectid;
-            $data->item = 'lesson_pages';
-            static::observer_insert($data);
-        }
-    }
-
-    /**
-     * mod_lesson_page updated event observer.
-     * @param \mod_lesson\event\page_updated $event The mod_lesson page updated event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function mod_lesson_page_updated(\mod_lesson\event\page_updated $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            static::area_altered($event);
-        }
-    }
-
-    /**
-     * core_question created observer
-     * @param \core\event\question_created $event The core_question created event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function core_question_created(\core\event\question_created $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            manager::find_new_or_updated_areas($event);
-        }
-    }
-
-    /**
-     * core_question updated observer
-     * @param \core\event\question_updated $event The core_question created event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function core_question_updated(\core\event\question_updated $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            manager::find_new_or_updated_areas($event);
-        }
-    }
-
-    /**
-     * core_question deleted observer
-     * @param \core\event\question_deleted $event The core_question deleted event.
-     * @throws \dml_exception
-     */
-    public static function core_question_deleted(\core\event\question_deleted $event) {
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($event->courseid)) {
-            $data = new stdClass();
-            $data->courseid = $event->courseid;
-            $data->contextid = -1;
-            $data->innercontextid = $event->objectid;
-            $data->item = $event->objecttable;
-            static::observer_insert($data);
-        }
-    }
-
-    /**
-     * Book chapter created event observer.
-     * @param \mod_book\event\chapter_created $event The book chapter created event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function book_chapter_created(\mod_book\event\chapter_created $event) {
-        // If this feature has been disabled, do nothing.
-        if (accessibility::is_accessibility_enabled()) {
-            static::area_altered($event);
-        }
-    }
-
-    /**
-     * Book chapter deleted event observer.
-     * @param \mod_book\event\chapter_deleted $event The book chapter deleted event.
-     * @throws \dml_exception
-     */
-    public static function book_chapter_deleted(\mod_book\event\chapter_deleted $event) {
-        // If this feature has been disabled, do nothing.
-        if (accessibility::is_accessibility_enabled()) {
-            $data = new stdClass();
-            $data->courseid = $event->courseid;
-            $data->contextid = -1;
-            $data->innercontextid = $event->objectid;
-            $data->item = 'book_chapters';
-            static::observer_insert($data);
-        }
-    }
-
-    /**
-     * Book chapter update event observer.
-     * @param \mod_book\event\chapter_updated $event The book chapter updated event.
-     * @throws \ReflectionException
-     * @throws \dml_exception
-     */
-    public static function book_chapter_updated(\mod_book\event\chapter_updated $event) {
-        // If this feature has been disabled, do nothing.
-        if (accessibility::is_accessibility_enabled()) {
-            static::area_altered($event);
-        }
-    }
-
-    /**
-     * Add an observer record if appropriate.
-     * @param stdClass $data
-     * @throws \dml_exception
-     */
-    private static function observer_insert(stdClass $data) {
-        global $DB;
-
-        // Handle if this feature is enabled and this course is in the schedule.
-        if (static::course_event_should_be_handled($data->courseid)) {
-            $data->timecreated = time();
-            $data->timecompleted = 0;
-
-            $DB->insert_record(manager::DB_PROCESS, $data);
-        }
-    }
-}

admin/tool/brickfield/classes/form/registration_form.php

@@ -1,149 +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/>.
-
-/**
- * Class registration_form
- *
- * @package    tool_brickfield
- * @copyright  2021 Brickfield Education Labs https://www.brickfield.ie
- * @author  2020 JM Tomas <jmtomas@tresipunt.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
- */
-
-namespace tool_brickfield\form;
-defined('MOODLE_INTERNAL') || die();
-
-use coding_exception;
-use dml_exception;
-use html_writer;
-use moodle_exception;
-use moodleform;
-use stdClass;
-use tool_brickfield\manager;
-use tool_brickfield\registration;
-
-global $CFG;
-require_once($CFG->libdir . '/formslib.php');
-
-/**
- * Class registration_form
- *
- * @package    tool_brickfield
- * @author  2020 JM Tomas <jmtomas@tresipunt.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
- */
-class registration_form  extends moodleform {
-
-    /**
-     * Form definition.
-     * @throws moodle_exception
-     */
-    public function definition() {
-        $mform = & $this->_form;
-        $required = get_string('required');
-        $info = $this->get_defaultinfo();
-        $registration = new registration();
-        $key = $registration->get_api_key();
-        $hash = $registration->get_secret_key();
-
-        $mform->addElement('header', 'activationheader', get_string('activationheader', manager::PLUGINNAME));
-        $mform->addElement('text', 'key', get_string('secretkey', manager::PLUGINNAME));
-        $mform->setType('key', PARAM_TEXT);
-        $mform->setDefault('key', !empty($key) ? $key : '');
-        $mform->addHelpButton('key', 'secretkey', manager::PLUGINNAME);
-
-        $mform->addElement('text', 'hash', get_string('sitehash', manager::PLUGINNAME));
-        $mform->setType('hash', PARAM_TEXT);
-        $mform->setDefault('hash', !empty($hash) ? $hash : '');
-        $mform->addHelpButton('hash', 'sitehash', manager::PLUGINNAME);
-
-        $mform->addElement('header', 'moreinfo', get_string('moreinfo', manager::PLUGINNAME));
-        $mform->addElement('static', 'siteinfosummary', '',
-            get_string('sendfollowinginfo', manager::PLUGINNAME, $info->moreinfostring));
-
-        $mform->addElement('hidden', 'lang', $info->languagecode);
-        $mform->setType('lang', PARAM_TEXT);
-        $mform->addElement('hidden', 'countrycode', $info->country);
-        $mform->setType('countrycode', PARAM_TEXT);
-        $mform->addElement('hidden', 'url', $info->url);
-        $mform->setType('url', PARAM_URL);
-
-        $this->add_action_buttons(false, get_string('activate', manager::PLUGINNAME, '#'));
-    }
-
-    /**
-     * Get default data for registration form
-     *
-     * @throws moodle_exception
-     * @return stdClass
-     */
-    protected function get_defaultinfo(): stdClass {
-        global $CFG;
-        $admin = get_admin();
-        $site = get_site();
-        $data = new stdClass();
-        $data->name = $site->fullname;
-        $data->url = $CFG->wwwroot;
-        $data->language = get_string('thislanguage', 'langconfig');
-        $data->languagecode = $admin->lang ?: $CFG->lang;
-        $data->country = $admin->country ?: $CFG->country;
-        $data->email = $admin->email;
-        $data->moreinfo = self::get_moreinfo();
-        $data->moreinfostring = self::get_moreinfostring($data->moreinfo);
-        return $data;
-    }
-
-    /**
-     * Get more information.
-     * @return array
-     * @throws dml_exception
-     */
-    private static function get_moreinfo(): array {
-        global $CFG, $DB;
-        $moreinfo = array();
-        $moodlerelease = $CFG->release;
-        if (preg_match('/^(\d+\.\d.*?)[. ]/', $moodlerelease, $matches)) {
-            $moodlerelease = $matches[1];
-        }
-        $moreinfo['release'] = $moodlerelease;
-        $moreinfo['numcourses'] = $DB->count_records('course') - 1;
-        $moreinfo['numusers'] = $DB->count_records('user', array('deleted' => 0));
-        $moreinfo['numfiles'] = $DB->count_records('files');
-        $moreinfo['numfactivities'] = $DB->count_records('course_modules');
-        $moreinfo['mobileservice'] = empty($CFG->enablemobilewebservice) ? 0 : $CFG->enablemobilewebservice;
-        $moreinfo['usersmobileregistered'] = $DB->count_records('user_devices');
-        $moreinfo['contentyperesults'] = '';
-        $moreinfo['contenttypeerrors'] = '';
-        $moreinfo['percheckerrors'] = '';
-        return $moreinfo;
-    }
-
-    /**
-     * Get HTML list for more information.
-     *
-     * @param array $moreinfo
-     * @return string
-     * @throws coding_exception
-     */
-    private static function get_moreinfostring(array $moreinfo): string {
-        $html = html_writer::start_tag('ul');
-        foreach ($moreinfo as $key => $value) {
-            $html .= html_writer::tag('li', get_string($key, manager::PLUGINNAME, $value));
-        }
-        $html .= html_writer::end_tag('ul');
-        return $html;
-    }
-}

admin/tool/brickfield/classes/local/areas/core_course/base.php

@@ -1,118 +0,0 @@
-<?php
-// This file is part of the Query submission plugin
-//
-// 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/>.
-
-namespace tool_brickfield\local\areas\core_course;
-
-use core\event\course_created;
-use core\event\course_updated;
-use core\event\course_restored;
-use tool_brickfield\area_base;
-
-/**
- * Base class for various course-related areas
- *
- * This is an abstract class so it will be skipped by manager when it finds all areas
- *
- * @package    tool_brickfield
- * @copyright  2020 onward: Brickfield Education Labs, www.brickfield.ie
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-abstract class base extends area_base {
-
-    /**
-     * Find recordset of the relevant areas.
-     * @param \core\event\base $event
-     * @return \moodle_recordset|null
-     * @throws \coding_exception
-     * @throws \dml_exception
-     */
-    public function find_relevant_areas(\core\event\base $event): ?\moodle_recordset {
-        if ($event instanceof course_created) {
-            return $this->find_fields_in_course_table(['courseid' => $event->courseid]);
-        } else if ($event instanceof course_restored) {
-            return $this->find_fields_in_course_table(['courseid' => $event->courseid]);
-        } else if ($event instanceof course_updated) {
-            return $this->find_fields_in_course_table(['courseid' => $event->courseid]);
-        }
-        return null;
-    }
-
-    /**
-     * Find recordset of the course areas.
-     * @param int $courseid
-     * @return \moodle_recordset
-     * @throws \coding_exception
-     * @throws \dml_exception
-     */
-    public function find_course_areas(int $courseid): ?\moodle_recordset {
-        return $this->find_fields_in_course_table(['courseid' => $courseid]);
-    }
-
-    /**
-     * Return an array of area objects that contain content at the site and system levels only.
-     * @return mixed
-     */
-    public function find_system_areas(): ?\moodle_recordset {
-        return null;
-    }
-
-    /**
-     * Helper method that can be used by the classes that define a field in the 'course' table
-     *
-     * @param array $params
-     * @return \moodle_recordset
-     * @throws \coding_exception
-     * @throws \dml_exception
-     */
-    protected function find_fields_in_course_table(array $params = []): \moodle_recordset {
-        global $DB;
-        $where = [];
-
-        if (!empty($params['courseid'])) {
-            $where[] = 't.id = :courseid';
-        }
-
-        $rs = $DB->get_recordset_sql('SELECT
-          ' . $this->get_type() . ' AS type,
-          ctx.id AS contextid,
-          ' . $this->get_standard_area_fields_sql() . '
-          t.id AS itemid,
-          t.id AS courseid,
-          t.'.$this->get_fieldname().' AS content
-        FROM {'.$this->get_tablename().'} t
-        JOIN {context} ctx ON ctx.instanceid = t.id AND ctx.contextlevel = :pctxlevelcourse '.
-            ($where ? 'WHERE ' . join(' AND ', $where) : '') . '
-        ORDER BY t.id',
-            ['pctxlevelcourse' => CONTEXT_COURSE] + $params);
-
-        return $rs;
-    }
-
-    /**
-     * Returns the moodle_url of the page to edit the error.
-     * @param \stdClass $componentinfo
-     * @return \moodle_url
-     */
-    public static function get_edit_url(\stdClass $componentinfo): \moodle_url {
-        if ($componentinfo->tablename == 'course_sections') {
-            return new \moodle_url('/course/editsection.php', ['id' => $componentinfo->itemid, 'sr' => '']);
-        } else if ($componentinfo->tablename == 'course_categories') {
-            return new \moodle_url('/course/editcategory.php', ['id' => $componentinfo->itemid]);
-        } else {
-            return new \moodle_url('/course/edit.php', ['id' => $componentinfo->courseid]);
-        }
-    }
-}

admin/tool/brickfield/classes/local/areas/core_course/category_base.php

@@ -1,92 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-namespace tool_brickfield\local\areas\core_course;
-
-use core\event\course_category_created;
-use core\event\course_category_updated;
-use tool_brickfield\area_base;
-
-/**
- * Base class for all areas that represent a field from the course_categories table (such as 'intro' or 'name')
- *
- * @package    tool_brickfield
- * @copyright  2020 onward: Brickfield Education Labs, www.brickfield.ie
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-abstract class category_base extends area_base {
-
-    /**
-     * Find recordset of the relevant areas.
-     * @param \core\event\base $event
-     * @return \moodle_recordset|null
-     * @throws \dml_exception
-     */
-    public function find_relevant_areas(\core\event\base $event): ?\moodle_recordset {
-        if ($event instanceof course_category_updated || $event instanceof course_category_created) {
-            return $this->find_fields_in_course_categories_table(['itemid' => $event->objectid]);
-        }
-        return null;
-    }
-
-    /**
-     * Find recordset of the course areas.
-     * @param int $courseid
-     * @return \moodle_recordset|null
-     */
-    public function find_course_areas(int $courseid): ?\moodle_recordset {
-        return null;
-    }
-
-    /**
-     * Return an array of area objects that contain content at the site and system levels only. All category content is considered
-     * system level.
-     * @return mixed
-     */
-    public function find_system_areas(): ?\moodle_recordset {
-        return $this->find_fields_in_course_categories_table();
-    }
-
-    /**
-     * Helper method that can be used by the classes that define a field in the respective module table
-     *
-     * @param array $params
-     * @return \moodle_recordset
-     * @throws \dml_exception
-     */
-    protected function find_fields_in_course_categories_table(array $params = []): \moodle_recordset {
-        global $DB;
-        $where = [];
-        if (!empty($params['itemid'])) {
-            $where[] = 't.id = :itemid';
-        }
-
-        $rs = $DB->get_recordset_sql('SELECT
-          ' . $this->get_type() . ' AS type,
-          ctx.id AS contextid,
-          ' . $this->get_standard_area_fields_sql() . '
-          t.id AS itemid,
-          t.id AS categoryid,
-          t.'.$this->get_fieldname().' AS content
-        FROM {'.$this->get_tablename().'} t
-        JOIN {context} ctx ON ctx.instanceid = t.id AND ctx.contextlevel = :pctxlevelcategory '.
-            ($where ? 'WHERE ' . join(' AND ', $where) : '') . '
-        ORDER BY t.id',
-            ['pctxlevelcategory' => CONTEXT_COURSECAT] + $params);
-
-        return $rs;
-    }
-}

admin/tool/brickfield/classes/local/areas/core_course/category_description.php

@@ -1,43 +0,0 @@
-<?php
-// This file is part of the Query submission plugin
-//
-// 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/>.
-
-namespace tool_brickfield\local\areas\core_course;
-
-/**
- * Category description observer.
- *
- * @package    tool_brickfield
- * @copyright  2020 onward: Brickfield Education Labs, www.brickfield.ie
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class category_description extends category_base {
-
-    /**
-     * Get table name.
-     * @return string
-     */
-    public function get_tablename(): string {
-        return 'course_categories';
-    }
-
-    /**
-     * Get field name.
-     * @return string
-     */
-    public function get_fieldname(): string {
-        return 'description';
-    }
-}

admin/tool/brickfield/classes/local/areas/core_course/category_name.php

@@ -1,43 +0,0 @@
-<?php
-// This file is part of the Query submission plugin
-//
-// 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/>.
-
-namespace tool_brickfield\local\areas\core_course;
-
-/**
- * Category name observer.
- *
- * @package    tool_brickfield
- * @copyright  2020 onward: Brickfield Education Labs, www.brickfield.ie
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class category_name extends category_base {
-
-    /**
-     * Get table name.
-     * @return string
-     */
-    public function get_tablename(): string {
-        return 'course_categories';
-    }
-
-    /**
-     * Get field name.
-     * @return string
-     */
-    public function get_fieldname(): string {
-        return 'name';
-    }
-}

admin/tool/brickfield/classes/local/areas/core_course/fullname.php

@@ -1,43 +0,0 @@
-<?php
-// This file is part of the Query submission plugin
-//
-// 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/>.
-
-namespace tool_brickfield\local\areas\core_course;
-
-/**
- * Course full name observer.
- *
- * @package    tool_brickfield
- * @copyright  2020 onward: Brickfield Education Labs, www.brickfield.ie
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class fullname extends base {
-
-    /**
-     * Get table name.
-     * @return string
-     */
-    public function get_tablename(): string {
-        return 'course';
-    }
-
-    /**
-     * Get field name.
-     * @return string
-     */
-    public function get_fieldname(): string {
-        return 'fullname';
-    }
-}