Moodle release 4.0

Perform strict array_search due to conflicting results in versions <php8.0

.eslintrc

@@ -227,7 +227,7 @@
       },
       // We're using babel transpiling so use their parser
       // for linting.
-      parser: 'babel-eslint',
+      parser: '@babel/eslint-parser',
       // Check AMD with some slightly stricter rules.
       rules: {
         'no-unused-vars': 'error',
@@ -300,7 +300,8 @@
       },
       parserOptions: {
         'ecmaVersion': 9,
-        'sourceType': 'module'
+        'sourceType': 'module',
+        'requireConfigFile': false,
       }
     }
   ]

.github/workflows/push.yml

@@ -20,8 +20,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Configuring node & npm
-        shell: bash -l {0}
-        run: nvm install
+        uses: actions/setup-node@v2
+        with:
+          node-version-file: '.nvmrc'
 
       - name: Installing node stuff
         run: npm install
@@ -78,7 +79,7 @@ jobs:
         if: ${{ matrix.db == 'pgsql' }}
         uses: m4nu56/postgresql-action@v1
         with:
-          postgresql version: 9.6
+          postgresql version: 10
           postgresql db: test
           postgresql user: test
           postgresql password: test

.gitignore

@@ -51,3 +51,6 @@ moodle-plugin-ci.phar
 .eslintignore
 .stylelintignore
 /jsdoc
+/admin/tool/componentlibrary/docs
+/admin/tool/componentlibrary/hugo/site/data/my-index.json
+.hugo_build.lock

.grunt/babel-plugin-add-module-to-define.js

@@ -111,8 +111,22 @@ module.exports = ({template, types}) => {
                             if (!this.seenDefine && path.get('callee').isIdentifier({name: 'define'})) {
                                 // We only want to modify the first instance of define that we find.
                                 this.seenDefine = true;
+
                                 // Get the Moodle component for the file being processed.
                                 var moduleName = getModuleNameFromFileName(this.file.opts.filename);
+
+                                // The function signature of `define()` is:
+                                // define = function (name, deps, callback) {...}
+                                // Ensure that if the moduel supplied its own name that it is replaced.
+                                if (path.node.arguments.length > 0) {
+                                    // Ensure that there is only one name.
+                                    if (path.node.arguments[0].type === 'StringLiteral') {
+                                        // eslint-disable-next-line
+                                        console.log(`Replacing module name '${path.node.arguments[0].extra.rawValue}' with ${moduleName}`);
+                                        path.node.arguments.shift();
+                                    }
+                                }
+
                                 // Add the module name as the first argument to the define function.
                                 path.node.arguments.unshift(types.stringLiteral(moduleName));
                                 // Add a space after the define function in the built file so that previous versions

.grunt/tasks/componentlibrary.js

@@ -0,0 +1,140 @@
+// 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 */
+
+/**
+ * Component Library build tasks.
+ *
+ * @copyright  2021 Andrew Nicols
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+module.exports = grunt => {
+
+    /**
+     * Get a child path of the component library.
+     *
+     * @param   {string} path
+     * @returns {string}
+     */
+    const getCLPath = path => `admin/tool/componentlibrary/${path}`;
+
+    /**
+     * Get a spawn handler.
+     *
+     * This is a generic function to write the spawn output, and then to exit if required and mark the async task as
+     * complete.
+     *
+     * @param   {Promise} done
+     * @returns {function}
+     */
+    const getSpawnHandler = done => (error, result, code) => {
+        grunt.log.write(result);
+
+        if (error) {
+            process.exit(code);
+        }
+        done();
+    };
+
+    /**
+     * Spawn a function against Node with the provided args.
+     *
+     * @param   {array} args
+     * @returns {object}
+     */
+    const spawnNodeCall = args => grunt.util.spawn({
+        cmd: 'node',
+        args,
+    }, getSpawnHandler(grunt.task.current.async()));
+
+    /**
+     * Build the docs using Hugo.
+     *
+     * @returns {Object} Reference to the spawned task
+     */
+    const docsBuild = () => spawnNodeCall([
+        'node_modules/hugo-bin/cli.js',
+        '--config', getCLPath('config.yml'),
+        '--cleanDestinationDir',
+    ]);
+
+    /**
+     * Build the docs index using the hugo-lunr-indexer.
+     *
+     * @returns {Object} Reference to the spawned task
+     */
+    const indexBuild = () => spawnNodeCall([
+        'node_modules/hugo-lunr-indexer/bin/hli.js',
+        '-i', getCLPath('content/**'),
+        '-o', getCLPath('hugo/site/data/my-index.json'),
+        '-l', 'yaml',
+        '-d', '---',
+    ]);
+
+    /**
+     * Build the hugo CSS.
+     *
+     * @returns {Object} Reference to the spawned task
+     */
+    const cssBuild = () => spawnNodeCall([
+        'node_modules/node-sass/bin/node-sass',
+        '--output-style', 'expanded',
+        '--source-map', true,
+        '--source-map-contents', true,
+        '--precision', 6,
+        getCLPath('hugo/scss/docs.scss'),
+        '-o', getCLPath('hugo/dist/css/'),
+    ]);
+
+    // Register the various component library tasks.
+    grunt.registerTask('componentlibrary:docsBuild', 'Build the component library', docsBuild);
+    grunt.registerTask('componentlibrary:cssBuild', 'Build the component library', cssBuild);
+    grunt.registerTask('componentlibrary:indexBuild', 'Build the component library', indexBuild);
+    grunt.registerTask('componentlibrary', 'Build the component library', [
+        'componentlibrary:docsBuild',
+        'componentlibrary:cssBuild',
+        'componentlibrary:indexBuild',
+    ]);
+
+    grunt.config.merge({
+        watch: {
+            componentLibraryDocs: {
+                files: [
+                    getCLPath('content/**/*.md'),
+                    getCLPath('hugo'),
+                ],
+                tasks: ['componentlibrary:docsBuild', 'componentlibrary:indexBuild'],
+            },
+            componentLibraryCSS: {
+                files: [
+                    getCLPath('hugo/scss/**/*.scss'),
+                    'hugo',
+                ],
+                tasks: ['componentlibrary:cssBuild'],
+            },
+        },
+    });
+
+    // Add the 'componentlibrary' task as a startup task.
+    grunt.moodleEnv.startupTasks.push('componentlibrary');
+
+    return {
+        docsBuild,
+        cssBuild,
+        indexBuild,
+    };
+};

.grunt/tasks/gherkinlint.js

@@ -85,5 +85,8 @@ module.exports = grunt => {
         },
     });
 
+    // Add the 'gherkinlint' task as a startup task.
+    grunt.moodleEnv.startupTasks.push('gherkinlint');
+
     return handler;
 };

.grunt/tasks/ignorefiles.js

@@ -50,6 +50,7 @@ module.exports = grunt => {
             'theme/boost/style/moodle.css',
             'theme/classic/style/moodle.css',
             'jsdoc/styles/*.css',
+            'admin/tool/componentlibrary/hugo/dist/css/docs.css',
         ].concat(thirdPartyPaths);
         grunt.file.write('.stylelintignore', stylelintIgnores.join('\n') + '\n');
     };

.grunt/tasks/javascript.js

@@ -30,6 +30,7 @@
  * @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');
@@ -53,65 +54,139 @@ module.exports = grunt => {
 
     // Register JS tasks.
     grunt.registerTask('yui', ['eslint:yui', 'shifter']);
-    grunt.registerTask('amd', ['ignorefiles', 'eslint:amd', 'babel']);
+    grunt.registerTask('amd', ['ignorefiles', 'eslint:amd', 'rollup']);
     grunt.registerTask('js', ['amd', 'yui']);
 
     // Register NPM tasks.
     grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.loadNpmTasks('grunt-rollup');
 
-    // Load the Babel tasks and config.
-    grunt.loadNpmTasks('grunt-babel');
+    const babelTransform = require('@babel/core').transform;
+    const babel = (options = {}) => {
+        return {
+            name: 'babel',
+
+            transform: (code, id) => {
+                grunt.log.debug(`Transforming ${id}`);
+                options.filename = id;
+                const transformed = babelTransform(code, options);
+
+                return {
+                    code: transformed.code,
+                    map: transformed.map
+                };
+            }
+        };
+    };
+
+    // Note: We have to use a rate limit plugin here because rollup runs all tasks asynchronously and in parallel.
+    // When we kick off a full run, if we kick off a rollup of every file this will fork-bomb the machine.
+    // To work around this we use a concurrent Promise queue based on the number of available processors.
+    const rateLimit = () => {
+        const queue = [];
+        let queueRunner;
+
+        const startQueue = () => {
+            if (queueRunner) {
+                return;
+            }
+
+            queueRunner = setTimeout(() => {
+                const limit = Math.max(1, require('os').cpus().length / 2);
+                grunt.log.debug(`Starting rollup with queue size of ${limit}`);
+                runQueue(limit);
+            }, 100);
+        };
+
+        // The queue runner will run the next `size` items in the queue.
+        const runQueue = (size = 1) => {
+            queue.splice(0, size).forEach(resolve => {
+                resolve();
+            });
+        };
+
+        return {
+            name: 'ratelimit',
+
+            // The options hook is run in parallel.
+            // We can return an unresolved Promise which is queued for later resolution.
+            options: async() => {
+                return new Promise(resolve => {
+                    queue.push(resolve);
+                    startQueue();
+                });
+            },
+
+            // When an item in the queue completes, start the next item in the queue.
+            buildEnd: () => {
+                runQueue();
+            },
+        };
+    };
+
+    const terser = require('rollup-plugin-terser').terser;
     grunt.config.merge({
-        babel: {
+        rollup: {
             options: {
-                sourceMaps: true,
-                comments: false,
+                format: 'esm',
+                dir: 'output',
+                sourcemap: true,
+                treeshake: false,
+                context: 'window',
                 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'
+                    rateLimit(),
+                    babel({
+                        sourceMaps: true,
+                        comments: false,
+                        compact: false,
+                        plugins: [
+                            'transform-es2015-modules-amd-lazy',
+                            'system-import-transformer',
+                            // This plugin modifies the Babel transpiling for "export default"
+                            // so that if it's used then only the exported value is returned
+                            // by the generated AMD module.
+                            //
+                            // It also adds the Moodle plugin name to the AMD module definition
+                            // so that it can be imported as expected in other modules.
+                            path.resolve('.grunt/babel-plugin-add-module-to-define.js'),
+                            '@babel/plugin-syntax-dynamic-import',
+                            '@babel/plugin-syntax-import-meta',
+                            ['@babel/plugin-proposal-class-properties', {'loose': false}],
+                            '@babel/plugin-proposal-json-strings'
+                        ],
+                        presets: [
+                            ['@babel/preset-env', {
+                                targets: {
+                                    browsers: [
+                                        ">0.3%",
+                                        "last 2 versions",
+                                        "not ie >= 0",
+                                        "not op_mini all",
+                                        "not Opera > 0",
+                                        "not dead"
+                                    ]
+                                },
+                                modules: false,
+                                useBuiltIns: false
+                            }]
+                        ]
+                    }),
+
+                    terser({
+                        // Do not mangle variables.
+                        // Makes debugging easier.
+                        mangle: false,
+                    }),
                 ],
-                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
-                }]
-            }
+                }],
+            },
         },
     });
 
@@ -126,13 +201,16 @@ module.exports = grunt => {
         },
     });
 
+    // Add the 'js' task as a startup task.
+    grunt.moodleEnv.startupTasks.push('js');
+
     // 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}]);
+        grunt.config('rollup.dist.files', [{expand: true, src: files, rename: babelRename}]);
         changedFiles = Object.create(null);
     }, 200);
 

.grunt/tasks/startup.js

@@ -34,10 +34,8 @@ module.exports = grunt => {
         } 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');
+            // Run all of the requested startup tasks.
+            grunt.moodleEnv.startupTasks.forEach(taskName => grunt.task.run(taskName));
         }
     };
 

.grunt/tasks/style.js

@@ -29,4 +29,7 @@ module.exports = grunt => {
 
     // Load the SASS tasks.
     require('./sass')(grunt);
+
+    // Add the 'css' task as a startup task.
+    grunt.moodleEnv.startupTasks.push('css');
 };

.nvmrc

@@ -1 +1 @@
-v14.18.0
+lts/gallium

.travis.yml

@@ -17,7 +17,7 @@ services:
     - docker
 
 addons:
-  postgresql: "9.6"
+  postgresql: "10"
 
 branches:
   except:
@@ -221,7 +221,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_400_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

@@ -246,6 +246,8 @@ module.exports = function(grunt) {
         require(path.resolve(`./.grunt/tasks/${name}.js`))(grunt);
     };
 
+    // Startup tasks.
+    grunt.moodleEnv.startupTasks = [];
 
     // Add Moodle task configuration.
     addTask('gherkinlint', grunt);
@@ -253,6 +255,7 @@ module.exports = function(grunt) {
 
     addTask('javascript', grunt);
     addTask('style', grunt);
+    addTask('componentlibrary', grunt);
 
     addTask('watch', grunt);
     addTask('startup', grunt);

admin/antiviruses.php

@@ -54,18 +54,19 @@ if (!confirm_sesskey()) {
     redirect($returnurl);
 }
 
+$needsupdate = false;
 switch ($action) {
     case 'disable':
         // Remove from enabled list.
-        $key = array_search($antivirus, $activeantiviruses);
-        unset($activeantiviruses[$key]);
+        $class = \core_plugin_manager::resolve_plugininfo_class('antivirus');
+        $class::enable_plugin($antivirus, false);
         break;
 
     case 'enable':
         // Add to enabled list.
         if (!in_array($antivirus, $activeantiviruses)) {
-            $activeantiviruses[] = $antivirus;
-            $activeantiviruses = array_unique($activeantiviruses);
+            $class = \core_plugin_manager::resolve_plugininfo_class('antivirus');
+            $class::enable_plugin($antivirus, true);
         }
         break;
 
@@ -78,6 +79,7 @@ switch ($action) {
                 $fsave = $activeantiviruses[$key];
                 $activeantiviruses[$key] = $activeantiviruses[$key + 1];
                 $activeantiviruses[$key + 1] = $fsave;
+                $needsupdate = true;
             }
         }
         break;
@@ -91,6 +93,7 @@ switch ($action) {
                 $fsave = $activeantiviruses[$key];
                 $activeantiviruses[$key] = $activeantiviruses[$key - 1];
                 $activeantiviruses[$key - 1] = $fsave;
+                $needsupdate = true;
             }
         }
         break;
@@ -98,10 +101,13 @@ switch ($action) {
     default:
         break;
 }
-$new = implode(',', $activeantiviruses);
-add_to_config_log('antiviruses', $CFG->antiviruses, $new, 'core');
-set_config('antiviruses', $new);
 
-core_plugin_manager::reset_caches();
+if ($needsupdate) {
+    $new = implode(',', $activeantiviruses);
+    add_to_config_log('antiviruses', $CFG->antiviruses, $new, 'core');
+    set_config('antiviruses', $new);
+    core_plugin_manager::reset_caches();
+}
+
 
 redirect ($returnurl);

admin/auth.php

@@ -40,34 +40,15 @@ if (!confirm_sesskey()) {
 
 switch ($action) {
     case 'disable':
-        // remove from enabled list
-        $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);
-        }
-
-        if ($auth == $CFG->registerauth) {
-            set_config('registerauth', '');
-        }
-        \core\session\manager::gc(); // Remove stale sessions.
-        core_plugin_manager::reset_caches();
+        // Remove from enabled list.
+        $class = \core_plugin_manager::resolve_plugininfo_class('auth');
+        $class::enable_plugin($auth, false);
         break;
 
     case 'enable':
-        // add to enabled list
-        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);
-        }
-
-        \core\session\manager::gc(); // Remove stale sessions.
-        core_plugin_manager::reset_caches();
+        // Add to enabled list.
+        $class = \core_plugin_manager::resolve_plugininfo_class('auth');
+        $class::enable_plugin($auth, true);
         break;
 
     case 'down':
@@ -109,5 +90,3 @@ switch ($action) {
 }
 
 redirect($returnurl);
-
-

admin/blocks.php

@@ -30,26 +30,28 @@
     $strprotect = get_string('blockprotect', 'admin');
     $strunprotect = get_string('blockunprotect', 'admin');
 
-/// If data submitted, then process and store.
 
+    // If data submitted, then process and store.
     if (!empty($hide) && confirm_sesskey()) {
-        if (!$block = $DB->get_record('block', array('id'=>$hide))) {
-            print_error('blockdoesnotexist', 'error');
+        if (!$block = $DB->get_record('block', ['id' => $hide])) {
+            throw new \moodle_exception('blockdoesnotexist', 'error');
         }
-        $DB->set_field('block', 'visible', '0', array('id'=>$block->id));      // Hide block
-        add_to_config_log('block_visibility', $block->visible, '0', $block->name);
-        core_plugin_manager::reset_caches();
-        admin_get_root(true, false);  // settings not required - only pages
+
+        $class = \core_plugin_manager::resolve_plugininfo_class('block');
+        $class::enable_plugin($block->name, false);
+        // Settings not required - only pages.
+        admin_get_root(true, false);
     }
 
     if (!empty($show) && confirm_sesskey() ) {
-        if (!$block = $DB->get_record('block', array('id'=>$show))) {
-            print_error('blockdoesnotexist', 'error');
+        if (!$block = $DB->get_record('block', ['id' => $show])) {
+            throw new \moodle_exception('blockdoesnotexist', 'error');
         }
-        $DB->set_field('block', 'visible', '1', array('id'=>$block->id));      // Show block
-        add_to_config_log('block_visibility', $block->visible, '1', $block->name);
-        core_plugin_manager::reset_caches();
-        admin_get_root(true, false);  // settings not required - only pages
+
+        $class = \core_plugin_manager::resolve_plugininfo_class('block');
+        $class::enable_plugin($block->name, true);
+        // Settings not required - only pages.
+        admin_get_root(true, false);
     }
 
     if (!empty($protect) && confirm_sesskey()) {
@@ -67,6 +69,7 @@
     echo $OUTPUT->header();
     echo $OUTPUT->heading($strmanageblocks);
 
+    echo $OUTPUT->notification(get_string('noteunneededblocks', 'admin'), 'info');
 /// Main display starts here
 
 /// Get and sort the existing blocks
@@ -234,5 +237,3 @@
     }
 
     echo $OUTPUT->footer();
-
-

admin/category.php

@@ -48,6 +48,12 @@ if (!($settingspage->check_access())) {
     print_error('accessdenied', 'admin');
 }
 
+$hassiteconfig = has_capability('moodle/site:config', $PAGE->context);
+if ($hassiteconfig) {
+    $PAGE->add_header_action($OUTPUT->render_from_template('core_admin/header_search_input', [
+        'action' => new moodle_url('/admin/search.php'),
+    ]));
+}
 
 $statusmsg = '';
 $errormsg  = '';
@@ -75,7 +81,7 @@ if ($PAGE->user_allowed_editing() && $adminediting != -1) {
     $USER->editing = $adminediting;
 }
 $buttons = null;
-if ($PAGE->user_allowed_editing()) {
+if ($PAGE->user_allowed_editing() && !$PAGE->theme->haseditswitch) {
     $url = clone($PAGE->url);
     if ($PAGE->user_is_editing()) {
         $caption = get_string('blockseditoff');
@@ -140,13 +146,7 @@ if ($errormsg !== '') {
     echo $OUTPUT->notification($statusmsg, 'notifysuccess');
 }
 
-$path = array_reverse($settingspage->visiblepath);
-if (is_array($path)) {
-    $visiblename = join(' / ', $path);
-} else {
-    $visiblename = $path;
-}
-echo $OUTPUT->heading(get_string('admincategory', 'admin', $visiblename), 2);
+echo $OUTPUT->heading(get_string('admincategory', 'admin', $settingspage->visiblename), 2);
 
 echo html_writer::start_tag('form', array('action' => '', 'method' => 'post', 'id' => 'adminsettings'));
 echo html_writer::start_tag('div');
@@ -158,9 +158,7 @@ echo $outputhtml;
 echo html_writer::end_tag('fieldset');
 echo html_writer::end_tag('form');
 
-$PAGE->requires->yui_module('moodle-core-formchangechecker', 'M.core_formchangechecker.init', [[
-    'formid' => 'adminsettings'
-]]);
-$PAGE->requires->string_for_js('changesmadereallygoaway', 'moodle');
+// Add the form change checker.
+$PAGE->requires->js_call_amd('core_form/changechecker', 'watchFormById', ['adminsettings']);
 
 echo $OUTPUT->footer();

admin/classes/form/testoutgoingmailconf_form.php

@@ -48,6 +48,17 @@ class testoutgoingmailconf_form extends \moodleform {
         $mform->setType('recipient', PARAM_EMAIL);
         $mform->addRule('recipient', get_string('required'), 'required');
 
+        // From user.
+        $options = ['maxlength' => '100', 'size' => '25'];
+        $mform->addElement('text', 'from', get_string('testoutgoingmailconf_fromemail', 'admin'), $options);
+        $mform->setType('from', PARAM_TEXT);
+        $mform->addHelpButton('from', 'testoutgoingmailconf_fromemail', 'admin');
+
+        // Additional subject text.
+        $options = ['size' => '25'];
+        $mform->addElement('text', 'additionalsubject', get_string('testoutgoingmailconf_subjectadditional', 'admin'), $options);
+        $mform->setType('additionalsubject', PARAM_TEXT);
+
         $buttonarray = array();
         $buttonarray[] = $mform->createElement('submit', 'send', get_string('testoutgoingmailconf_sendtest', 'admin'));
         $buttonarray[] = $mform->createElement('cancel');
@@ -56,4 +67,26 @@ class testoutgoingmailconf_form extends \moodleform {
         $mform->closeHeaderBefore('buttonar');
 
     }
+
+    /**
+     * Validate Form field, should be a valid email format or a username that matches with a Moodle user.
+     *
+     * @param array $data
+     * @param array $files
+     * @return array
+     * @throws \dml_exception|\coding_exception
+     */
+    public function validation($data, $files): array {
+        $errors = parent::validation($data, $files);
+
+        if (isset($data['from']) && $data['from']) {
+            $userfrom = \core_user::get_user_by_username($data['from']);
+
+            if (!$userfrom && !validate_email($data['from'])) {
+                $errors['from'] = get_string('testoutgoingmailconf_fromemail_invalid', 'admin');
+            }
+        }
+
+        return $errors;
+    }
 }

admin/classes/local/entities/task_log.php

@@ -0,0 +1,304 @@
+<?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 core_admin\local\entities;
+
+use core_reportbuilder\local\filters\date;
+use core_reportbuilder\local\filters\duration;
+use core_reportbuilder\local\filters\select;
+use core_reportbuilder\local\filters\text;
+use core_reportbuilder\local\helpers\format;
+use lang_string;
+use core_reportbuilder\local\entities\base;
+use core_reportbuilder\local\report\column;
+use core_reportbuilder\local\report\filter;
+use stdClass;
+
+/**
+ * Task log entity class implementation
+ *
+ * @package    core_admin
+ * @copyright  2021 David Matamoros <davidmc@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class task_log extends base {
+
+    /** @var int Result success */
+    protected const SUCCESS = 0;
+
+    /** @var int Result failed */
+    protected const FAILED = 1;
+
+    /**
+     * Database tables that this entity uses and their default aliases
+     *
+     * @return array
+     */
+    protected function get_default_table_aliases(): array {
+        return ['task_log' => 'tl'];
+    }
+
+    /**
+     * The default title for this entity in the list of columns/conditions/filters in the report builder
+     *
+     * @return lang_string
+     */
+    protected function get_default_entity_title(): lang_string {
+        return new lang_string('entitytasklog', 'admin');
+    }
+
+    /**
+     * The default machine-readable name for this entity that will be used in the internal names of the columns/filters
+     *
+     * @return string
+     */
+    protected function get_default_entity_name(): string {
+        return 'task_log';
+    }
+
+    /**
+     * Initialise the entity
+     *
+     * @return base
+     */
+    public function initialise(): base {
+        $columns = $this->get_all_columns();
+        foreach ($columns as $column) {
+            $this->add_column($column);
+        }
+
+        $filters = $this->get_all_filters();
+        foreach ($filters as $filter) {
+            $this->add_filter($filter);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns list of all available columns
+     *
+     * @return column[]
+     */
+    protected function get_all_columns(): array {
+
+        $tablealias = $this->get_table_alias('task_log');
+
+        // Name column.
+        $columns[] = (new column(
+            'name',
+            new lang_string('name'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_TEXT)
+            ->add_field("$tablealias.classname")
+            ->set_is_sortable(true)
+            ->add_callback(static function(string $value): string {
+                $output = '';
+                if (class_exists($value)) {
+                    $task = new $value;
+                    if ($task instanceof \core\task\scheduled_task) {
+                        $output = $task->get_name();
+                    }
+                }
+                $output .= \html_writer::tag('div', "\\{$value}", [
+                    'class' => 'task-class',
+                ]);
+                return $output;
+            });
+
+        // Type column.
+        $columns[] = (new column(
+            'type',
+            new lang_string('tasktype', 'admin'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_INTEGER)
+            ->add_field("{$tablealias}.type")
+            ->set_is_sortable(true)
+            ->add_callback(static function(int $value): string {
+                if (\core\task\database_logger::TYPE_SCHEDULED === $value) {
+                    return get_string('task_type:scheduled', 'admin');
+                }
+                return get_string('task_type:adhoc', 'admin');
+            });
+
+        // Start time column.
+        $columns[] = (new column(
+            'starttime',
+            new lang_string('task_starttime', 'admin'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_TIMESTAMP)
+            ->add_field("{$tablealias}.timestart")
+            ->set_is_sortable(true)
+            ->add_callback([format::class, 'userdate'], get_string('strftimedatetimeshortaccurate', 'core_langconfig'));
+
+        // Duration column.
+        $columns[] = (new column(
+            'duration',
+            new lang_string('task_duration', 'admin'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_FLOAT)
+            ->add_field("{$tablealias}.timeend - {$tablealias}.timestart", 'duration')
+            ->set_is_sortable(true)
+            ->add_callback(static function(float $value): string {
+                $duration = round($value, 2);
+                if (empty($duration)) {
+                    // The format_time function returns 'now' when the difference is exactly 0.
+                    // Note: format_time performs concatenation in exactly this fashion so we should do this for consistency.
+                    return '0 ' . get_string('secs', 'moodle');
+                }
+                return format_time($duration);
+            });
+
+        // Hostname column.
+        $columns[] = (new column(
+            'hostname',
+            new lang_string('hostname', 'admin'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_TEXT)
+            ->add_field("$tablealias.hostname")
+            ->set_is_sortable(true);
+
+        // PID column.
+        $columns[] = (new column(
+            'pid',
+            new lang_string('pid', 'admin'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_INTEGER)
+            ->add_field("{$tablealias}.pid")
+            ->set_is_sortable(true);
+
+        // Database column.
+        $columns[] = (new column(
+            'database',
+            new lang_string('task_dbstats', 'admin'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_INTEGER)
+            ->add_fields("{$tablealias}.dbreads, {$tablealias}.dbwrites")
+            ->set_is_sortable(true)
+            ->add_callback(static function(int $value, stdClass $row): string {
+                $output = '';
+                $output .= \html_writer::div(get_string('task_stats:dbreads', 'admin', $row->dbreads));
+                $output .= \html_writer::div(get_string('task_stats:dbwrites', 'admin', $row->dbwrites));
+                return $output;
+            });
+
+        // Result column.
+        $columns[] = (new column(
+            'result',
+            new lang_string('task_result', 'admin'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_INTEGER)
+            ->add_field("$tablealias.result")
+            ->set_is_sortable(true)
+            ->add_callback(static function(int $value): string {
+                if ($value) {
+                    return get_string('task_result:failed', 'admin');
+                }
+                return get_string('success');
+            });
+
+        return $columns;
+    }
+
+    /**
+     * Return list of all available filters
+     *
+     * @return filter[]
+     */
+    protected function get_all_filters(): array {
+        $filters = [];
+
+        $tablealias = $this->get_table_alias('task_log');
+
+        // Name filter (Filter by classname).
+        $filters[] = (new filter(
+            text::class,
+            'name',
+            new lang_string('classname', 'tool_task'),
+            $this->get_entity_name(),
+            "{$tablealias}.classname"
+        ))
+            ->add_joins($this->get_joins());
+
+        // Output filter (Filter by task output).
+        $filters[] = (new filter(
+            text::class,
+            'output',
+            new lang_string('task_logoutput', 'admin'),
+            $this->get_entity_name(),
+            "{$tablealias}.output"
+        ))
+            ->add_joins($this->get_joins());
+
+        // Result filter.
+        $filters[] = (new filter(
+            select::class,
+            'result',
+            new lang_string('task_result', 'admin'),
+            $this->get_entity_name(),
+            "{$tablealias}.result"
+        ))
+            ->add_joins($this->get_joins())
+            ->set_options([
+                self::SUCCESS => get_string('success'),
+                self::FAILED => get_string('task_result:failed', 'admin'),
+            ]);
+
+        // Start time filter.
+        $filters[] = (new filter(
+            date::class,
+            'timestart',
+            new lang_string('task_starttime', 'admin'),
+            $this->get_entity_name(),
+            "{$tablealias}.timestart"
+        ))
+            ->add_joins($this->get_joins())
+            ->set_limited_operators([
+                date::DATE_ANY,
+                date::DATE_RANGE,
+                date::DATE_PREVIOUS,
+                date::DATE_CURRENT,
+            ]);
+
+        // Duration filter.
+        $filters[] = (new filter(
+            duration::class,
+            'duration',
+            new lang_string('task_duration', 'admin'),
+            $this->get_entity_name(),
+            "${tablealias}.timeend - {$tablealias}.timestart"
+        ))
+            ->add_joins($this->get_joins());
+
+        return $filters;
+    }
+}

admin/classes/local/settings/filesize.php

@@ -98,7 +98,7 @@ class filesize extends \admin_setting {
         if (empty($bytes)) {
             return get_string('none');
         }
-        return display_size($bytes);
+        return display_size($bytes, 0);
     }
 
     /**

admin/classes/local/settings/linkable_settings_page.php

@@ -0,0 +1,37 @@
+<?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/>.
+
+/**
+ * A settings page which can be viewed with a link directly.
+ *
+ * @package    core_admin
+ * @copyright  2021 Andrew Lyons <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace core_admin\local\settings;
+
+use moodle_url;
+
+interface linkable_settings_page {
+
+    /**
+     * Get the URL to view this settings page.
+     *
+     * @return moodle_url
+     */
+    public function get_settings_page_url(): moodle_url;
+}

admin/classes/local/settings/setting_scheduled_task_status.php

@@ -0,0 +1,121 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Admin setting to show current scheduled task's status.
+ *
+ * @package core
+ * @copyright 2021 Universitat Rovira i Virgili
+ * @author Jordi Pujol-Ahulló <jpahullo@gmail.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+namespace core_admin\local\settings;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->libdir . '/moodlelib.php');
+
+use admin_setting_description;
+use core\task\manager;
+use core\task\scheduled_task;
+use html_writer;
+use lang_string;
+use moodle_url;
+use stdClass;
+
+/**
+ * This admin setting tells whether a given scheduled task is enabled, providing a link to its configuration page.
+ *
+ * The goal of this setting is to help contextualizing the configuration settings with related scheduled task status,
+ * providing the big picture of that part of the system.
+ *
+ * @package core
+ * @copyright 2021 Universitat Rovira i Virgili
+ * @author Jordi Pujol-Ahulló <jpahullo@gmail.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class setting_scheduled_task_status extends admin_setting_description {
+    /**
+     * @var string fully qualified class name of a scheduled task.
+     */
+    private $classname;
+    /**
+     * @var string additional text to append to the description.
+     */
+    private $extradescription;
+
+    /**
+     * setting_scheduled_task_status constructor.
+     * @param string $name unique setting name.
+     * @param string $scheduledtaskclassname full classpath class name of the scheduled task.
+     * @param string $extradescription extra detail to append to the scheduled task status to add context in the setting
+     * page.
+     */
+    public function __construct(string $name, string $scheduledtaskclassname, string $extradescription = '') {
+        $visiblename = new lang_string('task_status', 'admin');
+        $this->classname = $scheduledtaskclassname;
+        $this->extradescription = $extradescription;
+
+        parent::__construct($name, $visiblename, '');
+    }
+
+    /**
+     * Calculates lazily the content of the description.
+     * @param mixed $data nothing expected in this case.
+     * @param string $query nothing expected in this case.
+     * @return string the HTML content to print for this setting.
+     */
+    public function output_html($data, $query = ''): string {
+        if (empty($this->description)) {
+            $this->description = $this->get_task_description();
+        }
+
+        return parent::output_html($data, $query);
+    }
+
+    /**
+     * Returns the HTML to print as the description.
+     * @return string description to be printed.
+     */
+    private function get_task_description(): string {
+        $task = manager::get_scheduled_task($this->classname);
+        if ($task->is_enabled()) {
+            $taskenabled = get_string('enabled', 'admin');
+        } else {
+            $taskenabled = get_string('disabled', 'admin');
+        }
+        $taskenabled = strtolower($taskenabled);
+        $gotourl = new moodle_url(
+            '/admin/tool/task/scheduledtasks.php',
+            [],
+            scheduled_task::get_html_id($this->classname)
+        );
+        if (!empty($this->extradescription)) {
+            $this->extradescription = '<br />' . $this->extradescription;
+        }
+
+        $taskdetail = new stdClass();
+        $taskdetail->class = $this->classname;
+        $taskdetail->name = $task->get_name();
+        $taskdetail->status = $taskenabled;
+        $taskdetail->gotourl = $gotourl->out(false);
+        $taskdetail->extradescription = $this->extradescription;
+
+        return html_writer::tag('p', get_string('task_status_desc', 'admin', $taskdetail));
+    }
+}

admin/classes/local/systemreports/task_logs.php

@@ -0,0 +1,158 @@
+<?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 core_admin\local\systemreports;
+
+use context_system;
+use core_admin\local\entities\task_log;
+use core_reportbuilder\local\entities\user;
+use core_reportbuilder\local\report\action;
+use lang_string;
+use moodle_url;
+use pix_icon;
+use core_reportbuilder\system_report;
+
+/**
+ * Task logs system report class implementation
+ *
+ * @package    core_admin
+ * @copyright  2021 David Matamoros <davidmc@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class task_logs extends system_report {
+
+    /**
+     * Initialise report, we need to set the main table, load our entities and set columns/filters
+     */
+    protected function initialise(): void {
+        // Our main entity, it contains all of the column definitions that we need.
+        $entitymain = new task_log();
+        $entitymainalias = $entitymain->get_table_alias('task_log');
+
+        $this->set_main_table('task_log', $entitymainalias);
+        $this->add_entity($entitymain);
+
+        // Any columns required by actions should be defined here to ensure they're always available.
+        $this->add_base_fields("{$entitymainalias}.id");
+
+        // We can join the "user" entity to our "main" entity and use the fullname column from the user entity.
+        $entityuser = new user();
+        $entituseralias = $entityuser->get_table_alias('user');
+        $this->add_entity($entityuser->add_join(
+            "LEFT JOIN {user} {$entituseralias} ON {$entituseralias}.id = {$entitymainalias}.userid"
+        ));
+
+        // Now we can call our helper methods to add the content we want to include in the report.
+        $this->add_columns();
+        $this->add_filters();
+        $this->add_actions();
+
+        // Set if report can be downloaded.
+        $this->set_downloadable(true, get_string('tasklogs', 'admin'));
+    }
+
+    /**
+     * Validates access to view this report
+     *
+     * @return bool
+     */
+    protected function can_view(): bool {
+        return has_capability('moodle/site:config', context_system::instance());
+    }
+
+    /**
+     * Get the visible name of the report
+     *
+     * @return string
+     */
+    public static function get_name(): string {
+        return get_string('entitytasklog', 'admin');
+    }
+
+    /**
+     * Adds the columns we want to display in the report
+     *
+     * They are all provided by the entities we previously added in the {@see initialise} method, referencing each by their
+     * unique identifier
+     */
+    public function add_columns(): void {
+        $columns = [
+            'task_log:name',
+            'task_log:type',
+            'user:fullname',
+            'task_log:starttime',
+            'task_log:duration',
+            'task_log:hostname',
+            'task_log:pid',
+            'task_log:database',
+            'task_log:result',
+        ];
+
+        $this->add_columns_from_entities($columns);
+
+        // It's possible to override the display name of a column, if you don't want to use the value provided by the entity.
+        if ($column = $this->get_column('user:fullname')) {
+            $column->set_title(new lang_string('user', 'admin'));
+        }
+
+        // It's possible to set a default initial sort direction for one column.
+        $this->set_initial_sort_column('task_log:starttime', SORT_DESC);
+    }
+
+    /**
+     * Adds the filters we want to display in the report
+     *
+     * They are all provided by the entities we previously added in the {@see initialise} method, referencing each by their
+     * unique identifier
+     */
+    protected function add_filters(): void {
+        $filters = [
+            'task_log:name',
+            'task_log:output',
+            'task_log:result',
+            'task_log:timestart',
+            'task_log:duration',
+        ];
+
+        $this->add_filters_from_entities($filters);
+    }
+
+    /**
+     * Add the system report actions. An extra column will be appended to each row, containing all actions added here
+     *
+     * Note the use of ":id" placeholder which will be substituted according to actual values in the row
+     */
+    protected function add_actions(): void {
+
+        // Action to view individual task log on a popup window.
+        $this->add_action((new action(
+            new moodle_url('/admin/tasklogs.php', ['logid' => ':id']),
+            new pix_icon('e/search', ''),
+            [],
+            true,
+            new lang_string('view'),
+        )));
+
+        // Action to download individual task log.
+        $this->add_action((new action(
+            new moodle_url('/admin/tasklogs.php', ['logid' => ':id', 'download' => true]),
+            new pix_icon('t/download', ''),
+            [],
+            false,
+            new lang_string('download'),
+        )));
+    }
+}

admin/classes/task_log_table.php

@@ -1,293 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Task log table.
- *
- * @package    core_admin
- * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_admin;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir . '/tablelib.php');
-
-/**
- * Table to display list of task logs.
- *
- * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class task_log_table extends \table_sql {
-
-    /**
-     * Constructor for the task_log table.
-     *
-     * @param   string      $filter
-     * @param   int         $resultfilter
-     */
-    public function __construct(string $filter = '', int $resultfilter = null) {
-        global $DB;
-
-        if (-1 === $resultfilter) {
-            $resultfilter = null;
-        }
-
-        parent::__construct('tasklogs');
-
-        $columnheaders = [
-            'classname'  => get_string('name'),
-            'type'       => get_string('tasktype', 'admin'),
-            'userid'     => get_string('user', 'admin'),
-            'timestart'  => get_string('task_starttime', 'admin'),
-            'duration'   => get_string('task_duration', 'admin'),
-            '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'    => '',
-        ];
-        $this->define_columns(array_keys($columnheaders));
-        $this->define_headers(array_values($columnheaders));
-
-        // The name column is a header.
-        $this->define_header_column('classname');
-
-        // This table is not collapsible.
-        $this->collapsible(false);
-
-        // The actions class should not wrap. Use the BS text utility class.
-        $this->column_class('actions', 'text-nowrap');
-
-        // Allow pagination.
-        $this->pageable(true);
-
-        // Allow sorting. Default to sort by timestarted DESC.
-        $this->sortable(true, 'timestart', SORT_DESC);
-
-        // Add filtering.
-        $where = [];
-        $params = [];
-        if (!empty($filter)) {
-            $orwhere = [];
-            $filter = str_replace('\\', '\\\\', $filter);
-
-            // Check the class name.
-            $orwhere[] = $DB->sql_like('classname', ':classfilter', false, false);
-            $params['classfilter'] = '%' . $DB->sql_like_escape($filter) . '%';
-
-            $orwhere[] = $DB->sql_like('output', ':outputfilter', false, false);
-            $params['outputfilter'] = '%' . $DB->sql_like_escape($filter) . '%';
-
-            $where[] = "(" . implode(' OR ', $orwhere) . ")";
-        }
-
-        if (null !== $resultfilter) {
-            $where[] = 'tl.result = :result';
-            $params['result'] = $resultfilter;
-        }
-
-        $where = implode(' AND ', $where);
-
-        $this->set_sql('', '', $where, $params);
-    }
-
-    /**
-     * Query the db. Store results in the table object for use by build_table.
-     *
-     * @param int $pagesize size of page for paginated displayed table.
-     * @param bool $useinitialsbar do you want to use the initials bar. Bar
-     * will only be used if there is a fullname column defined for the table.
-     */
-    public function query_db($pagesize, $useinitialsbar = true) {
-        global $DB;
-
-        // Fetch the attempts.
-        $sort = $this->get_sql_sort();
-        if ($sort) {
-            $sort = "ORDER BY $sort";
-        }
-
-        // 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;
-
-        $where = '';
-        if (!empty($this->sql->where)) {
-            $where = "WHERE {$this->sql->where}";
-        }
-
-        $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,
-                    {$userfields}
-                FROM {task_log} tl
-           LEFT JOIN {user} u ON u.id = tl.userid
-                {$where}
-                {$sort}";
-
-        $this->pagesize($pagesize, $DB->count_records_sql("SELECT COUNT('x') FROM {task_log} tl {$where}", $this->sql->params));
-        if (!$this->is_downloading()) {
-            $this->rawdata = $DB->get_records_sql($sql, $this->sql->params, $this->get_page_start(), $this->get_page_size());
-        } else {
-            $this->rawdata = $DB->get_records_sql($sql, $this->sql->params);
-        }
-    }
-
-    /**
-     * Format the name cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_classname($row) : string {
-        $output = '';
-        if (class_exists($row->classname)) {
-            $task = new $row->classname;
-            if ($task instanceof \core\task\scheduled_task) {
-                $output = $task->get_name();
-            }
-        }
-
-        $output .= \html_writer::tag('div', "\\{$row->classname}", [
-                'class' => 'task-class',
-            ]);
-        return $output;
-    }
-
-    /**
-     * Format the type cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_type($row) : string {
-        if (\core\task\database_logger::TYPE_SCHEDULED == $row->type) {
-            return get_string('task_type:scheduled', 'admin');
-        } else {
-            return get_string('task_type:adhoc', 'admin');
-        }
-    }
-
-    /**
-     * Format the timestart cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_result($row) : string {
-        if ($row->result) {
-            return get_string('task_result:failed', 'admin');
-        } else {
-            return get_string('success');
-        }
-    }
-
-    /**
-     * Format the timestart cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_timestart($row) : string {
-        return userdate($row->timestart, get_string('strftimedatetimeshort', 'langconfig'));
-    }
-
-    /**
-     * Format the duration cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_duration($row) : string {
-        $duration = round($row->timeend - $row->timestart, 2);
-
-        if (empty($duration)) {
-            // The format_time function returns 'now' when the difference is exactly 0.
-            // Note: format_time performs concatenation in exactly this fashion so we should do this for consistency.
-            return '0 ' . get_string('secs', 'moodle');
-        }
-
-        return format_time($duration);
-    }
-
-    /**
-     * Format the DB details cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_db($row) : string {
-        $output = '';
-
-        $output .= \html_writer::div(get_string('task_stats:dbreads', 'admin', $row->dbreads));
-        $output .= \html_writer::div(get_string('task_stats:dbwrites', 'admin', $row->dbwrites));
-
-        return $output;
-    }
-
-    /**
-     * Format the actions cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_actions($row) : string {
-        global $OUTPUT;
-
-        $actions = [];
-
-        $url = new \moodle_url('/admin/tasklogs.php', ['logid' => $row->id]);
-
-        // Quick view.
-        $actions[] = $OUTPUT->action_icon(
-            $url,
-            new \pix_icon('e/search', get_string('view')),
-            new \popup_action('click', $url)
-        );
-
-        // Download.
-        $actions[] = $OUTPUT->action_icon(
-            new \moodle_url($url, ['download' => true]),
-            new \pix_icon('t/download', get_string('download'))
-        );
-
-        return implode('&nbsp;', $actions);
-    }
-
-    /**
-     * Format the user cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_userid($row) : string {
-        if (empty($row->userid)) {
-            return '';
-        }
-
-        $user = (object) [];
-        username_load_fields_from_object($user, $row, 'user');
-
-        return fullname($user);
-    }
-}

admin/cli/install.php

@@ -74,6 +74,8 @@ Options:
 --adminpass=PASSWORD  Password for the moodle admin account,
                       required in non-interactive mode.
 --adminemail=STRING   Email address for the moodle admin account.
+--sitepreset=STRING   Admin site preset to be applied during the installation process.
+--supportemail=STRING Email address for support and help.
 --upgradekey=STRING   The upgrade key to be set in the config.php, leave empty to not set it.
 --non-interactive     No interactive questions, installation fails if any
                       problem encountered.
@@ -254,6 +256,8 @@ list($options, $unrecognized) = cli_get_params(
         'adminuser'         => 'admin',
         'adminpass'         => '',
         'adminemail'        => '',
+        'sitepreset'        => '',
+        'supportemail'      => '',
         'upgradekey'        => '',
         'non-interactive'   => false,
         'agree-license'     => false,
@@ -276,6 +280,12 @@ if (array_key_exists($lang, $languages)) {
     $CFG->lang = $lang;
 }
 
+// Set up site admin preset.
+$sitepreset = clean_param($options['sitepreset'], PARAM_RAW);
+if (!empty($sitepreset)) {
+    $CFG->setsitepresetduringinstall = $sitepreset;
+}
+
 if ($unrecognized) {
     $unrecognized = implode("\n  ", $unrecognized);
     cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
@@ -731,6 +741,20 @@ if (!$skipdatabase) {
         $a = (object)['option' => 'adminemail', 'value' => $options['adminemail']];
         cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
     }
+
+    // Ask for the support email address.
+    if ($interactive) {
+        cli_separator();
+        cli_heading(get_string('clisupportemail', 'install'));
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['supportemail']);
+        $options['supportemail'] = cli_input($prompt, $options['supportemail']);
+    }
+
+    // Validate that the support email address provided is valid.
+    if (!empty($options['supportemail']) && !validate_email($options['supportemail'])) {
+        $a = (object)['option' => 'supportemail', 'value' => $options['supportemail']];
+        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
+    }
 }
 
 // Ask for the upgrade key.

admin/cli/mysql_engine.php

@@ -1,180 +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/>.
-
-/**
- * MySQL engine conversion tool.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2009 Petr Skoda (http://skodak.org)
- * @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');      // cli only functions
-
-if ($DB->get_dbfamily() !== 'mysql') {
-    cli_error('This function is designed for MySQL databases only!');
-}
-
-// now get cli options
-list($options, $unrecognized) = cli_get_params(array('help'=>false, 'list'=>false, 'engine'=>false, 'available'=>false),
-                                               array('h'=>'help', 'l'=>'list', 'a'=>'available'));
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-$help =
-"MySQL engine conversions script.
-
-It is recommended to stop the web server before the conversion.
-Do not use MyISAM if possible, because it is not ACID compliant
-and does not support transactions.
-
-Options:
---engine=ENGINE       Convert MySQL tables to different engine
--l, --list            Show table information
--a, --available       Show list of available engines
--h, --help            Print out this help
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/mysql_engine.php --engine=InnoDB
-";
-
-if (!empty($options['engine'])) {
-    $engines = mysql_get_engines();
-    $engine = clean_param($options['engine'], PARAM_ALPHA);
-    if (!isset($engines[strtoupper($engine)])) {
-        cli_error("Error: engine '$engine' is not available on this server!");
-    }
-
-    echo "Converting tables to '$engine' for $CFG->wwwroot:\n";
-    $prefix = $DB->get_prefix();
-    $prefix = str_replace('_', '\\_', $prefix);
-    $sql = "SHOW TABLE STATUS WHERE Name LIKE BINARY '$prefix%'";
-    $rs = $DB->get_recordset_sql($sql);
-    $converted = 0;
-    $skipped   = 0;
-    $errors    = 0;
-    foreach ($rs as $table) {
-        if (strtoupper($table->engine) === strtoupper($engine)) {
-            $newengine = mysql_get_table_engine($table->name);
-            echo str_pad($table->name, 40). " - NO CONVERSION NEEDED ($newengine)\n";
-            $skipped++;
-            continue;
-        }
-        echo str_pad($table->name, 40). " - ";
-
-        try {
-            $DB->change_database_structure("ALTER TABLE {$table->name} ENGINE = $engine");
-            $newengine = mysql_get_table_engine($table->name);
-            if (strtoupper($newengine) !== strtoupper($engine)) {
-                echo "ERROR ($newengine)\n";
-                $errors++;
-                continue;
-            }
-            echo "DONE ($newengine)\n";
-            $converted++;
-        } catch (moodle_exception $e) {
-            echo $e->getMessage()."\n";
-            $errors++;
-            continue;
-        }
-    }
-    $rs->close();
-    echo "Converted: $converted, skipped: $skipped, errors: $errors\n";
-    exit(0); // success
-
-} else if (!empty($options['list'])) {
-    echo "List of tables for $CFG->wwwroot:\n";
-    $prefix = $DB->get_prefix();
-    $prefix = str_replace('_', '\\_', $prefix);
-    $sql = "SHOW TABLE STATUS WHERE Name LIKE BINARY '$prefix%'";
-    $rs = $DB->get_recordset_sql($sql);
-    $counts = array();
-    foreach ($rs as $table) {
-        if (isset($counts[$table->engine])) {
-            $counts[$table->engine]++;
-        } else {
-            $counts[$table->engine] = 1;
-        }
-        echo str_pad($table->engine, 10);
-        echo $table->name .  "\n";
-    }
-    $rs->close();
-
-    echo "\n";
-    echo "Table engines summary for $CFG->wwwroot:\n";
-    foreach ($counts as $engine => $count) {
-        echo "$engine: $count\n";
-    }
-    exit(0); // success
-
-} else if (!empty($options['available'])) {
-    echo "List of available MySQL engines for $CFG->wwwroot:\n";
-    $engines = mysql_get_engines();
-    foreach ($engines as $engine) {
-        echo " $engine\n";
-    }
-    die;
-
-} else {
-    echo $help;
-    die;
-}
-
-
-
-// ========== Some functions ==============
-
-function mysql_get_engines() {
-    global $DB;
-
-    $sql = "SHOW Engines";
-    $rs = $DB->get_recordset_sql($sql);
-    $engines = array();
-    foreach ($rs as $engine) {
-        if (strtoupper($engine->support) !== 'YES' and strtoupper($engine->support) !== 'DEFAULT') {
-            continue;
-        }
-        $engines[strtoupper($engine->engine)] = $engine->engine;
-        if (strtoupper($engine->support) === 'DEFAULT') {
-            $engines[strtoupper($engine->engine)] .= ' (default)';
-        }
-    }
-    $rs->close();
-
-    return $engines;
-}
-
-function mysql_get_table_engine($tablename) {
-    global $DB;
-
-    $engine = null;
-    $sql = "SHOW TABLE STATUS WHERE Name = '$tablename'"; // no special chars expected here
-    $rs = $DB->get_recordset_sql($sql);
-    if ($rs->valid()) {
-        $record = $rs->current();
-        $engine = $record->engine;
-    }
-    $rs->close();
-    return $engine;
-}

admin/contentbank.php

@@ -48,12 +48,14 @@ if (!isset($plugins[$name])) {
 switch ($action) {
     case 'disable':
         if ($plugins[$name]->is_enabled()) {
-            set_config('disabled', 1, 'contentbank_'. $name);
+            $class = \core_plugin_manager::resolve_plugininfo_class('contenttype');
+            $class::enable_plugin($name, false);
         }
         break;
     case 'enable':
         if (!$plugins[$name]->is_enabled()) {
-            unset_config('disabled', 'contentbank_'. $name);
+            $class = \core_plugin_manager::resolve_plugininfo_class('contenttype');
+            $class::enable_plugin($name, true);
         }
         break;
     case 'up':
@@ -63,6 +65,7 @@ switch ($action) {
             $seq[$currentindex] = $seq[$currentindex - 1];
             $seq[$currentindex - 1] = $name;
             set_config('contentbank_plugins_sortorder', implode(',', $seq));
+            core_plugin_manager::reset_caches();
         }
         break;
     case 'down':
@@ -72,10 +75,10 @@ switch ($action) {
             $seq[$currentindex] = $seq[$currentindex + 1];
             $seq[$currentindex + 1] = $name;
             set_config('contentbank_plugins_sortorder', implode(',', $seq));
+            core_plugin_manager::reset_caches();
         }
         break;
 }
-core_plugin_manager::reset_caches();
 $cache = cache::make('core', 'contentbank_enabled_extensions');
 $cache->purge();
 $cache = cache::make('core', 'contentbank_context_extensions');

admin/courseformats.php

@@ -47,17 +47,14 @@ if (!isset($formatplugins[$formatname])) {
 switch ($action) {
     case 'disable':
         if ($formatplugins[$formatname]->is_enabled()) {
-            if (get_config('moodlecourse', 'format') === $formatname) {
-                print_error('cannotdisableformat', 'error', $return);
-            }
-            set_config('disabled', 1, 'format_'. $formatname);
-            core_plugin_manager::reset_caches();
+            $class = \core_plugin_manager::resolve_plugininfo_class('format');
+            $class::enable_plugin($formatname, false);
         }
         break;
     case 'enable':
         if (!$formatplugins[$formatname]->is_enabled()) {
-            unset_config('disabled', 'format_'. $formatname);
-            core_plugin_manager::reset_caches();
+            $class = \core_plugin_manager::resolve_plugininfo_class('format');
+            $class::enable_plugin($formatname, true);
         }
         break;
     case 'up':

admin/customfields.php

@@ -47,14 +47,14 @@ if (!isset($customfieldplugins[$customfieldname])) {
 switch ($action) {
     case 'disable':
         if ($customfieldplugins[$customfieldname]->is_enabled()) {
-            set_config('disabled', 1, 'customfield_'. $customfieldname);
-            core_plugin_manager::reset_caches();
+            $class = \core_plugin_manager::resolve_plugininfo_class('customfield');
+            $class::enable_plugin($customfieldname, false);
         }
         break;
     case 'enable':
         if (!$customfieldplugins[$customfieldname]->is_enabled()) {
-            unset_config('disabled', 'customfield_'. $customfieldname);
-            core_plugin_manager::reset_caches();
+            $class = \core_plugin_manager::resolve_plugininfo_class('customfield');
+            $class::enable_plugin($customfieldname, true);
         }
         break;
 }

admin/dataformats.php

@@ -48,14 +48,14 @@ if (!isset($plugins[$name])) {
 switch ($action) {
     case 'disable':
         if ($plugins[$name]->is_enabled()) {
-            set_config('disabled', 1, 'dataformat_'. $name);
-            core_plugin_manager::reset_caches();
+            $class = \core_plugin_manager::resolve_plugininfo_class('dataformat');
+            $class::enable_plugin($name, false);
         }
         break;
     case 'enable':
         if (!$plugins[$name]->is_enabled()) {
-            unset_config('disabled', 'dataformat_'. $name);
-            core_plugin_manager::reset_caches();
+            $class = \core_plugin_manager::resolve_plugininfo_class('dataformat');
+            $class::enable_plugin($name, true);
         }
         break;
     case 'up':
@@ -78,4 +78,3 @@ switch ($action) {
         break;
 }
 redirect($return);
-

admin/editors.php

@@ -39,22 +39,19 @@ if (!confirm_sesskey()) {
     redirect($returnurl);
 }
 
-
 $return = true;
 switch ($action) {
     case 'disable':
-        // remove from enabled list
-        $key = array_search($editor, $active_editors);
-        unset($active_editors[$key]);
-        add_to_config_log('editor_visibility', '1', '0', $editor);
+        // Remove from enabled list.
+        $class = \core_plugin_manager::resolve_plugininfo_class('editor');
+        $class::enable_plugin($editor, false);
         break;
 
     case 'enable':
-        // add to enabled list
+        // Add to enabled list.
         if (!in_array($editor, $active_editors)) {
-            $active_editors[] = $editor;
-            $active_editors = array_unique($active_editors);
-            add_to_config_log('editor_visibility', '0', '1', $editor);
+            $class = \core_plugin_manager::resolve_plugininfo_class('editor');
+            $class::enable_plugin($editor, true);
         }
         break;
 
@@ -68,6 +65,8 @@ switch ($action) {
                 $active_editors[$key] = $active_editors[$key + 1];
                 $active_editors[$key + 1] = $fsave;
                 add_to_config_log('editor_position', $key, $key + 1, $editor);
+                set_config('texteditors', implode(',', $active_editors));
+                core_plugin_manager::reset_caches();
             }
         }
         break;
@@ -82,6 +81,8 @@ switch ($action) {
                 $active_editors[$key] = $active_editors[$key - 1];
                 $active_editors[$key - 1] = $fsave;
                 add_to_config_log('editor_position', $key, $key - 1, $editor);
+                set_config('texteditors', implode(',', $active_editors));
+                core_plugin_manager::reset_caches();
             }
         }
         break;
@@ -90,14 +91,6 @@ switch ($action) {
         break;
 }
 
-// at least one editor must be active
-if (empty($active_editors)) {
-    $active_editors = array('textarea');
-}
-
-set_config('texteditors', implode(',', $active_editors));
-core_plugin_manager::reset_caches();
-
 if ($return) {
     redirect ($returnurl);
 }

admin/enrol.php

@@ -43,25 +43,18 @@ $all     = enrol_get_plugins(false);
 
 $return = new moodle_url('/admin/settings.php', array('section'=>'manageenrols'));
 
-$syscontext = context_system::instance();
-
 switch ($action) {
     case 'disable':
-        unset($enabled[$enrol]);
-        set_config('enrol_plugins_enabled', implode(',', array_keys($enabled)));
-        core_plugin_manager::reset_caches();
-        $syscontext->mark_dirty(); // resets all enrol caches
+        $class = \core_plugin_manager::resolve_plugininfo_class('enrol');
+        $class::enable_plugin($enrol, false);
         break;
 
     case 'enable':
         if (!isset($all[$enrol])) {
             break;
         }
-        $enabled = array_keys($enabled);
-        $enabled[] = $enrol;
-        set_config('enrol_plugins_enabled', implode(',', $enabled));
-        core_plugin_manager::reset_caches();
-        $syscontext->mark_dirty(); // resets all enrol caches
+        $class = \core_plugin_manager::resolve_plugininfo_class('enrol');
+        $class::enable_plugin($enrol, true);
         break;
 
     case 'up':
@@ -129,4 +122,4 @@ switch ($action) {
 }
 
 
-redirect($return);
+redirect($return);

admin/environment.xml

@@ -3729,6 +3729,8 @@
           <ON_CHECK message="iscustomadminwarnings" />
         </FEEDBACK>
       </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/filters.php

@@ -31,14 +31,15 @@ $filterpath = optional_param('filterpath', '', PARAM_PLUGIN);
 admin_externalpage_setup('managefilters');
 
 // Clean up bogus filter states first.
+/** @var core\plugininfo\filter[] $plugininfos */
 $plugininfos = core_plugin_manager::instance()->get_plugins_of_type('filter');
-$filters = array();
+$filters = [];
 $states = filter_get_global_states();
 foreach ($states as $state) {
     if (!isset($plugininfos[$state->filter]) and !get_config('filter_'.$state->filter, 'version')) {
-        // Purge messy leftovers after incorrectly uninstalled plugins and unfinished installs.
-        $DB->delete_records('filter_active', array('filter' => $state->filter));
-        $DB->delete_records('filter_config', array('filter' => $state->filter));
+        // Purge messy leftovers after incorrectly uninstalled plugins and unfinished installations.
+        $DB->delete_records('filter_active', ['filter' => $state->filter]);
+        $DB->delete_records('filter_config', ['filter' => $state->filter]);
         error_log('Deleted bogus "filter_'.$state->filter.'" states and config data.');
     } else {
         $filters[$state->filter] = $state;
@@ -50,7 +51,6 @@ foreach ($plugininfos as $filter => $info) {
     if (isset($filters[$filter])) {
         continue;
     }
-    /** @var \core\plugininfo\base $info */
     if ($info->is_installed_and_upgraded()) {
         filter_set_global_state($filter, TEXTFILTER_DISABLED);
         $states = filter_get_global_states();
@@ -72,10 +72,9 @@ switch ($action) {
 
     case 'setstate':
         if (isset($filters[$filterpath]) and $newstate = optional_param('newstate', '', PARAM_INT)) {
-            filter_set_global_state($filterpath, $newstate);
-            if ($newstate == TEXTFILTER_DISABLED) {
-                filter_set_applies_to_strings($filterpath, false);
-            }
+            /** @var \core\plugininfo\filter $class */
+            $class = core_plugin_manager::resolve_plugininfo_class('filter');
+            $class::enable_plugin($filterpath, $newstate);
         }
         break;
 
@@ -83,12 +82,16 @@ switch ($action) {
         if (isset($filters[$filterpath])) {
             $applytostrings = optional_param('stringstoo', false, PARAM_BOOL);
             filter_set_applies_to_strings($filterpath, $applytostrings);
+            reset_text_filters_cache();
+            core_plugin_manager::reset_caches();
         }
         break;
 
     case 'down':
         if (isset($filters[$filterpath])) {
             filter_set_global_state($filterpath, $filters[$filterpath]->active, 1);
+            reset_text_filters_cache();
+            core_plugin_manager::reset_caches();
         }
         break;
 
@@ -96,14 +99,14 @@ switch ($action) {
         if (isset($filters[$filterpath])) {
             $oldpos = $filters[$filterpath]->sortorder;
             filter_set_global_state($filterpath, $filters[$filterpath]->active, -1);
+            reset_text_filters_cache();
+            core_plugin_manager::reset_caches();
         }
         break;
 }
 
-// Reset caches and return.
+// Return.
 if ($action) {
-    reset_text_filters_cache();
-    core_plugin_manager::reset_caches();
     redirect(new moodle_url('/admin/filters.php'));
 }
 
@@ -115,12 +118,12 @@ $states = filter_get_global_states();
 $stringfilters = filter_get_string_filters();
 
 $table = new html_table();
-$table->head  = array(get_string('filter'), get_string('isactive', 'filters'),
-        get_string('order'), get_string('applyto', 'filters'), get_string('settings'), get_string('uninstallplugin', 'core_admin'));
+$table->head  = [get_string('filter'), get_string('isactive', 'filters'),
+        get_string('order'), get_string('applyto', 'filters'), get_string('settings'), get_string('uninstallplugin', 'core_admin')];
 $table->colclasses = array ('leftalign', 'leftalign', 'centeralign', 'leftalign', 'leftalign', 'leftalign');
 $table->attributes['class'] = 'admintable generaltable';
 $table->id = 'filterssetting';
-$table->data  = array();
+$table->data  = [];
 
 $lastactive = null;
 foreach ($states as $state) {
@@ -157,15 +160,16 @@ die;
 /**
  * Return action URL.
  *
- * @param string $filterpath
- * @param string $action
- * @return moodle_url
+ * @param string $filterpath which filter to get the URL for.
+ * @param string $action which action to get the URL for.
+ * @return moodle_url|null the requested URL.
  */
-function filters_action_url($filterpath, $action) {
+function filters_action_url(string $filterpath, string $action): ?moodle_url {
     if ($action === 'delete') {
         return core_plugin_manager::instance()->get_uninstall_url('filter_'.$filterpath, 'manage');
     }
-    return new moodle_url('/admin/filters.php', array('sesskey'=>sesskey(), 'filterpath'=>$filterpath, 'action'=>$action));
+    return new moodle_url('/admin/filters.php',
+            ['sesskey' => sesskey(), 'filterpath' => $filterpath, 'action' => $action]);
 }
 
 /**
@@ -178,24 +182,25 @@ function filters_action_url($filterpath, $action) {
  * @param bool $applytostrings
  * @return array data
  */
-function get_table_row(\core\plugininfo\filter $plugininfo, $state, $isfirstrow, $islastactive, $applytostrings) {
+function get_table_row(\core\plugininfo\filter $plugininfo, stdClass $state,
+        bool $isfirstrow, bool $islastactive, bool $applytostrings): array {
     global $OUTPUT;
-    $row = array();
+    $row = [];
     $filter = $state->filter;
     $active = $plugininfo->is_installed_and_upgraded();
 
     static $activechoices;
     static $applytochoices;
     if (!isset($activechoices)) {
-        $activechoices = array(
+        $activechoices = [
             TEXTFILTER_DISABLED => get_string('disabled', 'core_filters'),
             TEXTFILTER_OFF => get_string('offbutavailable', 'core_filters'),
             TEXTFILTER_ON => get_string('on', 'core_filters'),
-        );
-        $applytochoices = array(
+        ];
+        $applytochoices = [
             0 => get_string('content', 'core_filters'),
             1 => get_string('contentandheadings', 'core_filters'),
-        );
+        ];
     }
 
     // Filter name.
@@ -209,7 +214,7 @@ function get_table_row(\core\plugininfo\filter $plugininfo, $state, $isfirstrow,
 
     // Disable/off/on.
     $select = new single_select(filters_action_url($filter, 'setstate'), 'newstate', $activechoices, $state->active, null, 'active' . $filter);
-    $select->set_label(get_string('isactive', 'filters'), array('class' => 'accesshide'));
+    $select->set_label(get_string('isactive', 'filters'), ['class' => 'accesshide']);
     $row[] = $OUTPUT->render($select);
 
     // Re-order.
@@ -217,12 +222,14 @@ function get_table_row(\core\plugininfo\filter $plugininfo, $state, $isfirstrow,
     $spacer = $OUTPUT->spacer();
     if ($state->active != TEXTFILTER_DISABLED) {
         if (!$isfirstrow) {
-            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'up'), new pix_icon('t/up', get_string('up'), '', array('class' => 'iconsmall')));
+            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'up'),
+                    new pix_icon('t/up', get_string('up'), '', ['class' => 'iconsmall']));
         } else {
             $updown .= $spacer;
         }
         if (!$islastactive) {
-            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'down'), new pix_icon('t/down', get_string('down'), '', array('class' => 'iconsmall')));
+            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'down'),
+                    new pix_icon('t/down', get_string('down'), '', ['class' => 'iconsmall']));
         } else {
             $updown .= $spacer;
         }
@@ -230,20 +237,23 @@ function get_table_row(\core\plugininfo\filter $plugininfo, $state, $isfirstrow,
     $row[] = $updown;
 
     // Apply to strings.
-    $select = new single_select(filters_action_url($filter, 'setapplyto'), 'stringstoo', $applytochoices, $applytostrings, null, 'applyto' . $filter);
-    $select->set_label(get_string('applyto', 'filters'), array('class' => 'accesshide'));
+    $select = new single_select(filters_action_url($filter, 'setapplyto'),
+            'stringstoo', $applytochoices, $applytostrings, null, 'applyto' . $filter);
+    $select->set_label(get_string('applyto', 'filters'), ['class' => 'accesshide']);
     $select->disabled = ($state->active == TEXTFILTER_DISABLED);
     $row[] = $OUTPUT->render($select);
 
     // Settings link, if required.
     if ($active and filter_has_global_settings($filter)) {
-        $row[] = html_writer::link(new moodle_url('/admin/settings.php', array('section'=>'filtersetting'.$filter)), get_string('settings'));
+        $row[] = html_writer::link(new moodle_url('/admin/settings.php',
+                ['section' => 'filtersetting'.$filter]), get_string('settings'));
     } else {
         $row[] = '';
     }
 
     // Uninstall.
-    $row[] = html_writer::link(filters_action_url($filter, 'delete'), get_string('uninstallplugin', 'core_admin'));
+    $row[] = html_writer::link(filters_action_url($filter, 'delete'),
+            get_string('uninstallplugin', 'core_admin'));
 
     return $row;
 }

admin/index.php

@@ -53,6 +53,12 @@ if (!extension_loaded('xml')) {
     die();
 }
 
+// Make sure mbstring extension is available.
+if (!extension_loaded('mbstring')) {
+    echo 'Moodle requires the mbstring PHP extension. Please install or enable the mbstring extension.';
+    die();
+}
+
 define('NO_OUTPUT_BUFFERING', true);
 
 if (isset($_POST['upgradekey'])) {
@@ -719,6 +725,12 @@ if (during_initial_install()) {
     set_config('rolesactive', 1); // after this, during_initial_install will return false.
     set_config('adminsetuppending', 1);
     set_config('registrationpending', 1); // Remind to register site after all other setup is finished.
+
+    // Apply default preset, if it is defined in $CFG and has a valid value.
+    if (!empty($CFG->setsitepresetduringinstall)) {
+        \core_adminpresets\helper::change_default_preset($CFG->setsitepresetduringinstall);
+    }
+
     // we need this redirect to setup proper session
     upgrade_finished("index.php?sessionstarted=1&lang=$CFG->lang");
 }
@@ -819,6 +831,7 @@ $insecuredataroot = is_dataroot_insecure(true);
 $SESSION->admin_critical_warning = ($insecuredataroot==INSECURE_DATAROOT_ERROR);
 
 $adminroot = admin_get_root();
+$PAGE->set_primary_active_tab('siteadminnode');
 
 // Check if there are any new admin settings which have still yet to be set
 if (any_new_admin_settings($adminroot)) {
@@ -907,6 +920,15 @@ $showcampaigncontent = !isset($CFG->showcampaigncontent) || $CFG->showcampaignco
 // Encourage admins to enable the user feedback feature if it is not enabled already.
 $showfeedbackencouragement = empty($CFG->enableuserfeedback);
 
+// Check if the service and support content setting is enabled or not.
+$servicesandsupportcontent = !isset($CFG->showservicesandsupportcontent) || $CFG->showservicesandsupportcontent;
+
+// Check whether the XML-RPC protocol is enabled or not.
+require_once($CFG->libdir . '/environmentlib.php');
+$result = new environment_results('custom_checks');
+$result = check_xmlrpc_usage($result);
+$xmlrpcwarning = !is_null($result) ? get_string($result->getFeedbackStr(), 'admin') : '';
+
 admin_externalpage_setup('adminnotifications');
 
 $output = $PAGE->get_renderer('core', 'admin');
@@ -915,4 +937,5 @@ echo $output->admin_notifications_page($maturity, $insecuredataroot, $errorsdisp
                                        $maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb,
                                        $registered, $cachewarnings, $eventshandlers, $themedesignermode, $devlibdir,
                                        $mobileconfigured, $overridetossl, $invalidforgottenpasswordurl, $croninfrequent,
-                                       $showcampaigncontent, $showfeedbackencouragement);
+                                       $showcampaigncontent, $showfeedbackencouragement, $servicesandsupportcontent,
+                                       $xmlrpcwarning);

admin/media.php

@@ -49,11 +49,13 @@ if (!array_key_exists($media, $plugins)) {
 
 switch ($action) {
     case 'disable':
-        $plugins[$media]->set_enabled(false);
+        $class = \core_plugin_manager::resolve_plugininfo_class('media');
+        $class::enable_plugin($media, false);
         break;
 
     case 'enable':
-        $plugins[$media]->set_enabled(true);
+        $class = \core_plugin_manager::resolve_plugininfo_class('media');
+        $class::enable_plugin($media, true);
         break;
 
     case 'up':

admin/message.php

@@ -48,69 +48,52 @@ if (($form = data_submitted()) && confirm_sesskey()) {
     foreach ($providers as $provider) {
         $componentproviderbase = $provider->component.'_'.$provider->name;
         $disableprovidersetting = $componentproviderbase.'_disable';
-        $providerdisabled = false;
         if (!isset($form->$disableprovidersetting)) {
-            $providerdisabled = true;
             $newpreferences[$disableprovidersetting] = 1;
         } else {
             $newpreferences[$disableprovidersetting] = 0;
         }
 
-        foreach (array('permitted', 'loggedin', 'loggedoff') as $setting) {
-            $value = null;
-            $componentprovidersetting = $componentproviderbase.'_'.$setting;
-            if ($setting == 'permitted') {
-                // If we deal with permitted select element, we need to create individual
-                // setting for each possible processor. Note that this block will
-                // always be processed first after entring parental foreach iteration
-                // so we can change form values on this stage.
-                foreach ($processors as $processor) {
-                    $value = '';
-                    if (isset($form->{$componentprovidersetting}[$processor->name])) {
-                        $value = $form->{$componentprovidersetting}[$processor->name];
-                    }
-                    // Ensure that loggedin loggedoff options are set correctly for this permission.
-                    if (($value == 'disallowed') || $providerdisabled) {
-                        // It might be better to unset them, but I can't figure out why that cause error.
-                        $form->{$componentproviderbase.'_loggedin'}[$processor->name] = 0;
-                        $form->{$componentproviderbase.'_loggedoff'}[$processor->name] = 0;
-                    } else if ($value == 'forced') {
-                        $form->{$componentproviderbase.'_loggedin'}[$processor->name] = 1;
-                        $form->{$componentproviderbase.'_loggedoff'}[$processor->name] = 1;
-                    }
-                    // Record the site preference.
-                    $newpreferences[$processor->name.'_provider_'.$componentprovidersetting] = $value;
-                }
-            } else {
-                $newsettings = array();
-                if (property_exists($form, $componentprovidersetting)) {
-                    // We must be processing loggedin or loggedoff checkboxes.
-                    // Store defained comma-separated processors as setting value.
-                    // Using array_filter eliminates elements set to 0 above.
-                    $newsettings = array_keys(array_filter($form->{$componentprovidersetting}));
-                }
-
-                // Let's join existing setting values for disabled processors.
-                $property = 'message_provider_'.$componentprovidersetting;
-                if (property_exists($preferences, $property)) {
-                    $existingsetting = $preferences->$property;
-                    foreach ($disabledprocessors as $disable) {
-                        if (strpos($existingsetting, $disable->name) > -1) {
-                            $newsettings[] = $disable->name;
-                        }
-                    }
-                }
-
-                $value = join(',', $newsettings);
-                if (empty($value)) {
-                    $value = null;
+        $componentprovidersetting = $componentproviderbase.'_locked';
+        foreach ($processors as $processor) {
+            $value = 0;
+            if (isset($form->{$componentprovidersetting}[$processor->name])) {
+                $value = $form->{$componentprovidersetting}[$processor->name];
+                if ($value == 'on') {
+                    $value = 1;
                 }
             }
-            if ($setting != 'permitted') {
-                // We have already recoded site preferences for 'permitted' type.
-                $newpreferences['message_provider_'.$componentprovidersetting] = $value;
+
+            // Record the site preference.
+            $newpreferences[$processor->name.'_provider_'.$componentprovidersetting] = $value;
+        }
+
+        $componentprovidersetting = $componentproviderbase.'_enabled';
+        $newsettings = [];
+        if (isset($form->$componentprovidersetting)) {
+            // Store defined comma-separated processors as setting value.
+            // Using array_filter eliminates elements set to 0 above.
+            $newsettings = array_keys(array_filter($form->{$componentprovidersetting}));
+        }
+
+        // Let's join existing setting values for disabled processors.
+        $property = 'message_provider_'.$componentprovidersetting;
+        if (property_exists($preferences, $property)) {
+            $existingsetting = $preferences->$property;
+            foreach ($disabledprocessors as $disable) {
+                if (strpos($existingsetting, $disable->name) > -1) {
+                    $newsettings[] = $disable->name;
+                }
             }
         }
+
+        $value = join(',', $newsettings);
+        if (empty($value)) {
+            $value = null;
+        }
+
+        // Record the site preference.
+        $newpreferences['message_provider_'.$componentprovidersetting] = $value;
     }
 
     // Update database.
@@ -119,10 +102,8 @@ 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);
+        $class = \core_plugin_manager::resolve_plugininfo_class('message');
+        $class::enable_plugin($processor->name, $enabled);
     }
 
     foreach ($newpreferences as $name => $value) {
@@ -144,8 +125,6 @@ if (($form = data_submitted()) && confirm_sesskey()) {
 
 // Page settings
 $PAGE->set_context(context_system::instance());
-$PAGE->requires->js_init_call('M.core_message.init_defaultoutputs');
-
 $renderer = $PAGE->get_renderer('core', 'message');
 
 // Display the page.

admin/mnet/access_control.php

@@ -117,6 +117,7 @@ if ($form = data_submitted() and confirm_sesskey()) {
 }
 
 echo $OUTPUT->header();
+echo $OUTPUT->render(mnet_get_deprecation_notice());
 
 // Explain
 echo $OUTPUT->box(get_string('ssoacldescr','mnet'));

admin/mnet/index.php

@@ -81,6 +81,7 @@
     $hosts = $DB->get_records_select('mnet_host', "id <> ? AND deleted = 0", array($CFG->mnet_localhost_id), 'wwwroot ASC');
 
     echo $OUTPUT->header();
+    echo $OUTPUT->render(mnet_get_deprecation_notice());
 ?>
 <form method="post" action="index.php">
     <table align="center" width="635" class="generaltable" border="0" cellpadding="5" cellspacing="0">

admin/mnet/peers.php

@@ -51,6 +51,8 @@ if ($hostid && $DB->get_field('mnet_host', 'deleted', array('id' => $hostid)) !=
 $PAGE->set_url('/admin/mnet/peers.php');
 admin_externalpage_setup($adminsection);
 
+$deprecatenotify = mnet_get_deprecation_notice();
+
 if (!extension_loaded('openssl')) {
     print_error('requiresopenssl', 'mnet');
 }
@@ -90,6 +92,7 @@ if ($formdata = $simpleform->get_data()) {
     $formdata->oldpublickey = $mnet_peer->public_key; // set this so we can confirm on form post without having to recreate the mnet_peer object
     $reviewform->set_data($mnet_peer);
     echo $OUTPUT->header();
+    echo $OUTPUT->render($deprecatenotify);
     echo $OUTPUT->box_start();
     $reviewform->display();
     echo $OUTPUT->box_end();
@@ -177,6 +180,7 @@ if ($formdata = $reviewform->get_data()) {
     }
 } else if ($reviewform->is_submitted()) { // submitted, but errors
     echo $OUTPUT->header();
+    echo $OUTPUT->render($deprecatenotify);
     echo $OUTPUT->box_start();
     $reviewform->display();
     echo $OUTPUT->box_end();
@@ -187,6 +191,7 @@ if ($formdata = $reviewform->get_data()) {
 
 // normal flow - just display all hosts with links
 echo $OUTPUT->header();
+echo $OUTPUT->render($deprecatenotify);
 $hosts = mnet_get_hosts(true);
 
 // print the table to display the register all hosts setting

admin/mnet/tabs.php

@@ -44,4 +44,5 @@ if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
 } else {
     $tabs[] = new tabobject('mnetdetails', '#', $strmnetedithost, $strmnetedithost, false);
 }
+echo $OUTPUT->render(mnet_get_deprecation_notice());
 print_tabs(array($tabs), $currenttab);

admin/mnet/trustedhosts.html

@@ -1,5 +1,6 @@
 <?php
 echo $OUTPUT->header();
+echo $OUTPUT->render(mnet_get_deprecation_notice());
 ?>
 <div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->
 <table cellspacing="0" cellpadding="5"  class="generaltable generalbox" >

admin/modules.php

@@ -30,42 +30,17 @@
 /// If data submitted, then process and store.
 
     if (!empty($hide) and confirm_sesskey()) {
-        if (!$module = $DB->get_record("modules", array("name"=>$hide))) {
-            print_error('moduledoesnotexist', 'error');
-        }
-        $DB->set_field("modules", "visible", "0", array("id"=>$module->id)); // Hide main module
-        // Remember the visibility status in visibleold
-        // and hide...
-        $sql = "UPDATE {course_modules}
-                   SET visibleold=visible, visible=0
-                 WHERE module=?";
-        $DB->execute($sql, array($module->id));
-        // Increment course.cacherev for courses where we just made something invisible.
-        // This will force cache rebuilding on the next request.
-        increment_revision_number('course', 'cacherev',
-                "id IN (SELECT DISTINCT course
-                                FROM {course_modules}
-                               WHERE visibleold=1 AND module=?)",
-                array($module->id));
-        core_plugin_manager::reset_caches();
+        $class = \core_plugin_manager::resolve_plugininfo_class('mod');
+        $class::enable_plugin($hide, false);
+
         admin_get_root(true, false);  // settings not required - only pages
         redirect(new moodle_url('/admin/modules.php'));
     }
 
     if (!empty($show) and confirm_sesskey()) {
-        if (!$module = $DB->get_record("modules", array("name"=>$show))) {
-            print_error('moduledoesnotexist', 'error');
-        }
-        $DB->set_field("modules", "visible", "1", array("id"=>$module->id)); // Show main module
-        $DB->set_field('course_modules', 'visible', '1', array('visibleold'=>1, 'module'=>$module->id)); // Get the previous saved visible state for the course module.
-        // Increment course.cacherev for courses where we just made something visible.
-        // This will force cache rebuilding on the next request.
-        increment_revision_number('course', 'cacherev',
-                "id IN (SELECT DISTINCT course
-                                FROM {course_modules}
-                               WHERE visible=1 AND module=?)",
-                array($module->id));
-        core_plugin_manager::reset_caches();
+        $class = \core_plugin_manager::resolve_plugininfo_class('mod');
+        $class::enable_plugin($show, true);
+
         admin_get_root(true, false);  // settings not required - only pages
         redirect(new moodle_url('/admin/modules.php'));
     }
@@ -100,7 +75,7 @@
             $missing = true;
         } else {
             // took out hspace="\10\", because it does not validate. don't know what to replace with.
-            $icon = "<img src=\"" . $OUTPUT->image_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
+            $icon = "<img src=\"" . $OUTPUT->image_url('monologo', $module->name) . "\" class=\"icon\" alt=\"\" />";
             $strmodulename = $icon.' '.get_string('modulename', $module->name);
             $missing = false;
         }
@@ -163,5 +138,3 @@
     $table->print_html();
 
     echo $OUTPUT->footer();
-
-

admin/plugins.php

@@ -52,6 +52,8 @@ $pageurl = new moodle_url('/admin/plugins.php', $pageparams);
 
 $pluginman = core_plugin_manager::instance();
 
+$PAGE->set_primary_active_tab('siteadminnode');
+
 if ($uninstall) {
 
     if (!$confirmed) {

admin/portfolio.php

@@ -102,20 +102,15 @@ if (($action == 'edit') || ($action == 'new')) {
     require_sesskey();
 
     $instance = portfolio_instance($portfolio);
-    $current = $instance->get('visible');
-    if (empty($current) && $instance->instance_sanity_check()) {
-        print_error('cannotsetvisible', 'portfolio', $baseurl);
-    }
-
+    $plugin = $instance->get('plugin');
     if ($action == 'show') {
         $visible = 1;
     } else {
         $visible = 0;
     }
 
-    $instance->set('visible', $visible);
-    $instance->save();
-    core_plugin_manager::reset_caches();
+    $class = \core_plugin_manager::resolve_plugininfo_class('portfolio');
+    $class::enable_plugin($plugin, $visible);
     $return = true;
 } else if ($action == 'delete') {
     $instance = portfolio_instance($portfolio);
@@ -246,4 +241,3 @@ if ($return) {
 }
 
 echo $OUTPUT->footer();
-

admin/presets/classes/helper.php

@@ -0,0 +1,390 @@
+<?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 core_adminpresets;
+
+/**
+ * Admin presets helper class.
+ *
+ * @package    core_adminpresets
+ * @copyright  2021 Sara Arjona (sara@moodle.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class helper {
+
+    /**
+     * Create an empty preset.
+     *
+     * @param array $data Preset data. Supported values:
+     *   - name. To define the preset name.
+     *   - comments. To change the comments field.
+     *   - author. To update the author field.
+     *   - iscore. Whether the preset is a core preset or not. Valid values on \core_adminpresets\manager class.
+     * @return int The identifier of the preset created.
+     */
+    public static function create_preset(array $data): int {
+        global $CFG, $USER, $DB;
+
+        $name = array_key_exists('name', $data) ? $data['name'] : '';
+        $comments = array_key_exists('comments', $data) ? $data['comments'] : '';
+        $author = array_key_exists('author', $data) ? $data['author'] : fullname($USER);
+        $iscore = array_key_exists('iscore', $data) ? $data['iscore'] : manager::NONCORE_PRESET;
+
+        // Validate iscore value.
+        $allowed = [manager::NONCORE_PRESET, manager::STARTER_PRESET, manager::FULL_PRESET];
+        if (!in_array($iscore, $allowed)) {
+            $iscore = manager::NONCORE_PRESET;
+        }
+
+        $preset = [
+            'userid' => $USER->id,
+            'name' => $name,
+            'comments' => $comments,
+            'site' => $CFG->wwwroot,
+            'author' => $author,
+            'moodleversion' => $CFG->version,
+            'moodlerelease' => $CFG->release,
+            'iscore' => $iscore,
+            'timecreated' => time(),
+            'timeimported' => 0,
+        ];
+
+        $presetid = $DB->insert_record('adminpresets', $preset);
+        return $presetid;
+    }
+
+    /**
+     * Helper method to add a setting item to a preset.
+     *
+     * @param int $presetid Preset identifier where the item will belong.
+     * @param string $name Item name.
+     * @param string $value Item value.
+     * @param string|null $plugin Item plugin.
+     * @param string|null $advname If the item is an advanced setting, the name of the advanced setting should be specified here.
+     * @param string|null $advvalue If the item is an advanced setting, the value of the advanced setting should be specified here.
+     * @return int The item identificator.
+     */
+    public static function add_item(int $presetid, string $name, string $value, ?string $plugin = 'none',
+            ?string $advname = null, ?string $advvalue = null): int {
+        global $DB;
+
+        $presetitem = [
+            'adminpresetid' => $presetid,
+            'plugin' => $plugin,
+            'name' => $name,
+            'value' => $value,
+        ];
+        $itemid = $DB->insert_record('adminpresets_it', $presetitem);
+
+        if (!empty($advname)) {
+            $presetadv = [
+                'itemid' => $itemid,
+                'name' => $advname,
+                'value' => $advvalue,
+            ];
+            $DB->insert_record('adminpresets_it_a', $presetadv);
+        }
+
+        return $itemid;
+    }
+
+    /**
+     * Helper method to add a plugin to a preset.
+     *
+     * @param int $presetid Preset identifier where the item will belong.
+     * @param string $plugin Plugin type.
+     * @param string $name Plugin name.
+     * @param int $enabled Whether the plugin will be enabled or not.
+     * @return int The plugin identificator.
+     */
+    public static function add_plugin(int $presetid, string $plugin, string $name, int $enabled): int {
+        global $DB;
+
+        $pluginentry = [
+            'adminpresetid' => $presetid,
+            'plugin' => $plugin,
+            'name' => $name,
+            'enabled' => $enabled,
+        ];
+        $pluginid = $DB->insert_record('adminpresets_plug', $pluginentry);
+
+        return $pluginid;
+    }
+
+    /**
+     * Apply the given preset. If it's a filename, the preset will be imported and then applied.
+     *
+     * @param string $presetnameorfile The preset name to be applied or a valid preset file to be imported and applied.
+     * @return int|null The preset identifier that has been applied or null if the given value was not valid.
+     */
+    public static function change_default_preset(string $presetnameorfile): ?int {
+        global $DB;
+
+        $presetid = null;
+
+        // Check if the given variable points to a valid preset file to be imported and applied.
+        if (is_readable($presetnameorfile)) {
+            $xmlcontent = file_get_contents($presetnameorfile);
+            $manager = new manager();
+            list($xmlnotused, $preset) = $manager->import_preset($xmlcontent);
+            if (!is_null($preset)) {
+                list($applied) = $manager->apply_preset($preset->id);
+                if (!empty($applied)) {
+                    $presetid = $preset->id;
+                }
+            }
+        } else {
+            // Check if the given preset exists; if that's the case, it will be applied.
+            $stringmanager = get_string_manager();
+            if ($stringmanager->string_exists($presetnameorfile . 'preset', 'core_adminpresets')) {
+                $params = ['name' => get_string($presetnameorfile . 'preset', 'core_adminpresets')];
+            } else {
+                $params = ['name' => $presetnameorfile];
+            }
+            if ($preset = $DB->get_record('adminpresets', $params)) {
+                $manager = new manager();
+                list($applied) = $manager->apply_preset($preset->id);
+                if (!empty($applied)) {
+                    $presetid = $preset->id;
+                }
+            }
+        }
+
+        return $presetid;
+    }
+
+    /**
+     * Helper method to create default site admin presets and initialize them.
+     */
+    public static function create_default_presets(): void {
+        // Create the "Starter" site admin preset.
+        $data = [
+            'name' => get_string('starterpreset', 'core_adminpresets'),
+            'comments' => get_string('starterpresetdescription', 'core_adminpresets'),
+            'iscore' => manager::STARTER_PRESET,
+        ];
+        $presetid = static::create_preset($data);
+
+        // Add settings to the "Starter" site admin preset.
+        static::add_item($presetid, 'usecomments', '0');
+        static::add_item($presetid, 'usetags', '0');
+        static::add_item($presetid, 'enablenotes', '0');
+        static::add_item($presetid, 'enableblogs', '0');
+        static::add_item($presetid, 'enablebadges', '0');
+        static::add_item($presetid, 'enableanalytics', '0');
+        static::add_item($presetid, 'enabled', '0', 'core_competency');
+        static::add_item($presetid, 'pushcourseratingstouserplans', '0', 'core_competency');
+        static::add_item($presetid, 'showdataretentionsummary', '0', 'tool_dataprivacy');
+        static::add_item($presetid, 'forum_maxattachments', '3');
+        static::add_item($presetid, 'guestloginbutton', '0');
+        // Set Activity chooser tabs to "Starred, All, Recommended".
+        static::add_item($presetid, 'activitychoosertabmode', '1');
+
+        // Modules: Hide chat, database, external tool (lti), IMS content package (imscp), lesson, SCORM, survey, wiki, workshop.
+        static::add_plugin($presetid, 'mod', 'chat', false);
+        static::add_plugin($presetid, 'mod', 'data', false);
+        static::add_plugin($presetid, 'mod', 'lti', false);
+        static::add_plugin($presetid, 'mod', 'imscp', false);
+        static::add_plugin($presetid, 'mod', 'lesson', false);
+        static::add_plugin($presetid, 'mod', 'scorm', false);
+        static::add_plugin($presetid, 'mod', 'survey', false);
+        static::add_plugin($presetid, 'mod', 'wiki', false);
+        static::add_plugin($presetid, 'mod', 'workshop', false);
+
+        // Availability restrictions: Hide Grouping, User profile.
+        static::add_plugin($presetid, 'availability', 'grouping', false);
+        static::add_plugin($presetid, 'availability', 'profile', false);
+
+        // Blocks: Hide Activities, Blog menu, Blog tags, Comments, Course completion status, Courses, Flickr,
+        // Global search, Latest badges, Learning plans, Logged in user, Login, Main menu, Mentees, Network servers, Online users,
+        // Private files, Recent blog entries, Recently accessed courses, Search forums, Section links, Social activities,
+        // Starred courses, Tags, YouTube.
+        // Hidden by default: Course/site summary, RSS feeds, Self completion, Feedback.
+        static::add_plugin($presetid, 'block', 'activity_modules', false);
+        static::add_plugin($presetid, 'block', 'blog_menu', false);
+        static::add_plugin($presetid, 'block', 'blog_tags', false);
+        static::add_plugin($presetid, 'block', 'comments', false);
+        static::add_plugin($presetid, 'block', 'completionstatus', false);
+        static::add_plugin($presetid, 'block', 'course_summary', false);
+        static::add_plugin($presetid, 'block', 'course_list', false);
+        static::add_plugin($presetid, 'block', 'tag_flickr', false);
+        static::add_plugin($presetid, 'block', 'globalsearch', false);
+        static::add_plugin($presetid, 'block', 'badges', false);
+        static::add_plugin($presetid, 'block', 'lp', false);
+        static::add_plugin($presetid, 'block', 'myprofile', false);
+        static::add_plugin($presetid, 'block', 'login', false);
+        static::add_plugin($presetid, 'block', 'site_main_menu', false);
+        static::add_plugin($presetid, 'block', 'mentees', false);
+        static::add_plugin($presetid, 'block', 'mnet_hosts', false);
+        static::add_plugin($presetid, 'block', 'private_files', false);
+        static::add_plugin($presetid, 'block', 'blog_recent', false);
+        static::add_plugin($presetid, 'block', 'rss_client', false);
+        static::add_plugin($presetid, 'block', 'search_forums', false);
+        static::add_plugin($presetid, 'block', 'section_links', false);
+        static::add_plugin($presetid, 'block', 'selfcompletion', false);
+        static::add_plugin($presetid, 'block', 'social_activities', false);
+        static::add_plugin($presetid, 'block', 'tags', false);
+        static::add_plugin($presetid, 'block', 'tag_youtube', false);
+        static::add_plugin($presetid, 'block', 'feedback', false);
+        static::add_plugin($presetid, 'block', 'online_users', false);
+        static::add_plugin($presetid, 'block', 'recentlyaccessedcourses', false);
+        static::add_plugin($presetid, 'block', 'starredcourses', false);
+
+        // Course formats: Disable Social format.
+        static::add_plugin($presetid, 'format', 'social', false);
+
+        // Data formats: Disable Javascript Object Notation (.json).
+        static::add_plugin($presetid, 'dataformat', 'json', false);
+
+        // Enrolments: Disable Cohort sync, Guest access.
+        static::add_plugin($presetid, 'enrol', 'cohort', false);
+        static::add_plugin($presetid, 'enrol', 'guest', false);
+
+        // Filter: Disable MathJax, Activity names auto-linking.
+        static::add_plugin($presetid, 'filter', 'mathjaxloader', TEXTFILTER_DISABLED);
+        static::add_plugin($presetid, 'filter', 'activitynames', TEXTFILTER_DISABLED);
+
+        // Question behaviours: Disable Adaptive mode (no penalties), Deferred feedback with CBM, Immediate feedback with CBM.
+        static::add_plugin($presetid, 'qbehaviour', 'adaptivenopenalty', false);
+        static::add_plugin($presetid, 'qbehaviour', 'deferredcbm', false);
+        static::add_plugin($presetid, 'qbehaviour', 'immediatecbm', false);
+
+        // Question types: Disable Calculated, Calculated multichoice, Calculated simple, Drag and drop markers,
+        // Drag and drop onto image, Embedded answers (Cloze), Numerical, Random short-answer matching.
+        static::add_plugin($presetid, 'qtype', 'calculated', false);
+        static::add_plugin($presetid, 'qtype', 'calculatedmulti', false);
+        static::add_plugin($presetid, 'qtype', 'calculatedsimple', false);
+        static::add_plugin($presetid, 'qtype', 'ddmarker', false);
+        static::add_plugin($presetid, 'qtype', 'ddimageortext', false);
+        static::add_plugin($presetid, 'qtype', 'multianswer', false);
+        static::add_plugin($presetid, 'qtype', 'numerical', false);
+        static::add_plugin($presetid, 'qtype', 'randomsamatch', false);
+
+        // Repositories: Disable Server files, URL downloader, Wikimedia.
+        static::add_plugin($presetid, 'repository', 'local', false);
+        static::add_plugin($presetid, 'repository', 'url', false);
+        static::add_plugin($presetid, 'repository', 'wikimedia', false);
+
+        // Text editors: Disable TinyMCE HTML editor.
+        static::add_plugin($presetid, 'editor', 'tinymce', false);
+
+        // Create the "Full" site admin preset.
+        $data = [
+            'name' => get_string('fullpreset', 'core_adminpresets'),
+            'comments' => get_string('fullpresetdescription', 'core_adminpresets'),
+            'iscore' => manager::FULL_PRESET,
+        ];
+        $presetid = static::create_preset($data);
+
+        // Add settings to the "Full" site admin preset.
+        static::add_item($presetid, 'usecomments', '1');
+        static::add_item($presetid, 'usetags', '1');
+        static::add_item($presetid, 'enablenotes', '1');
+        static::add_item($presetid, 'enableblogs', '1');
+        static::add_item($presetid, 'enablebadges', '1');
+        static::add_item($presetid, 'enableanalytics', '1');
+        static::add_item($presetid, 'enabled', '1', 'core_competency');
+        static::add_item($presetid, 'pushcourseratingstouserplans', '1', 'core_competency');
+        static::add_item($presetid, 'showdataretentionsummary', '1', 'tool_dataprivacy');
+        static::add_item($presetid, 'forum_maxattachments', '9');
+        static::add_item($presetid, 'guestloginbutton', '1');
+        // Set Activity chooser tabs to the default value ("Starred, All, Activities, Resources, Recommended").
+        static::add_item($presetid, 'activitychoosertabmode', '0');
+
+        // Modules: Enable chat, database, external tool (lti), IMS content package (imscp), lesson, SCORM, survey, wiki, workshop.
+        static::add_plugin($presetid, 'mod', 'chat', true);
+        static::add_plugin($presetid, 'mod', 'data', true);
+        static::add_plugin($presetid, 'mod', 'lti', true);
+        static::add_plugin($presetid, 'mod', 'imscp', true);
+        static::add_plugin($presetid, 'mod', 'lesson', true);
+        static::add_plugin($presetid, 'mod', 'scorm', true);
+        static::add_plugin($presetid, 'mod', 'survey', true);
+        static::add_plugin($presetid, 'mod', 'wiki', true);
+        static::add_plugin($presetid, 'mod', 'workshop', true);
+
+        // Availability restrictions: Enable Grouping, User profile.
+        static::add_plugin($presetid, 'availability', 'grouping', true);
+        static::add_plugin($presetid, 'availability', 'profile', true);
+
+        // Blocks: Enable Activities, Blog menu, Blog tags, Comments, Course completion status, Courses, Flickr,
+        // Global search, Latest badges, Learning plans, Logged in user, Login, Main menu, Mentees, Network servers, Online users,
+        // Private files, Recent blog entries, Recently accessed courses, Search forums, Section links, Social activities,
+        // Starred courses, Tags, YouTube.
+        // Hidden by default: Course/site summary, RSS feeds, Self completion, Feedback.
+        static::add_plugin($presetid, 'block', 'activity_modules', true);
+        static::add_plugin($presetid, 'block', 'blog_menu', true);
+        static::add_plugin($presetid, 'block', 'blog_tags', true);
+        static::add_plugin($presetid, 'block', 'comments', true);
+        static::add_plugin($presetid, 'block', 'completionstatus', true);
+        static::add_plugin($presetid, 'block', 'course_list', true);
+        static::add_plugin($presetid, 'block', 'tag_flickr', true);
+        static::add_plugin($presetid, 'block', 'globalsearch', true);
+        static::add_plugin($presetid, 'block', 'badges', true);
+        static::add_plugin($presetid, 'block', 'lp', true);
+        static::add_plugin($presetid, 'block', 'myprofile', true);
+        static::add_plugin($presetid, 'block', 'login', true);
+        static::add_plugin($presetid, 'block', 'site_main_menu', true);
+        static::add_plugin($presetid, 'block', 'mentees', true);
+        static::add_plugin($presetid, 'block', 'mnet_hosts', true);
+        static::add_plugin($presetid, 'block', 'private_files', true);
+        static::add_plugin($presetid, 'block', 'blog_recent', true);
+        static::add_plugin($presetid, 'block', 'search_forums', true);
+        static::add_plugin($presetid, 'block', 'section_links', true);
+        static::add_plugin($presetid, 'block', 'social_activities', true);
+        static::add_plugin($presetid, 'block', 'tags', true);
+        static::add_plugin($presetid, 'block', 'online_users', true);
+        static::add_plugin($presetid, 'block', 'recentlyaccessedcourses', true);
+        static::add_plugin($presetid, 'block', 'starredcourses', true);
+
+        // Course formats: Enable Social format.
+        static::add_plugin($presetid, 'format', 'social', true);
+
+        // Data formats: Enable Javascript Object Notation (.json).
+        static::add_plugin($presetid, 'dataformat', 'json', true);
+
+        // Enrolments: Enable Cohort sync, Guest access.
+        static::add_plugin($presetid, 'enrol', 'cohort', true);
+        static::add_plugin($presetid, 'enrol', 'guest', true);
+
+        // Filter: Enable MathJax, Activity names auto-linking.
+        static::add_plugin($presetid, 'filter', 'mathjaxloader', TEXTFILTER_ON);
+        static::add_plugin($presetid, 'filter', 'activitynames', TEXTFILTER_ON);
+
+        // Question behaviours: Enable Adaptive mode (no penalties), Deferred feedback with CBM, Immediate feedback with CBM.
+        static::add_plugin($presetid, 'qbehaviour', 'adaptivenopenalty', true);
+        static::add_plugin($presetid, 'qbehaviour', 'deferredcbm', true);
+        static::add_plugin($presetid, 'qbehaviour', 'immediatecbm', true);
+
+        // Question types: Enable Calculated, Calculated multichoice, Calculated simple, Drag and drop markers,
+        // Drag and drop onto image, Embedded answers (Cloze), Numerical, Random short-answer matching.
+        static::add_plugin($presetid, 'qtype', 'calculated', true);
+        static::add_plugin($presetid, 'qtype', 'calculatedmulti', true);
+        static::add_plugin($presetid, 'qtype', 'calculatedsimple', true);
+        static::add_plugin($presetid, 'qtype', 'ddmarker', true);
+        static::add_plugin($presetid, 'qtype', 'ddimageortext', true);
+        static::add_plugin($presetid, 'qtype', 'multianswer', true);
+        static::add_plugin($presetid, 'qtype', 'numerical', true);
+        static::add_plugin($presetid, 'qtype', 'randomsamatch', true);
+
+        // Repositories: Enable Server files, URL downloader, Wikimedia.
+        static::add_plugin($presetid, 'repository', 'local', true);
+        static::add_plugin($presetid, 'repository', 'url', true);
+        static::add_plugin($presetid, 'repository', 'wikimedia', true);
+
+        // Text editors: Enable TinyMCE HTML editor.
+        static::add_plugin($presetid, 'editor', 'tinymce', true);
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_bloglevel.php

@@ -0,0 +1,57 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_adminpresets\local\setting;
+
+/**
+ * Select setting for blog's bloglevel setting.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_bloglevel extends adminpresets_admin_setting_configselect {
+
+    /**
+     * Extended to change the block visibility.
+     *
+     * @param bool $name Setting name to store.
+     * @param mixed $value Setting value to store.
+     * @return int|false config_log inserted id or false whenever the value has not been saved.
+     */
+    public function save_value($name = false, $value = null) {
+        global $DB;
+
+        if (!$id = parent::save_value($name, $value)) {
+            return false;
+        }
+
+        // Object values if no arguments.
+        if ($value === null) {
+            $value = $this->value;
+        }
+
+        // Pasted from admin_setting_bloglevel (can't use write_config).
+        if ($value == 0) {
+            $DB->set_field('block', 'visible', 0, ['name' => 'blog_menu']);
+        } else {
+            $DB->set_field('block', 'visible', 1, ['name' => 'blog_menu']);
+        }
+
+        return $id;
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_configcheckbox.php

@@ -0,0 +1,45 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Checkbox setting.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_configcheckbox extends adminpresets_setting {
+
+    protected function set_value($value) {
+        $this->value = clean_param($value, PARAM_BOOL);
+        $this->set_visiblevalue();
+
+        return true;
+    }
+
+    protected function set_visiblevalue() {
+        if ($this->value) {
+            $str = get_string('yes');
+        } else {
+            $str = get_string('no');
+        }
+
+        $this->visiblevalue = $str;
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_configcheckbox_with_advanced.php

@@ -0,0 +1,48 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_adminpresets\local\setting;
+
+use admin_setting;
+
+/**
+ * Checkbox with an advanced checkbox that controls an additional $name.'_adv' config setting.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_configcheckbox_with_advanced extends adminpresets_admin_setting_configcheckbox {
+
+    public function __construct(admin_setting $settingdata, $dbsettingvalue) {
+        // To look for other values.
+        $this->attributes = ['adv' => $settingdata->name . '_adv'];
+        parent::__construct($settingdata, $dbsettingvalue);
+    }
+
+    /**
+     * Uses delegation
+     */
+    protected function set_visiblevalue() {
+        parent::set_visiblevalue();
+
+        if (!is_null($this->attributesvalues) && array_key_exists($this->attributes['adv'], $this->attributesvalues)) {
+            $value = $this->attributesvalues[$this->attributes['adv']];
+            $this->visiblevalue .= $this->delegation->extra_set_visiblevalue($value, 'advanced');
+        }
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_configcheckbox_with_lock.php

@@ -0,0 +1,47 @@
+<?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 core_adminpresets\local\setting;
+
+use admin_setting;
+
+/**
+ * Checkbox with an advanced checkbox that controls an additional $name.'_locked' config setting.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_configcheckbox_with_lock extends adminpresets_admin_setting_configcheckbox {
+
+    public function __construct(admin_setting $settingdata, $dbsettingvalue) {
+        // To look for other values.
+        $this->attributes = ['locked' => $settingdata->name . '_locked'];
+        parent::__construct($settingdata, $dbsettingvalue);
+    }
+
+    /**
+     * Uses delegation
+     */
+    protected function set_visiblevalue() {
+        parent::set_visiblevalue();
+        if (!is_null($this->attributesvalues) && array_key_exists($this->attributes['locked'], $this->attributesvalues)) {
+            $value = $this->attributesvalues[$this->attributes['locked']];
+            $this->visiblevalue .= $this->delegation->extra_set_visiblevalue($value, 'locked');
+        }
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_configiplist.php

@@ -0,0 +1,41 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Used to validate a textarea used for ip addresses.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_configiplist extends adminpresets_admin_setting_configtext {
+
+    protected function set_value($value) {
+        // Check ip format.
+        if ($this->settingdata->validate($value) !== true) {
+            $this->value = false;
+            $this->set_visiblevalue();
+            return false;
+        }
+        $this->value = $value;
+        $this->set_visiblevalue();
+
+        return true;
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_configmulticheckbox.php

@@ -0,0 +1,32 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Class to be extended by multicheckbox settings.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_configmulticheckbox extends adminpresets_admin_setting_configmultiselect {
+
+    public function set_behaviors() {
+        $this->behaviors['loadchoices'] = &$this->settingdata;
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect.php

@@ -0,0 +1,76 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Extends the base class and lists the selected values separated by comma.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_configmultiselect extends adminpresets_setting {
+
+    /**
+     * Ensure that the $value values are setting choices.
+     *
+     * @param mixed $value Setting value
+     * @return mixed Returns false if wrong param value
+     */
+    protected function set_value($value) {
+        if ($value) {
+            $options = explode(',', $value);
+            foreach ($options as $option) {
+
+                foreach ($this->settingdata->choices as $key => $choice) {
+
+                    if ($key == $option) {
+                        $this->value = $option;
+                        $this->set_visiblevalue();
+                        return true;
+                    }
+                }
+            }
+
+            $value = implode(',', $options);
+        }
+        $this->value = $value;
+        $this->set_visiblevalue();
+
+        return true;
+    }
+
+    protected function set_visiblevalue() {
+        $values = explode(',', $this->value);
+        $visiblevalues = [];
+
+        foreach ($values as $value) {
+
+            if (!empty($this->settingdata->choices[$value])) {
+                $visiblevalues[] = $this->settingdata->choices[$value];
+            }
+        }
+
+        if (empty($visiblevalues)) {
+            $this->visiblevalue = '';
+            return false;
+        }
+
+        $this->visiblevalue = implode(', ', $visiblevalues);
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_configmultiselect_with_loader.php

@@ -0,0 +1,32 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Generalizes a configmultipleselect with load_choices().
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_configmultiselect_with_loader extends adminpresets_admin_setting_configmultiselect {
+
+    public function set_behaviors() {
+        $this->behaviors['loadchoices'] = &$this->settingdata;
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_configselect.php

@@ -0,0 +1,65 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Select one value from list.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_configselect extends adminpresets_setting {
+
+    /**
+     * Sets the setting value cleaning it.
+     *
+     * @param mixed $value must be one of the setting choices.
+     * @return bool true if the value one of the setting choices
+     */
+    protected function set_value($value) {
+        // When we intantiate the class we need the choices.
+        if (empty($this->settindata->choices) && method_exists($this->settingdata, 'load_choices')) {
+            $this->settingdata->load_choices();
+        }
+
+        if (!is_null($this->settingdata->choices) and is_array($this->settingdata->choices)) {
+            foreach ($this->settingdata->choices as $key => $choice) {
+
+                if ($key == $value) {
+                    $this->value = $value;
+                    $this->set_visiblevalue();
+                    return true;
+                }
+            }
+        }
+        $this->value = false;
+        $this->set_visiblevalue();
+        return false;
+    }
+
+    protected function set_visiblevalue() {
+        // Just to avoid heritage problems.
+        if (empty($this->settingdata->choices[$this->value])) {
+            $this->visiblevalue = '';
+        } else {
+            $this->visiblevalue = $this->settingdata->choices[$this->value];
+        }
+
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_configselect_with_advanced.php

@@ -0,0 +1,59 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_adminpresets\local\setting;
+
+use admin_setting;
+
+/**
+ * Adds support for the "advanced" attribute.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_configselect_with_advanced extends adminpresets_admin_setting_configselect {
+
+    /** @var string Name of the advanced setting. **/
+    protected $advancedkey;
+
+    public function __construct(admin_setting $settingdata, $dbsettingvalue) {
+        // Getting the advanced defaultsetting attribute name.
+        if (is_array($settingdata->defaultsetting)) {
+            foreach ($settingdata->defaultsetting as $key => $defaultvalue) {
+                if ($key != 'value') {
+                    $this->advancedkey = $key;
+                }
+            }
+        }
+
+        // To look for other values.
+        $this->attributes = [$this->advancedkey => $settingdata->name . '_adv'];
+        parent::__construct($settingdata, $dbsettingvalue);
+    }
+
+    /**
+     * Funcionality used by other _with_advanced settings
+     */
+    protected function set_visiblevalue() {
+        parent::set_visiblevalue();
+        if (!is_null($this->attributesvalues)) {
+            $attribute = $this->attributes[$this->advancedkey];
+            $this->visiblevalue .= $this->delegation->extra_set_visiblevalue($this->attributesvalues[$attribute], 'advanced');
+        }
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_configtext.php

@@ -0,0 +1,58 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Basic text setting, cleans the param using the admin_setting paramtext attribute.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_configtext extends adminpresets_setting {
+
+    /**
+     * Validates the value using paramtype attribute
+     *
+     * @param mixed $value
+     * @return  boolean Cleaned or not, but always true.
+     */
+    protected function set_value($value) {
+        $this->value = $value;
+
+        if (empty($this->settingdata->paramtype)) {
+
+            // For configfile, configpasswordunmask....
+            $this->settingdata->paramtype = 'RAW';
+        }
+
+        $paramtype = 'PARAM_' . strtoupper($this->settingdata->paramtype);
+
+        // Regexp.
+        if (!defined($paramtype)) {
+            $this->value = preg_replace($this->settingdata->paramtype, '', $this->value);
+
+            // Standard moodle param type.
+        } else {
+            $this->value = clean_param($this->value, constant($paramtype));
+        }
+        $this->set_visiblevalue();
+
+        return true;
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_configtext_with_advanced.php

@@ -0,0 +1,47 @@
+<?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 core_adminpresets\local\setting;
+
+use admin_setting;
+
+/**
+ * Adds the advanced attribute.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_configtext_with_advanced extends adminpresets_admin_setting_configtext {
+
+    public function __construct(admin_setting $settingdata, $dbsettingvalue) {
+        // To look for other values.
+        $this->attributes = ['fix' => $settingdata->name . '_adv'];
+        parent::__construct($settingdata, $dbsettingvalue);
+    }
+
+    /**
+     * Delegates
+     */
+    protected function set_visiblevalue() {
+        parent::set_visiblevalue();
+        if (!is_null($this->attributesvalues) && array_key_exists($this->attributes['fix'], $this->attributesvalues)) {
+            $value = $this->attributesvalues[$this->attributes['fix']];
+            $this->visiblevalue .= $this->delegation->extra_set_visiblevalue($value, 'advanced');
+        }
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_configtime.php

@@ -0,0 +1,67 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Time selector.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_configtime extends adminpresets_setting {
+
+    /**
+     * To check that the value is one of the options
+     *
+     * @param string $name
+     * @param mixed $value
+     */
+    public function set_attribute_value($name, $value) {
+        for ($i = 0; $i < 60; $i = $i + 5) {
+            $minutes[$i] = $i;
+        }
+
+        if (!empty($minutes[$value])) {
+            $this->attributesvalues[$name] = $value;
+        } else {
+            $this->attributesvalues[$name] = $this->settingdata->defaultsetting['m'];
+        }
+    }
+
+    protected function set_value($value) {
+        $this->attributes = ['m' => $this->settingdata->name2];
+
+        for ($i = 0; $i < 24; $i++) {
+            $hours[$i] = $i;
+        }
+
+        if (empty($hours[$value])) {
+            $this->value = false;
+        }
+
+        $this->value = $value;
+        $this->set_visiblevalue();
+    }
+
+    protected function set_visiblevalue() {
+        if (!is_null($this->attributesvalues) && array_key_exists($this->settingdata->name2, $this->attributesvalues)) {
+            $this->visiblevalue = $this->value . ':' . $this->attributesvalues[$this->settingdata->name2];
+        }
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_devicedetectregex.php

@@ -0,0 +1,43 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Reimplementation to allow human friendly view of the selected regexps.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_devicedetectregex extends adminpresets_admin_setting_configtext {
+
+    public function set_visiblevalue() {
+        $values = json_decode($this->get_value());
+
+        if (!$values) {
+            parent::set_visiblevalue();
+            return;
+        }
+
+        $this->visiblevalue = '';
+        foreach ($values as $key => $value) {
+            $this->visiblevalue .= $key . ' = ' . $value . ', ';
+        }
+        $this->visiblevalue = rtrim($this->visiblevalue, ', ');
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_gradecat_combo.php

@@ -0,0 +1,61 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_adminpresets\local\setting;
+
+use admin_setting;
+
+/**
+ * A select with force and advanced options
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_gradecat_combo extends adminpresets_admin_setting_configselect {
+
+    /**
+     * One db value for two setting attributes
+     *
+     * @param admin_setting $settingdata
+     * @param mixed $dbsettingvalue
+     */
+    public function __construct(admin_setting $settingdata, $dbsettingvalue) {
+        // The set_attribute_value() method will mod the VARNAME_flag value.
+        $this->attributes = ['forced' => $settingdata->name . '_flag', 'adv' => $settingdata->name . '_flag'];
+        parent::__construct($settingdata, $dbsettingvalue);
+    }
+
+    /**
+     * Special treatment! the value be extracted from the $value argument
+     */
+    protected function set_visiblevalue() {
+        parent::set_visiblevalue();
+
+        if (!is_null($this->attributesvalues) && array_key_exists($this->settingdata->name . '_flag', $this->attributesvalues)) {
+            $flagvalue = $this->attributesvalues[$this->settingdata->name . '_flag'];
+
+            if (isset($flagvalue)) {
+                $forcedvalue = (($flagvalue % 2) == 1);
+                $advancedvalue = ($flagvalue >= 2);
+
+                $this->visiblevalue .= $this->delegation->extra_set_visiblevalue($forcedvalue, 'forced');
+                $this->visiblevalue .= $this->delegation->extra_set_visiblevalue($advancedvalue, 'advanced');
+            }
+        }
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_sitesettext.php

@@ -0,0 +1,67 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Reimplemented to store values in course table, not in config or config_plugins.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_sitesettext extends adminpresets_admin_setting_configtext {
+
+    /**
+     * Overwritten to store the value in the course table
+     *
+     * @param bool $name
+     * @param mixed $value
+     * @return  int|false config_log inserted id or false whenever the new value is the same as old value.
+     */
+    public function save_value($name = false, $value = null) {
+        global $DB;
+
+        // Object values if no arguments.
+        if ($value === null) {
+            $value = $this->value;
+        }
+        if (!$name) {
+            $name = $this->settingdata->name;
+        }
+
+        $sitecourse = $DB->get_record('course', ['id' => 1]);
+        $actualvalue = $sitecourse->{$name};
+
+        // If it's the same value skip.
+        if ($actualvalue == $value) {
+            return false;
+        }
+
+        // Plugin name or ''.
+        $plugin = $this->settingdata->plugin;
+        if ($plugin == 'none' || $plugin == '') {
+            $plugin = null;
+        }
+
+        // Updating mdl_course.
+        $sitecourse->{$name} = $value;
+        $DB->update_record('course', $sitecourse);
+
+        return $this->to_log($plugin, $name, $this->value, $actualvalue);
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_special_backupdays.php

@@ -0,0 +1,53 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Special control for selecting days to backup.
+ *
+ * It doesn't specify loadchoices behavior because is set_visiblevalue who needs it.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_special_backupdays extends adminpresets_setting {
+
+    protected function set_value($value) {
+        $this->value = clean_param($value, PARAM_SEQUENCE);
+        $this->set_visiblevalue();
+    }
+
+    protected function set_visiblevalue() {
+        $this->settingdata->load_choices();
+
+        $days = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];
+
+        $selecteddays = [];
+
+        $week = str_split($this->value);
+        foreach ($week as $key => $day) {
+            if ($day) {
+                $index = $days[$key];
+                $selecteddays[] = $this->settingdata->choices[$index];
+            }
+        }
+
+        $this->visiblevalue = implode(', ', $selecteddays);
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_special_calendar_weekend.php

@@ -0,0 +1,44 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_adminpresets\local\setting;
+
+/**
+ * Special admin control for calendar weekend.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_special_calendar_weekend extends adminpresets_setting {
+
+    protected function set_visiblevalue() {
+        if (!$this->value) {
+            parent::set_visiblevalue();
+            return;
+        }
+
+        $days = ['sunday', 'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday'];
+        for ($i = 0; $i < 7; $i++) {
+            if ($this->value & (1 << $i)) {
+                $settings[] = get_string($days[$i], 'calendar');
+            }
+        }
+
+        $this->visiblevalue = implode(', ', $settings);
+    }
+}

admin/presets/classes/local/setting/adminpresets_admin_setting_users_with_capability.php

@@ -0,0 +1,39 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Extends configselect to reuse set_valuevisible.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_admin_setting_users_with_capability extends adminpresets_admin_setting_configmultiselect {
+
+    protected function set_behaviors() {
+        $this->behaviors['loadchoices'] = &$this->settingdata;
+    }
+
+    protected function set_value($value) {
+        // Dirty hack (the value stored in the DB is '').
+        $this->settingdata->choices[''] = $this->settingdata->choices['$@NONE@$'];
+
+        return parent::set_value($value);
+    }
+}

admin/presets/classes/local/setting/adminpresets_setting.php

@@ -0,0 +1,268 @@
+<?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 core_adminpresets\local\setting;
+
+use admin_setting;
+use moodle_exception;
+use stdClass;
+
+/**
+ * Admin tool presets plugin to load some settings.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adminpresets_setting {
+
+    /**
+     * @var admin_setting
+     */
+    protected $settingdata;
+
+    /**
+     * @var delegation
+     */
+    protected $delegation;
+
+    /**
+     * The setting DB value
+     *
+     * @var mixed
+     */
+    protected $value;
+
+    /**
+     * Stores the visible value of the setting DB value
+     *
+     * @var string
+     */
+    protected $visiblevalue;
+
+    /**
+     * For multiple value settings, used to look for the other values
+     *
+     * @var string
+     */
+    protected $attributes = false;
+
+    /**
+     * To store the setting attributes
+     *
+     * @var array
+     */
+    protected $attributesvalues;
+
+    /**
+     * Stores the setting data and the selected value
+     *
+     * @param admin_setting $settingdata admin_setting subclass
+     * @param mixed $dbsettingvalue Actual value
+     */
+    public function __construct(admin_setting $settingdata, $dbsettingvalue) {
+        $this->settingdata = $settingdata;
+        $this->delegation = new delegation();
+
+        if ($this->settingdata->plugin == '') {
+            $this->settingdata->plugin = 'none';
+        }
+
+        // Applies specific children behaviors.
+        $this->set_behaviors();
+        $this->apply_behaviors();
+
+        // Cleaning value.
+        $this->set_value($dbsettingvalue);
+    }
+
+    /**
+     * Each class can overwrite this method to specify extra processes
+     */
+    protected function set_behaviors() {
+    }
+
+    /**
+     * Applies the children class specific behaviors
+     *
+     * See delegation class for the available extra behaviors
+     */
+    protected function apply_behaviors() {
+        if (!empty($this->behaviors)) {
+
+            foreach ($this->behaviors as $behavior => $arguments) {
+
+                // The arguments of the behavior depends on the caller.
+                $methodname = 'extra_' . $behavior;
+                $this->delegation->{$methodname}($arguments);
+            }
+        }
+    }
+
+    /**
+     * Gets the setting value.
+     *
+     * @return mixed The setting value
+     */
+    public function get_value() {
+        return $this->value;
+    }
+
+    /**
+     * Sets the setting value cleaning it
+     *
+     * Child classes should overwrite method to clean more acurately
+     *
+     * @param mixed $value Setting value
+     * @return mixed Returns false if wrong param value
+     */
+    protected function set_value($value) {
+        $this->value = $value;
+        $this->set_visiblevalue();
+    }
+
+    public function get_visiblevalue() {
+        return $this->visiblevalue;
+    }
+
+    /**
+     * Sets the visible name for the setting selected value
+     *
+     * In most cases the child classes will overwrite
+     */
+    protected function set_visiblevalue() {
+        $this->visiblevalue = $this->value;
+    }
+
+    public function get_attributes() {
+        return $this->attributes;
+    }
+
+    public function get_attributes_values() {
+        return $this->attributesvalues;
+    }
+
+    public function get_settingdata() {
+        return $this->settingdata;
+    }
+
+    public function set_attribute_value($name, $value) {
+        $this->attributesvalues[$name] = $value;
+    }
+
+    /**
+     * Saves the setting attributes values
+     *
+     * @return     array        Array of inserted ids (in config_log)
+     */
+    public function save_attributes_values() {
+        // Plugin name or null.
+        $plugin = $this->settingdata->plugin;
+        if ($plugin == 'none' || $plugin == '') {
+            $plugin = null;
+        }
+
+        if (!$this->attributesvalues) {
+            return false;
+        }
+
+        // To store inserted ids.
+        $ids = [];
+        foreach ($this->attributesvalues as $name => $value) {
+
+            // Getting actual setting.
+            $actualsetting = get_config($plugin, $name);
+
+            // If it's the actual setting get off.
+            if ($value == $actualsetting) {
+                return false;
+            }
+
+            if ($id = $this->save_value($name, $value)) {
+                $ids[] = $id;
+            }
+        }
+
+        return $ids;
+    }
+
+    /**
+     * Stores the setting into database, logs the change and returns the config_log inserted id
+     *
+     * @param bool $name Setting name to store.
+     * @param mixed $value Setting value to store.
+     * @return int|false config_log inserted id or false whenever the new value is the same as old value.
+     * @throws dml_exception
+     * @throws moodle_exception
+     */
+    public function save_value($name = false, $value = null) {
+        // Object values if no arguments.
+        if ($value === null) {
+            $value = $this->value;
+        }
+        if (!$name) {
+            $name = $this->settingdata->name;
+        }
+
+        // Plugin name or null.
+        $plugin = $this->settingdata->plugin;
+        if ($plugin == 'none' || $plugin == '') {
+            $plugin = null;
+        }
+
+        // Getting the actual value.
+        $actualvalue = get_config($plugin, $name);
+
+        // If it's the same it's not necessary.
+        if ($actualvalue == $value) {
+            return false;
+        }
+
+        set_config($name, $value, $plugin);
+
+        return $this->to_log($plugin, $name, $value, $actualvalue);
+    }
+
+    /**
+     * Copy of config_write method of the admin_setting class
+     *
+     * @param string $plugin
+     * @param string $name
+     * @param mixed $value
+     * @param mixed $actualvalue
+     * @return  integer The stored config_log id
+     */
+    protected function to_log($plugin, $name, $value, $actualvalue) {
+        global $DB, $USER;
+
+        // Log the change (pasted from admin_setting class).
+        $log = new stdClass();
+        $log->userid = during_initial_install() ? 0 : $USER->id; // 0 as user id during install.
+        $log->timemodified = time();
+        $log->plugin = $plugin;
+        $log->name = $name;
+        $log->value = $value;
+        $log->oldvalue = $actualvalue;
+
+        // Getting the inserted config_log id.
+        if (!$id = $DB->insert_record('config_log', $log)) {
+            throw new moodle_exception('errorinserting', 'core_adminpresets');
+        }
+
+        return $id;
+    }
+}

admin/presets/classes/local/setting/delegation.php

@@ -0,0 +1,53 @@
+<?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 core_adminpresets\local\setting;
+
+use admin_setting;
+
+/**
+ * Cross-class methods
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class delegation {
+
+    /**
+     * Adds a piece of string to the $type setting
+     *
+     * @param boolean $value
+     * @param string $type Indicates the "extra" setting
+     * @return    string
+     */
+    public function extra_set_visiblevalue(bool $value, string $type): string {
+        // Adding the advanced value to the text string if present.
+        if ($value) {
+            $string = get_string('markedas' . $type, 'core_adminpresets');
+        } else {
+            $string = get_string('markedasnon' . $type, 'core_adminpresets');
+        }
+
+        // Adding the advanced state.
+        return ', ' . $string;
+    }
+
+    public function extra_loadchoices(admin_setting &$adminsetting) {
+        $adminsetting->load_choices();
+    }
+}

admin/presets/classes/privacy/provider.php

@@ -0,0 +1,125 @@
+<?php
+// This file is part of The Course Module Navigation Block
+//
+// 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 core_adminpresets\privacy;
+
+use core_privacy\local\metadata\collection;
+use core_privacy\local\request\approved_contextlist;
+use core_privacy\local\request\approved_userlist;
+use core_privacy\local\request\contextlist;
+use core_privacy\local\request\userlist;
+
+/**
+ * Admin presets this file handle privacy provider.
+ *
+ * @package          core_adminpresets
+ * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
+ * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
+ * @license          http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class provider implements
+        \core_privacy\local\metadata\provider,
+        \core_privacy\local\request\subsystem\provider,
+        \core_privacy\local\request\core_userlist_provider {
+
+    /**
+     * Returns information about the user data stored in this component.
+     *
+     * @param  collection $collection A list of information about this component
+     * @return collection The collection object filled out with information about this component.
+     */
+    public static function get_metadata(collection $collection) : collection {
+        // These tables are really data about site configuration and not user data.
+
+        // The adminpresets includes information about which user performed a configuration change using the admin_presets
+        // tool.
+        // This is not considered to be user data.
+        $collection->add_database_table('adminpresets', [
+                'userid'        => 'privacy:metadata:adminpresets:userid',
+                'name'          => 'privacy:metadata:adminpresets:name',
+                'comments'      => 'privacy:metadata:adminpresets:comments',
+                'site'          => 'privacy:metadata:adminpresets:site',
+                'moodlerelease' => 'privacy:metadata:adminpresets:moodlerelease',
+                'timecreated'   => 'privacy:metadata:adminpresets:timecreated',
+            ], 'privacy:metadata:adminpresets');
+
+        // The adminpresets_app includes information about which user performed configuration change using the admin_presets
+        // tool.
+        // This is not considered to be user data.
+        $collection->add_database_table('adminpresets_app', [
+                'adminpresetid' => 'privacy:metadata:adminpresets_app:adminpresetid',
+                'userid'        => 'privacy:metadata:adminpresets_app:userid',
+                'time'          => 'privacy:metadata:adminpresets_app:time',
+            ], 'privacy:metadata:adminpresets_app');
+
+        return $collection;
+    }
+
+    /**
+     * Get the list of contexts that contain user information for the specified user.
+     *
+     * @param   int $userid The user to search.
+     * @return  contextlist $contextlist The contextlist containing the list of contexts used in this plugin.
+     */
+    public static function get_contexts_for_userid(int $userid) : contextlist {
+        return new contextlist();
+    }
+
+    /**
+     * Get the list of users who have data within a context.
+     *
+     * @param   userlist    $userlist   The userlist containing the list of users who have data in this context/plugin combination.
+     */
+    public static function get_users_in_context(userlist $userlist) {
+        // Don't add any user.
+    }
+
+    /**
+     * Export all user data for the specified user, in the specified contexts.
+     *
+     * @param approved_contextlist $contextlist The approved contexts to export information for.
+     */
+    public static function export_user_data(approved_contextlist $contextlist) {
+        // None of the core tables should be exported.
+    }
+
+    /**
+     * Delete all data for all users in the specified context.
+     *
+     * @param context $context The specific context to delete data for.
+     */
+    public static function delete_data_for_all_users_in_context(\context $context) {
+        // None of the the data from these tables should be deleted.
+    }
+
+    /**
+     * Delete all user data for the specified user, in the specified contexts.
+     *
+     * @param approved_contextlist $contextlist The approved contexts and user information to delete information for.
+     */
+    public static function delete_data_for_user(approved_contextlist $contextlist) {
+        // None of the the data from these tables should be deleted.
+    }
+
+    /**
+     * Delete multiple users within a single context.
+     *
+     * @param   approved_userlist       $userlist The approved context and user information to delete information for.
+     */
+    public static function delete_data_for_users(approved_userlist $userlist) {
+        // None of the the data from these tables should be deleted.
+    }
+}

admin/presets/tests/fixtures/import_settings.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PRESET>
+  <NAME>Imported preset</NAME>
+  <COMMENTS>&lt;p dir="ltr" style="text-align:left;"&gt;Porfolios enabled, Emojipicker enabled, Lesson  media width set to 900 and maxanswers set to 2 and disabled advanced&lt;/p&gt;</COMMENTS>
+  <PRESET_DATE>1631615985</PRESET_DATE>
+  <SITE_URL>http://demo.moodle</SITE_URL>
+  <AUTHOR>Ada Lovelace</AUTHOR>
+  <MOODLE_VERSION>2021091100</MOODLE_VERSION>
+  <MOODLE_RELEASE>4.0dev (Build: 20210911)</MOODLE_RELEASE>
+  <ADMIN_SETTINGS>
+    <MOD_LESSON>
+      <SETTINGS>
+        <MAXANSWERS maxanswers_adv="">2</MAXANSWERS>
+        <MEDIAWIDTH>900</MEDIAWIDTH>
+      </SETTINGS>
+    </MOD_LESSON>
+    <NONE>
+      <SETTINGS>
+        <ALLOWEMOJIPICKER>1</ALLOWEMOJIPICKER>
+        <ENABLEPORTFOLIOS>1</ENABLEPORTFOLIOS>
+      </SETTINGS>
+    </NONE>
+  </ADMIN_SETTINGS>
+</PRESET>

admin/presets/tests/fixtures/import_settings_plugins.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PRESET>
+  <NAME>Imported preset</NAME>
+  <COMMENTS>&lt;p dir="ltr" style="text-align:left;"&gt;Porfolios enabled, Emojipicker enabled, Lesson  media width set to 900 and maxanswers set to 2 and disabled advanced. Plugins: disabled block_html, mod_database and mod_chat plugins and enabled atto_html, block_activity_modules and mod_lesson.&lt;/p&gt;</COMMENTS>
+  <PRESET_DATE>1631615985</PRESET_DATE>
+  <SITE_URL>http://demo.moodle</SITE_URL>
+  <AUTHOR>Ada Lovelace</AUTHOR>
+  <MOODLE_VERSION>2021091100</MOODLE_VERSION>
+  <MOODLE_RELEASE>4.0dev (Build: 20210911)</MOODLE_RELEASE>
+  <ADMIN_SETTINGS>
+    <MOD_LESSON>
+      <SETTINGS>
+        <MAXANSWERS maxanswers_adv="">2</MAXANSWERS>
+        <MEDIAWIDTH>900</MEDIAWIDTH>
+      </SETTINGS>
+    </MOD_LESSON>
+    <NONE>
+      <SETTINGS>
+        <ALLOWEMOJIPICKER>1</ALLOWEMOJIPICKER>
+        <ENABLEPORTFOLIOS>1</ENABLEPORTFOLIOS>
+      </SETTINGS>
+    </NONE>
+  </ADMIN_SETTINGS>
+  <PLUGINS>
+    <ATTO>
+      <HTML>1</HTML>
+    </ATTO>
+    <BLOCK>
+      <HTML>0</HTML>
+      <ACTIVITY_MODULES>1</ACTIVITY_MODULES>
+    </BLOCK>
+    <MOD>
+      <CHAT>0</CHAT>
+      <DATA>0</DATA>
+      <LESSON>1</LESSON>
+    </MOD>
+  </PLUGINS>
+</PRESET>

admin/presets/tests/fixtures/import_settings_with_unexisting_setting.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PRESET>
+  <NAME>Imported preset</NAME>
+  <COMMENTS>&lt;p dir="ltr" style="text-align:left;"&gt;Porfolios enabled, Emojipicker enabled, Lesson  media width set to 900 and maxanswers set to 2 and disabled advanced&lt;/p&gt;</COMMENTS>
+  <PRESET_DATE>1631615985</PRESET_DATE>
+  <SITE_URL>http://demo.moodle</SITE_URL>
+  <AUTHOR>Ada Lovelace</AUTHOR>
+  <MOODLE_VERSION>2021091100</MOODLE_VERSION>
+  <MOODLE_RELEASE>4.0dev (Build: 20210911)</MOODLE_RELEASE>
+  <ADMIN_SETTINGS>
+    <MOD_LESSON>
+      <SETTINGS>
+        <MAXANSWERS maxanswers_adv="">2</MAXANSWERS>
+        <MEDIAWIDTH>900</MEDIAWIDTH>
+      </SETTINGS>
+    </MOD_LESSON>
+    <NONE>
+      <SETTINGS>
+        <UNEXISTINGSETTING>0</UNEXISTINGSETTING>
+        <ALLOWEMOJIPICKER>1</ALLOWEMOJIPICKER>
+        <ENABLEPORTFOLIOS>1</ENABLEPORTFOLIOS>
+      </SETTINGS>
+    </NONE>
+  </ADMIN_SETTINGS>
+</PRESET>

admin/presets/tests/fixtures/import_starter_name.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PRESET>
+    <NAME>Starter</NAME>
+    <COMMENTS>&lt;p dir="ltr" style="text-align:left;"&gt;Badges disabled, Emojipicker enabled, Lesson  media width set to 900 and maxanswers set to 2 and disabled advanced. Plugins: disabled block_html, mod_database and mod_chat plugins and enabled atto_html and block_activity_modules.&lt;/p&gt;</COMMENTS>
+    <PRESET_DATE>1631615985</PRESET_DATE>
+    <SITE_URL>http://demo.moodle</SITE_URL>
+    <AUTHOR>Ada Lovelace</AUTHOR>
+    <MOODLE_VERSION>2021091100</MOODLE_VERSION>
+    <MOODLE_RELEASE>4.0dev (Build: 20210911)</MOODLE_RELEASE>
+    <ADMIN_SETTINGS>
+        <MOD_LESSON>
+            <SETTINGS>
+                <MAXANSWERS maxanswers_adv="">2</MAXANSWERS>
+                <MEDIAWIDTH>900</MEDIAWIDTH>
+            </SETTINGS>
+        </MOD_LESSON>
+        <NONE>
+            <SETTINGS>
+                <ALLOWEMOJIPICKER>1</ALLOWEMOJIPICKER>
+                <ENABLEBADGES>0</ENABLEBADGES>
+            </SETTINGS>
+        </NONE>
+    </ADMIN_SETTINGS>
+    <PLUGINS>
+        <ATTO>
+            <HTML>1</HTML>
+        </ATTO>
+        <BLOCK>
+            <HTML>0</HTML>
+            <ACTIVITY_MODULES>1</ACTIVITY_MODULES>
+        </BLOCK>
+        <MOD>
+            <CHAT>0</CHAT>
+            <DATA>0</DATA>
+            <LESSON>1</LESSON>
+        </MOD>
+    </PLUGINS>
+</PRESET>

admin/presets/tests/fixtures/invalid_xml_file.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PRESET>
+  <NAME>Imported preset - Invalid XML file</NAME>
+  <COMMENTS></COMMENTS>
+  <PRESET_DATE>1631615985</PRESET_DATE>
+  <SITE_URL>http://demo.moodle</SITE_URL>
+  <AUTHOR>Ada Lovelace</AUTHOR>
+  <MOODLE_VERSION>2021091100</MOODLE_VERSION>
+  <MOODLE_RELEASE>4.0dev (Build: 20210911)</MOODLE_RELEASE>
+  <ADMIN_SETTINGS>
+    <MOD_LESSON>
+      <SETTINGS>
+        <MAXANSWERS maxanswers_adv="">2</MAXANSWERS>
+        <MEDIAWIDTH>900</MEDIAWIDTH>
+      </SETTINGS>
+    </MOD_LESSON>
+    <NONE>
+      <SETTINGS>
+        <ALLOWEMOJIPICKER>1</ALLOWEMOJIPICKER>
+        <ENABLEPORTFOLIOS>1</ENABLEPORTFOLIOS>
+      </SETTINGS>
+    </NONE>
+</PRESET>

admin/presets/tests/fixtures/unexisting_category.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PRESET>
+  <NAME>Imported preset with unexisting category</NAME>
+  <COMMENTS></COMMENTS>
+  <PRESET_DATE>1631615985</PRESET_DATE>
+  <SITE_URL>http://demo.moodle</SITE_URL>
+  <AUTHOR>Ada Lovelace</AUTHOR>
+  <MOODLE_VERSION>2021091100</MOODLE_VERSION>
+  <MOODLE_RELEASE>4.0dev (Build: 20210911)</MOODLE_RELEASE>
+  <ADMIN_SETTINGS>
+    <NONE>
+      <UNEXISTINGCATEGORY>
+        <ENABLEPORTFOLIOS>1</ENABLEPORTFOLIOS>
+      </UNEXISTINGCATEGORY>
+    </NONE>
+  </ADMIN_SETTINGS>
+</PRESET>

admin/presets/tests/fixtures/unexisting_setting.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PRESET>
+  <NAME>Imported preset with unexisting setting</NAME>
+  <COMMENTS></COMMENTS>
+  <PRESET_DATE>1631615985</PRESET_DATE>
+  <SITE_URL>http://demo.moodle</SITE_URL>
+  <AUTHOR>Ada Lovelace</AUTHOR>
+  <MOODLE_VERSION>2021091100</MOODLE_VERSION>
+  <MOODLE_RELEASE>4.0dev (Build: 20210911)</MOODLE_RELEASE>
+  <ADMIN_SETTINGS>
+    <NONE>
+      <SETTINGS>
+        <UNEXISTINGSETTING>0</UNEXISTINGSETTING>
+      </SETTINGS>
+    </NONE>
+  </ADMIN_SETTINGS>
+</PRESET>

admin/presets/tests/generator/lib.php

@@ -0,0 +1,254 @@
+<?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/>.
+
+defined('MOODLE_INTERNAL') || die();
+
+use core_adminpresets\local\setting\adminpresets_setting;
+use core_adminpresets\manager;
+use core_adminpresets\helper;
+
+global $CFG;
+require_once($CFG->libdir . '/adminlib.php');
+
+/**
+ * Data generator for adminpresets component.
+ *
+ * @package    core_adminpresets
+ * @category   test
+ * @copyright  2021 Sara Arjona (sara@moodle.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class core_adminpresets_generator extends \component_generator_base {
+
+    /**
+     * Create a preset. This preset will have only 3 settings and 3 plugins.
+     * Settings:
+     *  - none.enablebadges = 0
+     *  - none.allowemojipicker = 1
+     *  - mod_lesson.mediawidth = 900
+     *  - mod_lesson.maxanswers = 2 with advanced disabled.
+     * Plugins:
+     * - enrol_guest = 0
+     * - mod_glossary = 0
+     * - qtype_truefalse = 1
+     *
+     * @param array $data Preset data. Supported values:
+     *   - name. To define the preset name.
+     *   - comments. To change the comments field.
+     *   - author. To set the author.
+     *   - applypreset. Whether the preset should be applied too or not.
+     * @return int Identifier of the preset created.
+     */
+    public function create_preset(array $data = []): int {
+        global $DB, $USER, $CFG;
+
+        if (!isset($data['name'])) {
+            $data['name'] = 'Preset default name';
+        }
+        if (!isset($data['comments'])) {
+            $data['comments'] = 'Preset default comment';
+        }
+        if (!isset($data['author'])) {
+            $data['author'] = 'Default author';
+        }
+        if (!isset($data['iscore'])) {
+            $data['iscore'] = manager::NONCORE_PRESET;
+        }
+        // Validate iscore value.
+        $allowed = [manager::NONCORE_PRESET, manager::STARTER_PRESET, manager::FULL_PRESET];
+        if (!in_array($data['iscore'], $allowed)) {
+            $data['iscore'] = manager::NONCORE_PRESET;
+        }
+
+        $preset = [
+            'userid' => $USER->id,
+            'name' => $data['name'],
+            'comments' => $data['comments'],
+            'site' => $CFG->wwwroot,
+            'author' => $data['author'],
+            'moodleversion' => $CFG->version,
+            'moodlerelease' => $CFG->release,
+            'timecreated' => time(),
+            'timeimported' => 0,
+            'iscore' => $data['iscore'],
+        ];
+
+        $presetid = $DB->insert_record('adminpresets', $preset);
+        $preset['id'] = $presetid;
+
+        // Setting: enablebadges = 0.
+        helper::add_item($presetid, 'enablebadges', '0');
+        // Setting: allowemojipicker = 1.
+        helper::add_item($presetid, 'allowemojipicker', '1');
+        // Setting: mediawidth = 900.
+        helper::add_item($presetid, 'mediawidth', '900', 'mod_lesson');
+        // Setting: maxanswers = 2 (with advanced disabled).
+        helper::add_item($presetid, 'maxanswers', '2', 'mod_lesson', 'maxanswers_adv', 0);
+
+        // Plugin: enrol_guest = 0.
+        helper::add_plugin($presetid, 'enrol', 'guest', 0);
+        // Plugin: mod_glossary = 0.
+        helper::add_plugin($presetid, 'mod', 'glossary', 0);
+        // Plugin: qtype_truefalse.
+        helper::add_plugin($presetid, 'qtype', 'truefalse', 1);
+
+        // Check if the preset should be created as applied preset too, to fill in the rest of the tables.
+        $applypreset = isset($data['applypreset']) && $data['applypreset'];
+        if ($applypreset) {
+            $presetapp = [
+                'adminpresetid' => $presetid,
+                'userid' => $USER->id,
+                'time' => time(),
+            ];
+            $appid = $DB->insert_record('adminpresets_app', $presetapp);
+
+            $this->apply_setting($appid, 'enablebadges', '1', '0');
+            // The allowemojipicker setting shouldn't be applied because the value matches the current one.
+            $this->apply_setting($appid, 'mediawidth', '640', '900', 'mod_lesson');
+            $this->apply_setting($appid, 'maxanswers', '5', '2', 'mod_lesson');
+            $this->apply_setting($appid, 'maxanswers_adv', '1', '0', 'mod_lesson', 'maxanswers');
+
+            $this->apply_plugin($appid, 'enrol', 'guest', 1, 0);
+            $this->apply_plugin($appid, 'mod', 'glossary', 1, 0);
+            // The qtype_truefalse plugin shouldn't be applied because the value matches the current one.
+        }
+
+        return $presetid;
+    }
+
+    /**
+     * Helper method to create an applied setting item.
+     *
+     * @param int $appid The applied preset identifier.
+     * @param string $name The setting name.
+     * @param string $oldvalue The setting old value.
+     * @param string $newvalue The setting new value.
+     * @param string|null $plugin The setting plugin (or null if none).
+     * @param string|null $itemname Whether it should be treated as advanced item or not.
+     *
+     * @return bool|int true or new id.
+     */
+    private function apply_setting(int $appid, string $name, string $oldvalue, string $newvalue, ?string $plugin = null,
+            ?string $itemname = null) {
+        global $DB;
+
+        set_config($name, $newvalue, $plugin);
+        $configlogid = $this->add_to_config_log($name, $oldvalue, $newvalue, $plugin);
+        $presetappitem = [
+            'adminpresetapplyid' => $appid,
+            'configlogid' => $configlogid,
+        ];
+        $table = 'adminpresets_app_it';
+        if (!is_null($itemname)) {
+            $table = 'adminpresets_app_it_a';
+            $presetappitem['itemname'] = $itemname;
+        }
+        $appitemid = $DB->insert_record($table, $presetappitem);
+
+        return $appitemid;
+
+    }
+
+    /**
+     * Helper method to create an applied plugin.
+     *
+     * @param int $appid The applied preset identifier.
+     * @param string $plugin The plugin type.
+     * @param string $name The plugin name.
+     * @param int $oldvalue The setting old value.
+     * @param int $newvalue The setting new value.
+     *
+     * @return bool|int true or new id.
+     */
+    private function apply_plugin(int $appid, string $plugin, string $name, int $oldvalue, int $newvalue) {
+        global $DB;
+
+        // Change plugin visibility.
+        $pluginclass = \core_plugin_manager::resolve_plugininfo_class($plugin);
+        $pluginclass::enable_plugin($name, $newvalue);
+
+        // Create entry in applied plugins table.
+        $presetappplug = [
+            'adminpresetapplyid' => $appid,
+            'plugin' => $plugin,
+            'name' => $name,
+            'value' => $newvalue,
+            'oldvalue' => $oldvalue,
+        ];
+        $appplugid = $DB->insert_record('adminpresets_app_plug', $presetappplug);
+
+        return $appplugid;
+    }
+
+    /**
+     * Helper method to add entry in config_log.
+     *
+     * @param string $name The setting name.
+     * @param string $oldvalue The setting old value.
+     * @param string $value The setting new value.
+     * @param string|null $plugin The setting plugin (or null if the setting doesn't belong to any plugin).
+     * @return int The id of the config_log entry created.
+     */
+    private function add_to_config_log(string $name, string $oldvalue, string $value, ?string $plugin = null): int {
+        global $DB, $USER;
+
+        $log = new stdClass();
+        $log->userid = $USER->id;
+        $log->timemodified = time();
+        $log->name = $name;
+        $log->oldvalue = $oldvalue;
+        $log->value = $value;
+        $log->plugin = $plugin;
+        $id = $DB->insert_record('config_log', $log);
+
+        return $id;
+    }
+
+    /**
+     * Helper method to access to a protected property.
+     *
+     * @param string|object $object The class.
+     * @param string $property The private/protected property in $object to access.
+     * @return mixed The current value of the property.
+     */
+    public function access_protected($object, string $property) {
+        $reflection = new ReflectionClass($object);
+        $property = $reflection->getProperty($property);
+        $property->setAccessible(true);
+        return $property->getValue($object);
+    }
+
+
+    /**
+     * Given a tree category and setting name, it gets the adminpresets_setting class.
+     *
+     * @param string $category Tree category name where the setting is located.
+     * @param string $settingname Setting name to get the class.
+     * @return adminpresets_setting
+     */
+    public function get_admin_preset_setting(string $category, string $settingname): adminpresets_setting {
+        $adminroot = admin_get_root();
+
+        // Set method accessibility.
+        $method = new ReflectionMethod(manager::class, 'get_setting');
+        $method->setAccessible(true);
+
+        // Get the proper adminpresets_setting instance.
+        $settingpage = $adminroot->locate($category);
+        $settingdata = $settingpage->settings->$settingname;
+        return $method->invokeArgs(new manager(), [$settingdata, '']);
+    }
+}

admin/presets/tests/generator_test.php

@@ -0,0 +1,236 @@
+<?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 core_adminpresets;
+
+/**
+ * Tests for the data generator.
+ *
+ * @package    core_adminpresets
+ * @category   test
+ * @copyright  2021 Sara Arjona (sara@moodle.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @coversDefaultClass core_adminpresets_generator
+ */
+class generator_test extends \advanced_testcase {
+
+    /**
+     * Test the behaviour of create_preset() method.
+     *
+     * @covers ::create_preset
+     * @dataProvider create_preset_provider
+     *
+     * @param string|null $name Preset name field.
+     * @param string|null $comments Preset comments field.
+     * @param string|null $author Preset author field.
+     * @param bool $applypreset Whether the preset should be applied or not.
+     * @param int|null $iscore Whether the preset is a core preset or not.
+     * @param int|null $iscoreresult Expected iscore value for the result preset.
+     */
+    public function test_create_preset(?string $name = null, ?string $comments = null, ?string $author = null,
+            bool $applypreset = false, ?int $iscore = null, ?int $iscoreresult = null): void {
+        global $CFG, $DB;
+
+        $this->resetAfterTest();
+
+        $data = [];
+        if (isset($name)) {
+            $data['name'] = $name;
+        } else {
+            // Set the default value used in the generator.
+            $name = 'Preset default name';
+        }
+        if (isset($comments)) {
+            // Set the default value used in the generator.
+            $data['comments'] = $comments;
+        } else {
+            // Set the default value used in the generator.
+            $comments = 'Preset default comment';
+        }
+        if (isset($author)) {
+            $data['author'] = $author;
+        } else {
+            $author = 'Default author';
+        }
+        if ($applypreset) {
+            $data['applypreset'] = $applypreset;
+        }
+        if (isset($iscore)) {
+            $data['iscore'] = $iscore;
+        }
+        if (!isset($iscoreresult)) {
+            $iscoreresult = manager::NONCORE_PRESET;
+        }
+
+        // Create a preset.
+        $presetid = $this->getDataGenerator()->get_plugin_generator('core_adminpresets')->create_preset($data);
+
+        // Check the preset data.
+        $preset = $DB->get_record('adminpresets', ['id' => $presetid]);
+
+        $this->assertEquals($name, $preset->name);
+        $this->assertEquals($comments, $preset->comments);
+        $this->assertEquals($author, $preset->author);
+        $this->assertEquals($iscoreresult, $preset->iscore);
+        $this->assertEquals($CFG->version, $preset->moodleversion);
+        $this->assertEquals($CFG->release, $preset->moodlerelease);
+        $this->assertEquals($CFG->wwwroot, $preset->site);
+
+        // Check the settings.
+        $settings = $DB->get_records('adminpresets_it', ['adminpresetid' => $presetid]);
+        $this->assertCount(4, $settings);
+        // These are the settings created in the generator. Check the results match them.
+        $expectedsettings = [
+            'enablebadges' => 0,
+            'allowemojipicker' => 1,
+            'mediawidth' => 900,
+            'maxanswers' => 2,
+        ];
+        foreach ($settings as $setting) {
+            $this->assertArrayHasKey($setting->name, $expectedsettings);
+            $this->assertEquals($expectedsettings[$setting->name], $setting->value);
+        }
+
+        // Check the advanced settings (should be only one).
+        $settingsid = array_keys($settings);
+        list($insql, $inparams) = $DB->get_in_or_equal($settingsid);
+        $advsettings = $DB->get_records_select('adminpresets_it_a', 'itemid ' . $insql, $inparams);
+        $this->assertCount(1, $advsettings);
+        $advsetting = reset($advsettings);
+        $this->assertEquals('maxanswers_adv', $advsetting->name);
+        $this->assertEquals(0, $advsetting->value);
+
+        // Check the plugins.
+        $plugins = $DB->get_records('adminpresets_plug', ['adminpresetid' => $presetid]);
+        $this->assertCount(3, $plugins);
+        // These are the plugins created in the generator. Check the results match them.
+        $expectedplugins = [
+            'enrol' => [
+                'guest' => 0,
+            ],
+            'mod' => [
+                'glossary' => 0,
+            ],
+            'qtype' => [
+                'truefalse' => 1,
+            ],
+        ];
+        foreach ($plugins as $plugin) {
+            $this->assertArrayHasKey($plugin->plugin, $expectedplugins);
+            $this->assertArrayHasKey($plugin->name, $expectedplugins[$plugin->plugin]);
+            $this->assertEquals($expectedplugins[$plugin->plugin][$plugin->name], $plugin->enabled);
+        }
+
+        if ($applypreset) {
+            // Verify that the preset has been applied.
+            $apps = $DB->get_records('adminpresets_app', ['adminpresetid' => $presetid]);
+            $this->assertCount(1, $apps);
+            $app = reset($apps);
+
+            // Check the applied settings.
+            $appsettings = $DB->get_records('adminpresets_app_it', ['adminpresetapplyid' => $app->id]);
+            $this->assertCount(3, $appsettings);
+            // These are the settings created in the generator (all but the allowemojipicker because it hasn't changed).
+            $expectedappsettings = $expectedsettings;
+            unset($expectedappsettings['allowemojipicker']);
+            // Check the results match the expected settings applied.
+            foreach ($appsettings as $appsetting) {
+                $configlog = $DB->get_record('config_log', ['id' => $appsetting->configlogid]);
+                $this->assertArrayHasKey($configlog->name, $expectedappsettings);
+                $this->assertEquals($expectedappsettings[$configlog->name], $configlog->value);
+            }
+
+            $appsettings = $DB->get_records('adminpresets_app_it_a', ['adminpresetapplyid' => $app->id]);
+            $this->assertCount(1, $appsettings);
+            $appsetting = reset($appsettings);
+            $configlog = $DB->get_record('config_log', ['id' => $appsetting->configlogid]);
+            $this->assertEquals('maxanswers_adv', $configlog->name);
+            $this->assertEquals(0, $configlog->value);
+
+            // Check the applied plugins.
+            $appplugins = $DB->get_records('adminpresets_app_plug', ['adminpresetapplyid' => $app->id]);
+            $this->assertCount(2, $appplugins);
+            // These are the plugins created in the generator (all but the qtype_truefalse because it hasn't changed).
+            $expectedappplugins = $expectedplugins;
+            unset($expectedappplugins['qtype']);
+            // Check the results match the expected plugins applied.
+            foreach ($appplugins as $appplugin) {
+                $this->assertArrayHasKey($appplugin->plugin, $expectedappplugins);
+                $this->assertArrayHasKey($appplugin->name, $expectedappplugins[$appplugin->plugin]);
+                $this->assertEquals($expectedappplugins[$appplugin->plugin][$appplugin->name], $appplugin->value);
+            }
+        }
+    }
+
+    /**
+     * Data provider for test_create_preset().
+     *
+     * @return array
+     */
+    public function create_preset_provider(): array {
+        return [
+            'Default values' => [
+            ],
+            'Name not empty' => [
+                'name' => 'Preset xaxi name',
+            ],
+            'Comment not empty' => [
+                'name' => null,
+                'comments' => 'This is a different comment',
+            ],
+            'Author not empty' => [
+                'name' => null,
+                'comments' => null,
+                'author' => 'Ada Lovelace',
+            ],
+            'No default values for all the fields' => [
+                'name' => 'Preset with a super-nice name',
+                'comments' => 'This is a comment different from the previous one',
+                'author' => 'Alejandro Sanz',
+            ],
+            'Apply preset' => [
+                'name' => null,
+                'comments' => null,
+                'author' => null,
+                'applypreset' => true,
+            ],
+            'Starter preset' => [
+                'name' => 'Starter',
+                'comments' => null,
+                'author' => null,
+                'applypreset' => false,
+                'iscore' => manager::STARTER_PRESET,
+                'iscoreresult' => manager::STARTER_PRESET,
+            ],
+            'Full preset' => [
+                'name' => 'Full',
+                'comments' => null,
+                'author' => null,
+                'applypreset' => false,
+                'iscore' => manager::FULL_PRESET,
+                'iscoreresult' => manager::FULL_PRESET,
+            ],
+            'Invalid iscore' => [
+                'name' => 'Invalid iscore value',
+                'comments' => null,
+                'author' => null,
+                'applypreset' => false,
+                'iscore' => -1,
+                'iscoreresult' => manager::NONCORE_PRESET,
+            ],
+        ];
+    }
+}

admin/presets/tests/helper_test.php

@@ -0,0 +1,387 @@
+<?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 core_adminpresets;
+
+/**
+ * Tests for the helper class.
+ *
+ * @package    core_adminpresets
+ * @category   test
+ * @copyright  2021 Sara Arjona (sara@moodle.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @coversDefaultClass helper
+ */
+class helper_test extends \advanced_testcase {
+
+    /**
+     * Test the behaviour of create_preset() method.
+     *
+     * @covers ::create_preset
+     * @dataProvider create_preset_provider
+     *
+     * @param string|null $name Preset name field.
+     * @param string|null $comments Preset comments field.
+     * @param int|null $iscore Preset iscore field.
+     * @param int|null $iscoreresult Expected iscore value for the result preset.
+     */
+    public function test_create_preset(?string $name = null, ?string $comments = null, ?int $iscore = null,
+           ?int $iscoreresult = null): void {
+        global $CFG, $DB, $USER;
+
+        $this->resetAfterTest();
+
+        $data = [];
+        if (isset($name)) {
+            $data['name'] = $name;
+        }
+        if (isset($comments)) {
+            $data['comments'] = $comments;
+        }
+        if (isset($iscore)) {
+            $data['iscore'] = $iscore;
+        }
+        if (!isset($iscoreresult)) {
+            $iscoreresult = manager::NONCORE_PRESET;
+        }
+
+        // Create a preset.
+        $presetid = helper::create_preset($data);
+
+        // Check the preset data.
+        $preset = $DB->get_record('adminpresets', ['id' => $presetid]);
+
+        $this->assertEquals($name, $preset->name);
+        $this->assertEquals($comments, $preset->comments);
+        $this->assertEquals(fullname($USER), $preset->author);
+        $this->assertEquals($iscoreresult, $preset->iscore);
+        $this->assertEquals($CFG->version, $preset->moodleversion);
+        $this->assertEquals($CFG->release, $preset->moodlerelease);
+        $this->assertEquals($CFG->wwwroot, $preset->site);
+
+        // Check the preset is empty and hasn't settings or plugins.
+        $settings = $DB->get_records('adminpresets_it', ['adminpresetid' => $presetid]);
+        $this->assertCount(0, $settings);
+        $plugins = $DB->get_records('adminpresets_plug', ['adminpresetid' => $presetid]);
+        $this->assertCount(0, $plugins);
+    }
+
+    /**
+     * Data provider for test_create_preset().
+     *
+     * @return array
+     */
+    public function create_preset_provider(): array {
+        return [
+            'Default values' => [
+            ],
+            'Name not empty' => [
+                'name' => 'Preset xaxi name',
+            ],
+            'Comments not empty' => [
+                'name' => null,
+                'comments' => 'This is a different comment',
+            ],
+            'Name and comments not empty' => [
+                'name' => 'Preset with a super-nice name',
+                'comments' => 'This is a comment different from the previous one',
+            ],
+            'Starter preset' => [
+                'name' => 'Starter',
+                'comments' => null,
+                'iscore' => manager::STARTER_PRESET,
+                'iscoreresult' => manager::STARTER_PRESET,
+            ],
+            'Full preset' => [
+                'name' => 'Full',
+                'comments' => null,
+                'iscore' => manager::FULL_PRESET,
+                'iscoreresult' => manager::FULL_PRESET,
+            ],
+            'Invalid iscore' => [
+                'name' => 'Invalid iscore value',
+                'comments' => null,
+                'iscore' => -1,
+                'iscoreresult' => manager::NONCORE_PRESET,
+            ],
+        ];
+    }
+
+    /**
+     * Test the behaviour of add_item() method.
+     *
+     * @covers ::add_item
+     * @dataProvider add_item_provider
+     *
+     * @param string $name Item name.
+     * @param string $value Item value.
+     * @param string|null $plugin Item plugin.
+     * @param string|null $advname If the item is an advanced setting, the name of the advanced setting should be specified here.
+     * @param string|null $advvalue If the item is an advanced setting, the value of the advanced setting should be specified here.
+     */
+    public function test_add_item(string $name, string $value, ?string $plugin = 'none', ?string $advname = null,
+            ?string $advvalue = null): void {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        // Create a preset.
+        $presetid = helper::create_preset([]);
+        $this->assertEquals(1, $DB->count_records('adminpresets', ['id' => $presetid]));
+
+        // Add items.
+        $itemid = helper::add_item($presetid, $name, $value, $plugin, $advname, $advvalue);
+
+        // Check settings have been created.
+        $settings = $DB->get_records('adminpresets_it', ['adminpresetid' => $presetid]);
+        $this->assertCount(1, $settings);
+
+        $setting = reset($settings);
+        $this->assertEquals($itemid, $setting->id);
+        $this->assertEquals($name, $setting->name);
+        $this->assertEquals($value, $setting->value);
+        $this->assertEquals($plugin, $setting->plugin);
+
+        if ($advname) {
+            // Check settings have been created.
+            $advsettings = $DB->get_records('adminpresets_it_a', ['itemid' => $itemid]);
+            $this->assertCount(1, $advsettings);
+
+            $advsetting = reset($advsettings);
+            $this->assertEquals($advname, $advsetting->name);
+            $this->assertEquals($advvalue, $advsetting->value);
+        } else {
+            // Check no advanced items have been created.
+            $this->assertEquals(0, $DB->count_records('adminpresets_it_a', ['itemid' => $itemid]));
+        }
+
+        // Check no plugins have been created.
+        $this->assertEquals(0, $DB->count_records('adminpresets_plug', ['adminpresetid' => $presetid]));
+    }
+
+    /**
+     * Data provider for test_add_item().
+     *
+     * @return array
+     */
+    public function add_item_provider(): array {
+        return [
+            'Setting without plugin' => [
+                'name' => 'settingname',
+                'value' => 'thisisthevalue',
+            ],
+            'Setting with plugin' => [
+                'name' => 'settingname',
+                'value' => 'thisisthevalue',
+                'plugin' => 'pluginname',
+            ],
+            'Setting with advanced item' => [
+                'name' => 'settingname',
+                'value' => 'thevalue',
+                'plugin' => 'pluginname',
+                'advname' => 'advsettingname',
+                'advvalue' => 'advsettingvalue',
+            ],
+        ];
+    }
+
+    /**
+     * Test the behaviour of add_plugin() method.
+     *
+     * @covers ::add_plugin
+     * @dataProvider add_plugin_provider
+     *
+     * @param string $type Plugin type.
+     * @param string $name Plugin name.
+     * @param mixed $enabled Whether the plugin will be enabled or not.
+     */
+    public function test_add_plugin(string $type, string $name, $enabled = 0): void {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        // Create a preset.
+        $presetid = helper::create_preset([]);
+        $this->assertEquals(1, $DB->count_records('adminpresets', ['id' => $presetid]));
+
+        // Add plugin.
+        $pluginid = helper::add_plugin($presetid, $type, $name, $enabled);
+
+        // Check plugin has been created.
+        $pluggins = $DB->get_records('adminpresets_plug', ['adminpresetid' => $presetid]);
+        $this->assertCount(1, $pluggins);
+
+        $plugin = reset($pluggins);
+        $this->assertEquals($pluginid, $plugin->id);
+        $this->assertEquals($type, $plugin->plugin);
+        $this->assertEquals($name, $plugin->name);
+        $this->assertEquals((int) $enabled, $plugin->enabled);
+
+        // Check no settings have been created.
+        $this->assertEquals(0, $DB->count_records('adminpresets_it', ['adminpresetid' => $presetid]));
+    }
+
+    /**
+     * Data provider for test_add_plugin().
+     *
+     * @return array
+     */
+    public function add_plugin_provider(): array {
+        return [
+            'Plugin: enabled (using int)' => [
+                'type' => 'plugintype',
+                'name' => 'pluginname',
+                'enabled' => 1,
+            ],
+            'Plugin: enabled (using bool)' => [
+                'type' => 'plugintype',
+                'name' => 'pluginname',
+                'enabled' => true,
+            ],
+            'Plugin: disabled (using int)' => [
+                'type' => 'plugintype',
+                'name' => 'pluginname',
+                'enabled' => 0,
+            ],
+            'Plugin: disabled (using bool)' => [
+                'type' => 'plugintype',
+                'name' => 'pluginname',
+                'enabled' => false,
+            ],
+            'Plugin: negative int value' => [
+                'type' => 'plugintype',
+                'name' => 'pluginname',
+                'enabled' => -9999,
+            ],
+        ];
+    }
+
+    /**
+     * Test the behaviour of change_default_preset() method.
+     *
+     * @covers ::change_default_preset
+     * @dataProvider change_default_preset_provider
+     *
+     * @param string $preset The preset name to apply or the path to the XML to be imported and applied.
+     * @param array|null $settings A few settings to check (with their expected values).
+     * @param array|null $plugins A few module plugins to check (with their expected values for the visibility).
+     */
+    public function test_change_default_preset(string $preset, ?array $settings = null, ?array $plugins = null): void {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // We need to change some of the default values; otherwise, the full preset won't be applied, because all the settings
+        // and plugins are the same.
+        set_config('enableanalytics', '0');
+
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $generator->create_preset(['name' => 'Preset 1']);
+
+        $presetid = helper::change_default_preset($preset);
+
+        if (empty($settings) && empty($plugins)) {
+            // The preset hasn't been applied.
+            $this->assertNull($presetid);
+        } else {
+            // The preset has been applied. Check the settings and plugins are the expected.
+            $this->assertNotEmpty($presetid);
+
+            // Check the setting values have changed accordingly with the ones defined in the preset.
+            foreach ($settings as $settingname => $settingvalue) {
+                $this->assertEquals($settingvalue, get_config('core', $settingname));
+            }
+
+            // Check the plugins visibility have changed accordingly with the ones defined in the preset.
+            $enabledplugins = \core\plugininfo\mod::get_enabled_plugins();
+            foreach ($plugins as $pluginname => $pluginvalue) {
+                if ($pluginvalue) {
+                    $this->assertArrayHasKey($pluginname, $enabledplugins);
+                } else {
+                    $this->assertArrayNotHasKey($pluginname, $enabledplugins);
+                }
+            }
+        }
+    }
+
+    /**
+     * Data provider for test_change_default_preset().
+     *
+     * @return array
+     */
+    public function change_default_preset_provider(): array {
+        return [
+            'Starter preset' => [
+                'preset' => 'starter',
+                'settings' => [
+                    'enablebadges' => 0,
+                    'enableportfolios' => 0,
+                ],
+                'plugins' => [
+                    'assign' => 1,
+                    'chat' => 0,
+                    'data' => 0,
+                    'lesson' => 0,
+                ],
+            ],
+            'Full preset' => [
+                'preset' => 'full',
+                'settings' => [
+                    'enablebadges' => 1,
+                    'enableportfolios' => 0,
+                ],
+                'plugins' => [
+                    'assign' => 1,
+                    'chat' => 1,
+                    'data' => 1,
+                    'lesson' => 1,
+                ],
+            ],
+            'Preset 1, created manually' => [
+                'preset' => 'Preset 1',
+                'settings' => [
+                    'enablebadges' => 0,
+                    'allowemojipicker' => 1,
+                ],
+                'plugins' => [
+                    'assign' => 1,
+                    'glossary' => 0,
+                ],
+            ],
+            'Unexisting preset name' => [
+                'preset' => 'unexisting',
+            ],
+            'Valid XML file' => [
+                'preset' => __DIR__ . '/fixtures/import_settings_plugins.xml',
+                'settings' => [
+                    'allowemojipicker' => 1,
+                    'enableportfolios' => 1,
+                ],
+                'plugins' => [
+                    'assign' => 1,
+                    'chat' => 0,
+                    'data' => 0,
+                    'lesson' => 1,
+                ],
+            ],
+            'Invalid XML file' => [
+                'preset' => __DIR__ . '/fixtures/invalid_xml_file.xml',
+            ],
+            'Unexisting XML file' => [
+                'preset' => __DIR__ . '/fixtures/unexisting.xml',
+            ],
+        ];
+    }
+}

admin/presets/tests/local/setting/adminpresets_admin_setting_bloglevel_test.php

@@ -0,0 +1,92 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Tests for the adminpresets_admin_setting_bloglevel class.
+ *
+ * @package    core_adminpresets
+ * @category   test
+ * @copyright  2021 Sara Arjona (sara@moodle.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @coversDefaultClass \core_adminpresets\local\setting\adminpresets_admin_setting_bloglevel
+ */
+class adminpresets_admin_setting_bloglevel_test extends \advanced_testcase {
+
+    /**
+     * Test the behaviour of save_value() method.
+     *
+     * @covers ::save_value
+     * @dataProvider save_value_provider
+     *
+     * @param int $settingvalue Setting value to be saved.
+     * @param bool $expectedsaved Whether the setting will be saved or not.
+     */
+    public function test_save_value(int $settingvalue, bool $expectedsaved): void {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        // Login as admin, to access all the settings.
+        $this->setAdminUser();
+
+        // Set the config values (to confirm they change after applying the preset).
+        set_config('bloglevel', BLOG_SITE_LEVEL); // All site users can see all blog entries.
+
+        // Get the setting and save the value.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $setting = $generator->get_admin_preset_setting('blog', 'bloglevel');
+        $result = $setting->save_value(false, $settingvalue);
+
+        // Check the result is the expected (saved when it has a different value and ignored when the value is the same).
+        if ($expectedsaved) {
+            $this->assertCount(1, $DB->get_records('config_log', ['id' => $result]));
+            // Specific from the save_value in adminpresets_admin_setting_bloglevel.
+            if ($settingvalue != 0) {
+                $this->assertTrue((bool) $DB->get_field('block', 'visible', ['name' => 'blog_menu']));
+            } else {
+                $this->assertFalse((bool) $DB->get_field('block', 'visible', ['name' => 'blog_menu']));
+            }
+        } else {
+            $this->assertFalse($result);
+        }
+        $this->assertEquals($settingvalue, get_config('core', 'bloglevel'));
+    }
+
+    /**
+     * Data provider for test_save_value().
+     *
+     * @return array
+     */
+    public function save_value_provider(): array {
+        return [
+            'Save the bloglevel and set blog_menu block visibility to true' => [
+                'setttingvalue' => BLOG_USER_LEVEL,
+                'expectedsaved' => true,
+            ],
+            'Same value to bloglevel, so it will not be saved' => [
+                'setttingvalue' => BLOG_SITE_LEVEL,
+                'expectedsaved' => false,
+            ],
+            'Save the bloglevel and set blog_menu block visibility to false' => [
+                'setttingvalue' => 0,
+                'expectedsaved' => true,
+            ],
+        ];
+    }
+
+}

admin/presets/tests/local/setting/adminpresets_admin_setting_sitesettext_test.php

@@ -0,0 +1,94 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Tests for the adminpresets_admin_setting_sitesettext class.
+ *
+ * @package    core_adminpresets
+ * @category   test
+ * @copyright  2021 Sara Arjona (sara@moodle.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @coversDefaultClass \core_adminpresets\local\setting\adminpresets_admin_setting_sitesettext
+ */
+class adminpresets_admin_setting_sitesettext_test extends \advanced_testcase {
+
+    /**
+     * Test the behaviour of save_value() method.
+     *
+     * @covers ::save_value
+     * @dataProvider save_value_provider
+     *
+     * @param string $settingname Setting name to save.
+     * @param string $settingvalue Setting value to be saved.
+     * @param bool $expectedsaved Whether the setting will be saved or not.
+     */
+    public function test_save_value(string $settingname, string $settingvalue, bool $expectedsaved): void {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        // Login as admin, to access all the settings.
+        $this->setAdminUser();
+
+        // Get the setting and save the value.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $setting = $generator->get_admin_preset_setting('frontpagesettings', $settingname);
+        $result = $setting->save_value(false, $settingvalue);
+
+        // Check the result is the expected (saved when it has a different value and ignored when the value is the same).
+        if ($expectedsaved) {
+            $this->assertCount(1, $DB->get_records('config_log', ['id' => $result]));
+            // Specific from the save_value in adminpresets_admin_setting_sitesettext.
+            $sitecourse = $DB->get_record('course', ['id' => 1]);
+            $this->assertEquals($settingvalue, $sitecourse->{$settingname});
+        } else {
+            $this->assertFalse($result);
+        }
+    }
+
+    /**
+     * Data provider for test_save_value().
+     *
+     * @return array
+     */
+    public function save_value_provider(): array {
+        return [
+            'Fullname: different value' => [
+                'settingname' => 'fullname',
+                'setttingvalue' => 'New site fullname',
+                'expectedsaved' => true,
+            ],
+            'Fullname: same value' => [
+                'settingname' => 'fullname',
+                'setttingvalue' => 'PHPUnit test site',
+                'expectedsaved' => false,
+            ],
+            'Summary: different value' => [
+                'settingname' => 'summary',
+                'setttingvalue' => 'This is a new site summary.',
+                'expectedsaved' => true,
+            ],
+            'Summary: same value' => [
+                'settingname' => 'summary',
+                'setttingvalue' => '',
+                'expectedsaved' => false,
+            ],
+        ];
+    }
+
+}

admin/presets/tests/local/setting/adminpresets_setting_test.php

@@ -0,0 +1,198 @@
+<?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 core_adminpresets\local\setting;
+
+/**
+ * Tests for the adminpresets_setting class.
+ *
+ * @package    core_adminpresets
+ * @category   test
+ * @copyright  2021 Sara Arjona (sara@moodle.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @coversDefaultClass \core_adminpresets\local\setting\adminpresets_setting
+ */
+class adminpresets_setting_test extends \advanced_testcase {
+
+    /**
+     * Test the behaviour of save_value() method.
+     *
+     * @covers ::save_value
+     * @dataProvider save_value_provider
+     *
+     * @param string $category Admin tree where the setting belongs.
+     * @param string $settingplugin Plugin where the setting belongs.
+     * @param string $settingname Setting name.
+     * @param string $settingvalue Setting value to be saved.
+     * @param bool $expectedsaved Whether the setting will be saved or not.
+     */
+    public function test_save_value(string $category, string $settingplugin, string $settingname, string $settingvalue,
+            bool $expectedsaved): void {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        // Login as admin, to access all the settings.
+        $this->setAdminUser();
+
+        // Set the config values (to confirm they change after applying the preset).
+        set_config('enablebadges', 1);
+        set_config('mediawidth', '640', 'mod_lesson');
+
+        // The expected setting name in the admin tree is $plugin.$name when plugin is not core.
+        if ($settingplugin !== 'core') {
+            $name = $settingplugin . $settingname;
+        } else {
+            $name = $settingname;
+        }
+        // Get the setting and save the value.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $setting = $generator->get_admin_preset_setting($category, $name);
+        $result = $setting->save_value(false, $settingvalue);
+
+        // Check the result is the expected (saved when it has a different value and ignored when the value is the same).
+        if ($expectedsaved) {
+            $this->assertCount(1, $DB->get_records('config_log', ['id' => $result]));
+        } else {
+            $this->assertFalse($result);
+        }
+        $this->assertEquals($settingvalue, get_config($settingplugin, $settingname));
+    }
+
+    /**
+     * Data provider for test_save_value().
+     *
+     * @return array
+     */
+    public function save_value_provider(): array {
+        return [
+            'Core setting with the same value is not saved' => [
+                'category' => 'optionalsubsystems',
+                'settingplugin' => 'core',
+                'settingname' => 'enablebadges',
+                'setttingvalue' => '1',
+                'expectedsaved' => false,
+            ],
+            'Core setting with a different value is saved' => [
+                'category' => 'optionalsubsystems',
+                'settingplugin' => 'core',
+                'settingname' => 'enablebadges',
+                'setttingvalue' => '0',
+                'expectedsaved' => true,
+            ],
+            'Plugin setting with the same value is not saved' => [
+                'category' => 'modsettinglesson',
+                'settingplugin' => 'mod_lesson',
+                'settingname' => 'mediawidth',
+                'setttingvalue' => '640',
+                'expectedsaved' => false,
+            ],
+            'Plugin setting with different value is saved' => [
+                'category' => 'modsettinglesson',
+                'settingplugin' => 'mod_lesson',
+                'settingname' => 'mediawidth',
+                'setttingvalue' => '900',
+                'expectedsaved' => true,
+            ],
+        ];
+    }
+
+    /**
+     * Test the behaviour of save_attributes_values() method.
+     *
+     * @covers ::save_attributes_values
+     * @dataProvider save_attributes_values_provider
+     *
+     * @param string $category Admin tree where the setting belongs.
+     * @param string $settingplugin Plugin where the setting belongs.
+     * @param string $settingname Setting name.
+     * @param string|null $advsettingname Advanced setting name.
+     * @param string $advsettingvalue Advanced setting value to be saved.
+     * @param bool $expectedsaved Whether the setting will be saved or not.
+     */
+    public function test_save_attributes_values(string $category, string $settingplugin, string $settingname,
+            ?string $advsettingname, string $advsettingvalue, bool $expectedsaved): void {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        // Login as admin, to access all the settings.
+        $this->setAdminUser();
+
+        // Set the config values (to confirm they change after applying the preset).
+        set_config('maxanswers_adv', '1', 'mod_lesson');
+
+        // The expected setting name in the admin tree is $plugin.$name when plugin is not core.
+        if ($settingplugin !== 'core') {
+            $name = $settingplugin . $settingname;
+        } else {
+            $name = $settingname;
+        }
+        // Get the setting and save the value.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $setting = $generator->get_admin_preset_setting($category, $name);
+        if ($advsettingname) {
+            $setting->set_attribute_value($advsettingname, $advsettingvalue);
+        }
+        $result = $setting->save_attributes_values();
+
+        // Check the result is the expected (saved when it has a different value and ignored when the value is the same).
+        if ($expectedsaved) {
+            $this->assertCount(1, $result);
+            $configlog = reset($result);
+            $this->assertCount(1, $DB->get_records('config_log', ['id' => $configlog]));
+        } else {
+            $this->assertFalse($result);
+        }
+        if ($advsettingname) {
+            $this->assertEquals($advsettingvalue, get_config($settingplugin, $advsettingname));
+        }
+    }
+
+    /**
+     * Data provider for test_save_attributes_values().
+     *
+     * @return array
+     */
+    public function save_attributes_values_provider(): array {
+        return [
+            'Plugin setting with the same value is not saved' => [
+                'category' => 'modsettinglesson',
+                'settingplugin' => 'mod_lesson',
+                'settingname' => 'maxanswers',
+                'advsettingname' => 'maxanswers_adv',
+                'advsetttingvalue' => '1',
+                'expectedsaved' => false,
+            ],
+            'Plugin setting with different value is saved' => [
+                'category' => 'modsettinglesson',
+                'settingplugin' => 'mod_lesson',
+                'settingname' => 'maxanswers',
+                'advsettingname' => 'maxanswers_adv',
+                'advsetttingvalue' => '0',
+                'expectedsaved' => true,
+            ],
+            'Plugin setting without advanced attributes are not saved' => [
+                'category' => 'modsettinglesson',
+                'settingplugin' => 'mod_lesson',
+                'settingname' => 'maxanswers',
+                'advsettingname' => null,
+                'advsetttingvalue' => '0',
+                'expectedsaved' => false,
+            ],
+        ];
+    }
+}

admin/presets/tests/manager_test.php

@@ -0,0 +1,771 @@
+<?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 core_adminpresets;
+
+use stdClass;
+
+/**
+ * Tests for the manager class.
+ *
+ * @package    core_adminpresets
+ * @category   test
+ * @copyright  2021 Sara Arjona (sara@moodle.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @coversDefaultClass \core_adminpresets\manager
+ */
+class manager_test extends \advanced_testcase {
+    /**
+     * Test the behaviour of protected get_site_settings method.
+     *
+     * @covers ::get_site_settings
+     * @covers ::get_settings
+     */
+    public function test_manager_get_site_settings(): void {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        // Login as admin, to access all the settings.
+        $this->setAdminUser();
+
+        $manager = new manager();
+        $result = $manager->get_site_settings();
+
+        // Check fullname is set into the none category.
+        $this->assertInstanceOf(
+                '\core_adminpresets\local\setting\adminpresets_admin_setting_sitesettext',
+                $result['none']['fullname']
+        );
+        $this->assertEquals('PHPUnit test site', $result['none']['fullname']->get_value());
+
+        // Check some of the config setting is present (they should be stored in the "none" category).
+        $this->assertInstanceOf(
+                '\core_adminpresets\local\setting\adminpresets_admin_setting_configcheckbox',
+                $result['none']['enablecompletion']
+        );
+        $this->assertEquals(1, $result['none']['enablecompletion']->get_value());
+
+        // Check some of the plugin config settings is present.
+        $this->assertInstanceOf(
+                '\core_adminpresets\local\setting\adminpresets_admin_setting_configtext',
+                $result['folder']['maxsizetodownload']
+        );
+        $this->assertEquals(0, $result['folder']['maxsizetodownload']->get_value());
+
+        // Set some of these values.
+        $sitecourse = new stdClass();
+        $sitecourse->id = 1;
+        $sitecourse->fullname = 'New site fullname';
+        $DB->update_record('course', $sitecourse);
+
+        set_config('enablecompletion', 0);
+        set_config('maxsizetodownload', 101, 'folder');
+
+        // Check the new values are returned properly.
+        $result = $manager->get_site_settings();
+        // Site fullname.
+        $this->assertInstanceOf(
+                '\core_adminpresets\local\setting\adminpresets_admin_setting_sitesettext',
+                $result['none']['fullname']
+        );
+        $this->assertEquals($sitecourse->fullname, $result['none']['fullname']->get_value());
+        // Config setting.
+        $this->assertInstanceOf(
+                '\core_adminpresets\local\setting\adminpresets_admin_setting_configcheckbox',
+                $result['none']['enablecompletion']
+        );
+        $this->assertEquals(0, $result['none']['enablecompletion']->get_value());
+        // Plugin config settting.
+        $this->assertInstanceOf(
+                '\core_adminpresets\local\setting\adminpresets_admin_setting_configtext',
+                $result['folder']['maxsizetodownload']
+        );
+        $this->assertEquals(101, $result['folder']['maxsizetodownload']->get_value());
+    }
+
+    /**
+     * Test the behaviour of protected get_setting method.
+     *
+     * @covers ::get_setting
+     * @covers ::get_settings_class
+     */
+    public function test_manager_get_setting(): void {
+        $this->resetAfterTest();
+
+        // Login as admin, to access all the settings.
+        $this->setAdminUser();
+
+        $adminroot = admin_get_root();
+
+        // Check the adminpresets_xxxxx class is created properly when it exists.
+        $settingpage = $adminroot->locate('optionalsubsystems');
+        $settingdata = $settingpage->settings->enablebadges;
+        $manager = new manager();
+        $result = $manager->get_setting($settingdata, '');
+        $this->assertInstanceOf('\core_adminpresets\local\setting\adminpresets_admin_setting_configcheckbox', $result);
+        $this->assertNotEquals('core_adminpresets\local\setting\adminpresets_setting', get_class($result));
+
+        // Check the mapped class is returned when no specific class exists and it exists in the mappings array.
+        $settingpage = $adminroot->locate('h5psettings');
+        $settingdata = $settingpage->settings->h5plibraryhandler;;
+        $result = $manager->get_setting($settingdata, '');
+        $this->assertInstanceOf('\core_adminpresets\local\setting\adminpresets_admin_setting_configselect', $result);
+        $this->assertNotEquals(
+                'core_adminpresets\local\setting\adminpresets_admin_settings_h5plib_handler_select',
+                get_class($result)
+        );
+
+        // Check the mapped class is returned when no specific class exists and it exists in the mappings array.
+        $settingpage = $adminroot->locate('modsettingquiz');
+        $settingdata = $settingpage->settings->quizbrowsersecurity;;
+        $result = $manager->get_setting($settingdata, '');
+        $this->assertInstanceOf('\mod_quiz\adminpresets\adminpresets_mod_quiz_admin_setting_browsersecurity', $result);
+        $this->assertNotEquals('core_adminpresets\local\setting\adminpresets_setting', get_class($result));
+
+        // Check the adminpresets_setting class is returned when no specific class exists.
+        $settingpage = $adminroot->locate('managecustomfields');
+        $settingdata = $settingpage->settings->customfieldsui;;
+        $result = $manager->get_setting($settingdata, '');
+        $this->assertInstanceOf('\core_adminpresets\local\setting\adminpresets_setting', $result);
+        $this->assertEquals('core_adminpresets\local\setting\adminpresets_setting', get_class($result));
+    }
+
+    /**
+     * Test the behaviour of apply_preset() method when the given presetid doesn't exist.
+     *
+     * @covers ::apply_preset
+     */
+    public function test_apply_preset_unexisting_preset(): void {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // Create some presets.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $presetid = $generator->create_preset();
+
+        // Unexisting preset identifier.
+        $unexistingid = $presetid * 2;
+
+        $manager = new manager();
+        $this->expectException(\moodle_exception::class);
+        $manager->apply_preset($unexistingid);
+    }
+
+    /**
+     * Test the behaviour of apply_preset() method.
+     *
+     * @covers ::apply_preset
+     */
+    public function test_apply_preset(): void {
+        global $DB;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // Create a preset.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $presetid = $generator->create_preset();
+
+        $currentpresets = $DB->count_records('adminpresets');
+        $currentitems = $DB->count_records('adminpresets_it');
+        $currentadvitems = $DB->count_records('adminpresets_it_a');
+        $currentplugins = $DB->count_records('adminpresets_plug');
+        $currentapppresets = $DB->count_records('adminpresets_app');
+        $currentappitems = $DB->count_records('adminpresets_app_it');
+        $currentappadvitems = $DB->count_records('adminpresets_app_it_a');
+        $currentappplugins = $DB->count_records('adminpresets_app_plug');
+
+        // Set the config values (to confirm they change after applying the preset).
+        set_config('enablebadges', 1);
+        set_config('allowemojipicker', 1);
+        set_config('mediawidth', '640', 'mod_lesson');
+        set_config('maxanswers', '5', 'mod_lesson');
+        set_config('maxanswers_adv', '1', 'mod_lesson');
+        set_config('enablecompletion', 1);
+        set_config('usecomments', 0);
+
+        // Call the apply_preset method.
+        $manager = new manager();
+        $manager->apply_preset($presetid);
+
+        // Check the preset applied has been added to database.
+        $this->assertCount($currentapppresets + 1, $DB->get_records('adminpresets_app'));
+        // Applied items: enablebadges@none, mediawitdh@mod_lesson and maxanswers@@mod_lesson.
+        $this->assertCount($currentappitems + 3, $DB->get_records('adminpresets_app_it'));
+        // Applied advanced items: maxanswers_adv@mod_lesson.
+        $this->assertCount($currentappadvitems + 1, $DB->get_records('adminpresets_app_it_a'));
+        // Applied plugins: enrol_guest and mod_glossary.
+        $this->assertCount($currentappplugins + 2, $DB->get_records('adminpresets_app_plug'));
+        // Check no new preset has been created.
+        $this->assertCount($currentpresets, $DB->get_records('adminpresets'));
+        $this->assertCount($currentitems, $DB->get_records('adminpresets_it'));
+        $this->assertCount($currentadvitems, $DB->get_records('adminpresets_it_a'));
+        $this->assertCount($currentplugins, $DB->get_records('adminpresets_plug'));
+
+        // Check the setting values have changed accordingly with the ones defined in the preset.
+        $this->assertEquals(0, get_config('core', 'enablebadges'));
+        $this->assertEquals(900, get_config('mod_lesson', 'mediawidth'));
+        $this->assertEquals(2, get_config('mod_lesson', 'maxanswers'));
+        $this->assertEquals(0, get_config('mod_lesson', 'maxanswers_adv'));
+
+        // These settings will never change.
+        $this->assertEquals(1, get_config('core', 'allowemojipicker'));
+        $this->assertEquals(1, get_config('core', 'enablecompletion'));
+        $this->assertEquals(0, get_config('core', 'usecomments'));
+
+        // Check the plugins visibility have changed accordingly with the ones defined in the preset.
+        $enabledplugins = \core\plugininfo\enrol::get_enabled_plugins();
+        $this->assertArrayNotHasKey('guest', $enabledplugins);
+        $this->assertArrayHasKey('manual', $enabledplugins);
+        $enabledplugins = \core\plugininfo\mod::get_enabled_plugins();
+        $this->assertArrayNotHasKey('glossary', $enabledplugins);
+        $this->assertArrayHasKey('assign', $enabledplugins);
+        $enabledplugins = \core\plugininfo\qtype::get_enabled_plugins();
+        $this->assertArrayHasKey('truefalse', $enabledplugins);
+
+        // Check the presetid has been also stored in the lastpresetapplied config setting.
+        $this->assertEquals($presetid, get_config('adminpresets', 'lastpresetapplied'));
+
+        // Call apply_preset as a simulation, so it shouldn't be applied and lastpresetapplied should still be $presetid.
+        $presetid2 = $generator->create_preset();
+        $manager->apply_preset($presetid2, true);
+        $this->assertEquals($presetid, get_config('adminpresets', 'lastpresetapplied'));
+    }
+
+
+    /**
+     * Test the behaviour of export_preset() method.
+     *
+     * @covers ::export_preset
+     * @dataProvider export_preset_provider
+     *
+     * @param bool $includesensible Whether the sensible settings should be exported too or not.
+     * @param string $presetname Preset name.
+     */
+    public function test_export_preset(bool $includesensible = false, string $presetname = 'Export 1'): void {
+        global $DB;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // Get current presets and items.
+        $currentpresets = $DB->count_records('adminpresets');
+        $currentadvitems = $DB->count_records('adminpresets_it_a');
+
+        // Initialise some settings (to compare their values have been exported as expected).
+        set_config('recaptchapublickey', 'abcde');
+        set_config('enablebadges', '0');
+        set_config('mediawidth', '900', 'mod_lesson');
+        set_config('maxanswers', '2', 'mod_lesson');
+        set_config('maxanswers_adv', '0', 'mod_lesson');
+        set_config('defaultfeedback', '0', 'mod_lesson');
+        set_config('defaultfeedback_adv', '1', 'mod_lesson');
+
+        // Prepare the data to export preset.
+        $data = [
+            'name' => $presetname,
+            'comments' => ['text' => 'This is a presets for testing export'],
+            'author' => 'Super-Girl',
+            'includesensiblesettings' => $includesensible,
+        ];
+
+        // Call the method to be tested.
+        $manager = new manager();
+        list($presetid, $settingsfound, $pluginsfound) = $manager->export_preset((object) $data);
+
+        // Check the preset record has been created.
+        $presets = $DB->get_records('adminpresets');
+        $this->assertCount($currentpresets + 1, $presets);
+        $this->assertArrayHasKey($presetid, $presets);
+        $preset = $presets[$presetid];
+        $this->assertEquals($presetname, $preset->name);
+        $this->assertEquals(manager::NONCORE_PRESET, $preset->iscore);
+
+        // Check the preset includes settings and plugins.
+        $this->assertTrue($settingsfound);
+        $this->assertTrue($pluginsfound);
+
+        // Check the items, advanced attributes and plugins have been created.
+        $this->assertGreaterThan(0, $DB->count_records('adminpresets_it', ['adminpresetid' => $presetid]));
+        $this->assertGreaterThan($currentadvitems, $DB->count_records('adminpresets_it_a'));
+        $this->assertGreaterThan(0, $DB->count_records('adminpresets_plug', ['adminpresetid' => $presetid]));
+
+        // Check settings have been created with the expected values.
+        $params = ['adminpresetid' => $presetid, 'plugin' => 'none', 'name' => 'enablebadges'];
+        $setting = $DB->get_record('adminpresets_it', $params);
+        $this->assertEquals('0', $setting->value);
+
+        $params = ['adminpresetid' => $presetid, 'plugin' => 'mod_lesson', 'name' => 'mediawidth'];
+        $setting = $DB->get_record('adminpresets_it', $params);
+        $this->assertEquals('900', $setting->value);
+
+        $params = ['adminpresetid' => $presetid, 'plugin' => 'mod_lesson', 'name' => 'maxanswers'];
+        $setting = $DB->get_record('adminpresets_it', $params);
+        $this->assertEquals('2', $setting->value);
+        $params = ['itemid' => $setting->id, 'name' => 'maxanswers_adv'];
+        $setting = $DB->get_record('adminpresets_it_a', $params);
+        $this->assertEquals('0', $setting->value);
+
+        $params = ['adminpresetid' => $presetid, 'plugin' => 'mod_lesson', 'name' => 'defaultfeedback'];
+        $setting = $DB->get_record('adminpresets_it', $params);
+        $this->assertEquals('0', $setting->value);
+        $params = ['itemid' => $setting->id, 'name' => 'defaultfeedback_adv'];
+        $setting = $DB->get_record('adminpresets_it_a', $params);
+        $this->assertEquals('1', $setting->value);
+
+        // Check plugins have been created with the expected values.
+        $manager = \core_plugin_manager::instance();
+        $plugintype = 'enrol';
+        $plugins = $manager->get_present_plugins($plugintype);
+        $enabledplugins = $manager->get_enabled_plugins($plugintype);
+        foreach ($plugins as $pluginname => $unused) {
+            $params = ['adminpresetid' => $presetid, 'plugin' => $plugintype, 'name' => $pluginname];
+            $plugin = $DB->get_record('adminpresets_plug', $params);
+            $enabled = (!empty($enabledplugins) && array_key_exists($pluginname, $enabledplugins));
+            $this->assertEquals($enabled, (bool) $plugin->enabled);
+        }
+
+        // Check whether sensible settings have been exported or not.
+        $params = ['adminpresetid' => $presetid, 'plugin' => 'none', 'name' => 'recaptchapublickey'];
+        $recaptchasetting = $DB->get_record('adminpresets_it', $params);
+        $params = ['adminpresetid' => $presetid, 'plugin' => 'none', 'name' => 'cronremotepassword'];
+        $cronsetting = $DB->get_record('adminpresets_it', $params);
+        if ($includesensible) {
+            $this->assertEquals('abcde', $recaptchasetting->value);
+            $this->assertNotFalse($cronsetting);
+        } else {
+            $this->assertFalse($recaptchasetting);
+            $this->assertFalse($cronsetting);
+        }
+    }
+
+    /**
+     * Data provider for test_export_preset().
+     *
+     * @return array
+     */
+    public function export_preset_provider(): array {
+        return [
+            'Export settings and plugins, excluding sensible' => [
+                'includesensible' => false,
+            ],
+            'Export settings and plugins, including sensible' => [
+                'includesensible' => true,
+            ],
+            'Export settings and plugins, with Starter name (it should not be marked as core)' => [
+                'includesensible' => false,
+                'presetname' => 'Starter',
+            ],
+            'Export settings and plugins, with Full name (it should not be marked as core)' => [
+                'includesensible' => false,
+                'presetname' => 'Full',
+            ],
+        ];
+    }
+
+    /**
+     * Test the behaviour of download_preset() method, when the given presetid doesn't exist.
+     *
+     * @covers ::download_preset
+     */
+    public function test_download_unexisting_preset(): void {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // Create some presets.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $presetid = $generator->create_preset();
+
+        // Unexisting preset identifier.
+        $unexistingid = $presetid * 2;
+
+        $manager = new manager();
+        $this->expectException(\moodle_exception::class);
+        $manager->download_preset($unexistingid);
+    }
+
+
+    /**
+     * Test the behaviour of import_preset() method.
+     *
+     * @dataProvider import_preset_provider
+     * @covers ::import_preset
+     *
+     * @param string $filecontents File content to import.
+     * @param bool $expectedpreset Whether the preset should be created or not.
+     * @param bool $expectedsettings Whether settings will be created or not.
+     * @param bool $expectedplugins Whether plugins will be created or not.
+     * @param bool $expecteddebugging Whether debugging message will be thrown or not.
+     * @param string|null $expectedexception Expected exception class (if that's the case).
+     * @param string|null $expectedpresetname Expected preset name.
+     */
+    public function test_import_preset(string $filecontents, bool $expectedpreset, bool $expectedsettings = false,
+            bool $expectedplugins = false, bool $expecteddebugging = false, string $expectedexception = null,
+            string $expectedpresetname = 'Imported preset'): void {
+        global $DB;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        $currentpresets = $DB->count_records('adminpresets');
+        $currentitems = $DB->count_records('adminpresets_it');
+        $currentadvitems = $DB->count_records('adminpresets_it_a');
+
+        // Call the method to be tested.
+        $manager = new manager();
+        try {
+            list($xml, $preset, $settingsfound, $pluginsfound) = $manager->import_preset($filecontents);
+        } catch (\exception $e) {
+            if ($expectedexception) {
+                $this->assertInstanceOf($expectedexception, $e);
+            }
+        } finally {
+            if ($expecteddebugging) {
+                $this->assertDebuggingCalled();
+            }
+
+            if ($expectedpreset) {
+                // Check the preset record has been created.
+                $presets = $DB->get_records('adminpresets');
+                $this->assertCount($currentpresets + 1, $presets);
+                $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+                $this->assertArrayHasKey($preset->id, $presets);
+                $preset = $presets[$preset->id];
+                $this->assertEquals($expectedpresetname, $preset->name);
+                $this->assertEquals('http://demo.moodle', $preset->site);
+                $this->assertEquals('Ada Lovelace', $preset->author);
+                $this->assertEquals(manager::NONCORE_PRESET, $preset->iscore);
+
+                if ($expectedsettings) {
+                    // Check the items have been created.
+                    $items = $DB->get_records('adminpresets_it', ['adminpresetid' => $preset->id]);
+                    $this->assertCount(4, $items);
+                    $presetitems = [
+                        'none' => [
+                            'enablebadges' => 0,
+                            'enableportfolios' => 1,
+                            'allowemojipicker' => 1,
+                        ],
+                        'mod_lesson' => [
+                            'mediawidth' => 900,
+                            'maxanswers' => 2,
+                        ],
+                    ];
+                    foreach ($items as $item) {
+                        $this->assertArrayHasKey($item->name, $presetitems[$item->plugin]);
+                        $this->assertEquals($presetitems[$item->plugin][$item->name], $item->value);
+                    }
+
+                    // Check the advanced attributes have been created.
+                    $advitems = $DB->get_records('adminpresets_it_a');
+                    $this->assertCount($currentadvitems + 1, $advitems);
+                    $advitemfound = false;
+                    foreach ($advitems as $advitem) {
+                        if ($advitem->name == 'maxanswers_adv') {
+                            $this->assertEmpty($advitem->value);
+                            $advitemfound = true;
+                        }
+                    }
+                    $this->assertTrue($advitemfound);
+                }
+
+                if ($expectedplugins) {
+                    // Check the plugins have been created.
+                    $plugins = $DB->get_records('adminpresets_plug', ['adminpresetid' => $preset->id]);
+                    $this->assertCount(6, $plugins);
+                    $presetplugins = [
+                        'atto' => [
+                            'html' => 1,
+                        ],
+                        'block' => [
+                            'html' => 0,
+                            'activity_modules' => 1,
+                        ],
+                        'mod' => [
+                            'chat' => 0,
+                            'data' => 0,
+                            'lesson' => 1,
+                        ],
+                    ];
+                    foreach ($plugins as $plugin) {
+                        $this->assertArrayHasKey($plugin->name, $presetplugins[$plugin->plugin]);
+                        $this->assertEquals($presetplugins[$plugin->plugin][$plugin->name], $plugin->enabled);
+                    }
+
+                }
+            } else {
+                // Check the preset nor the items are not created.
+                $this->assertCount($currentpresets, $DB->get_records('adminpresets'));
+                $this->assertCount($currentitems, $DB->get_records('adminpresets_it'));
+                $this->assertCount($currentadvitems, $DB->get_records('adminpresets_it_a'));
+            }
+        }
+    }
+
+    /**
+     * Data provider for test_import_preset().
+     *
+     * @return array
+     */
+    public function import_preset_provider(): array {
+        return [
+            'Import settings from an empty file' => [
+                'filecontents' => '',
+                'expectedpreset' => false,
+            ],
+            'Import settings and plugins from a valid XML file' => [
+                'filecontents' => file_get_contents(__DIR__ . '/fixtures/import_settings_plugins.xml'),
+                'expectedpreset' => true,
+                'expectedsettings' => true,
+                'expectedplugins' => true,
+            ],
+            'Import only settings from a valid XML file' => [
+                'filecontents' => file_get_contents(__DIR__ . '/fixtures/import_settings.xml'),
+                'expectedpreset' => true,
+                'expectedsettings' => true,
+                'expectedplugins' => false,
+            ],
+            'Import settings and plugins from a valid XML file with Starter name, which will be marked as non-core' => [
+                'filecontents' => file_get_contents(__DIR__ . '/fixtures/import_starter_name.xml'),
+                'expectedpreset' => true,
+                'expectedsettings' => true,
+                'expectedplugins' => true,
+                'expecteddebugging' => false,
+                'expectedexception' => null,
+                'expectedpresetname' => 'Starter',
+            ],
+            'Import settings from an invalid XML file' => [
+                'filecontents' => file_get_contents(__DIR__ . '/fixtures/invalid_xml_file.xml'),
+                'expectedpreset' => false,
+                'expectedsettings' => false,
+                'expectedplugins' => false,
+                'expecteddebugging' => false,
+                'expectedexception' => \Exception::class,
+            ],
+            'Import unexisting settings category' => [
+                'filecontents' => file_get_contents(__DIR__ . '/fixtures/unexisting_category.xml'),
+                'expectedpreset' => false,
+                'expectedsettings' => false,
+                'expectedplugins' => false,
+            ],
+            'Import unexisting setting' => [
+                'filecontents' => file_get_contents(__DIR__ . '/fixtures/unexisting_setting.xml'),
+                'expectedpreset' => false,
+                'expectedsettings' => false,
+                'expectedplugins' => false,
+                'expecteddebugging' => true,
+            ],
+            'Import valid settings with one unexisting setting too' => [
+                'filecontents' => file_get_contents(__DIR__ . '/fixtures/import_settings_with_unexisting_setting.xml'),
+                'expectedpreset' => true,
+                'expectedsettings' => false,
+                'expectedplugins' => false,
+                'expecteddebugging' => true,
+            ],
+        ];
+    }
+
+
+    /**
+     * Test the behaviour of delete_preset() method when the preset id doesn't exist.
+     *
+     * @covers ::delete_preset
+     */
+    public function test_delete_preset_unexisting_preset(): void {
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // Create some presets.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $presetid = $generator->create_preset(['name' => 'Preset 1']);
+
+        // Unexisting preset identifier.
+        $unexistingid = $presetid * 2;
+
+        $manager = new manager();
+
+        $this->expectException(\moodle_exception::class);
+        $manager->delete_preset($unexistingid);
+    }
+
+    /**
+     * Test the behaviour of delete_preset() method.
+     *
+     * @covers ::delete_preset
+     */
+    public function test_delete_preset(): void {
+        global $DB;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // Create some presets.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $presetid1 = $generator->create_preset(['name' => 'Preset 1', 'applypreset' => true]);
+        $presetid2 = $generator->create_preset(['name' => 'Preset 2']);
+
+        $currentpresets = $DB->count_records('adminpresets');
+        $currentitems = $DB->count_records('adminpresets_it');
+        $currentadvitems = $DB->count_records('adminpresets_it_a');
+        $currentplugins = $DB->count_records('adminpresets_plug');
+
+        // Only preset1 has been applied.
+        $this->assertCount(1, $DB->get_records('adminpresets_app'));
+        // Only the preset1 settings that have changed: enablebadges, mediawidth and maxanswers.
+        $this->assertCount(3, $DB->get_records('adminpresets_app_it'));
+        // Only the preset1 advanced settings that have changed: maxanswers_adv.
+        $this->assertCount(1, $DB->get_records('adminpresets_app_it_a'));
+        // Only the preset1 plugins that have changed: enrol_guest and mod_glossary.
+        $this->assertCount(2, $DB->get_records('adminpresets_app_plug'));
+
+        // Call the method to be tested.
+        $manager = new manager();
+        $manager->delete_preset($presetid1);
+
+        // Check the preset data has been removed.
+        $presets = $DB->get_records('adminpresets');
+        $this->assertCount($currentpresets - 1, $presets);
+        $preset = reset($presets);
+        $this->assertArrayHasKey($presetid2, $presets);
+        // Check preset items.
+        $this->assertCount($currentitems - 4, $DB->get_records('adminpresets_it'));
+        $this->assertCount(0, $DB->get_records('adminpresets_it', ['adminpresetid' => $presetid1]));
+        // Check preset advanced items.
+        $this->assertCount($currentadvitems - 1, $DB->get_records('adminpresets_it_a'));
+        // Check preset plugins.
+        $this->assertCount($currentplugins - 3, $DB->get_records('adminpresets_plug'));
+        $this->assertCount(0, $DB->get_records('adminpresets_plug', ['adminpresetid' => $presetid1]));
+        // Check preset applied tables are empty now.
+        $this->assertCount(0, $DB->get_records('adminpresets_app'));
+        $this->assertCount(0, $DB->get_records('adminpresets_app_it'));
+        $this->assertCount(0, $DB->get_records('adminpresets_app_it_a'));
+        $this->assertCount(0, $DB->get_records('adminpresets_app_plug'));
+    }
+
+    /**
+     * Test the behaviour of revert_preset() method when the preset applied id doesn't exist.
+     *
+     * @covers ::revert_preset
+     */
+    public function test_revert_preset_unexisting_presetapp(): void {
+        global $DB;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // Create a preset and apply it.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $presetid = $generator->create_preset(['applypreset' => true]);
+        $presetappid = $DB->get_field('adminpresets_app', 'id', ['adminpresetid' => $presetid]);
+
+        // Unexisting applied preset identifier.
+        $unexistingid = $presetappid * 2;
+
+        $manager = new manager();
+        $this->expectException(\moodle_exception::class);
+        $manager->revert_preset($unexistingid);
+    }
+
+    /**
+     * Test the behaviour of revert_preset() method.
+     *
+     * @covers ::revert_preset
+     */
+    public function test_revert_preset(): void {
+        global $DB;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // Set the config values (to confirm they change after applying the preset).
+        set_config('enablebadges', 1);
+        set_config('allowemojipicker', 1);
+        set_config('mediawidth', '640', 'mod_lesson');
+        set_config('maxanswers', '5', 'mod_lesson');
+        set_config('maxanswers_adv', '1', 'mod_lesson');
+        set_config('enablecompletion', 1);
+        set_config('usecomments', 0);
+
+        // Create a preset and apply it.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $presetid = $generator->create_preset(['applypreset' => true]);
+        $presetappid = $DB->get_field('adminpresets_app', 'id', ['adminpresetid' => $presetid]);
+
+        $currentpresets = $DB->count_records('adminpresets');
+        $currentitems = $DB->count_records('adminpresets_it');
+        $currentadvitems = $DB->count_records('adminpresets_it_a');
+        $currentplugins = $DB->count_records('adminpresets_plug');
+        $this->assertCount(1, $DB->get_records('adminpresets_app'));
+        $this->assertCount(3, $DB->get_records('adminpresets_app_it'));
+        $this->assertCount(1, $DB->get_records('adminpresets_app_it_a'));
+        $this->assertCount(2, $DB->get_records('adminpresets_app_plug'));
+
+        // Check the setttings have changed accordingly after applying the preset.
+        $this->assertEquals(0, get_config('core', 'enablebadges'));
+        $this->assertEquals(900, get_config('mod_lesson', 'mediawidth'));
+        $this->assertEquals(2, get_config('mod_lesson', 'maxanswers'));
+        $this->assertEquals(1, get_config('core', 'allowemojipicker'));
+        $this->assertEquals(1, get_config('core', 'enablecompletion'));
+        $this->assertEquals(0, get_config('core', 'usecomments'));
+
+        // Check the plugins visibility have changed accordingly with the ones defined in the preset.
+        $enabledplugins = \core\plugininfo\enrol::get_enabled_plugins();
+        $this->assertArrayNotHasKey('guest', $enabledplugins);
+        $enabledplugins = \core\plugininfo\mod::get_enabled_plugins();
+        $this->assertArrayNotHasKey('glossary', $enabledplugins);
+        $enabledplugins = \core\plugininfo\qtype::get_enabled_plugins();
+        $this->assertArrayHasKey('truefalse', $enabledplugins);
+
+        // Call the method to be tested.
+        $manager = new manager();
+        list($presetapp, $rollback, $failures) = $manager->revert_preset($presetappid);
+
+        // Check the preset applied has been reverted (so the records in _appXX tables have been removed).
+        $this->assertNotEmpty($presetapp);
+        $this->assertNotEmpty($rollback);
+        $this->assertEmpty($failures);
+        $this->assertCount(0, $DB->get_records('adminpresets_app'));
+        $this->assertCount(0, $DB->get_records('adminpresets_app_it'));
+        $this->assertCount(0, $DB->get_records('adminpresets_app_it_a'));
+        $this->assertCount(0, $DB->get_records('adminpresets_app_plug'));
+        // Check the preset data hasn't changed.
+        $this->assertCount($currentpresets, $DB->get_records('adminpresets'));
+        $this->assertCount($currentitems, $DB->get_records('adminpresets_it'));
+        $this->assertCount($currentadvitems, $DB->get_records('adminpresets_it_a'));
+        $this->assertCount($currentplugins, $DB->get_records('adminpresets_plug'));
+
+        // Check the setting values have been reverted accordingly.
+        $this->assertEquals(1, get_config('core', 'enablebadges'));
+        $this->assertEquals(640, get_config('mod_lesson', 'mediawidth'));
+        $this->assertEquals(5, get_config('mod_lesson', 'maxanswers'));
+        $this->assertEquals(1, get_config('mod_lesson', 'maxanswers_adv'));
+        // These settings won't change, regardless if they are posted to the form.
+        $this->assertEquals(1, get_config('core', 'allowemojipicker'));
+        $this->assertEquals(1, get_config('core', 'enablecompletion'));
+        $this->assertEquals(0, get_config('core', 'usecomments'));
+
+        // Check the plugins visibility have been reverted accordingly.
+        $enabledplugins = \core\plugininfo\enrol::get_enabled_plugins();
+        $this->assertArrayHasKey('guest', $enabledplugins);
+        $enabledplugins = \core\plugininfo\mod::get_enabled_plugins();
+        $this->assertArrayHasKey('glossary', $enabledplugins);
+        // This plugin won't change (because it had the same value than before the preset was applied).
+        $enabledplugins = \core\plugininfo\qtype::get_enabled_plugins();
+        $this->assertArrayHasKey('truefalse', $enabledplugins);
+    }
+}

admin/presets/tests/privacy/privacy_provider_test.php

@@ -0,0 +1,170 @@
+<?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 core_adminpresets\privacy;
+
+use context_system;
+use context_user;
+use core_privacy\local\metadata\collection;
+use core_privacy\tests\provider_testcase;
+
+/**
+ * Tests for the privacy provider class.
+ *
+ * @package    core_adminpresets
+ * @category   test
+ * @copyright  2021 Sara Arjona (sara@moodle.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @coversDefaultClass \core_adminpresets\privacy\provider
+ */
+class privacy_provider_test extends provider_testcase {
+
+    /**
+     * Test for provider::get_metadata().
+     * @covers ::get_metadata
+     */
+    public function test_get_metadata() {
+        $collection = new collection('core_adminpresets');
+        $newcollection = provider::get_metadata($collection);
+        $itemcollection = $newcollection->get_collection();
+        $this->assertCount(2, $itemcollection);
+
+        // The expected metadata fields are covered by test_metadata_provider() in privacy/tests/provider_test.php.
+    }
+
+    /**
+     * Test for provider::get_contexts_for_userid() doesn't return any context.
+     * @covers ::get_contexts_for_userid
+     */
+    public function test_get_contexts_for_userid() {
+        global $USER;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // Create a preset.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $generator->create_preset();
+
+        $contextlist = provider::get_contexts_for_userid($USER->id);
+        $this->assertEmpty($contextlist);
+    }
+
+    /**
+     * Test for provider::get_users_in_context() doesn't return any user.
+     * @covers ::get_users_in_context
+     */
+    public function test_get_users_in_context() {
+        global $USER;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // Create a preset.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $generator->create_preset();
+
+        $usercontext = context_user::instance($USER->id);
+        $userlist = new \core_privacy\local\request\userlist($usercontext, 'core_adminpresets');
+        \core_message\privacy\provider::get_users_in_context($userlist);
+        $this->assertEmpty($userlist->get_userids());
+    }
+
+
+    /**
+     * Test for provider::export_user_data().
+     * @covers ::export_user_data
+     */
+    public function test_export_user_data() {
+        global $USER;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        // Create a preset.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $generator->create_preset();
+
+        // Check data is not exported in user context.
+        $usercontext = context_user::instance($USER->id);
+        $this->export_context_data_for_user($USER->id, $usercontext, 'core_adminpresets');
+        $writer = \core_privacy\local\request\writer::with_context($usercontext);
+
+        $this->assertEmpty($writer->get_data([get_string('siteadminpresetspluginname', 'core_adminpresets')]));
+        $this->assertEmpty($writer->get_all_metadata([]));
+        $this->assertEmpty($writer->get_files([]));
+
+        // Check data is not exported in system context either.
+        $systemcontext = context_system::instance();
+        $this->export_context_data_for_user($USER->id, $systemcontext, 'core_adminpresets');
+        $writer = \core_privacy\local\request\writer::with_context($systemcontext);
+
+        $this->assertEmpty($writer->get_data([get_string('siteadminpresetspluginname', 'core_adminpresets')]));
+        $this->assertEmpty($writer->get_all_metadata([]));
+        $this->assertEmpty($writer->get_files([]));
+    }
+
+    /**
+     * Test for provider::delete_data_for_all_users_in_context().
+     * @covers ::delete_data_for_all_users_in_context
+     */
+    public function test_delete_data_for_all_users_in_context() {
+        global $DB, $USER;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        $currentpresets = $DB->count_records('adminpresets');
+
+        // Create a preset.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $generator->create_preset();
+        $this->assertEquals($currentpresets + 1, $DB->count_records('adminpresets'));
+
+        $usercontext = context_user::instance($USER->id);
+
+        provider::delete_data_for_all_users_in_context($usercontext);
+
+        // Confirm the presets haven't been removed.
+        $this->assertEquals($currentpresets + 1, $DB->count_records('adminpresets'));
+    }
+
+    /**
+     * Test for provider::delete_data_for_user().
+     * @covers ::delete_data_for_user
+     */
+    public function test_delete_data_for_user() {
+        global $DB, $USER;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        $currentpresets = $DB->count_records('adminpresets');
+
+        // Create a preset.
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_adminpresets');
+        $generator->create_preset();
+        $this->assertEquals($currentpresets + 1, $DB->count_records('adminpresets'));
+
+        $usercontext = context_user::instance($USER->id);
+        $contextlist = new \core_privacy\local\request\approved_contextlist($USER, 'core_adminpresets', [$usercontext->id]);
+        provider::delete_data_for_user($contextlist);
+
+        // Confirm the presets haven't been removed.
+        $this->assertEquals($currentpresets + 1, $DB->count_records('adminpresets'));
+    }
+
+}

admin/purgecaches.php

@@ -38,12 +38,11 @@ $form = new core_admin\form\purge_caches(null, ['returnurl' => $returnurl]);
 if ($data = $form->get_data()) {
 
     // Valid request. Purge, and redirect the user back to where they came from.
-    $selected = $data->purgeselectedoptions;
-    purge_caches($selected);
-
     if (isset($data->all)) {
+        purge_caches();
         $message = get_string('purgecachesfinished', 'admin');
     } else {
+        purge_caches($data->purgeselectedoptions);
         $message = get_string('purgeselectedcachesfinished', 'admin');
     }
 

admin/qbankplugins.php

@@ -0,0 +1,72 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Question bank plugin settings.
+ *
+ * @package    core
+ * @subpackage questionbank
+ * @copyright  2021 Catalyst IT Australia Pty Ltd
+ * @author     Safat Shahin <safatshahin@catalyst-au.net>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once('../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+
+use qbank_columnsortorder\column_manager;
+
+$action = required_param('action', PARAM_ALPHANUMEXT);
+$name   = required_param('name', PARAM_PLUGIN);
+
+$syscontext = context_system::instance();
+$PAGE->set_url('/admin/qbankplugins.php');
+$PAGE->set_context($syscontext);
+
+require_admin();
+require_sesskey();
+
+$return = new moodle_url('/admin/settings.php', ['section' => 'manageqbanks']);
+
+$plugins = core_plugin_manager::instance()->get_plugins_of_type('qbank');
+$sortorder = array_flip(array_keys($plugins));
+
+if (!isset($plugins[$name])) {
+    throw new moodle_exception('qbanknotfound', 'question', $return, $name);
+}
+
+$plugintypename = $plugins[$name]->type . '_' . $plugins[$name]->name;
+$columnsortordermanager = new column_manager();
+
+switch ($action) {
+    case 'disable':
+        if ($plugins[$name]->is_enabled()) {
+            $columnsortordermanager->disable_columns($plugintypename);
+            $class = \core_plugin_manager::resolve_plugininfo_class('qbank');
+            $class::enable_plugin($name, false);
+            set_config('disabled', 1, 'qbank_'. $name);
+        }
+        break;
+    case 'enable':
+        if (!$plugins[$name]->is_enabled()) {
+            $columnsortordermanager->enable_columns($plugintypename);
+            $class = \core_plugin_manager::resolve_plugininfo_class('qbank');
+            $class::enable_plugin($name, true);
+        }
+        break;
+}
+
+redirect($return);

admin/qbehaviours.php

@@ -88,10 +88,9 @@ if (($disable = optional_param('disable', '', PARAM_PLUGIN)) && confirm_sesskey(
     }
 
     if (array_search($disable, $disabledbehaviours) === false) {
-        $disabledbehaviours[] = $disable;
-        set_config('disabledbehaviours', implode(',', $disabledbehaviours), 'question');
+        $class = \core_plugin_manager::resolve_plugininfo_class('qbehaviour');
+        $class::enable_plugin($disable, false);
     }
-    core_plugin_manager::reset_caches();
     redirect($thispageurl);
 }
 
@@ -106,10 +105,9 @@ if (($enable = optional_param('enable', '', PARAM_PLUGIN)) && confirm_sesskey())
     }
 
     if (($key = array_search($enable, $disabledbehaviours)) !== false) {
-        unset($disabledbehaviours[$key]);
-        set_config('disabledbehaviours', implode(',', $disabledbehaviours), 'question');
+        $class = \core_plugin_manager::resolve_plugininfo_class('qbehaviour');
+        $class::enable_plugin($enable, true);
     }
-    core_plugin_manager::reset_caches();
     redirect($thispageurl);
 }
 
@@ -238,4 +236,3 @@ function question_behaviour_icon_html($action, $behaviour, $icon, $alt, $tip) {
             new pix_icon($icon, $alt, 'moodle', array('title' => '', 'class' => 'iconsmall')),
             null, array('title' => $tip));
 }
-

admin/qtypes.php

@@ -42,25 +42,54 @@ $qtypes = question_bank::get_all_qtypes();
 $pluginmanager = core_plugin_manager::instance();
 
 // Get some data we will need - question counts and which types are needed.
-$counts = $DB->get_records_sql("
-        SELECT qtype, COUNT(1) as numquestions, SUM(hidden) as numhidden
-        FROM {question} GROUP BY qtype", array());
-$needed = array();
+$hiddenstatus = \core_question\local\bank\question_version_status::QUESTION_STATUS_HIDDEN;
+$draftstatus = \core_question\local\bank\question_version_status::QUESTION_STATUS_DRAFT;
+
+$sql = "SELECT result.qtype,
+               SUM(result.numquestions) AS numquestions,
+               SUM(result.numhidden) AS numhidden,
+               SUM(result.numdraft) AS numdraft
+          FROM (SELECT data.qtype,
+                       data.versionid,
+                       COUNT(data.numquestions) AS numquestions,
+                       (SELECT COUNT(qv.id)
+                          FROM {question_versions} qv
+                         WHERE qv.id = data.versionid
+                           AND qv.status = :hiddenstatus) AS numhidden,
+                       (SELECT COUNT(qv.id)
+                         FROM {question_versions} qv
+                        WHERE qv.id = data.versionid
+                          AND qv.status = :draftstatus) AS numdraft
+                  FROM (SELECT q.qtype, qv.id AS versionid, 1 AS numquestions
+                         FROM {question} q
+                         JOIN {question_versions} qv ON qv.questionid = q.id
+                         JOIN {question_bank_entries} qbe ON qbe.id = qv.questionbankentryid
+                         AND qv.version = (SELECT MAX(v.version)
+                                             FROM {question_versions} v
+                                             JOIN {question_bank_entries} be ON be.id = v.questionbankentryid
+                                            WHERE be.id = qbe.id)) data
+                GROUP BY data.qtype, data.versionid) result
+       GROUP BY result.qtype";
+
+$counts = $DB->get_records_sql($sql, ['hiddenstatus' => $hiddenstatus, 'draftstatus' => $draftstatus]);
+$needed = [];
 foreach ($qtypes as $qtypename => $qtype) {
     if (!isset($counts[$qtypename])) {
         $counts[$qtypename] = new stdClass;
         $counts[$qtypename]->numquestions = 0;
         $counts[$qtypename]->numhidden = 0;
+        $counts[$qtypename]->numdraft = 0;
     }
     $needed[$qtypename] = $counts[$qtypename]->numquestions > 0 ||
             $pluginmanager->other_plugins_that_require($qtype->plugin_name());
-    $counts[$qtypename]->numquestions -= $counts[$qtypename]->numhidden;
+    $counts[$qtypename]->numquestions -= ($counts[$qtypename]->numhidden + $counts[$qtypename]->numdraft);
 }
 $needed['missingtype'] = true; // The system needs the missing question type.
 foreach ($counts as $qtypename => $count) {
     if (!isset($qtypes[$qtypename])) {
-        $counts['missingtype']->numquestions += $count->numquestions - $count->numhidden;
+        $counts['missingtype']->numquestions += $count->numquestions - ($count->numhidden + $count->numdraft);
         $counts['missingtype']->numhidden += $count->numhidden;
+        $counts['missingtype']->numdraft += $count->numdraft;
     }
 }
 
@@ -80,7 +109,8 @@ if (($disable = optional_param('disable', '', PARAM_PLUGIN)) && confirm_sesskey(
         print_error('unknownquestiontype', 'question', $thispageurl, $disable);
     }
 
-    set_config($disable . '_disabled', 1, 'question');
+    $class = \core_plugin_manager::resolve_plugininfo_class('qtype');
+    $class::enable_plugin($disable, false);
     redirect($thispageurl);
 }
 
@@ -94,7 +124,8 @@ if (($enable = optional_param('enable', '', PARAM_PLUGIN)) && confirm_sesskey())
         print_error('cannotenable', 'question', $thispageurl, $enable);
     }
 
-    unset_config($enable . '_disabled', 'question');
+    $class = \core_plugin_manager::resolve_plugininfo_class('qtype');
+    $class::enable_plugin($enable, true);
     redirect($thispageurl);
 }
 
@@ -151,8 +182,8 @@ foreach ($sortedqtypes as $qtypename => $localname) {
     $row[] = $icon . ' ' . $localname;
 
     // Number of questions of this type.
-    if ($counts[$qtypename]->numquestions + $counts[$qtypename]->numhidden > 0) {
-        if ($counts[$qtypename]->numhidden > 0) {
+    if ($counts[$qtypename]->numquestions + $counts[$qtypename]->numhidden + $counts[$qtypename]->numdraft > 0) {
+        if ($counts[$qtypename]->numhidden + $counts[$qtypename]->numdraft > 0) {
             $strcount = get_string('numquestionsandhidden', 'question', $counts[$qtypename]);
         } else {
             $strcount = $counts[$qtypename]->numquestions;
@@ -251,4 +282,3 @@ function question_type_icon_html($action, $qtypename, $icon, $alt, $tip) {
             new pix_icon($icon, $alt, 'moodle', array('title' => '', 'class' => 'iconsmall')),
             null, array('title' => $tip));
 }
-

admin/registration/check.php

@@ -0,0 +1,48 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Endpoint to get the Moodle version
+ *
+ * Moodle linkchecker will check this endpoint when it cannot get the Moodle version otherwise.
+ *
+ * @package    core
+ * @copyright  2022 Victor Deniz <victor@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once(__DIR__ . '/../../config.php');
+require_once($CFG->libdir . '/filelib.php');
+
+// Get public key.
+$key = download_file_content(HUB_STATSPUBLICKEY);
+// Check $key is a valid public key.
+$publickey = openssl_pkey_get_public($key);
+if ($publickey !== false) {
+    $publickeystr = openssl_pkey_get_details($publickey)['key'];
+} else {
+    die('Error getting a valid public key');
+}
+
+// Encrypt data.
+$message = $CFG->release;
+$success = openssl_public_encrypt(utf8_encode($message), $encrypteddata, $publickeystr);
+
+if ($success) {
+    echo base64_encode($encrypteddata);
+} else {
+    die ('Error encrypting the data');
+}

admin/renderer.php

@@ -15,20 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Renderer for core_admin subsystem
+ * Standard HTML output renderer for core_admin subsystem.
  *
  * @package    core
  * @subpackage admin
  * @copyright  2011 David Mudrak <david@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-
-defined('MOODLE_INTERNAL') || die();
-
-
-/**
- * Standard HTML output renderer for core_admin subsystem
- */
 class core_admin_renderer extends plugin_renderer_base {
 
     /**
@@ -284,6 +277,8 @@ class core_admin_renderer extends plugin_renderer_base {
      * @param bool $croninfrequent If true, warn that cron hasn't run in the past few minutes
      * @param bool $showcampaigncontent Whether the campaign content should be visible or not.
      * @param bool $showfeedbackencouragement Whether the feedback encouragement content should be displayed or not.
+     * @param bool $showservicesandsupport Whether the services and support content should be displayed or not.
+     * @param string $xmlrpcwarning XML-RPC deprecation warning message.
      *
      * @return string HTML to output.
      */
@@ -292,12 +287,14 @@ class core_admin_renderer extends plugin_renderer_base {
             $buggyiconvnomb, $registered, array $cachewarnings = array(), $eventshandlers = 0,
             $themedesignermode = false, $devlibdir = false, $mobileconfigured = false,
             $overridetossl = false, $invalidforgottenpasswordurl = false, $croninfrequent = false,
-            $showcampaigncontent = false, bool $showfeedbackencouragement = false) {
+            $showcampaigncontent = false, bool $showfeedbackencouragement = false, bool $showservicesandsupport = false,
+            $xmlrpcwarning = '') {
 
         global $CFG;
         $output = '';
 
         $output .= $this->header();
+        $output .= $this->output->heading(get_string('notifications', 'admin'));
         $output .= $this->maturity_info($maturity);
         $output .= $this->legacy_log_store_writing_error();
         $output .= empty($CFG->disableupdatenotifications) ? $this->available_updates($availableupdates, $availableupdatesfetch) : '';
@@ -316,7 +313,9 @@ class core_admin_renderer extends plugin_renderer_base {
         $output .= $this->registration_warning($registered);
         $output .= $this->mobile_configuration_warning($mobileconfigured);
         $output .= $this->forgotten_password_url_warning($invalidforgottenpasswordurl);
+        $output .= $this->mnet_deprecation_warning($xmlrpcwarning);
         $output .= $this->userfeedback_encouragement($showfeedbackencouragement);
+        $output .= $this->services_and_support_content($showservicesandsupport);
         $output .= $this->campaign_content($showcampaigncontent);
 
         //////////////////////////////////////////////////////////////////////////////////////////////////
@@ -895,7 +894,35 @@ class core_admin_renderer extends plugin_renderer_base {
             return '';
         }
 
-        return $this->render_from_template('core/campaign_content', ['lang' => current_language()]);
+        $lang = current_language();
+        $url = "https://campaign.moodle.org/current/lms/{$lang}/install/";
+        $params = [
+            'url' => $url,
+            'iframeid' => 'campaign-content'
+        ];
+
+        return $this->render_from_template('core/external_content_banner', $params);
+    }
+
+    /**
+     * Display services and support content.
+     *
+     * @param bool $showservicesandsupport Whether the services and support content should be visible or not.
+     * @return string the campaign content raw html.
+     */
+    protected function services_and_support_content(bool $showservicesandsupport): string {
+        if (!$showservicesandsupport) {
+            return '';
+        }
+
+        $lang = current_language();
+        $url = "https://campaign.moodle.org/current/lms/{$lang}/servicesandsupport/";
+        $params = [
+            'url' => $url,
+            'iframeid' => 'services-support-content'
+        ];
+
+        return $this->render_from_template('core/external_content_banner', $params);
     }
 
     /**
@@ -1053,12 +1080,21 @@ class core_admin_renderer extends plugin_renderer_base {
             $plugintyperows = array();
 
             foreach ($plugins as $name => $plugin) {
+                $component = "{$plugin->type}_{$plugin->name}";
+
                 $sumtotal++;
                 $row = new html_table_row();
-                $row->attributes['class'] = 'type-' . $plugin->type . ' name-' . $plugin->type . '_' . $plugin->name;
+                $row->attributes['class'] = "type-{$plugin->type} name-{$component}";
 
-                if ($this->page->theme->resolve_image_location('icon', $plugin->type . '_' . $plugin->name, null)) {
-                    $icon = $this->output->pix_icon('icon', '', $plugin->type . '_' . $plugin->name, array('class' => 'smallicon pluginicon'));
+                $iconidentifier = 'icon';
+                if ($plugin->type === 'mod') {
+                    $iconidentifier = 'monologo';
+                }
+
+                if ($this->page->theme->resolve_image_location($iconidentifier, $component, null)) {
+                    $icon = $this->output->pix_icon($iconidentifier, '', $component, [
+                        'class' => 'smallicon pluginicon',
+                    ]);
                 } else {
                     $icon = '';
                 }
@@ -1771,11 +1807,20 @@ class core_admin_renderer extends plugin_renderer_base {
             }
 
             foreach ($plugins as $name => $plugin) {
-                $row = new html_table_row();
-                $row->attributes['class'] = 'type-' . $plugin->type . ' name-' . $plugin->type . '_' . $plugin->name;
+                $component = "{$plugin->type}_{$plugin->name}";
 
-                if ($this->page->theme->resolve_image_location('icon', $plugin->type . '_' . $plugin->name, null)) {
-                    $icon = $this->output->pix_icon('icon', '', $plugin->type . '_' . $plugin->name, array('class' => 'icon pluginicon'));
+                $row = new html_table_row();
+                $row->attributes['class'] = "type-{$plugin->type} name-{$component}";
+
+                $iconidentifier = 'icon';
+                if ($plugin->type === 'mod') {
+                    $iconidentifier = 'monologo';
+                }
+
+                if ($this->page->theme->resolve_image_location($iconidentifier, $component, null)) {
+                    $icon = $this->output->pix_icon($iconidentifier, '', $component, [
+                        'class' => 'icon pluginicon',
+                    ]);
                 } else {
                     $icon = $this->output->spacer();
                 }
@@ -2208,4 +2253,18 @@ class core_admin_renderer extends plugin_renderer_base {
 
         return $output;
     }
+
+    /**
+     * Display a warning about the deprecation of Mnet.
+     *
+     * @param string $xmlrpcwarning The warning message
+     * @return string HTML to output.
+     */
+    protected function mnet_deprecation_warning($xmlrpcwarning) {
+        if (empty($xmlrpcwarning)) {
+            return '';
+        }
+
+        return $this->warning($xmlrpcwarning);
+    }
 }

admin/repository.php

@@ -142,6 +142,8 @@ if (($action == 'edit') || ($action == 'new')) {
             $success = true;
             if (!$repoid = $type->create()) {
                 $success = false;
+            } else {
+                add_to_config_log('repository_visibility', '', (int)$visible, $plugin);
             }
             $data = data_submitted();
         }
@@ -183,23 +185,15 @@ if (($action == 'edit') || ($action == 'new')) {
     if (!confirm_sesskey()) {
         print_error('confirmsesskeybad', '', $baseurl);
     }
-    $repositorytype = repository::get_type_by_typename($repository);
-    if (empty($repositorytype)) {
-        print_error('invalidplugin', 'repository', '', $repository);
-    }
-    $repositorytype->update_visibility(true);
-    core_plugin_manager::reset_caches();
+    $class = \core_plugin_manager::resolve_plugininfo_class('repository');
+    $class::enable_plugin($repository, 1);
     $return = true;
 } else if ($action == 'hide') {
     if (!confirm_sesskey()) {
         print_error('confirmsesskeybad', '', $baseurl);
     }
-    $repositorytype = repository::get_type_by_typename($repository);
-    if (empty($repositorytype)) {
-        print_error('invalidplugin', 'repository', '', $repository);
-    }
-    $repositorytype->update_visibility(false);
-    core_plugin_manager::reset_caches();
+    $class = \core_plugin_manager::resolve_plugininfo_class('repository');
+    $class::enable_plugin($repository, 0);
     $return = true;
 } else if ($action == 'delete') {
     $repositorytype = repository::get_type_by_typename($repository);
@@ -210,6 +204,8 @@ if (($action == 'edit') || ($action == 'new')) {
         }
 
         if ($repositorytype->delete($downloadcontents)) {
+            // Include this information into config changes table.
+            add_to_config_log('repository_visibility', $repositorytype->get_visible(), '', $repository);
             core_plugin_manager::reset_caches();
             redirect($baseurl);
         } else {
@@ -390,6 +386,7 @@ if (($action == 'edit') || ($action == 'new')) {
             }
 
             $table->data[] = array($i->get_readablename(), $OUTPUT->render($select), $updown, $settings, $uninstall);
+            $table->rowclasses[] = '';
 
             if (!in_array($typename, $alreadyplugins)) {
                 $alreadyplugins[] = $typename;
@@ -410,6 +407,7 @@ if (($action == 'edit') || ($action == 'new')) {
                     $uninstall = html_writer::link($uninstallurl, $struninstall);
                 }
                 $table->data[] = array(get_string('pluginname', 'repository_'.$plugin), $OUTPUT->render($select), '', '', $uninstall);
+                $table->rowclasses[] = 'dimmed_text';
             }
         }
     }

admin/roles/allow.php

@@ -49,6 +49,9 @@ if (optional_param('submit', false, PARAM_BOOL) && data_submitted() && confirm_s
     redirect($baseurl);
 }
 
+$PAGE->set_secondary_active_tab('users');
+$PAGE->set_primary_active_tab('siteadminnode');
+
 $controller->load_current_settings();
 
 // Display the editing form.

admin/roles/assign.php

@@ -61,6 +61,7 @@ if ($returnurl) {
 }
 $PAGE->set_url($pageurl);
 $PAGE->set_context($context);
+$PAGE->activityheader->disable();
 
 $contextname = $context->get_context_name();
 $courseid = $course->id;
@@ -164,7 +165,7 @@ switch ($context->contextlevel) {
         $showroles = 1;
         break;
     case CONTEXT_COURSECAT:
-        $PAGE->set_heading($SITE->fullname);
+        core_course_category::page_setup();
         break;
     case CONTEXT_COURSE:
         if ($isfrontpage) {
@@ -182,8 +183,35 @@ switch ($context->contextlevel) {
         break;
 }
 
+$PAGE->set_navigation_overflow_state(false);
+
+// Within a course context we need to explicitly set active tab as there isn't a reference in the nav tree.
+if ($context->contextlevel == CONTEXT_COURSE) {
+    $PAGE->set_secondary_active_tab('participants');
+}
 echo $OUTPUT->header();
 
+$backurl = null;
+// We are looking at a particular role. The page URL has been set correctly.
+if ($roleid) {
+    $backurl = $pageurl;
+} else if ($context->contextlevel == CONTEXT_COURSE && !$isfrontpage) {
+    // Return to the intermediary page when within the course context.
+    $backurl = new moodle_url('/enrol/otherusers.php', ['id' => $course->id]);
+} else if ($returnurl) {
+    // Factor in for $returnurl being passed.
+    $backurl = new moodle_url($returnurl);
+}
+
+if ($backurl) {
+    $backbutton = new single_button($backurl, get_string('back'), 'get');
+    $backbutton->class = 'singlebutton navitem';
+    echo html_writer::tag('div', $OUTPUT->render($backbutton), ['class' => 'tertiary-navigation']);
+} else if (in_array($context->contextlevel, [CONTEXT_COURSE, CONTEXT_MODULE, CONTEXT_COURSECAT])) {
+    // The front page doesn't have an intermediate page 'other users' but needs similar tertiary nav like a standard course.
+    echo $OUTPUT->render_participants_tertiary_nav($course);
+}
+
 // Print heading.
 echo $OUTPUT->heading_with_help($title, 'assignroles', 'core_role');
 
@@ -245,7 +273,6 @@ if ($roleid) {
     $select = new single_select($PAGE->url, 'roleid', $nameswithcounts, $roleid, null);
     $select->label = get_string('assignanotherrole', 'core_role');
     echo $OUTPUT->render($select);
-    echo '<p><a href="' . $url . '">' . get_string('backtoallroles', 'core_role') . '</a></p>';
     echo '</div>';
 
 } else if (empty($assignableroles)) {
@@ -314,17 +341,13 @@ if ($roleid) {
 
     echo html_writer::table($table);
 
-    if ($context->contextlevel > CONTEXT_USER) {
-
-        if ($returnurl) {
-            $url = new moodle_url($returnurl);
-        } else {
+    if (!$PAGE->has_secondary_navigation() && $context->contextlevel > CONTEXT_USER) {
+        if (!$returnurl) {
             $url = $context->get_url();
+            echo html_writer::start_tag('div', array('class' => 'backlink'));
+            echo html_writer::tag('a', get_string('backto', '', $contextname), array('href' => $url));
+            echo html_writer::end_tag('div');
         }
-
-        echo html_writer::start_tag('div', array('class'=>'backlink'));
-        echo html_writer::tag('a', get_string('backto', '', $contextname), array('href' => $url));
-        echo html_writer::end_tag('div');
     }
 }
 

admin/roles/check.php

@@ -87,6 +87,7 @@ if ($context->contextlevel == CONTEXT_BLOCK) {
     $PAGE->blocks->show_only_fake_blocks(true);
 }
 $PAGE->set_title($title);
+$PAGE->activityheader->disable();
 
 switch ($context->contextlevel) {
     case CONTEXT_SYSTEM:
@@ -99,7 +100,7 @@ switch ($context->contextlevel) {
         $showroles = 1;
         break;
     case CONTEXT_COURSECAT:
-        $PAGE->set_heading($SITE->fullname);
+        core_course_category::page_setup();
         break;
     case CONTEXT_COURSE:
         if ($isfrontpage) {
@@ -125,7 +126,12 @@ if (!is_null($reportuser)) {
     $rolenames = role_get_names($context);
 }
 
+$PAGE->set_navigation_overflow_state(false);
+
 echo $OUTPUT->header();
+if (in_array($context->contextlevel, [CONTEXT_COURSE, CONTEXT_MODULE, CONTEXT_COURSECAT])) {
+    echo $OUTPUT->render_participants_tertiary_nav($course);
+}
 
 // Print heading.
 echo $OUTPUT->heading($title);
@@ -180,7 +186,7 @@ echo '</form>';
 echo $OUTPUT->box_end();
 
 // Appropriate back link.
-if ($context->contextlevel > CONTEXT_USER) {
+if (!$PAGE->has_secondary_navigation() && $context->contextlevel > CONTEXT_USER) {
     echo html_writer::start_tag('div', array('class'=>'backlink'));
     if ($returnurl) {
         $backurl = new moodle_url($returnurl);

admin/roles/classes/admins_existing_selector.php

@@ -57,7 +57,10 @@ class core_role_admins_existing_selector extends user_selector_base {
 
         list($sort, $sortparams) = users_order_by_sql('', $search, $this->accesscontext);
         $params = array_merge($params, $sortparams);
-        $order = ' ORDER BY ' . $sort;
+
+        // Sort first by email domain and then by normal name order.
+        $order = " ORDER BY " . $DB->sql_substr('email', $DB->sql_position("'@'", 'email'),
+            $DB->sql_length('email') ) .  ", $sort";
 
         $availableusers = $DB->get_records_sql($fields . $sql . $order, $params);
 
@@ -80,10 +83,15 @@ class core_role_admins_existing_selector extends user_selector_base {
         if ($availableusers) {
             if ($search) {
                 $groupname = get_string('extusersmatching', 'core_role', $search);
+                $result[$groupname] = $availableusers;
             } else {
-                $groupname = get_string('extusers', 'core_role');
+                $groupnameprefix = get_string('extusers', 'core_role');
+                foreach ($availableusers as $user) {
+                    $domain = substr($user->email, strpos($user->email, '@'));
+                    $groupname = "$groupnameprefix $domain";
+                    $result[$groupname][] = $user;
+                }
             }
-            $result[$groupname] = $availableusers;
         }
 
         return $result;

admin/roles/classes/assign_user_selector_base.php

@@ -45,6 +45,7 @@ abstract class core_role_assign_user_selector_base extends user_selector_base {
             $this->context = context::instance_by_id($options['contextid']);
         }
         $options['accesscontext'] = $this->context;
+        $options['includecustomfields'] = true;
         parent::__construct($name, $options);
         $this->roleid = $options['roleid'];
         require_once($CFG->dirroot . '/group/lib.php');

admin/roles/classes/check_users_selector.php

@@ -46,6 +46,7 @@ class core_role_check_users_selector extends user_selector_base {
         if (!isset($options['multiselect'])) {
             $options['multiselect'] = false;
         }
+        $options['includecustomfields'] = true;
         parent::__construct($name, $options);
 
         $coursecontext = $this->accesscontext->get_course_context(false);
@@ -61,8 +62,9 @@ class core_role_check_users_selector extends user_selector_base {
         global $DB;
 
         list($wherecondition, $params) = $this->search_sql($search, 'u');
+        $params = array_merge($params, $this->userfieldsparams);
 
-        $fields      = 'SELECT ' . $this->required_fields_sql('u');
+        $fields      = 'SELECT u.id, ' . $this->userfieldsselects;
         $countfields = 'SELECT COUNT(1)';
 
         $coursecontext = $this->accesscontext->get_course_context(false);
@@ -74,6 +76,7 @@ class core_role_check_users_selector extends user_selector_base {
                               JOIN {user_enrolments} ue ON (ue.userid = subu.id)
                               JOIN {enrol} e ON (e.id = ue.enrolid AND e.courseid = :courseid1)
                            ) subq ON subq.id = u.id
+                           $this->userfieldsjoin
                      WHERE $wherecondition";
             $params['courseid1'] = $coursecontext->instanceid;
 
@@ -83,6 +86,7 @@ class core_role_check_users_selector extends user_selector_base {
                 $sql2 = " FROM {user} u
                      LEFT JOIN ({user_enrolments} ue
                                 JOIN {enrol} e ON (e.id = ue.enrolid AND e.courseid = :courseid2)) ON (ue.userid = u.id)
+                               $this->userfieldsjoin
                          WHERE $wherecondition
                                AND ue.id IS NULL";
                 $params['courseid2'] = $coursecontext->instanceid;
@@ -95,12 +99,13 @@ class core_role_check_users_selector extends user_selector_base {
             }
             $sql1 = null;
             $sql2 = " FROM {user} u
+                           $this->userfieldsjoin
                      WHERE $wherecondition";
         }
 
         $params['contextid'] = $this->accesscontext->id;
 
-        list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext);
+        list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext, $this->userfieldsmappings);
         $order = ' ORDER BY ' . $sort;
 
         $result = array();

admin/roles/classes/existing_role_holders.php

@@ -35,17 +35,18 @@ class core_role_existing_role_holders extends core_role_assign_user_selector_bas
 
         list($wherecondition, $params) = $this->search_sql($search, 'u');
         list($ctxcondition, $ctxparams) = $DB->get_in_or_equal($this->context->get_parent_context_ids(true), SQL_PARAMS_NAMED, 'ctx');
-        $params = array_merge($params, $ctxparams);
+        $params = array_merge($params, $ctxparams, $this->userfieldsparams);
         $params['roleid'] = $this->roleid;
 
-        list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext);
+        list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext, $this->userfieldsmappings);
         $params = array_merge($params, $sortparams);
 
-        $fields = "SELECT ra.id AS raid," . $this->required_fields_sql('u') . ",ra.contextid,ra.component ";
+        $fields = "SELECT ra.id AS raid, u.id, " . $this->userfieldsselects . ", ra.contextid, ra.component ";
         $countfields = "SELECT COUNT(1) ";
         $sql = "FROM {role_assignments} ra
                   JOIN {user} u ON u.id = ra.userid
                   JOIN {context} ctx ON ra.contextid = ctx.id
+                       $this->userfieldsjoin
                  WHERE $wherecondition
                        AND ctx.id $ctxcondition
                        AND ra.roleid = :roleid";

admin/roles/classes/permissions_table.php

@@ -51,7 +51,7 @@ class core_role_permissions_table extends core_role_capability_table_base {
         $this->overridableroles = $overridableroles;
 
         $roles = get_all_roles($context);
-        $this->roles = role_fix_names(array_reverse($roles, true), $context, ROLENAME_ALIAS, true);
+        $this->roles = role_fix_names(array_reverse($roles, true), $context, ROLENAME_BOTH, true);
 
     }
 

admin/roles/classes/potential_assignees_below_course.php

@@ -39,25 +39,26 @@ class core_role_potential_assignees_below_course extends core_role_assign_user_s
 
         // Now we have to go to the database.
         list($wherecondition, $params) = $this->search_sql($search, 'u');
-        $params = array_merge($params, $eparams);
+        $params = array_merge($params, $eparams, $this->userfieldsparams);
 
         if ($wherecondition) {
             $wherecondition = ' AND ' . $wherecondition;
         }
 
-        $fields      = 'SELECT ' . $this->required_fields_sql('u');
+        $fields      = 'SELECT u.id, ' . $this->userfieldsselects;
         $countfields = 'SELECT COUNT(u.id)';
 
         $sql   = " FROM ($enrolsql) enrolled_users_view
                    JOIN {user} u ON u.id = enrolled_users_view.id
               LEFT JOIN {role_assignments} ra ON (ra.userid = enrolled_users_view.id AND
                                             ra.roleid = :roleid AND ra.contextid = :contextid)
+                        $this->userfieldsjoin
                   WHERE ra.id IS NULL
                         $wherecondition";
         $params['contextid'] = $this->context->id;
         $params['roleid'] = $this->roleid;
 
-        list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext);
+        list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext, $this->userfieldsmappings);
         $order = ' ORDER BY ' . $sort;
 
         // Check to see if there are too many to show sensibly.