Moodle release 4.1.3

The nav element to go to detailed stats page is missing in classic

.eslintrc

@@ -6,6 +6,10 @@
   ],
   'env': {
     'browser': true,
+    // Enable ES6+ features by default.
+    // See http://eslint.org/docs/user-guide/configuring#specifying-environments
+    // Note: The YUI override must exactly match this when disabling the ES6+ version because those features are not supported by Shifter.
+    'es2020': true,
     'amd': true
   },
   'globals': {
@@ -83,6 +87,7 @@
     'no-octal-escape': 'error',
     'no-proto': 'error',
     'no-redeclare': 'warn',
+    'no-restricted-globals': ['error', { 'name': 'Notification' }],
     'no-return-assign': 'error',
     'no-script-url': 'error',
     'no-self-assign': 'error',
@@ -196,6 +201,10 @@
   overrides: [
     {
       files: ["**/yui/src/**/*.js"],
+      'env': {
+        // Disable ES6+ for YUI files.
+        'es2020': false,
+      },
       // Disable some rules which we can't safely define for YUI rollups.
       rules: {
         'no-undef': 'off',
@@ -221,10 +230,6 @@
     },
     {
       files: ["**/amd/src/*.js", "**/amd/src/**/*.js", "Gruntfile.js", ".grunt/*.js", ".grunt/tasks/*.js", "jsdoc.conf.js"],
-      // We support es6 now. Woot!
-      env: {
-        es6: true
-      },
       // We're using babel transpiling so use their parser
       // for linting.
       parser: '@babel/eslint-parser',
@@ -299,7 +304,6 @@
         ],
       },
       parserOptions: {
-        'ecmaVersion': 9,
         'sourceType': 'module',
         'requireConfigFile': false,
       }

.github/workflows/push.yml

@@ -9,18 +9,18 @@ on:
       - v[0-9]+.[0-9]+.[0-9]+*
 
 env:
-  php: 8.0
+  php: 8.1
 
 jobs:
   Grunt:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checking out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Configuring node & npm
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
 
@@ -54,19 +54,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-18.04
-            php: 7.3
+          - os: ubuntu-22.04
+            php: 7.4
             extensions:
             db: mysqli
-          - os: ubuntu-18.04
-            php: 8.0
+          - os: ubuntu-22.04
+            php: 8.1
             db: pgsql
-            extensions: xmlrpc-beta
 
     steps:
       - name: Setting up DB mysql
         if: ${{ matrix.db == 'mysqli' }}
-        uses: johanmeiring/mysql-action@tmpfs-patch
+        uses: moodlehq/mysql-action@v1
         with:
           collation server: utf8mb4_bin
           mysql version: 5.7
@@ -74,18 +73,20 @@ jobs:
           mysql user: test
           mysql password: test
           use tmpfs: true
+          tmpfs size: '1024M'
+          extra conf: --skip-log-bin
 
       - name: Setting up DB pgsql
         if: ${{ matrix.db == 'pgsql' }}
         uses: m4nu56/postgresql-action@v1
         with:
-          postgresql version: 10
+          postgresql version: 12
           postgresql db: test
           postgresql user: test
           postgresql password: test
 
       - name: Configuring git vars
-        uses: rlespinasse/github-slug-action@v3.x
+        uses: rlespinasse/github-slug-action@v4
 
       - name: Setting up PHP ${{ matrix.php }}
         uses: shivammathur/setup-php@v2
@@ -96,7 +97,7 @@ jobs:
           coverage: none
 
       - name: Checking out code from ${{ env.GITHUB_REF_SLUG }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setting up PHPUnit
         env:
@@ -111,4 +112,5 @@ jobs:
       - name: Running PHPUnit tests
         env:
           dbtype: ${{ matrix.db }}
-        run: vendor/bin/phpunit -v
+          phpunit_options: ${{ secrets.phpunit_options }}
+        run: vendor/bin/phpunit $phpunit_options

.gitignore

@@ -54,3 +54,5 @@ moodle-plugin-ci.phar
 /admin/tool/componentlibrary/docs
 /admin/tool/componentlibrary/hugo/site/data/my-index.json
 .hugo_build.lock
+phpcs.xml
+jsconfig.json

.grunt/components.js

@@ -156,7 +156,7 @@ const getThirdPartyLibsList = relativeTo => {
  * @returns {array}
  */
 const getThirdPartyPaths = () => {
-    const DOMParser = require('xmldom').DOMParser;
+    const DOMParser = require('@xmldom/xmldom').DOMParser;
     const fs = require('fs');
     const path = require('path');
     const xpath = require('xpath');
@@ -233,6 +233,7 @@ const getOwningComponentDirectory = checkPath => {
 };
 
 module.exports = {
+    fetchComponentData,
     getAmdSrcGlobList,
     getComponentFromPath,
     getComponentPaths,

.grunt/tasks/componentlibrary.js

@@ -45,6 +45,7 @@ module.exports = grunt => {
         grunt.log.write(result);
 
         if (error) {
+            grunt.log.error(result.stdout);
             process.exit(code);
         }
         done();
@@ -56,7 +57,7 @@ module.exports = grunt => {
      * @param   {array} args
      * @returns {object}
      */
-    const spawnNodeCall = args => grunt.util.spawn({
+    const spawnNodeCall = (args) => grunt.util.spawn({
         cmd: 'node',
         args,
     }, getSpawnHandler(grunt.task.current.async()));
@@ -91,13 +92,14 @@ module.exports = grunt => {
      * @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,
+        'node_modules/sass/sass.js',
+        '--style', 'expanded',
+        '--source-map',
+        '--embed-sources',
         '--precision', 6,
+        '--load-path', process.cwd(),
         getCLPath('hugo/scss/docs.scss'),
-        '-o', getCLPath('hugo/dist/css/'),
+        getCLPath('hugo/dist/css/docs.css'),
     ]);
 
     // Register the various component library tasks.

.grunt/tasks/ignorefiles.js

@@ -21,6 +21,43 @@
  */
 
 module.exports = grunt => {
+
+    /**
+     * Generate the PHPCS configuration.
+     *
+     * @param {Object} thirdPartyPaths
+     */
+    const phpcsIgnore = (thirdPartyPaths) => {
+        const {toXML} = require('jstoxml');
+
+        const config = {
+            _name: 'ruleset',
+            _attrs: {
+                name: "MoodleCore",
+            },
+            _content: [
+                {
+                    rule: {
+                        _attrs: {
+                            ref: './phpcs.xml.dist',
+                        },
+                    },
+                },
+            ],
+        };
+
+        thirdPartyPaths.forEach(library => {
+            config._content.push({
+                'exclude-pattern': library,
+            });
+        });
+
+        grunt.file.write('phpcs.xml', toXML(config, {
+            header: true,
+            indent: '  ',
+        }) + "\n");
+    };
+
     /**
      * Generate ignore files (utilising thirdpartylibs.xml data)
      */
@@ -53,6 +90,8 @@ module.exports = grunt => {
             'admin/tool/componentlibrary/hugo/dist/css/docs.css',
         ].concat(thirdPartyPaths);
         grunt.file.write('.stylelintignore', stylelintIgnores.join('\n') + '\n');
+
+        phpcsIgnore(thirdPartyPaths);
     };
 
     grunt.registerTask('ignorefiles', 'Generate ignore files for linters', handler);

.grunt/tasks/javascript.js

@@ -47,6 +47,9 @@ module.exports = grunt => {
     // Load ESLint.
     require('./eslint')(grunt);
 
+    // Load jsconfig.
+    require('./jsconfig')(grunt);
+
     // Load JSDoc.
     require('./jsdoc')(grunt);
 

.grunt/tasks/jsconfig.js

@@ -0,0 +1,53 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+/* jshint node: true, browser: false */
+/* eslint-env node */
+
+/**
+ * @copyright  2022 Andrew Lyons <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+const configuration = {
+    compilerOptions: {
+        baseUrl: ".",
+        paths: {
+        },
+        target: "es2015",
+        allowSyntheticDefaultImports: false,
+    },
+    exclude: [
+        "node_modules",
+    ],
+    include: [],
+};
+
+module.exports = (grunt) => {
+    const handler = () => {
+        const jsconfigData = Object.assign({}, configuration);
+
+        const path = require('path');
+        const {fetchComponentData} = require(path.join(process.cwd(), '.grunt', 'components.js'));
+
+        const componentData = fetchComponentData().components;
+        for (const [thisPath, component] of Object.entries(componentData)) {
+            jsconfigData.compilerOptions.paths[`${component}/*`] = [`${thisPath}/amd/src/*`];
+            jsconfigData.include.push(`${thisPath}/amd/src/**/*`);
+        }
+
+        grunt.file.write('jsconfig.json', JSON.stringify(jsconfigData, null, "  ") + "\n");
+    };
+    grunt.registerTask('jsconfig', 'Generate a jsconfig configuration compatible with the LSP', handler);
+};

.grunt/tasks/sass.js

@@ -32,7 +32,7 @@ module.exports = grunt => {
                 }
             },
             options: {
-                implementation: require('node-sass'),
+                implementation: require('sass'),
                 includePaths: ["theme/boost/scss/", "theme/classic/scss/"]
             }
         },

.travis.yml

@@ -10,14 +10,18 @@ language: php
 
 os: linux
 
-dist: bionic
+dist: focal
 
 services:
     - mysql
     - docker
 
 addons:
-  postgresql: "10"
+  postgresql: "12"
+  apt:
+    packages:
+      - postgresql-12
+      - postgresql-client-12
 
 branches:
   except:
@@ -32,34 +36,34 @@ jobs:
     fast_finish: true
 
     include:
-        # First all the lowest php ones (7.3)
-        - php: 7.3
+        # First all the lowest php ones (7.4)
+        - php: 7.4
           env: DB=none     TASK=CITEST
-        - php: 7.3
-          env: DB=none     TASK=GRUNT    NVM_VERSION='lts/carbon'
+        - php: 7.4
+          env: DB=none     TASK=GRUNT
 
         - if: env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present
-          php: 7.3
+          php: 7.4
           env: DB=pgsql    TASK=PHPUNIT
 
         - if: env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all"
-          php: 7.3
+          php: 7.4
           env: DB=mysqli   TASK=PHPUNIT
 
-        # Then, conditionally, all the highest php ones (8.0)
+        # Then, conditionally, all the highest php ones (8.1)
         - if: env(MOODLE_PHP) = "all"
-          php: 8.0
+          php: 8.1
           env: DB=none     TASK=CITEST
         - if: env(MOODLE_PHP) = "all"
-          php: 8.0
-          env: DB=none     TASK=GRUNT    NVM_VERSION='lts/carbon'
+          php: 8.1
+          env: DB=none     TASK=GRUNT
 
         - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present)
-          php: 8.0
+          php: 8.1
           env: DB=pgsql    TASK=PHPUNIT
 
         - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all")
-          php: 8.0
+          php: 8.1
           env: DB=mysqli   TASK=PHPUNIT
 
 cache:
@@ -72,6 +76,11 @@ before_install:
     # Avoid IPv6 default binding as service (causes redis not to start).
     - sudo service redis-server start --bind 127.0.0.1
 
+env:
+  global:
+    - PGVER=12
+    - PGPORT=5433
+
 install:
     - >
         if [ "$DB" = 'mysqli' ];
@@ -81,7 +90,8 @@ install:
             sudo service mysql stop
             sudo mv /var/lib/mysql /mnt/ramdisk
             sudo ln -s /mnt/ramdisk/mysql /var/lib/mysql
-            sudo service mysql restart
+            echo -e "[mysqld]\nskip-log-bin" | sudo tee -a /etc/mysql/my.cnf
+            sudo service mysql start
         fi
     - >
         if [ "$DB" = 'pgsql' ];
@@ -91,7 +101,8 @@ install:
             sudo service postgresql stop
             sudo mv /var/lib/postgresql /mnt/ramdisk
             sudo ln -s /mnt/ramdisk/postgresql /var/lib/postgresql
-            sudo service postgresql start 9.6
+            sudo service postgresql start
+            sh -c 'until pg_isready -p $PGPORT; do echo "Waiting for the DB to be up..."; sleep 2; done'
         fi
     - >
         if [ "$TASK" = 'PHPUNIT' ];
@@ -113,12 +124,11 @@ install:
     - >
         if [ "$TASK" = 'GRUNT' ];
         then
-            nvm install $NVM_VERSION ;
-            nvm use $NVM_VERSION ;
+            nvm install
+            nvm use
         fi
 
 before_script:
-    - if [[ ${TRAVIS_PHP_VERSION:0:1} -gt 7 ]]; then pecl install xmlrpc-beta; fi
     - echo 'max_input_vars=5000' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
     - phpenv config-rm xdebug.ini
     - >
@@ -146,10 +156,11 @@ before_script:
         then
           # Postgres-specific setup.
           sed -i \
-            -e "s%= 'username'%= 'postgres'%" \
+            -e "s%= 'username'%= 'travis'%" \
+            -e "s%'dbsocket'  => false%'dbsocket'  => true%" \
             config.php ;
 
-          psql -c 'CREATE DATABASE travis_ci_test;' -U postgres;
+          psql -c 'CREATE DATABASE travis_ci_test;' -U travis;
         fi
 
         if [ "$DB" = 'mysqli' ];
@@ -221,7 +232,7 @@ before_script:
         # We need the official upstream for comparison
         git remote add upstream https://github.com/moodle/moodle.git;
 
-        git fetch upstream MOODLE_400_STABLE;
+        git fetch upstream MOODLE_401_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`

TRADEMARK.txt

@@ -1,48 +1,66 @@
 MOODLE TRADEMARKS POLICY
 ========================
 
-The word "Moodle" is trademarked in many countries around the world. The word
-was originally coined as an acronym: Modular Object-Oriented Dynamic Learning
-Environment. The trademark is owned by Martin Dougiamas, Founder and Director
-of Moodle.
+The Moodle Trademark
+--------------------
 
-The law obligates trademark owners to police their marks and prevent the use of
-confusingly similar names by third parties. Through this policy we’d like to
-make it clear how Moodle-related projects, organisations, and people can use
-the Moodle trademark. We’d also like to be clear about how use of the word is
-restricted when used to promote commercial Moodle services. We do this to
-protect the very business model that allows us to continue developing Moodle
-for you.
+The brand and word "Moodle" has trade mark protection in many countries around
+the world. Various Moodle™ trade marks are owned by either Moodle Pty Ltd or
+one of its associated entities. The law obligates trade mark owners to police
+their trade marks and prevent the use of confusingly similar names by
+third parties.
 
-Allowed uses
-------------
+We have created a more concise and thorough set of Trademark Guidelines
+(https://moodle.com/wp-content/uploads/2023/02/Moodle-Trademark-Guidelines-2023-4.pdf)
+to help you understand how to comply with Moodle's trade mark requirements.
+The Trademark Guidelines will also assist our Moodle Certified Partners and the
+community to understand some of the principles that inform Moodle's stance
+whenever potential infringement has been detected by us or our community.
 
-The following uses don’t require any permission at all:
+We need to be clear about use of the word "Moodle" and how we restrict its use
+when promoting commercial Moodle™ branded services. The proper use of
+trade marks reliably assures consumers about the quality of the associated
+products or services and where they have been derived from. Because the
+Moodle LMS is made available under the open source ‘GNU General Public License'
+that permits you to modify the copyrighted software, the distribution of such
+modified software in combination with Moodle trade marks can potentially
+mislead others in the community. To be clear, the GNU GPL does not include an
+implied right or licence to use Moodle's trade marks.
 
-* Referring to the software or the Moodle project.
-* Describing your own Moodle implementation (including within corporate
-  settings).
+We do all this to protect the very business model that allows us to continue
+developing various Moodle software solutions for you.
+
+Allowed uses of "Moodle"
+------------------------
+
+The following uses don't require any permission at all:
+
+* Referring to the software or the Moodle project as the "Moodle™ software"
+  or the "Moodle™ project"
+* Describing your own implementation of the Moodle™ software platform
+  (including within corporate settings).
 * Describing a Moodle-based community hub.
-* Describing some software you’ve made that integrates with Moodle
-  (eg a Moodle integration feature on another system).
+* Describing certain software you've made that integrates with Moodle™
+  branded software (e.g. a Moodle™ integration feature on another system).
 
-Restricted uses
----------------
+Restricted uses of "Moodle"
+---------------------------
 
 The following uses are generally prohibited without explicit and direct
 permission being granted to you by Moodle Pty Ltd. We do this to protect the
-Moodle project from software and sites which could confuse people. Please
-contact us to ask for permission in writing.
+Moodle™ project from software and sites which could confuse people. If in
+doubt, reach out for clarification at <trademarks@moodle.com>
 
-* You can’t use "Moodle" in the name of your software (including Mobile apps)
-* You can’t use "Moodle" in your company name
-* You can’t use "Moodle" in your domain name
-* You can’t use "Moodle" in advertising-related keywords (such as Adsense)
-* You can’t use "Moodle" to describe services around Moodle (such as hosting,
-  training, support, consulting, course creation services, theme development,
-  customisation, installation, integration and certification). This applies
-  even if you do not charge for the services. Note that usually only Moodle
-  Partners have this permission.
-
-For information about the Moodle Partner Certification Mark as well as for how
-to contact us, please see <https://moodle.com/trademarks/>.
+* You can't use the word "Moodle" or any Moodle logos for commercial purposes
+  without prior written permission from Moodle HQ.
+* You can't use "Moodle" in the name of your software (including Mobile apps).
+* You can't use "Moodle" in your company name.
+* You can't use "Moodle" in your domain name.
+* You can't use "Moodle" in advertising-related keywords (such as Adsense).
+* You can't use "Moodle" to describe services around Moodle
+  (such as hosting, training, support, consulting, course creation services,
+  theme development, customisation, installation, integration, analytics
+  and certification) that cause consumers to be confused that you are
+  associated with Moodle HQ if you are not.
+  This applies even if you do not charge for the services.
+  Note that usually only Moodle Partners have this permission.

admin/auth.php

@@ -28,7 +28,7 @@ if (empty($CFG->auth)) {
 }
 
 if (!empty($auth) and !exists_auth_plugin($auth)) {
-    print_error('pluginnotinstalled', 'auth', $returnurl, $auth);
+    throw new \moodle_exception('pluginnotinstalled', 'auth', $returnurl, $auth);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -55,7 +55,7 @@ switch ($action) {
         $key = array_search($auth, $authsenabled);
         // check auth plugin is valid
         if ($key === false) {
-            print_error('pluginnotenabled', 'auth', $returnurl, $auth);
+            throw new \moodle_exception('pluginnotenabled', 'auth', $returnurl, $auth);
         }
         // move down the list
         if ($key < (count($authsenabled) - 1)) {
@@ -72,7 +72,7 @@ switch ($action) {
         $key = array_search($auth, $authsenabled);
         // check auth is valid
         if ($key === false) {
-            print_error('pluginnotenabled', 'auth', $returnurl, $auth);
+            throw new \moodle_exception('pluginnotenabled', 'auth', $returnurl, $auth);
         }
         // move up the list
         if ($key >= 1) {

admin/blocks.php

@@ -75,7 +75,7 @@
 /// Get and sort the existing blocks
 
     if (!$blocks = $DB->get_records('block', array(), 'name ASC')) {
-        print_error('noblocks', 'error');  // Should never happen
+        throw new \moodle_exception('noblocks', 'error');  // Should never happen.
     }
 
     $incompatible = array();

admin/category.php

@@ -41,11 +41,11 @@ $adminroot = admin_get_root(); // need all settings
 $settingspage = $adminroot->locate($category, true);
 
 if (empty($settingspage) or !($settingspage instanceof admin_category)) {
-    print_error('categoryerror', 'admin', "$CFG->wwwroot/$CFG->admin/");
+    throw new \moodle_exception('categoryerror', 'error', "$CFG->wwwroot/$CFG->admin/");
 }
 
 if (!($settingspage->check_access())) {
-    print_error('accessdenied', 'admin');
+    throw new \moodle_exception('accessdenied', 'admin');
 }
 
 $hassiteconfig = has_capability('moodle/site:config', $PAGE->context);

admin/classes/reportbuilder/datasource/task_logs.php

@@ -0,0 +1,117 @@
+<?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/>.
+
+declare(strict_types=1);
+
+namespace core_admin\reportbuilder\datasource;
+
+use core_admin\reportbuilder\local\entities\task_log;
+use core_reportbuilder\datasource;
+use core_reportbuilder\local\entities\user;
+use core_reportbuilder\local\filters\select;
+
+/**
+ * Task logs datasource
+ *
+ * @package     core_admin
+ * @copyright   2022 Paul Holden <paulh@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class task_logs extends datasource {
+
+    /**
+     * Return user friendly name of the report source
+     *
+     * @return string
+     */
+    public static function get_name(): string {
+        return get_string('tasklogs', 'core_admin');
+    }
+
+    /**
+     * Initialise report
+     */
+    protected function initialise(): void {
+        $tasklogentity = new task_log();
+
+        $tasklogalias = $tasklogentity->get_table_alias('task_log');
+        $this->set_main_table('task_log', $tasklogalias);
+
+        $this->add_entity($tasklogentity);
+
+        // Join the user entity to represent the associated user.
+        $userentity = new user();
+        $useralias = $userentity->get_table_alias('user');
+        $this->add_entity($userentity->add_join("
+            LEFT JOIN {user} {$useralias}
+                   ON {$useralias}.id = {$tasklogalias}.userid")
+        );
+
+        // Add report elements from each of the entities we added to the report.
+        $this->add_all_from_entities();
+    }
+
+    /**
+     * Return the columns that will be added to the report upon creation
+     *
+     * @return string[]
+     */
+    public function get_default_columns(): array {
+        return [
+            'task_log:name',
+            'task_log:starttime',
+            'task_log:duration',
+            'task_log:result',
+        ];
+    }
+
+    /**
+     * Return the filters that will be added to the report upon creation
+     *
+     * @return string[]
+     */
+    public function get_default_filters(): array {
+        return [
+            'task_log:timestart',
+            'task_log:result',
+        ];
+    }
+
+    /**
+     * Return the conditions that will be added to the report upon creation
+     *
+     * @return string[]
+     */
+    public function get_default_conditions(): array {
+        return [
+            'task_log:type',
+            'task_log:timestart',
+            'task_log:result',
+        ];
+    }
+
+    /**
+     * Return the condition values that will be set for the report upon creation
+     *
+     * @return array
+     */
+    public function get_default_condition_values(): array {
+        return [
+            'task_log:type_operator' => select::EQUAL_TO,
+            'task_log:type_value' => \core\task\database_logger::TYPE_SCHEDULED,
+        ];
+    }
+}

admin/classes/reportbuilder/local/entities/task_log.php

@@ -14,18 +14,21 @@
 // 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;
+namespace core_admin\reportbuilder\local\entities;
 
 use core_reportbuilder\local\filters\date;
 use core_reportbuilder\local\filters\duration;
+use core_reportbuilder\local\filters\number;
 use core_reportbuilder\local\filters\select;
 use core_reportbuilder\local\filters\text;
+use core_reportbuilder\local\filters\autocomplete;
 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;
+use core_collator;
 
 /**
  * Task log entity class implementation
@@ -60,15 +63,6 @@ class task_log extends base {
         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
      *
@@ -80,9 +74,12 @@ class task_log extends base {
             $this->add_column($column);
         }
 
+        // All the filters defined by the entity can also be used as conditions.
         $filters = $this->get_all_filters();
         foreach ($filters as $filter) {
-            $this->add_filter($filter);
+            $this
+                ->add_filter($filter)
+                ->add_condition($filter);
         }
 
         return $this;
@@ -94,6 +91,7 @@ class task_log extends base {
      * @return column[]
      */
     protected function get_all_columns(): array {
+        global $DB;
 
         $tablealias = $this->get_table_alias('task_log');
 
@@ -107,20 +105,31 @@ class task_log extends base {
             ->set_type(column::TYPE_TEXT)
             ->add_field("$tablealias.classname")
             ->set_is_sortable(true)
-            ->add_callback(static function(string $value): string {
+            ->add_callback(static function(string $classname): string {
                 $output = '';
-                if (class_exists($value)) {
-                    $task = new $value;
-                    if ($task instanceof \core\task\scheduled_task) {
+                if (class_exists($classname)) {
+                    $task = new $classname;
+                    if ($task instanceof \core\task\task_base) {
                         $output = $task->get_name();
                     }
                 }
-                $output .= \html_writer::tag('div', "\\{$value}", [
-                    'class' => 'task-class',
+                $output .= \html_writer::tag('div', "\\{$classname}", [
+                    'class' => 'small text-muted',
                 ]);
                 return $output;
             });
 
+        // Component column.
+        $columns[] = (new column(
+            'component',
+            new lang_string('plugin'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_TEXT)
+            ->add_field("{$tablealias}.component")
+            ->set_is_sortable(true);
+
         // Type column.
         $columns[] = (new column(
             'type',
@@ -128,11 +137,11 @@ class task_log extends base {
             $this->get_entity_name()
         ))
             ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_INTEGER)
+            ->set_type(column::TYPE_TEXT)
             ->add_field("{$tablealias}.type")
             ->set_is_sortable(true)
-            ->add_callback(static function(int $value): string {
-                if (\core\task\database_logger::TYPE_SCHEDULED === $value) {
+            ->add_callback(static function($value): string {
+                if (\core\task\database_logger::TYPE_SCHEDULED === (int) $value) {
                     return get_string('task_type:scheduled', 'admin');
                 }
                 return get_string('task_type:adhoc', 'admin');
@@ -150,6 +159,18 @@ class task_log extends base {
             ->set_is_sortable(true)
             ->add_callback([format::class, 'userdate'], get_string('strftimedatetimeshortaccurate', 'core_langconfig'));
 
+        // End time column.
+        $columns[] = (new column(
+            'endtime',
+            new lang_string('task_endtime', 'admin'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_TIMESTAMP)
+            ->add_field("{$tablealias}.timeend")
+            ->set_is_sortable(true)
+            ->add_callback([format::class, 'userdate'], get_string('strftimedatetimeshortaccurate', 'core_langconfig'));
+
         // Duration column.
         $columns[] = (new column(
             'duration',
@@ -190,7 +211,9 @@ class task_log extends base {
             ->add_joins($this->get_joins())
             ->set_type(column::TYPE_INTEGER)
             ->add_field("{$tablealias}.pid")
-            ->set_is_sortable(true);
+            ->set_is_sortable(true)
+            // Although this is an integer column, it doesn't make sense to perform numeric aggregation on it.
+            ->set_disabled_aggregation(['avg', 'count', 'countdistinct', 'max', 'min', 'sum']);
 
         // Database column.
         $columns[] = (new column(
@@ -201,13 +224,37 @@ class task_log extends base {
             ->add_joins($this->get_joins())
             ->set_type(column::TYPE_INTEGER)
             ->add_fields("{$tablealias}.dbreads, {$tablealias}.dbwrites")
-            ->set_is_sortable(true)
+            ->set_is_sortable(true, ["{$tablealias}.dbreads", "{$tablealias}.dbwrites"])
             ->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;
-            });
+            })
+            // Although this is an integer column, it doesn't make sense to perform numeric aggregation on it.
+            ->set_disabled_aggregation(['avg', 'count', 'countdistinct', 'max', 'min', 'sum']);
+
+        // Database reads column.
+        $columns[] = (new column(
+            'dbreads',
+            new lang_string('task_dbreads', 'admin'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_INTEGER)
+            ->add_fields("{$tablealias}.dbreads")
+            ->set_is_sortable(true);
+
+        // Database writes column.
+        $columns[] = (new column(
+            'dbwrites',
+            new lang_string('task_dbwrites', 'admin'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_INTEGER)
+            ->add_fields("{$tablealias}.dbwrites")
+            ->set_is_sortable(true);
 
         // Result column.
         $columns[] = (new column(
@@ -216,11 +263,12 @@ class task_log extends base {
             $this->get_entity_name()
         ))
             ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_INTEGER)
-            ->add_field("$tablealias.result")
+            ->set_type(column::TYPE_BOOLEAN)
+            // For accurate aggregation, we need to return boolean success = true by xor'ing the field value.
+            ->add_field($DB->sql_bitxor("{$tablealias}.result", 1), 'success')
             ->set_is_sortable(true)
-            ->add_callback(static function(int $value): string {
-                if ($value) {
+            ->add_callback(static function(bool $success): string {
+                if (!$success) {
                     return get_string('task_result:failed', 'admin');
                 }
                 return get_string('success');
@@ -235,44 +283,69 @@ class task_log extends base {
      * @return filter[]
      */
     protected function get_all_filters(): array {
-        $filters = [];
+        global $DB;
 
         $tablealias = $this->get_table_alias('task_log');
 
         // Name filter (Filter by classname).
         $filters[] = (new filter(
-            text::class,
+            autocomplete::class,
             'name',
             new lang_string('classname', 'tool_task'),
             $this->get_entity_name(),
             "{$tablealias}.classname"
+        ))
+            ->add_joins($this->get_joins())
+            ->set_options_callback(static function(): array {
+                global $DB;
+                $classnames = $DB->get_fieldset_sql('SELECT DISTINCT classname FROM {task_log} ORDER BY classname ASC');
+
+                $options = [];
+                foreach ($classnames as $classname) {
+                    if (class_exists($classname)) {
+                        $task = new $classname;
+                        $options[$classname] = $task->get_name();
+                    }
+                }
+
+                core_collator::asort($options);
+                return $options;
+            });
+
+        // Component filter.
+        $filters[] = (new filter(
+            text::class,
+            'component',
+            new lang_string('plugin'),
+            $this->get_entity_name(),
+            "{$tablealias}.component"
         ))
             ->add_joins($this->get_joins());
 
+        // Type filter.
+        $filters[] = (new filter(
+            select::class,
+            'type',
+            new lang_string('tasktype', 'admin'),
+            $this->get_entity_name(),
+            "{$tablealias}.type"
+        ))
+            ->add_joins($this->get_joins())
+            ->set_options([
+                \core\task\database_logger::TYPE_ADHOC => new lang_string('task_type:adhoc', 'admin'),
+                \core\task\database_logger::TYPE_SCHEDULED => new lang_string('task_type:scheduled', 'admin'),
+            ]);
+
         // Output filter (Filter by task output).
         $filters[] = (new filter(
             text::class,
             'output',
             new lang_string('task_logoutput', 'admin'),
             $this->get_entity_name(),
-            "{$tablealias}.output"
+            $DB->sql_cast_to_char("{$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,
@@ -289,16 +362,66 @@ class task_log extends base {
                 date::DATE_CURRENT,
             ]);
 
+        // End time.
+        $filters[] = (new filter(
+            date::class,
+            'timeend',
+            new lang_string('task_endtime', 'admin'),
+            $this->get_entity_name(),
+            "{$tablealias}.timeend"
+        ))
+            ->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"
+            "{$tablealias}.timeend - {$tablealias}.timestart"
         ))
             ->add_joins($this->get_joins());
 
+        // Database reads.
+        $filters[] = (new filter(
+            number::class,
+            'dbreads',
+            new lang_string('task_dbreads', 'admin'),
+            $this->get_entity_name(),
+            "{$tablealias}.dbreads"
+        ))
+            ->add_joins($this->get_joins());
+
+        // Database writes.
+        $filters[] = (new filter(
+            number::class,
+            'dbwrites',
+            new lang_string('task_dbwrites', 'admin'),
+            $this->get_entity_name(),
+            "{$tablealias}.dbwrites"
+        ))
+            ->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'),
+            ]);
+
         return $filters;
     }
 }

admin/classes/reportbuilder/local/systemreports/task_logs.php

@@ -14,10 +14,10 @@
 // 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;
+namespace core_admin\reportbuilder\local\systemreports;
 
 use context_system;
-use core_admin\local\entities\task_log;
+use core_admin\reportbuilder\local\entities\task_log;
 use core_reportbuilder\local\entities\user;
 use core_reportbuilder\local\report\action;
 use lang_string;
@@ -121,6 +121,7 @@ class task_logs extends system_report {
     protected function add_filters(): void {
         $filters = [
             'task_log:name',
+            'task_log:type',
             'task_log:output',
             'task_log:result',
             'task_log:timestart',

admin/cli/delete_course.php

@@ -0,0 +1,124 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * CLI script to delete a course.
+ *
+ * @package    core
+ * @subpackage cli
+ * @author     Mikhail Golenkov <mikhailgolenkov@catalyst-au.net>
+ * @copyright  2022 Catalyst IT
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+define('CLI_SCRIPT', true);
+
+require(__DIR__ . '/../../config.php');
+require_once($CFG->libdir . '/clilib.php');
+require_once($CFG->libdir . '/cronlib.php');
+
+list($options, $unrecognized) = cli_get_params(
+    [
+        'courseid' => false,
+        'help' => false,
+        'showsql' => false,
+        'showdebugging' => false,
+        'disablerecyclebin' => false,
+        'non-interactive' => false,
+    ], [
+        'c' => 'courseid',
+        'h' => 'help',
+    ]
+);
+
+if ($unrecognized) {
+    $unrecognized = implode("\n  ", $unrecognized);
+    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
+}
+
+if ($options['help'] || empty($options['courseid'])) {
+    $help = <<<EOT
+CLI script to delete a course.
+
+Options:
+ -h, --help                Print out this help
+     --showsql             Show sql queries before they are executed
+     --showdebugging       Show developer level debugging information
+     --disablerecyclebin   Skip backing up the course
+     --non-interactive     No interactive questions or confirmations
+ -c, --courseid            Course id to be deleted
+
+Example:
+\$sudo -u www-data /usr/bin/php admin/cli/delete_course.php --courseid=123456
+\$sudo -u www-data /usr/bin/php admin/cli/delete_course.php --courseid=123456 --showdebugging
+\$sudo -u www-data /usr/bin/php admin/cli/delete_course.php --courseid=123456 --disablerecyclebin
+
+EOT;
+
+    echo $help;
+    die;
+}
+
+$interactive = empty($options['non-interactive']);
+
+if ($options['showdebugging']) {
+    mtrace('Enabling debugging...');
+    set_debugging(DEBUG_DEVELOPER, true);
+}
+
+if ($options['showsql']) {
+    mtrace('Enabling SQL debugging...');
+    $DB->set_debug(true);
+}
+
+if (CLI_MAINTENANCE) {
+    cli_error('CLI maintenance mode active, CLI execution suspended');
+}
+
+if (moodle_needs_upgrading()) {
+    cli_error('Moodle upgrade pending, CLI execution suspended');
+}
+
+$course = $DB->get_record('course', array('id' => $options['courseid']));
+if (empty($course)) {
+    cli_error('Course not found');
+}
+
+mtrace('Deleting course id ' . $course->id);
+mtrace('Course name: ' . $course->fullname);
+mtrace('Short name: ' . $course->shortname);
+
+if ($interactive) {
+    mtrace('');
+    $input = cli_input('Are you sure you wish to delete this course? (y/N)', 'N', ['y', 'Y', 'n', 'N']);
+    if (strtolower($input) != 'y') {
+        exit(0);
+    }
+}
+
+if ($options['disablerecyclebin']) {
+    mtrace('Disabling recycle bin...');
+    $overrideconfig = ['tool_recyclebin' => ['coursebinenable' => false, 'categorybinenable' => false]];
+    $CFG->forced_plugin_settings = array_merge($CFG->forced_plugin_settings, $overrideconfig);
+}
+
+core_php_time_limit::raise();
+delete_course($course);
+
+mtrace('Updating course count in categories...');
+fix_course_sortorder();
+
+mtrace('Done!');

admin/cli/restore_backup.php

@@ -69,15 +69,15 @@ if ($options['showdebugging']) {
 }
 
 if (!$admin = get_admin()) {
-    print_error('noadmins');
+    throw new \moodle_exception('noadmins');
 }
 
 if (!file_exists($options['file'])) {
-    print_error('filenotfound');
+    throw new \moodle_exception('filenotfound');
 }
 
 if (!$category = $DB->get_record('course_categories', ['id' => $options['categoryid']], 'id')) {
-    print_error('invalidcategoryid');
+    throw new \moodle_exception('invalidcategoryid');
 }
 
 $backupdir = "restore_" . uniqid();
@@ -102,7 +102,7 @@ try {
 } catch (Exception $e) {
     cli_heading(get_string('cleaningtempdata'));
     fulldelete($path);
-    print_error('generalexceptionmessage', 'error', '', $e->getMessage());
+    throw new \moodle_exception('generalexceptionmessage', 'error', '', $e->getMessage());
 }
 
 cli_heading(get_string('restoredcourseid', 'backup', $courseid));

admin/cli/scheduled_task.php

@@ -69,11 +69,11 @@ if ($options['help'] or (!$options['list'] and !$options['execute'])) {
     die;
 }
 
-if ($options['showdebugging']) {
+if ($options['showdebugging'] || !empty($CFG->showcrondebugging)) {
     set_debugging(DEBUG_DEVELOPER, true);
 }
 
-if ($options['showsql']) {
+if ($options['showsql'] || !empty($CFG->showcronsql)) {
     $DB->set_debug(true);
 }
 if ($options['list']) {

admin/contentbank.php

@@ -42,7 +42,7 @@ $plugins = core_plugin_manager::instance()->get_plugins_of_type('contenttype');
 $sortorder = array_flip(array_keys($plugins));
 
 if (!isset($plugins[$name])) {
-    print_error('contenttypenotfound', 'error', $return, $name);
+    throw new \moodle_exception('contenttypenotfound', 'error', $return, $name);
 }
 
 switch ($action) {

admin/course/resetindentation.php

@@ -0,0 +1,78 @@
+<?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/>.
+
+/**
+ * Reset course indentation
+ *
+ * @copyright 2023 Amaia Anabitarte <amaia@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once('../../config.php');
+
+require_admin();
+
+$format = required_param('format', PARAM_PLUGIN);
+$confirm = optional_param('confirm', false, PARAM_BOOL);
+$backurl = new moodle_url('/admin/settings.php', ['section' => 'formatsetting'.$format]);
+
+$PAGE->set_url('/admin/course/resetindentation.php', ['format' => $format]);
+$PAGE->set_context(context_system::instance());
+
+if ($confirm) {
+    require_sesskey();
+    $courses = $DB->get_records('course', ['format' => $format], 'id', 'id');
+    if (!empty($courses)) {
+        $courseids = array_keys($courses);
+        list($courseinsql, $courseparams) = $DB->get_in_or_equal($courseids, SQL_PARAMS_NAMED, 'course');
+        $DB->set_field_select('course_modules', 'indent', '0', "course $courseinsql AND indent <> 0", $courseparams);
+        rebuild_course_cache(0, true);
+    }
+    redirect(
+        $backurl,
+        get_string('resetindentationsuccess', 'admin'),
+        null,
+        \core\output\notification::NOTIFY_SUCCESS
+    );
+}
+
+$strtitle = get_string('resetindentation', 'admin');
+
+$PAGE->set_title($strtitle);
+$PAGE->set_heading($strtitle);
+
+navigation_node::override_active_url(new moodle_url(
+    '/admin/course/resetindentation.php',
+    ['action' => 'confirm', 'format' => $format]
+));
+
+echo $OUTPUT->header();
+
+$displayoptions = ['confirmtitle' => get_string('resetindentation_title', 'admin')];
+$confirmbutton = new single_button(
+    new moodle_url('/admin/course/resetindentation.php', ['confirm' => 1, 'format' => $format, 'sesskey' => sesskey()]),
+    get_string('resetindentation', 'admin'),
+    'post'
+);
+$cancelbutton = new single_button($backurl, get_string('cancel'));
+echo $OUTPUT->confirm(
+    get_string('resetindentation_help', 'admin', ['format' => get_string('pluginname', 'format_'.$format)]),
+    $confirmbutton,
+    $cancelbutton,
+    $displayoptions
+);
+
+echo $OUTPUT->footer();

admin/courseformats.php

@@ -41,7 +41,7 @@ $formatplugins = core_plugin_manager::instance()->get_plugins_of_type('format');
 $sortorder = array_flip(array_keys($formatplugins));
 
 if (!isset($formatplugins[$formatname])) {
-    print_error('courseformatnotfound', 'error', $return, $formatname);
+    throw new \moodle_exception('courseformatnotfound', 'error', $return, $formatname);
 }
 
 switch ($action) {

admin/cron.php

@@ -58,7 +58,7 @@ require_once($CFG->libdir.'/cronlib.php');
 // check if execution allowed
 if (!empty($CFG->cronclionly)) {
     // This script can only be run via the cli.
-    print_error('cronerrorclionly', 'admin');
+    throw new \moodle_exception('cronerrorclionly', 'admin');
     exit;
 }
 // This script is being called via the web, so check the password if there is one.
@@ -66,7 +66,7 @@ if (!empty($CFG->cronremotepassword)) {
     $pass = optional_param('password', '', PARAM_RAW);
     if ($pass != $CFG->cronremotepassword) {
         // wrong password.
-        print_error('cronerrorpassword', 'admin');
+        throw new \moodle_exception('cronerrorpassword', 'admin');
         exit;
     }
 }

admin/customfields.php

@@ -41,7 +41,7 @@ $customfieldplugins = core_plugin_manager::instance()->get_plugins_of_type('cust
 $sortorder = array_flip(array_keys($customfieldplugins));
 
 if (!isset($customfieldplugins[$customfieldname])) {
-    print_error('customfieldnotfound', 'error', $return, $customfieldname);
+    throw new \moodle_exception('customfieldnotfound', 'error', $return, $customfieldname);
 }
 
 switch ($action) {

admin/dataformats.php

@@ -42,7 +42,7 @@ $plugins = core_plugin_manager::instance()->get_plugins_of_type('dataformat');
 $sortorder = array_flip(array_keys($plugins));
 
 if (!isset($plugins[$name])) {
-    print_error('courseformatnotfound', 'error', $return, $name);
+    throw new \moodle_exception('courseformatnotfound', 'error', $return, $name);
 }
 
 switch ($action) {

admin/environment.php

@@ -55,11 +55,11 @@ if ($action == 'updatecomponent' && confirm_sesskey()) {
                     $a = new stdClass();
                     $a->url  = 'https://download.moodle.org/environment/environment.zip';
                     $a->dest = $CFG->dataroot . '/';
-                    print_error($cd->get_error(), 'error', $PAGE->url, $a);
+                    throw new \moodle_exception($cd->get_error(), 'error', $PAGE->url, $a);
                     die();
 
                 } else {
-                    print_error($cd->get_error(), 'error', $PAGE->url);
+                    throw new \moodle_exception($cd->get_error(), 'error', $PAGE->url);
                     die();
                 }
 

admin/environment.xml

@@ -3371,6 +3371,7 @@
       <VENDOR name="oracle" version="11.2" />
     </DATABASE>
     <PHP version="7.3.0" level="required">
+      <RESTRICT function="restrict_php_version_81" message="unsupportedphpversion81" />
     </PHP>
     <PCREUNICODE level="optional">
       <FEEDBACK>
@@ -3539,6 +3540,8 @@
       </CUSTOM_CHECK>
       <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
       </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
   <MOODLE version="4.0" requires="3.6">
@@ -3555,6 +3558,7 @@
       <VENDOR name="oracle" version="11.2" />
     </DATABASE>
     <PHP version="7.3.0" level="required">
+      <RESTRICT function="restrict_php_version_81" message="unsupportedphpversion81" />
     </PHP>
     <PCREUNICODE level="optional">
       <FEEDBACK>
@@ -3733,4 +3737,380 @@
       </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
+  <MOODLE version="4.1" requires="3.9">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.4" />
+      <VENDOR name="mysql" version="5.7" />
+      <VENDOR name="postgres" version="12" />
+      <VENDOR name="mssql" version="14.0" />
+      <VENDOR name="oracle" version="19" />
+    </DATABASE>
+    <PHP version="7.4.0" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="mbstringrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+      <PHP_EXTENSION name="sodium" level="optional"/>
+      <PHP_EXTENSION name="exif" level="optional"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="sixtyfourbitswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iscustomadminwarnings" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
+  <MOODLE version="4.2" requires="3.11.8">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.6.7" />
+      <VENDOR name="mysql" version="8.0" />
+      <VENDOR name="postgres" version="13" />
+      <VENDOR name="mssql" version="14.0" />
+      <VENDOR name="oracle" version="19" />
+    </DATABASE>
+    <PHP version="8.0.0" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="mbstringrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+      <PHP_EXTENSION name="sodium" level="required"/>
+      <PHP_EXTENSION name="exif" level="optional"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="sixtyfourbitsrequired" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iscustomadminwarnings" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/index.php

@@ -174,15 +174,17 @@ $documentationlink = '<a href="http://docs.moodle.org/en/Installation">Installat
 // Check some PHP server settings
 
 if (ini_get_bool('session.auto_start')) {
-    print_error('phpvaroff', 'debug', '', (object)array('name'=>'session.auto_start', 'link'=>$documentationlink));
+    throw new \moodle_exception('phpvaroff', 'debug', '',
+        (object)array('name' => 'session.auto_start', 'link' => $documentationlink));
 }
 
 if (!ini_get_bool('file_uploads')) {
-    print_error('phpvaron', 'debug', '', (object)array('name'=>'file_uploads', 'link'=>$documentationlink));
+    throw new \moodle_exception('phpvaron', 'debug', '',
+        (object)array('name' => 'file_uploads', 'link' => $documentationlink));
 }
 
 if (is_float_problem()) {
-    print_error('phpfloatproblem', 'admin', '', $documentationlink);
+    throw new \moodle_exception('phpfloatproblem', 'admin', '', $documentationlink);
 }
 
 // Set some necessary variables during set-up to avoid PHP warnings later on this page
@@ -203,7 +205,7 @@ require("$CFG->dirroot/version.php");       // defines $version, $release, $bran
 $CFG->target_release = $release;            // used during installation and upgrades
 
 if (!$version or !$release) {
-    print_error('withoutversion', 'debug'); // without version, stop
+    throw new \moodle_exception('withoutversion', 'debug'); // Without version, stop.
 }
 
 if (!core_tables_exist()) {
@@ -275,7 +277,7 @@ if (!core_tables_exist()) {
     if (!$DB->setup_is_unicodedb()) {
         if (!$DB->change_db_encoding()) {
             // If could not convert successfully, throw error, and prevent installation
-            print_error('unicoderequired', 'admin');
+            throw new \moodle_exception('unicoderequired', 'admin');
         }
     }
 
@@ -297,7 +299,7 @@ $stradministration = get_string('administration');
 $PAGE->set_context(context_system::instance());
 
 if (empty($CFG->version)) {
-    print_error('missingconfigversion', 'debug');
+    throw new \moodle_exception('missingconfigversion', 'debug');
 }
 
 // Detect config cache inconsistency, this happens when you switch branches on dev servers.
@@ -748,7 +750,7 @@ if (during_initial_install()) {
             redirect("index.php?sessionstarted=1&sessionverify=1&lang=$CFG->lang");
         } else {
             if (empty($SESSION->sessionverify)) {
-                print_error('installsessionerror', 'admin', "index.php?sessionstarted=1&lang=$CFG->lang");
+                throw new \moodle_exception('installsessionerror', 'admin', "index.php?sessionstarted=1&lang=$CFG->lang");
             }
             unset($SESSION->sessionverify);
         }
@@ -765,7 +767,7 @@ if (during_initial_install()) {
     if ($adminuser->password === 'adminsetuppending') {
         // prevent installation hijacking
         if ($adminuser->lastip !== getremoteaddr()) {
-            print_error('installhijacked', 'admin');
+            throw new \moodle_exception('installhijacked', 'admin');
         }
         // login user and let him set password and admin details
         $adminuser->newadminuser = 1;

admin/lib.php

@@ -55,7 +55,7 @@ function admin_page_type_list($pagetype, $parentcontext, $currentcontext) {
 function core_admin_pluginfile($course, $cm, $context, $filearea, $args, $forcedownload, array $options = array()) {
     global $CFG;
 
-    if (in_array($filearea, ['logo', 'logocompact'])) {
+    if (in_array($filearea, ['logo', 'logocompact', 'favicon'])) {
         $size = array_shift($args); // The path hides the size.
         $itemid = clean_param(array_shift($args), PARAM_INT);
         $filename = clean_param(array_shift($args), PARAM_FILE);

admin/mailout-debugger.php

@@ -45,7 +45,7 @@ if (isset($_ENV['TMPDIR']) && is_dir($_ENV['TMPDIR'])) {
 $tmpfile = $tmpdir . '/moodle-mailout.log';
 $fh = fopen($tmpfile, 'a+', false)
     or mdie("Error openning $tmpfile on append\n");
-fwrite($fh, "==== ".strftime("%a %b %e %H:%M:%S %Y", time())." ====\n");
+fwrite($fh, "==== ".date("D M d H:i:s Y", time())." ====\n");
 fwrite($fh, "==== Commandline: " . implode(' ',$argv) . "\n");
 
 $stdin = fopen('php://stdin', 'r');

admin/mnet/access_control.php

@@ -15,7 +15,7 @@ $action       = trim(strtolower(optional_param('action', '', PARAM_ALPHA)));
 admin_externalpage_setup('ssoaccesscontrol');
 
 if (!extension_loaded('openssl')) {
-    print_error('requiresopenssl', 'mnet');
+    throw new \moodle_exception('requiresopenssl', 'mnet');
 }
 
 $sitecontext = context_system::instance();
@@ -35,13 +35,13 @@ if (!empty($action) and confirm_sesskey()) {
 
     // boot if insufficient permission
     if (!has_capability('moodle/user:delete', $sitecontext)) {
-        print_error('nomodifyacl','mnet');
+        throw new \moodle_exception('nomodifyacl', 'mnet');
     }
 
     // fetch the record in question
     $id = required_param('id', PARAM_INT);
     if (!$idrec = $DB->get_record('mnet_sso_access_control', array('id'=>$id))) {
-        print_error('recordnoexists','mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+        throw new \moodle_exception('recordnoexists', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
     }
 
     switch ($action) {
@@ -56,7 +56,7 @@ if (!empty($action) and confirm_sesskey()) {
             // require the access parameter, and it must be 'allow' or 'deny'
             $accessctrl = trim(strtolower(required_param('accessctrl', PARAM_ALPHA)));
             if ($accessctrl != 'allow' and $accessctrl != 'deny') {
-                print_error('invalidaccessparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+                throw new \moodle_exception('invalidaccessparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
             }
 
             if (mnet_update_sso_access_control($idrec->username, $idrec->mnet_host_id, $accessctrl)) {
@@ -71,7 +71,7 @@ if (!empty($action) and confirm_sesskey()) {
             break;
 
         default:
-            print_error('invalidactionparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+            throw new \moodle_exception('invalidactionparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
     }
 }
 
@@ -82,7 +82,7 @@ if ($form = data_submitted() and confirm_sesskey()) {
 
     // check permissions and verify form input
     if (!has_capability('moodle/user:delete', $sitecontext)) {
-        print_error('nomodifyacl','mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+        throw new \moodle_exception('nomodifyacl', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
     }
     if (empty($form->username)) {
         $formerror['username'] = get_string('enterausername','mnet');
@@ -117,7 +117,6 @@ 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

@@ -17,13 +17,13 @@
     if (!extension_loaded('openssl')) {
         echo $OUTPUT->header();
         set_config('mnet_dispatcher_mode', 'off');
-        print_error('requiresopenssl', 'mnet');
+        throw new \moodle_exception('requiresopenssl', 'mnet');
     }
 
     if (!function_exists('curl_init') ) {
         echo $OUTPUT->header();
         set_config('mnet_dispatcher_mode', 'off');
-        print_error('nocurl', 'mnet');
+        throw new \moodle_exception('nocurl', 'mnet');
     }
 
     if (!isset($CFG->mnet_dispatcher_mode)) {
@@ -37,7 +37,7 @@
                 if (set_config('mnet_dispatcher_mode', $form->mode)) {
                     redirect('index.php', get_string('changessaved'));
                 } else {
-                    print_error('invalidaction', '', 'index.php');
+                    throw new \moodle_exception('invalidaction', '', 'index.php');
                 }
             }
         } elseif (!empty($form->submit) && $form->submit == get_string('delete')) {
@@ -46,11 +46,23 @@
 
             $formcontinue = new single_button(new moodle_url('index.php', array('confirm' => md5($mnet->public_key))), get_string('yes'));
             $formcancel = new single_button(new moodle_url('index.php', array()), get_string('no'));
+
+            echo $OUTPUT->header();
             echo $OUTPUT->confirm(get_string("deletekeycheck", "mnet"), $formcontinue, $formcancel);
+            echo $OUTPUT->footer();
             exit;
         } else {
             // We're deleting
 
+            // If no/cancel then redirect back to the network setting page.
+            if (!isset($form->confirm)) {
+                redirect(
+                    new moodle_url('/admin/mnet/index.php'),
+                    get_string('keydeletedcancelled', 'mnet'),
+                    null,
+                    \core\output\notification::NOTIFY_SUCCESS
+                );
+            }
 
             if (!isset($SESSION->mnet_confirm_delete_key)) {
                 // fail - you're being attacked?
@@ -63,25 +75,27 @@
 
             if($time < time() - 60) {
                 // fail - you're out of time.
-                print_error ('deleteoutoftime', 'mnet', 'index.php');
-                exit;
+                redirect(
+                    new moodle_url('/admin/mnet/index.php'),
+                    get_string('deleteoutoftime', 'mnet'),
+                    null,
+                    \core\output\notification::NOTIFY_WARNING
+                );
             }
 
             if ($key != md5(sha1($mnet->keypair['keypair_PEM']))) {
                 // fail - you're being attacked?
-                print_error ('deletewrongkeyvalue', 'mnet', 'index.php');
+                throw new \moodle_exception ('deletewrongkeyvalue', 'mnet', 'index.php');
                 exit;
             }
 
             $mnet->replace_keys();
             redirect('index.php', get_string('keydeleted','mnet'));
-            exit;
         }
     }
     $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/peer_forms.php

@@ -59,9 +59,8 @@ class mnet_simple_host_form extends moodleform {
             $wwwroot = 'http://'.$wwwroot;
         }
         if ($host = $DB->get_record('mnet_host', array('wwwroot' => $wwwroot))) {
-            global $CFG;
-            return array('wwwroot' => get_string('hostexists', 'mnet',
-                new moodle_url('/admin/mnet/peers.php', array('hostid' => $host->id))));
+            $str = get_string('hostexists', 'mnet', (new moodle_url('/admin/mnet/peers.php', ['hostid' => $host->id]))->out());
+            return array('wwwroot' => $str);
         }
         return array();
     }

admin/mnet/peers.php

@@ -51,18 +51,12 @@ 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');
+    throw new \moodle_exception('requiresopenssl', 'mnet');
 }
 
 if (!function_exists('curl_init') ) {
-    print_error('nocurl', 'mnet');
-}
-
-if (!function_exists('xmlrpc_encode_request')) {
-    print_error('xmlrpc-missing', 'mnet');
+    throw new \moodle_exception('nocurl', 'mnet');
 }
 
 if (!isset($CFG->mnet_dispatcher_mode)) {
@@ -92,7 +86,6 @@ 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();
@@ -176,11 +169,10 @@ if ($formdata = $reviewform->get_data()) {
     if ($mnet_peer->commit()) {
         redirect(new moodle_url('/admin/mnet/peers.php', array('hostid' => $mnet_peer->id)), get_string('changessaved'));
     } else {
-        print_error('invalidaction', 'error', 'index.php');
+        throw new \moodle_exception('invalidaction', 'error', 'index.php');
     }
 } 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();
@@ -191,7 +183,6 @@ 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,5 +44,4 @@ 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/testclient.php

@@ -18,7 +18,7 @@ require_once($CFG->libdir.'/adminlib.php');
 include_once($CFG->dirroot.'/mnet/lib.php');
 
 if ($CFG->mnet_dispatcher_mode === 'off') {
-    print_error('mnetdisabled', 'mnet');
+    throw new \moodle_exception('mnetdisabled', 'mnet');
 }
 
 admin_externalpage_setup('mnettestclient');
@@ -27,7 +27,7 @@ error_reporting(DEBUG_ALL);
 
 echo $OUTPUT->header();
 if (!extension_loaded('openssl')) {
-    print_error('requiresopenssl', 'mnet', '', NULL, true);
+    throw new \moodle_exception('requiresopenssl', 'mnet', '', null, true);
 }
 
 // optional drilling down parameters

admin/mnet/trustedhosts.html

@@ -1,6 +1,5 @@
 <?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/mnet/trustedhosts.php

@@ -10,7 +10,7 @@
 
     if (!extension_loaded('openssl')) {
         echo $OUTPUT->header();
-        print_error('requiresopenssl', 'mnet', '', NULL, true);
+        throw new \moodle_exception('requiresopenssl', 'mnet', '', null, true);
     }
 
     $site = get_site();

admin/modules.php

@@ -31,17 +31,19 @@
 
     if (!empty($hide) and confirm_sesskey()) {
         $class = \core_plugin_manager::resolve_plugininfo_class('mod');
-        $class::enable_plugin($hide, false);
-
-        admin_get_root(true, false);  // settings not required - only pages
+        if ($class::enable_plugin($hide, false)) {
+            // Settings not required - only pages.
+            admin_get_root(true, false);
+        }
         redirect(new moodle_url('/admin/modules.php'));
     }
 
-    if (!empty($show) and confirm_sesskey()) {
+    if (!empty($show) && confirm_sesskey()) {
         $class = \core_plugin_manager::resolve_plugininfo_class('mod');
-        $class::enable_plugin($show, true);
-
-        admin_get_root(true, false);  // settings not required - only pages
+        if ($class::enable_plugin($show, true)) {
+            // Settings not required - only pages.
+            admin_get_root(true, false);
+        }
         redirect(new moodle_url('/admin/modules.php'));
     }
 
@@ -51,7 +53,7 @@
 /// Get and sort the existing modules
 
     if (!$modules = $DB->get_records('modules', array(), 'name ASC')) {
-        print_error('moduledoesnotexist', 'error');
+        throw new \moodle_exception('moduledoesnotexist', 'error');
     }
 
 /// Print the table of all modules

admin/oauth2callback.php

@@ -30,25 +30,36 @@
 
 require_once(__DIR__ . '/../config.php');
 
+// The state parameter we've given (used in moodle as a redirect url).
+// Per https://www.rfc-editor.org/rfc/rfc6749#section-4.1.2.1, state is required, even during error responses.
+$state = required_param('state', PARAM_LOCALURL);
+$redirecturl = new moodle_url($state);
+$params = $redirecturl->params();
+
 $error = optional_param('error', '', PARAM_RAW);
+
 if ($error) {
-    $message = optional_param('error_description', '', PARAM_RAW);
-    if ($message) {
-        $SESSION->loginerrormsg = $message;
-        redirect(new moodle_url(get_login_url()));
-    } else {
-        $SESSION->loginerrormsg = $error;
-        redirect(new moodle_url(get_login_url()));
+    $message = optional_param('error_description', null, PARAM_RAW);
+
+    // Errors can occur for authenticated users, such as when a user denies authorization for some internal service call.
+    // In such cases, propagate the error to the component redirect URI.
+    if (isloggedin()) {
+        if (isset($params['sesskey']) && confirm_sesskey($params['sesskey'])) {
+            $redirecturl->param('error', $error);
+            if ($message) {
+                $redirecturl->param('error_description', $message);
+            }
+            redirect($redirecturl);
+        }
     }
+
+    // Not logged in or the sesskey verification failed, redirect to login + show errors.
+    $SESSION->loginerrormsg = $message ?? $error;
+    redirect(new moodle_url(get_login_url()));
 }
 
 // The authorization code generated by the authorization server.
 $code = required_param('code', PARAM_RAW);
-// The state parameter we've given (used in moodle as a redirect url).
-$state = required_param('state', PARAM_LOCALURL);
-
-$redirecturl = new moodle_url($state);
-$params = $redirecturl->params();
 
 if (isset($params['sesskey']) and confirm_sesskey($params['sesskey'])) {
     $redirecturl->param('oauth2code', $code);

admin/portfolio.php

@@ -116,13 +116,13 @@ if (($action == 'edit') || ($action == 'new')) {
     $instance = portfolio_instance($portfolio);
     if ($sure) {
         if (!confirm_sesskey()) {
-            print_error('confirmsesskeybad', '', $baseurl);
+            throw new \moodle_exception('confirmsesskeybad', '', $baseurl);
         }
         if ($instance->delete()) {
             $deletedstr = get_string('instancedeleted', 'portfolio');
             redirect($baseurl, $deletedstr, 1);
         } else {
-            print_error('instancenotdeleted', 'portfolio', $baseurl);
+            throw new \moodle_exception('instancenotdeleted', 'portfolio', $baseurl);
         }
         exit;
     } else {

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

@@ -16,6 +16,8 @@
 
 namespace core_adminpresets\local\setting;
 
+use admin_setting_configcheckbox;
+
 /**
  * Checkbox setting.
  *
@@ -26,15 +28,15 @@ namespace core_adminpresets\local\setting;
  */
 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;
-    }
-
+    /**
+     * Sets the visible name for the setting selected value
+     */
     protected function set_visiblevalue() {
-        if ($this->value) {
+        /** @var admin_setting_configcheckbox $settingdata */
+        $settingdata = $this->get_settingdata();
+
+        // We need to compare the "yes" value of the inner checkbox, which isn't necessarily boolean.
+        if ($this->value == $settingdata->yes) {
             $str = get_string('yes');
         } else {
             $str = get_string('no');

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

@@ -34,7 +34,7 @@ class adminpresets_admin_setting_configselect extends adminpresets_setting {
      */
     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')) {
+        if (empty($this->settingdata->choices) && method_exists($this->settingdata, 'load_choices')) {
             $this->settingdata->load_choices();
         }
 

admin/qbehaviours.php

@@ -84,7 +84,7 @@ if (!empty($config->disabledbehaviours)) {
 // Disable.
 if (($disable = optional_param('disable', '', PARAM_PLUGIN)) && confirm_sesskey()) {
     if (!isset($behaviours[$disable])) {
-        print_error('unknownbehaviour', 'question', $thispageurl, $disable);
+        throw new \moodle_exception('unknownbehaviour', 'question', $thispageurl, $disable);
     }
 
     if (array_search($disable, $disabledbehaviours) === false) {
@@ -97,11 +97,11 @@ if (($disable = optional_param('disable', '', PARAM_PLUGIN)) && confirm_sesskey(
 // Enable.
 if (($enable = optional_param('enable', '', PARAM_PLUGIN)) && confirm_sesskey()) {
     if (!isset($behaviours[$enable])) {
-        print_error('unknownbehaviour', 'question', $thispageurl, $enable);
+        throw new \moodle_exception('unknownbehaviour', 'question', $thispageurl, $enable);
     }
 
     if (!$archetypal[$enable]) {
-        print_error('cannotenablebehaviour', 'question', $thispageurl, $enable);
+        throw new \moodle_exception('cannotenablebehaviour', 'question', $thispageurl, $enable);
     }
 
     if (($key = array_search($enable, $disabledbehaviours)) !== false) {
@@ -114,7 +114,7 @@ if (($enable = optional_param('enable', '', PARAM_PLUGIN)) && confirm_sesskey())
 // Move up in order.
 if (($up = optional_param('up', '', PARAM_PLUGIN)) && confirm_sesskey()) {
     if (!isset($behaviours[$up])) {
-        print_error('unknownbehaviour', 'question', $thispageurl, $up);
+        throw new \moodle_exception('unknownbehaviour', 'question', $thispageurl, $up);
     }
 
     // This function works fine for behaviours, as well as qtypes.
@@ -126,7 +126,7 @@ if (($up = optional_param('up', '', PARAM_PLUGIN)) && confirm_sesskey()) {
 // Move down in order.
 if (($down = optional_param('down', '', PARAM_PLUGIN)) && confirm_sesskey()) {
     if (!isset($behaviours[$down])) {
-        print_error('unknownbehaviour', 'question', $thispageurl, $down);
+        throw new \moodle_exception('unknownbehaviour', 'question', $thispageurl, $down);
     }
 
     // This function works fine for behaviours, as well as qtypes.

admin/qtypes.php

@@ -24,6 +24,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+use core_question\local\bank\question_version_status;
 
 require_once(__DIR__ . '/../config.php');
 require_once($CFG->libdir . '/questionlib.php');
@@ -42,36 +43,23 @@ $qtypes = question_bank::get_all_qtypes();
 $pluginmanager = core_plugin_manager::instance();
 
 // Get some data we will need - question counts and which types are needed.
-$hiddenstatus = \core_question\local\bank\question_version_status::QUESTION_STATUS_HIDDEN;
-$draftstatus = \core_question\local\bank\question_version_status::QUESTION_STATUS_DRAFT;
+// The second JOIN on question_versions (qv2) is to get the latest version of each question. 
+// (Using this sort of JOIN is a known trick for doing this in the fastest possible way.)
+$counts = $DB->get_records_sql("
+        SELECT q.qtype,
+               COUNT(qv.id) AS numquestions,
+               SUM(CASE WHEN qv.status = :hiddenstatus THEN 1 ELSE 0 END) AS numhidden,
+               SUM(CASE WHEN qv.status = :draftstatus THEN 1 ELSE 0 END) AS numdraft
+          FROM {question} q
+          JOIN {question_versions} qv ON q.id = qv.questionid
+     LEFT JOIN {question_versions} qv2 ON qv.questionbankentryid = qv2.questionbankentryid AND qv.version < qv2.version
+         WHERE qv2.questionbankentryid IS NULL
+      GROUP BY q.qtype
+    ", [
+        'hiddenstatus' => question_version_status::QUESTION_STATUS_HIDDEN,
+        'draftstatus' => 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])) {
@@ -106,7 +94,7 @@ $sortedqtypes = question_bank::sort_qtype_array($sortedqtypes, $config);
 // Disable.
 if (($disable = optional_param('disable', '', PARAM_PLUGIN)) && confirm_sesskey()) {
     if (!isset($qtypes[$disable])) {
-        print_error('unknownquestiontype', 'question', $thispageurl, $disable);
+        throw new \moodle_exception('unknownquestiontype', 'question', $thispageurl, $disable);
     }
 
     $class = \core_plugin_manager::resolve_plugininfo_class('qtype');
@@ -117,11 +105,11 @@ if (($disable = optional_param('disable', '', PARAM_PLUGIN)) && confirm_sesskey(
 // Enable.
 if (($enable = optional_param('enable', '', PARAM_PLUGIN)) && confirm_sesskey()) {
     if (!isset($qtypes[$enable])) {
-        print_error('unknownquestiontype', 'question', $thispageurl, $enable);
+        throw new \moodle_exception('unknownquestiontype', 'question', $thispageurl, $enable);
     }
 
     if (!$qtypes[$enable]->menu_name()) {
-        print_error('cannotenable', 'question', $thispageurl, $enable);
+        throw new \moodle_exception('cannotenable', 'question', $thispageurl, $enable);
     }
 
     $class = \core_plugin_manager::resolve_plugininfo_class('qtype');
@@ -132,7 +120,7 @@ if (($enable = optional_param('enable', '', PARAM_PLUGIN)) && confirm_sesskey())
 // Move up in order.
 if (($up = optional_param('up', '', PARAM_PLUGIN)) && confirm_sesskey()) {
     if (!isset($qtypes[$up])) {
-        print_error('unknownquestiontype', 'question', $thispageurl, $up);
+        throw new \moodle_exception('unknownquestiontype', 'question', $thispageurl, $up);
     }
 
     $neworder = question_reorder_qtypes($sortedqtypes, $up, -1);
@@ -143,7 +131,7 @@ if (($up = optional_param('up', '', PARAM_PLUGIN)) && confirm_sesskey()) {
 // Move down in order.
 if (($down = optional_param('down', '', PARAM_PLUGIN)) && confirm_sesskey()) {
     if (!isset($qtypes[$down])) {
-        print_error('unknownquestiontype', 'question', $thispageurl, $down);
+        throw new \moodle_exception('unknownquestiontype', 'question', $thispageurl, $down);
     }
 
     $neworder = question_reorder_qtypes($sortedqtypes, $down, +1);

admin/renderer.php

@@ -2080,7 +2080,7 @@ class core_admin_renderer extends plugin_renderer_base {
                         $errorline = true;
                     } else {
                         if ($status) {                                          //Handle ok result (ok)
-                            $status = get_string('ok');
+                            $status = get_string('statusok');
                         } else {
                             if ($environment_result->getLevel() == 'optional') {//Handle check result (warning)
                                 $status = get_string('check');

admin/repository.php

@@ -152,7 +152,7 @@ if (($action == 'edit') || ($action == 'new')) {
             core_plugin_manager::reset_caches();
             redirect($baseurl);
         } else {
-            print_error('instancenotsaved', 'repository', $baseurl);
+            throw new \moodle_exception('instancenotsaved', 'repository', $baseurl);
         }
         exit;
     } else {
@@ -183,14 +183,14 @@ if (($action == 'edit') || ($action == 'new')) {
     }
 } else if ($action == 'show') {
     if (!confirm_sesskey()) {
-        print_error('confirmsesskeybad', '', $baseurl);
+        throw new \moodle_exception('confirmsesskeybad', '', $baseurl);
     }
     $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);
+        throw new \moodle_exception('confirmsesskeybad', '', $baseurl);
     }
     $class = \core_plugin_manager::resolve_plugininfo_class('repository');
     $class::enable_plugin($repository, 0);
@@ -200,7 +200,7 @@ if (($action == 'edit') || ($action == 'new')) {
     if ($sure) {
         $PAGE->set_pagetype('admin-repository-' . $repository);
         if (!confirm_sesskey()) {
-            print_error('confirmsesskeybad', '', $baseurl);
+            throw new \moodle_exception('confirmsesskeybad', '', $baseurl);
         }
 
         if ($repositorytype->delete($downloadcontents)) {
@@ -209,7 +209,7 @@ if (($action == 'edit') || ($action == 'new')) {
             core_plugin_manager::reset_caches();
             redirect($baseurl);
         } else {
-            print_error('instancenotdeleted', 'repository', $baseurl);
+            throw new \moodle_exception('instancenotdeleted', 'repository', $baseurl);
         }
         exit;
     } else {

admin/repositoryinstance.php

@@ -104,7 +104,7 @@ if (!empty($edit) || !empty($new)) {
             core_plugin_manager::reset_caches();
             redirect($parenturl);
         } else {
-            print_error('instancenotsaved', 'repository', $parenturl);
+            throw new \moodle_exception('instancenotsaved', 'repository', $parenturl);
         }
         exit;
     } else {
@@ -134,7 +134,7 @@ if (!empty($edit) || !empty($new)) {
             core_plugin_manager::reset_caches();
             redirect($parenturl, $deletedstr, 3);
         } else {
-            print_error('instancenotdeleted', 'repository', $parenturl);
+            throw new \moodle_exception('instancenotdeleted', 'repository', $parenturl);
         }
         exit;
     }

admin/roles/allow.php

@@ -33,7 +33,7 @@ $classformode = array(
     'view' => 'core_role_allow_view_page'
 );
 if (!isset($classformode[$mode])) {
-    print_error('invalidmode', '', '', $mode);
+    throw new \moodle_exception('invalidmode', '', '', $mode);
 }
 
 $baseurl = new moodle_url('/admin/roles/allow.php', array('mode'=>$mode));

admin/roles/assign.php

@@ -75,7 +75,7 @@ if ($roleid && !isset($assignableroles[$roleid])) {
     $a = new stdClass;
     $a->roleid = $roleid;
     $a->context = $contextname;
-    print_error('cannotassignrolehere', '', $context->get_url(), $a);
+    throw new \moodle_exception('cannotassignrolehere', '', $context->get_url(), $a);
 }
 
 // Work out an appropriate page title.

admin/roles/check.php

@@ -48,7 +48,7 @@ if ($course) {
 // Security first.
 require_login($course, false, $cm);
 if (!has_any_capability(array('moodle/role:assign', 'moodle/role:safeoverride', 'moodle/role:override', 'moodle/role:manage'), $context)) {
-    print_error('nopermissions', 'error', '', get_string('checkpermissions', 'core_role'));
+    throw new \moodle_exception('nopermissions', 'error', '', get_string('checkpermissions', 'core_role'));
 }
 
 navigation_node::override_active_url($url);

admin/roles/classes/admins_existing_selector.php

@@ -38,24 +38,28 @@ class core_role_admins_existing_selector extends user_selector_base {
             $name = 'removeselect';
         }
         $options['multiselect'] = false;
+        $options['includecustomfields'] = true;
         parent::__construct($name, $options);
     }
 
     public function find_users($search) {
         global $DB, $CFG;
-        list($wherecondition, $params) = $this->search_sql($search, '');
 
-        $fields      = 'SELECT ' . $this->required_fields_sql('');
+        [$wherecondition, $params] = $this->search_sql($search, 'u');
+        $params = array_merge($params, $this->userfieldsparams);
+
+        $fields = 'SELECT u.id, ' . $this->userfieldsselects;
 
         if ($wherecondition) {
-            $wherecondition = "$wherecondition AND id IN ($CFG->siteadmins)";
+            $wherecondition = "$wherecondition AND u.id IN ($CFG->siteadmins)";
         } else {
-            $wherecondition = "id IN ($CFG->siteadmins)";
+            $wherecondition = "u.id IN ($CFG->siteadmins)";
         }
-        $sql = " FROM {user}
+        $sql = " FROM {user} u
+                      $this->userfieldsjoin
                 WHERE $wherecondition";
 
-        list($sort, $sortparams) = users_order_by_sql('', $search, $this->accesscontext);
+        [$sort, $sortparams] = users_order_by_sql('u', $search, $this->accesscontext, $this->userfieldsmappings);
         $params = array_merge($params, $sortparams);
 
         // Sort first by email domain and then by normal name order.
@@ -87,8 +91,12 @@ class core_role_admins_existing_selector extends user_selector_base {
             } else {
                 $groupnameprefix = get_string('extusers', 'core_role');
                 foreach ($availableusers as $user) {
-                    $domain = substr($user->email, strpos($user->email, '@'));
-                    $groupname = "$groupnameprefix $domain";
+                    if (isset($user->email)) {
+                        $domain = substr($user->email, strpos($user->email, '@'));
+                        $groupname = "$groupnameprefix $domain";
+                    } else {
+                        $groupname = $groupnameprefix;
+                    }
                     $result[$groupname][] = $user;
                 }
             }

admin/roles/classes/admins_potential_selector.php

@@ -39,24 +39,28 @@ class core_role_admins_potential_selector extends user_selector_base {
             $name = 'addselect';
         }
         $options['multiselect'] = false;
+        $options['includecustomfields'] = true;
         $options['exclude'] = explode(',', $CFG->siteadmins);
         parent::__construct($name, $options);
     }
 
     public function find_users($search) {
         global $CFG, $DB;
-        list($wherecondition, $params) = $this->search_sql($search, '');
 
-        $fields      = 'SELECT ' . $this->required_fields_sql('');
+        [$wherecondition, $params] = $this->search_sql($search, 'u');
+        $params = array_merge($params, $this->userfieldsparams);
+
+        $fields = 'SELECT u.id, ' . $this->userfieldsselects;
         $countfields = 'SELECT COUNT(1)';
 
-        $sql = " FROM {user}
+        $sql = " FROM {user} u
+                      $this->userfieldsjoin
                 WHERE $wherecondition AND mnethostid = :localmnet";
 
         // It could be dangerous to make remote users admins and also this could lead to other problems.
         $params['localmnet'] = $CFG->mnet_localhost_id;
 
-        list($sort, $sortparams) = users_order_by_sql('', $search, $this->accesscontext);
+        [$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.

admin/roles/classes/define_role_table_advanced.php

@@ -533,7 +533,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
 
     protected function get_description_field($id) {
         return '<textarea class="form-textarea form-control" id="'. s($id) .'" name="description" rows="10" cols="50">' .
-            htmlspecialchars($this->role->description) .
+            htmlspecialchars($this->role->description, ENT_COMPAT) .
             '</textarea>';
     }
 

admin/roles/manage.php

@@ -68,7 +68,7 @@ $confirmed = (optional_param('confirm', false, PARAM_BOOL) && data_submitted() &
 switch ($action) {
     case 'delete':
         if (isset($undeletableroles[$roleid])) {
-            print_error('cannotdeletethisrole', '', $baseurl);
+            throw new \moodle_exception('cannotdeletethisrole', '', $baseurl);
         }
         if (!$confirmed) {
             // Show confirmation.
@@ -89,7 +89,7 @@ switch ($action) {
         }
         if (!delete_role($roleid)) {
             // The delete failed.
-            print_error('cannotdeleterolewithid', 'error', $baseurl, $roleid);
+            throw new \moodle_exception('cannotdeleterolewithid', 'error', $baseurl, $roleid);
         }
         // Deleted a role sitewide...
         redirect($baseurl);
@@ -108,10 +108,10 @@ switch ($action) {
                 }
             }
             if (is_null($thisrole) || is_null($prevrole)) {
-                print_error('cannotmoverolewithid', 'error', '', $roleid);
+                throw new \moodle_exception('cannotmoverolewithid', 'error', '', $roleid);
             }
             if (!switch_roles($thisrole, $prevrole)) {
-                print_error('cannotmoverolewithid', 'error', '', $roleid);
+                throw new \moodle_exception('cannotmoverolewithid', 'error', '', $roleid);
             }
         }
 
@@ -131,10 +131,10 @@ switch ($action) {
                 }
             }
             if (is_null($nextrole)) {
-                print_error('cannotmoverolewithid', 'error', '', $roleid);
+                throw new \moodle_exception('cannotmoverolewithid', 'error', '', $roleid);
             }
             if (!switch_roles($thisrole, $nextrole)) {
-                print_error('cannotmoverolewithid', 'error', '', $roleid);
+                throw new \moodle_exception('cannotmoverolewithid', 'error', '', $roleid);
             }
         }
 

admin/roles/override.php

@@ -90,10 +90,11 @@ $title = get_string('overridepermissionsforrole', 'core_role', $a);
 $currenttab = 'permissions';
 
 $PAGE->set_title($title);
+$PAGE->activityheader->disable();
 $PAGE->navbar->add($straction);
 switch ($context->contextlevel) {
     case CONTEXT_SYSTEM:
-        print_error('cannotoverridebaserole', 'error');
+        throw new \moodle_exception('cannotoverridebaserole', 'error');
         break;
     case CONTEXT_USER:
         $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
@@ -124,7 +125,7 @@ if (empty($overridableroles[$roleid])) {
     $a = new stdClass;
     $a->roleid = $roleid;
     $a->context = $contextname;
-    print_error('cannotoverriderolehere', '', $context->get_url(), $a);
+    throw new \moodle_exception('cannotoverriderolehere', '', $context->get_url(), $a);
 }
 
 // If we are actually overriding a role, create the table object, and save changes if appropriate.

admin/roles/permissions.php

@@ -100,7 +100,7 @@ $PAGE->set_title($title);
 $PAGE->activityheader->disable();
 switch ($context->contextlevel) {
     case CONTEXT_SYSTEM:
-        print_error('cannotoverridebaserole', 'error');
+        throw new \moodle_exception('cannotoverridebaserole', 'error');
         break;
     case CONTEXT_USER:
         $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));

admin/roles/tests/preset_test.php

@@ -14,19 +14,19 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core_role;
+
+use core_role_preset;
+
 /**
  * Role XML presets test case.
  *
  * @package   core_role
- * @category  phpunit
+ * @category  test
  * @copyright 2013 Petr Skoda {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-
-defined('MOODLE_INTERNAL') || die();
-
-
-class core_role_preset_testcase extends advanced_testcase {
+class preset_test extends \advanced_testcase {
     public function test_xml() {
         global $DB;
 
@@ -61,7 +61,7 @@ class core_role_preset_testcase extends advanced_testcase {
                    FROM {role_capabilities}
                   WHERE contextid = :syscontext AND roleid = :roleid
                ORDER BY capability ASC",
-                array('syscontext'=>context_system::instance()->id, 'roleid'=>$role->id));
+                array('syscontext' => \context_system::instance()->id, 'roleid' => $role->id));
 
             foreach ($capabilities as $cap) {
                 $this->assertEquals($cap->permission, $info['permissions'][$cap->capability]);

admin/roles/tests/privacy/provider_test.php

@@ -187,51 +187,51 @@ class provider_test extends provider_testcase {
             $writer = writer::with_context($context);
             $this->assertTrue($writer->has_any_data());
             if ($context->contextlevel == CONTEXT_MODULE) {
-                if ($data = $writer->get_data($subcontextstudent)) {
+                if ($data = (array)$writer->get_data($subcontextstudent)) {
                     $this->assertEquals($user->id, reset($data)->userid);
                 }
-                if ($data = $writer->get_data($subcontextrc)) {
+                if ($data = (array)$writer->get_data($subcontextrc)) {
                     $this->assertEquals('moodle/backup:backupactivity', reset($data)->capability);
                     $this->assertEquals($strpermissions[CAP_ALLOW], reset($data)->permission);
                 }
             }
             if ($context->contextlevel == CONTEXT_COURSE) {
-                if ($data = $writer->get_data($subcontextstudent)) {
+                if ($data = (array)$writer->get_data($subcontextstudent)) {
                     $this->assertEquals($user->id, reset($data)->userid);
                 }
-                if ($data = $writer->get_data($subcontextrc)) {
+                if ($data = (array)$writer->get_data($subcontextrc)) {
                     $this->assertEquals('moodle/backup:backupcourse', reset($data)->capability);
                 }
             }
             if ($context->contextlevel == CONTEXT_COURSECAT) {
-                if ($data = $writer->get_data($subcontextmanager)) {
+                if ($data = (array)$writer->get_data($subcontextmanager)) {
                     $this->assertEquals($user->id, reset($data)->modifierid);
                 }
-                if ($data = $writer->get_data($subcontextrc)) {
+                if ($data = (array)$writer->get_data($subcontextrc)) {
                     $this->assertEquals('moodle/category:manage', reset($data)->capability);
                 }
             }
             if ($context->contextlevel == CONTEXT_SYSTEM) {
-                if ($data = $writer->get_data($subcontextmanager)) {
+                if ($data = (array)$writer->get_data($subcontextmanager)) {
                     $this->assertEquals($user->id, reset($data)->modifierid);
                 }
-                if ($data = $writer->get_data($subcontextrc)) {
+                if ($data = (array)$writer->get_data($subcontextrc)) {
                     $this->assertEquals('moodle/backup:backupcourse', reset($data)->capability);
                 }
             }
             if ($context->contextlevel == CONTEXT_BLOCK) {
-                if ($data = $writer->get_data($subcontextstudent)) {
+                if ($data = (array)$writer->get_data($subcontextstudent)) {
                     $this->assertEquals($user->id, reset($data)->userid);
                 }
-                if ($data = $writer->get_data($subcontextrc)) {
+                if ($data = (array)$writer->get_data($subcontextrc)) {
                     $this->assertEquals('moodle/block:edit', reset($data)->capability);
                 }
             }
             if ($context->contextlevel == CONTEXT_USER) {
-                if ($data = $writer->get_data($subcontextmanager)) {
+                if ($data = (array)$writer->get_data($subcontextmanager)) {
                     $this->assertEquals($user->id, reset($data)->userid);
                 }
-                if ($data = $writer->get_data($subcontextrc)) {
+                if ($data = (array)$writer->get_data($subcontextrc)) {
                     $this->assertEquals('moodle/competency:evidencedelete', reset($data)->capability);
                 }
             }
@@ -415,7 +415,7 @@ class provider_test extends provider_testcase {
         provider::export_user_role_to_cohort($user->id);
         $writer = writer::with_context($contextuserassignover);
         $this->assertTrue($writer->has_any_data());
-        $exported = $writer->get_related_data($subcontextteacher, 'cohortroles');
+        $exported = (array)$writer->get_related_data($subcontextteacher, 'cohortroles');
         $this->assertEquals($user->id, reset($exported)->userid);
 
         // Test User is member of a cohort which User2 is assigned to role to this cohort.
@@ -432,7 +432,7 @@ class provider_test extends provider_testcase {
         provider::export_user_role_to_cohort($user->id);
         $writer = writer::with_context($contextuser);
         $this->assertTrue($writer->has_any_data());
-        $exported = $writer->get_related_data($subcontextteacher, 'cohortroles');
+        $exported = (array)$writer->get_related_data($subcontextteacher, 'cohortroles');
         $this->assertEquals($user2->id, reset($exported)->userid);
     }
 

admin/roles/usersroles.php

@@ -55,7 +55,7 @@ if ($course->id == SITEID) {
 $canview = has_any_capability(array('moodle/role:assign', 'moodle/role:safeoverride',
         'moodle/role:override', 'moodle/role:manage'), $usercontext);
 if (!$canview) {
-    print_error('nopermissions', 'error', '', get_string('checkpermissions', 'core_role'));
+    throw new \moodle_exception('nopermissions', 'error', '', get_string('checkpermissions', 'core_role'));
 }
 
 if ($userid != $USER->id) {

admin/searchareas.php

@@ -163,6 +163,7 @@ $table->head = [
 ];
 
 $searchareas = \core_search\manager::get_search_areas_list();
+core_collator::asort_objects_by_method($searchareas, 'get_visible_name');
 $areasconfig = isset($searchmanager) ? $searchmanager->get_areas_config($searchareas) : false;
 foreach ($searchareas as $area) {
     $areaid = $area->get_area_id();

admin/settings.php

@@ -23,18 +23,26 @@ if (empty($settingspage) or !($settingspage instanceof admin_settingpage)) {
     if (moodle_needs_upgrading()) {
         redirect(new moodle_url('/admin/index.php'));
     } else {
-        print_error('sectionerror', 'admin', "$CFG->wwwroot/$CFG->admin/");
+        throw new \moodle_exception('sectionerror', 'admin', "$CFG->wwwroot/$CFG->admin/");
     }
     die;
 }
 
 if (!($settingspage->check_access())) {
-    print_error('accessdenied', 'admin');
+    throw new \moodle_exception('accessdenied', 'admin');
     die;
 }
 
-$hassiteconfig = has_capability('moodle/site:config', $PAGE->context);
-if ($hassiteconfig) {
+// If the context in the admin_settingpage object is explicitly defined and it is not system, reset the current
+// page context and use that one instead. This ensures that the proper navigation is displayed and highlighted.
+if ($settingspage->context && !$settingspage->context instanceof \context_system) {
+    $PAGE->set_context($settingspage->context);
+}
+
+$hassiteconfig = has_capability('moodle/site:config', context_system::instance());
+// Display the admin search input element in the page header if the user has the capability to change the site
+// configuration and the current page context is system.
+if ($hassiteconfig && $PAGE->context instanceof \context_system) {
     $PAGE->add_header_action($OUTPUT->render_from_template('core_admin/header_search_input', [
         'action' => new moodle_url('/admin/search.php'),
     ]));
@@ -125,13 +133,6 @@ if (empty($SITE->fullname)) {
 
     $PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
     $PAGE->set_heading($SITE->fullname);
-    if ($section === 'frontpagesettings') {
-        $frontpagenode = $PAGE->settingsnav->find('frontpage', navigation_node::TYPE_SETTING);
-        $frontpagenode->make_active();
-        $PAGE->navbar->add(get_string('frontpage', 'admin'),
-            new moodle_url('/admin/category.php', ['category' => 'frontpage']));
-        $PAGE->navbar->add(get_string('frontpagesettings', 'admin'), $PAGE->url);
-    }
     echo $OUTPUT->header();
 
     if ($errormsg !== '') {

admin/settings/appearance.php

@@ -82,6 +82,14 @@ reports,core_reportbuilder|/reportbuilder/index.php',
     $setting->set_updatedcallback('theme_reset_all_caches');
     $temp->add($setting);
 
+    // Favicon file setting.
+    $title = get_string('favicon', 'admin');
+    $description = get_string('favicon_desc', 'admin');
+    $setting = new admin_setting_configstoredfile('core_admin/favicon', $title, $description, 'favicon', 0,
+        ['maxfiles' => 1, 'accepted_types' => ['image']]);
+    $setting->set_updatedcallback('theme_reset_all_caches');
+    $temp->add($setting);
+
     $ADMIN->add('appearance', $temp);
 
     // Course colours section.

admin/settings/courses.php

@@ -88,6 +88,15 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $downloadcontentsitedefault->add_dependent_on('downloadcoursecontentallowed');
     $temp->add($downloadcontentsitedefault);
 
+    $temp->add(
+            new admin_setting_configtext(
+                'moodlecourse/participantsperpage',
+                new lang_string('participants:perpage', 'course'),
+                new lang_string('participants:perpage_help', 'course'),
+                20
+            )
+        );
+
     // Course format.
     $temp->add(new admin_setting_heading('courseformathdr', new lang_string('type_format', 'plugin'), ''));
 
@@ -468,7 +477,8 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $temp->add(new admin_setting_heading('automatedsettings', new lang_string('automatedsettings','backup'), new lang_string('recyclebin_desc', 'backup')));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_users', new lang_string('generalusers', 'backup'), new lang_string('configgeneralusers', 'backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_role_assignments', new lang_string('generalroleassignments','backup'), new lang_string('configgeneralroleassignments','backup'), 1));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', new lang_string('generalactivities','backup'), new lang_string('configgeneralactivities','backup'), 1));
+    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', new lang_string('generalactivities', 'backup'),
+        new lang_string('backupautoactivitiesdescription', 'backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_blocks', new lang_string('generalblocks','backup'), new lang_string('configgeneralblocks','backup'), 1));
     $temp->add(new admin_setting_configcheckbox(
             'backup/backup_auto_files',

admin/settings/mnet.php

@@ -49,8 +49,6 @@ $ADMIN->add('mnet', new admin_externalpage('trustedhosts', new lang_string('trus
 if (isset($CFG->mnet_dispatcher_mode) and $CFG->mnet_dispatcher_mode !== 'off') {
     $profilefields = new admin_settingpage('mnetprofilefields', new lang_string('profilefields', 'mnet'),
                                                'moodle/site:config');
-    $profilefields->add(new admin_setting_heading('mnetprofilefields/xmlrpcmnet', '',
-        $OUTPUT->render(mnet_get_deprecation_notice())));
     $ADMIN->add('mnet', $profilefields);
 
     $fields = mnet_profile_field_options();

admin/settings/plugins.php

@@ -101,7 +101,7 @@ if ($hassiteconfig) {
         new lang_string('limitconcurrentlogins', 'core_auth'),
         new lang_string('limitconcurrentlogins_desc', 'core_auth'), 0, $options));
     $temp->add(new admin_setting_configtext('alternateloginurl', new lang_string('alternateloginurl', 'auth'),
-                                            new lang_string('alternatelogin', 'auth', htmlspecialchars(get_login_url())), ''));
+                                            new lang_string('alternatelogin', 'auth', htmlspecialchars(get_login_url(), ENT_COMPAT)), ''));
     $temp->add(new admin_setting_configtext('forgottenpasswordurl', new lang_string('forgottenpasswordurl', 'auth'),
                                             new lang_string('forgottenpassword', 'auth'), '', PARAM_URL));
     $temp->add(new admin_setting_confightmleditor('auth_instructions', new lang_string('instructions', 'auth'),
@@ -527,7 +527,10 @@ if ($hassiteconfig && !empty($CFG->enableplagiarism)) {
         $plugin->load_settings($ADMIN, 'plagiarism', $hassiteconfig);
     }
 }
-$ADMIN->add('reports', new admin_externalpage('comments', new lang_string('comments'), $CFG->wwwroot.'/comment/', 'moodle/site:viewreports'));
+
+// Comments report, note this page is really just a means to delete comments so check that.
+$ADMIN->add('reports', new admin_externalpage('comments', new lang_string('comments'), $CFG->wwwroot . '/comment/index.php',
+    'moodle/comment:delete'));
 
 // Course reports settings
 if ($hassiteconfig) {

admin/settings/reportbuilder.php

@@ -49,3 +49,18 @@ $ADMIN->add(
         empty($CFG->enablecustomreports)
     )
 );
+
+$settings = new admin_settingpage('reportbuildersettings', get_string('customreportssettings', 'core_reportbuilder'),
+    'moodle/site:config', empty($CFG->enablecustomreports));
+
+$settings->add(new admin_setting_configtext(
+    'customreportslimit',
+    new lang_string('customreportslimit', 'core_reportbuilder'),
+    new lang_string('customreportslimit_desc', 'core_reportbuilder'), 0, PARAM_INT));
+
+$settings->add(new admin_setting_configcheckbox(
+    'customreportsliveediting',
+    new lang_string('customreportsliveediting', 'core_reportbuilder'),
+    new lang_string('customreportsliveediting_desc', 'core_reportbuilder'), 1));
+
+$ADMIN->add('reportbuilder', $settings);

admin/settings/server.php

@@ -61,6 +61,16 @@ if ($hassiteconfig) {
     $temp->add($setting);
     $temp->add(new admin_setting_configtext('supportpage', new lang_string('supportpage', 'admin'),
         new lang_string('configsupportpage', 'admin'), '', PARAM_URL));
+    $temp->add(new admin_setting_configselect('supportavailability', new lang_string('supportavailability', 'admin'),
+        new lang_string('configsupportavailability', 'admin'), CONTACT_SUPPORT_AUTHENTICATED,
+        [
+            CONTACT_SUPPORT_ANYONE => new lang_string('availabletoanyone', 'admin'),
+            CONTACT_SUPPORT_AUTHENTICATED => new lang_string('availabletoauthenticated', 'admin'),
+            CONTACT_SUPPORT_DISABLED => new lang_string('disabled', 'admin'),
+        ]
+    ));
+
+
     $ADMIN->add('server', $temp);
 
     // Session handling.
@@ -172,6 +182,11 @@ if ($hassiteconfig) {
         new lang_string('configproxypassword', 'admin'), ''));
     $temp->add(new admin_setting_configtext('proxybypass', new lang_string('proxybypass', 'admin'),
         new lang_string('configproxybypass', 'admin'), 'localhost, 127.0.0.1'));
+    $temp->add(new admin_setting_configcheckbox('proxylogunsafe', new lang_string('proxylogunsafe', 'admin'),
+        new lang_string('configproxylogunsafe_help', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('proxyfixunsafe', new lang_string('proxyfixunsafe', 'admin'),
+        new lang_string('configproxyfixunsafe_help', 'admin'), 0));
+
     $ADMIN->add('server', $temp);
 
     $temp = new admin_settingpage('maintenancemode', new lang_string('sitemaintenancemode', 'admin'));
@@ -437,9 +452,35 @@ if ($hassiteconfig) {
         'CRAM-MD5' => 'CRAM-MD5',
     ];
 
+    // Get all the issuers.
+    $issuers = \core\oauth2\api::get_all_issuers();
+    $enabledissuers = [];
+    foreach ($issuers as $issuer) {
+        // Get the enabled issuer only.
+        if ($issuer->get('enabled')) {
+            $enabledissuers[] = $issuer;
+        }
+    }
+
+    if (count($enabledissuers) > 0) {
+        $authtypeoptions['XOAUTH2'] = 'XOAUTH2';
+    }
+
     $temp->add(new admin_setting_configselect('smtpauthtype', new lang_string('smtpauthtype', 'admin'),
         new lang_string('configsmtpauthtype', 'admin'), 'LOGIN', $authtypeoptions));
 
+    if (count($enabledissuers) > 0) {
+        $oauth2services = [
+            '' => new lang_string('none', 'admin'),
+        ];
+        foreach ($enabledissuers as $issuer) {
+            $oauth2services[$issuer->get('id')] = s($issuer->get('name'));
+        }
+
+        $temp->add(new admin_setting_configselect('smtpoauthservice', new lang_string('issuer', 'auth_oauth2'),
+            new lang_string('configsmtpoauthservice', 'admin'), '', $oauth2services));
+    }
+
     $temp->add(new admin_setting_configtext('smtpuser', new lang_string('smtpuser', 'admin'),
         new lang_string('configsmtpuser', 'admin'), '', PARAM_NOTAGS));
 

admin/settings/users.php

@@ -240,7 +240,8 @@ if ($hassiteconfig
                         if ($field->param2 > 255 || $field->datatype != 'text') {
                             continue;
                         }
-                        $fields['profile_field_' . $field->shortname] = $field->name . ' *';
+                        $fields['profile_field_' . $field->shortname] = format_string($field->name, true,
+                            ['context' => context_system::instance()]) . ' *';
                     }
 
                     return $fields;

admin/tasklogs.php

@@ -25,7 +25,7 @@
 require_once(__DIR__ . '/../config.php');
 require_once("{$CFG->libdir}/adminlib.php");
 
-use core_admin\local\systemreports\task_logs;
+use core_admin\reportbuilder\local\systemreports\task_logs;
 use core_reportbuilder\system_report_factory;
 
 $PAGE->set_url(new \moodle_url('/admin/tasklogs.php'));
@@ -60,8 +60,7 @@ $report = system_report_factory::create(task_logs::class, context_system::instan
 
 if (!empty($filter)) {
     $report->set_filter_values([
-        'task_log:name_operator' => \core_reportbuilder\local\filters\text::IS_EQUAL_TO,
-        'task_log:name_value' => $filter,
+        'task_log:name_values' => $filter,
     ]);
 }
 

admin/templates/setting_configpasswordunmask.mustache

@@ -51,12 +51,13 @@
 <div class="form-password">
     <span data-passwordunmask="wrapper" data-passwordunmaskid="{{ id }}">
         <span data-passwordunmask="editor">
-            <input  type="hidden"
+            <input  type="password"
+                    autocomplete="new-password"
                     name="{{ name }}"
                     id="{{ id }}"
                     value="{{ value }}"
                     data-size="{{ size }}"
-                    class="form-control d-inline-block"
+                    class="form-control d-none"
                     >
         </span>
         <a href="#" data-passwordunmask="edit" title="{{ edithint }}">

admin/tests/behat/browse_users.feature

@@ -18,7 +18,7 @@ Feature: An administrator can browse user accounts
     When I navigate to "Users > Accounts > Browse list of users" in site administration
     # Name field always present, email field is default for showidentity.
     Then the following should exist in the "users" table:
-      | First name / Surname | Email address   |
+      | First name / Last name | Email address   |
       | User One             | one@example.com |
       | User Two             | two@example.com |
     # Should not see other identity fields or non-default name fields.
@@ -34,7 +34,7 @@ Feature: An administrator can browse user accounts
       | alternativefullnameformat | firstnamephonetic lastname |
     When I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "users" table:
-      | First name - phonetic / Surname | Email address   |
+      | First name - phonetic / Last name | Email address   |
       | Yewzer One                      | one@example.com |
       | Yoozare Two                     | two@example.com |
 
@@ -43,7 +43,7 @@ Feature: An administrator can browse user accounts
       | showuseridentity | department,profile_field_frog |
     When I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "users" table:
-      | First name / Surname | Favourite frog  | Department |
+      | First name / Last name | Favourite frog  | Department |
       | User One             | Kermit          | Attack     |
       | User Two             | Tree            | Defence    |
     And I should not see "Email address" in the "table" "css_element"

admin/tests/behat/enable_multiple_accounts_use_same_email.feature

@@ -15,7 +15,7 @@ Feature: Allowing multiple accounts to have the same email address
     And I set the following fields to these values:
       | Username      | s2      |
       | First name    | Jane    |
-      | Surname       | Doe     |
+      | Last name     | Doe     |
       | Email address | <email> |
       | New password  | test    |
     And I press "Create user"
@@ -35,9 +35,7 @@ Feature: Allowing multiple accounts to have the same email address
       | username  | firstname | lastname | email           |
       | s1        | John      | Doe      | s1@example.com  |
       | s2        | Jane      | Doe      | s2@example.com  |
-    When I log in as "admin"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I click on "Edit" "link" in the "Jane Doe" "table_row"
+    When I am on the "s2" "user > editing" page logged in as "admin"
     And I set the field "Email address" to "<email>"
     And I press "Update profile"
     Then I should <expect> "This email address is already registered."

admin/tests/behat/filter_users.feature

@@ -18,6 +18,10 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
     And the following "cohorts" exist:
       | name | idnumber |
       | Cohort 1 | CH1 |
+    And the following "cohort members" exist:
+      | user  | cohort |
+      | user2 | CH1    |
+      | user3 | CH1    |
     And the following "courses" exist:
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
@@ -27,8 +31,6 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
       | user2 | C1 | student |
       | user3 | C1 | student |
     And I log in as "admin"
-    And I add "User Two (two@example.com)" user to "CH1" cohort members
-    And I add "User Three (three@example.com)" user to "CH1" cohort members
     And I navigate to "Users > Accounts > Browse list of users" in site administration
 
   Scenario: Filter user accounts by role and cohort

admin/tests/behat/filter_users_settings.feature

@@ -8,7 +8,7 @@ Feature: An administrator can configure the available user list filters
     When I log in as "admin"
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
     And I should not see "Firstname" in the "New filter" "fieldset"
     And I should not see "Username" in the "New filter" "fieldset"
     And I should not see "Email address" in the "New filter" "fieldset"
@@ -30,7 +30,7 @@ Feature: An administrator can configure the available user list filters
     And I should not see "MNet ID provider" in the "New filter" "fieldset"
     And I navigate to "Users > Accounts > Bulk user actions" in site administration
     Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
     And I should not see "Firstname" in the "New filter" "fieldset"
     And I should not see "Username" in the "New filter" "fieldset"
     And I should not see "Email address" in the "New filter" "fieldset"
@@ -57,7 +57,7 @@ Feature: An administrator can configure the available user list filters
     And I log in as "admin"
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
     And I should not see "Firstname" in the "New filter" "fieldset"
     And I should see "Username" in the "New filter" "fieldset"
     And I should see "Email address" in the "New filter" "fieldset"
@@ -79,7 +79,7 @@ Feature: An administrator can configure the available user list filters
     And I should not see "MNet ID provider" in the "New filter" "fieldset"
     And I navigate to "Users > Accounts > Bulk user actions" in site administration
     Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
     And I should not see "Firstname" in the "New filter" "fieldset"
     And I should see "Username" in the "New filter" "fieldset"
     And I should see "Email address" in the "New filter" "fieldset"
@@ -106,7 +106,7 @@ Feature: An administrator can configure the available user list filters
     And I log in as "admin"
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
     And I should not see "Firstname" in the "New filter" "fieldset"
     And I should not see "Username" in the "New filter" "fieldset"
     And I should not see "Email address" in the "New filter" "fieldset"
@@ -128,7 +128,7 @@ Feature: An administrator can configure the available user list filters
     And I should not see "MNet ID provider" in the "New filter" "fieldset"
     And I navigate to "Users > Accounts > Bulk user actions" in site administration
     Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
     And I should not see "Firstname" in the "New filter" "fieldset"
     And I should not see "Username" in the "New filter" "fieldset"
     And I should not see "Email address" in the "New filter" "fieldset"

admin/tests/behat/outgoing_mail.feature

@@ -0,0 +1,29 @@
+@core @core_admin
+Feature: Outgoing mail configuration
+  In order to send email from Moodle
+  As a Moodle administrator
+  I need to set mail configuration
+
+  Background:
+    Given I log in as "admin"
+
+  Scenario: SMTP Auth Type without OAuth 2 service setup yet
+    Given I navigate to "Server > Email > Outgoing mail configuration" in site administration
+    And I should not see "XOAUTH2" in the "SMTP Auth Type" "select"
+    And I should see "LOGIN" in the "SMTP Auth Type" "select"
+    And I should see "PLAIN" in the "SMTP Auth Type" "select"
+
+  Scenario: SMTP Auth Type with OAuth 2 service setup
+    Given I navigate to "Server > OAuth 2 services" in site administration
+    And I press "Google"
+    And I should see "Create new service: Google"
+    And I set the following fields to these values:
+      | Name          | Testing service   |
+      | Client ID     | thisistheclientid |
+      | Client secret | supersecret       |
+    And I press "Save changes"
+    When I navigate to "Server > Email > Outgoing mail configuration" in site administration
+    Then I should see "XOAUTH2" in the "SMTP Auth Type" "select"
+    And I should see "LOGIN" in the "SMTP Auth Type" "select"
+    And I should see "PLAIN" in the "SMTP Auth Type" "select"
+    And I should see "Testing service" in the "OAuth 2 service" "select"

admin/tests/behat/resetindentation.feature

@@ -0,0 +1,113 @@
+@core @core_admin @core_course @javascript
+Feature: Reset course indentation
+  In order to reset indentation in course modules
+  As a admin
+  I want change indent value for all the modules of a course format courses in one go
+
+  Background:
+    Given the following "courses" exist:
+      | fullname        | shortname | format |
+      | Topics Course 1 | T1        | topics |
+      | Topics Course 2 | T2        | topics |
+      | Weekly Course 1 | W1        | weeks  |
+      | Weekly Course 2 | W2        | weeks  |
+    And the following "activities" exist:
+      | activity | name                 | intro                       | course | idnumber |
+      | forum    | Topics forum name    | Topics forum description    | T1     | forum1   |
+      | data     | Topics database name | Topics database description | T1     | data1    |
+      | wiki     | Topics wiki name     | Topics wiki description     | T2     | wiki1    |
+      | forum    | Weekly forum name    | Weekly forum description    | W1     | forum2   |
+      | data     | Weekly database name | Weekly database description | W1     | data2    |
+      | wiki     | Weekly wiki name     | Weekly wiki description     | W2     | wiki2    |
+    And I log in as "admin"
+    And I am on "Topics Course 1" course homepage with editing mode on
+    And I open "Topics forum name" actions menu
+    And I click on "Move right" "link" in the "Topics forum name" activity
+    And I open "Topics forum name" actions menu
+    And "Move right" "link" in the "Topics forum name" "activity" should not be visible
+    And "Move left" "link" in the "Topics forum name" "activity" should be visible
+    And I press the escape key
+    And I open "Topics database name" actions menu
+    And "Move right" "link" in the "Topics database name" "activity" should be visible
+    And "Move left" "link" in the "Topics database name" "activity" should not be visible
+    And I am on "Topics Course 2" course homepage with editing mode on
+    And I open "Topics wiki name" actions menu
+    And I click on "Move right" "link" in the "Topics wiki name" activity
+    And I open "Topics wiki name" actions menu
+    And "Move right" "link" in the "Topics wiki name" "activity" should not be visible
+    And "Move left" "link" in the "Topics wiki name" "activity" should be visible
+    And I am on "Weekly Course 1" course homepage with editing mode on
+    And I open "Weekly forum name" actions menu
+    And I click on "Move right" "link" in the "Weekly forum name" activity
+    And I open "Weekly forum name" actions menu
+    And "Move right" "link" in the "Weekly forum name" "activity" should not be visible
+    And "Move left" "link" in the "Weekly forum name" "activity" should be visible
+    And I press the escape key
+    And I open "Weekly database name" actions menu
+    And "Move right" "link" in the "Weekly database name" "activity" should be visible
+    And "Move left" "link" in the "Weekly database name" "activity" should not be visible
+    And I am on "Weekly Course 2" course homepage with editing mode on
+    And I open "Weekly wiki name" actions menu
+    And I click on "Move right" "link" in the "Weekly wiki name" activity
+    And I open "Weekly wiki name" actions menu
+    And "Move right" "link" in the "Weekly wiki name" "activity" should not be visible
+    And "Move left" "link" in the "Weekly wiki name" "activity" should be visible
+
+  Scenario Outline: Apply course indentation reset
+    Given I navigate to "Plugins > Course formats > <format> format" in site administration
+    And I wait "5" seconds
+    And "Reset indentation" "link" should exist
+    When I click on "Reset indentation" "link"
+    And I should see "Reset indentation on course page"
+    And "Reset indentation" "button" should exist
+    And I click on "Reset indentation" "button"
+    Then I should see "Indentation reset"
+    And I am on "<format> Course 1" course homepage with editing mode on
+    And I open "<format> forum name" actions menu
+    And "Move right" "link" in the "<format> forum name" "activity" should be visible
+    And "Move left" "link" in the "<format> forum name" "activity" should not be visible
+    And I press the escape key
+    And I open "<format> database name" actions menu
+    And "Move right" "link" in the "<format> database name" "activity" should be visible
+    And "Move left" "link" in the "<format> database name" "activity" should not be visible
+    And I am on "<format> Course 2" course homepage with editing mode on
+    And I open "<format> wiki name" actions menu
+    And "Move right" "link" in the "<format> wiki name" "activity" should be visible
+    And "Move left" "link" in the "<format> wiki name" "activity" should not be visible
+#   Check other course formats had not been reset
+    And I am on "<other> Course 1" course homepage with editing mode on
+    And I open "<other> forum name" actions menu
+    And "Move right" "link" in the "<other> forum name" "activity" should not be visible
+    And "Move left" "link" in the "<other> forum name" "activity" should be visible
+
+    Examples:
+      | format | other  |
+      | Topics | Weekly |
+      | Weekly | Topics |
+
+  Scenario Outline: Cancel course indentation reset
+    Given I navigate to "Plugins > Course formats > <format> format" in site administration
+    And "Reset indentation" "link" should exist
+    When I click on "Reset indentation" "link"
+    And I should see "Reset indentation on course page"
+    And "Reset indentation" "button" should exist
+    And "Cancel" "button" should exist
+    And I click on "Cancel" "button"
+    Then I should not see "Indentation reset"
+    And I am on "<format> Course 1" course homepage with editing mode on
+    And I open "<format> forum name" actions menu
+    And "Move right" "link" in the "<format> forum name" "activity" should not be visible
+    And "Move left" "link" in the "<format> forum name" "activity" should be visible
+    And I press the escape key
+    And I open "<format> database name" actions menu
+    And "Move right" "link" in the "<format> database name" "activity" should be visible
+    And "Move left" "link" in the "<format> database name" "activity" should not be visible
+    And I am on "<format> Course 2" course homepage with editing mode on
+    And I open "<format> wiki name" actions menu
+    And "Move right" "link" in the "<format> wiki name" "activity" should not be visible
+    And "Move left" "link" in the "<format> wiki name" "activity" should be visible
+
+    Examples:
+      | format |
+      | Topics |
+      | Weekly |

admin/tests/behat/task_logs.feature

@@ -15,7 +15,6 @@ Feature: View task logs report and use its filters
     And I navigate to "Server > Tasks > Task logs" in site administration
     When I click on "Filters" "button"
     And I set the following fields in the "Class name" "core_reportbuilder > Filter" to these values:
-      | Class name operator | Contains |
       | Class name value    | <name>   |
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
     Then I should see "Filters applied"
@@ -27,9 +26,9 @@ Feature: View task logs report and use its filters
       | Type      | Name       |
       | Scheduled | <nonmatch> |
     Examples:
-      | name               | match                        | nonmatch                     |
-      | task\\clean_events | Cleanup event monitor events | Incoming email pickup        |
-      | task\\pickup_task  | Incoming email pickup        | Cleanup event monitor events |
+      | name                         | match                        | nonmatch                     |
+      | Cleanup event monitor events | Cleanup event monitor events | Incoming email pickup        |
+      | Incoming email pickup        | Incoming email pickup        | Cleanup event monitor events |
 
   @javascript
   # Task duration is dependent on many factors, we are asserting here that no task has a duration >2 minutes.
@@ -63,7 +62,7 @@ Feature: View task logs report and use its filters
     Then I should see "Filters applied"
     And I should see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
     And I should see "Nothing to display"
-    And I click on "Reset" "button" in the "[data-region='report-filters']" "css_element"
+    And I click on "Reset all" "button" in the "[data-region='report-filters']" "css_element"
     And I should see "Filters reset"
     And I should not see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
     And I should see "Filters" in the "#dropdownFiltersButton" "css_element"

admin/tests/reportbuilder/datasource/task_logs_test.php

@@ -0,0 +1,278 @@
+<?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/>.
+
+declare(strict_types=1);
+
+namespace core_admin\reportbuilder\datasource;
+
+use core\task\database_logger;
+use core_reportbuilder_generator;
+use core_reportbuilder_testcase;
+use core_reportbuilder\local\filters\{boolean_select, date, duration, number, select, text};
+use core_reportbuilder\task\send_schedules;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
+
+/**
+ * Unit tests for task logs datasource
+ *
+ * @package     core_admin
+ * @covers      \core_admin\reportbuilder\datasource\task_logs
+ * @copyright   2022 Paul Holden <paulh@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class task_logs_test extends core_reportbuilder_testcase {
+
+    /**
+     * Test default datasource
+     */
+    public function test_datasource_default(): void {
+        $this->resetAfterTest();
+
+        $this->generate_task_log_data(true, 3, 2, 1654038000, 1654038060);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Tasks', 'source' => task_logs::class, 'default' => 1]);
+
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertCount(1, $content);
+
+        // Default columns are name, starttime, duration, result.
+        [$name, $timestart, $duration, $result] = array_values($content[0]);
+        $this->assertStringContainsString(send_schedules::class, $name);
+        $this->assertEquals('1/06/22, 07:00:00', $timestart);
+        $this->assertEquals('1 min', $duration);
+        $this->assertEquals('Success', $result);
+    }
+
+    /**
+     * Test datasource columns that aren't added by default
+     */
+    public function test_datasource_non_default_columns(): void {
+        $this->resetAfterTest();
+
+        $this->generate_task_log_data(true, 3, 2, 1654038000, 1654038060, 'hi', 'core_reportbuilder', 'test', 43);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+        $report = $generator->create_report(['name' => 'Tasks', 'source' => task_logs::class, 'default' => 0]);
+
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'task_log:component']);
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'task_log:type']);
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'task_log:endtime']);
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'task_log:hostname']);
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'task_log:pid']);
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'task_log:database']);
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'task_log:dbreads']);
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'task_log:dbwrites']);
+
+        $content = $this->get_custom_report_content($report->get('id'));
+        $this->assertCount(1, $content);
+
+        $this->assertEquals([
+            'core_reportbuilder',
+            'Scheduled',
+            '1/06/22, 07:01:00',
+            'test',
+            '43',
+            '<div>3 reads</div><div>2 writes</div>',
+            '3',
+            '2',
+        ], array_values($content[0]));
+    }
+
+    /**
+     * Data provider for {@see test_datasource_filters}
+     *
+     * @return array[]
+     */
+    public function datasource_filters_provider(): array {
+        return [
+            'Filter name' => ['task_log:name', [
+                'task_log:name_values' => [send_schedules::class],
+            ], true],
+            'Filter name (no match)' => ['task_log:name', [
+                'task_log:name_values' => ['invalid'],
+            ], false],
+            'Filter component' => ['task_log:component', [
+                'task_log:component_operator' => select::EQUAL_TO,
+                'task_log:component_value' => 'core_reportbuilder',
+            ], true],
+            'Filter component (no match)' => ['task_log:component', [
+                'task_log:component_operator' => select::NOT_EQUAL_TO,
+                'task_log:component_value' => 'core_reportbuilder',
+            ], false],
+            'Filter type' => ['task_log:type', [
+                'task_log:type_operator' => select::EQUAL_TO,
+                'task_log:type_value' => database_logger::TYPE_SCHEDULED,
+            ], true],
+            'Filter type (no match)' => ['task_log:type', [
+                'task_log:type_operator' => select::EQUAL_TO,
+                'task_log:type_value' => database_logger::TYPE_ADHOC,
+            ], false],
+            'Filter output' => ['task_log:output', [
+                'task_log:output_operator' => text::IS_NOT_EMPTY,
+            ], true],
+            'Filter output (no match)' => ['task_log:output', [
+                'task_log:output_operator' => text::IS_EMPTY,
+            ], false],
+            'Filter result' => ['task_log:result', [
+                'task_log:result_operator' => boolean_select::CHECKED,
+            ], true],
+            'Filter result (no match)' => ['task_log:result', [
+                'task_log:result_operator' => boolean_select::NOT_CHECKED,
+            ], false],
+            'Filter time start' => ['task_log:timestart', [
+                'task_log:timestart_operator' => date::DATE_RANGE,
+                'task_log:timestart_from' => 1622502000,
+            ], true],
+            'Filter time start (no match)' => ['task_log:timestart', [
+                'task_log:timestart_operator' => date::DATE_RANGE,
+                'task_log:timestart_to' => 1622502000,
+            ], false],
+            'Filter time end' => ['task_log:timeend', [
+                'task_log:timeend_operator' => date::DATE_RANGE,
+                'task_log:timeend_from' => 1622502000,
+            ], true],
+            'Filter time end (no match)' => ['task_log:timeend', [
+                'task_log:timeend_operator' => date::DATE_RANGE,
+                'task_log:timeend_to' => 1622502000,
+            ], false],
+            'Filter duration' => ['task_log:duration', [
+                'task_log:duration_operator' => duration::DURATION_MAXIMUM,
+                'task_log:duration_unit' => MINSECS,
+                'task_log:duration_value' => 2,
+            ], true],
+            'Filter duration (no match)' => ['task_log:duration', [
+                'task_log:duration_operator' => duration::DURATION_MINIMUM,
+                'task_log:duration_unit' => MINSECS,
+                'task_log:duration_value' => 2,
+            ], false],
+            'Filter database reads' => ['task_log:dbreads', [
+                'task_log:dbreads_operator' => number::LESS_THAN,
+                'task_log:dbreads_value1' => 4,
+            ], true],
+            'Filter database reads (no match)' => ['task_log:dbreads', [
+                'task_log:dbreads_operator' => number::GREATER_THAN,
+                'task_log:dbreads_value1' => 4,
+            ], false],
+            'Filter database writes' => ['task_log:dbwrites', [
+                'task_log:dbwrites_operator' => number::LESS_THAN,
+                'task_log:dbwrites_value1' => 4,
+            ], true],
+            'Filter database writes (no match)' => ['task_log:dbwrites', [
+                'task_log:dbwrites_operator' => number::GREATER_THAN,
+                'task_log:dbwrites_value1' => 4,
+            ], false],
+        ];
+    }
+
+    /**
+     * Test datasource filters
+     *
+     * @param string $filtername
+     * @param array $filtervalues
+     * @param bool $expectmatch
+     *
+     * @dataProvider datasource_filters_provider
+     */
+    public function test_datasource_filters(
+        string $filtername,
+        array $filtervalues,
+        bool $expectmatch
+    ): void {
+        $this->resetAfterTest();
+
+        $this->generate_task_log_data(true, 3, 2, 1654038000, 1654038060, 'hi', 'core_reportbuilder', 'test', 43);
+
+        /** @var core_reportbuilder_generator $generator */
+        $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
+
+        // Create report containing single component column, and given filter.
+        $report = $generator->create_report(['name' => 'Tasks', 'source' => task_logs::class, 'default' => 0]);
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'task_log:component']);
+
+        // Add filter, set it's values.
+        $generator->create_filter(['reportid' => $report->get('id'), 'uniqueidentifier' => $filtername]);
+        $content = $this->get_custom_report_content($report->get('id'), 0, $filtervalues);
+
+        if ($expectmatch) {
+            $this->assertCount(1, $content);
+            $this->assertEquals('core_reportbuilder', reset($content[0]));
+        } else {
+            $this->assertEmpty($content);
+        }
+    }
+
+    /**
+     * Stress test datasource
+     *
+     * In order to execute this test PHPUNIT_LONGTEST should be defined as true in phpunit.xml or directly in config.php
+     */
+    public function test_stress_datasource(): void {
+        if (!PHPUNIT_LONGTEST) {
+            $this->markTestSkipped('PHPUNIT_LONGTEST is not defined');
+        }
+
+        $this->resetAfterTest();
+
+        $this->generate_task_log_data(true, 3, 2, 1654038000, 1654038060, 'hi', 'core_reportbuilder', 'test', 43);
+
+        $this->datasource_stress_test_columns(task_logs::class);
+        $this->datasource_stress_test_columns_aggregation(task_logs::class);
+        $this->datasource_stress_test_conditions(task_logs::class, 'task_log:name');
+    }
+
+    /**
+     * Helper to generate some task logs data
+     *
+     * @param bool $success
+     * @param int $dbreads
+     * @param int $dbwrites
+     * @param float $timestart
+     * @param float $timeend
+     * @param string $logoutput
+     * @param string $component
+     * @param string $hostname
+     * @param int $pid
+     */
+    private function generate_task_log_data(
+        bool $success,
+        int $dbreads,
+        int $dbwrites,
+        float $timestart,
+        float $timeend,
+        string $logoutput = 'hello',
+        string $component = 'moodle',
+        string $hostname = 'phpunit',
+        int $pid = 42
+    ): void {
+
+        $logpath = make_request_directory() . '/log.txt';
+        file_put_contents($logpath, $logoutput);
+
+        $task = new send_schedules();
+        $task->set_component($component);
+        $task->set_hostname($hostname);
+        $task->set_pid($pid);
+
+        database_logger::store_log_for_task($task, $logpath, !$success, $dbreads, $dbwrites, $timestart, $timeend);
+    }
+}

admin/tool/admin_presets/classes/local/action/rollback.php

@@ -52,7 +52,7 @@ class rollback extends base {
             );
 
             $context->applications[] = [
-                'timeapplied' => strftime($format, $application->time),
+                'timeapplied' => \core_date::strftime($format, (int)$application->time),
                 'user' => fullname($user),
                 'action' => $rollbacklink->out(false),
             ];

admin/tool/admin_presets/tests/behat/download.feature

@@ -1,18 +1,20 @@
 @tool @tool_admin_presets
 Feature: I can download a preset
-
   Background:
-    Given I log in as "admin"
-    And the following "tool_admin_presets > preset" exist:
+    Given the following "tool_admin_presets > preset" exist:
       | name       |
       | Custom preset |
-    And I navigate to "Site admin presets" in site administration
 
   @javascript
-  Scenario: Core and custom preset settings can be downloaded
+  Scenario: Custom preset settings can be downloaded
     Given I log in as "admin"
     And I navigate to "Site admin presets" in site administration
     When I open the action menu in "Custom preset" "table_row"
     Then following "Download" "link" in the "Custom preset" "table_row" should download between "0" and "5000" bytes
-    And I open the action menu in "Starter" "table_row"
-    And following "Download" "link" in the "Starter" "table_row" should download between "0" and "5000" bytes
+
+  @javascript
+  Scenario: Core preset settings can be downloaded
+    Given I log in as "admin"
+    And I navigate to "Site admin presets" in site administration
+    When I open the action menu in "Starter" "table_row"
+    Then following "Download" "link" in the "Starter" "table_row" should download between "0" and "5000" bytes

admin/tool/admin_presets/tests/behat/export_settings.feature

@@ -11,8 +11,11 @@ Feature: I can add a new preset with current settings
     And I set the field "Name" to "Starter"
     And I set the field "Description" to "Non-core starter preset"
     When I click on "Create preset" "button"
-    Then I should see "Moodle with all of the most popular features" in the "Starter" "table_row"
-    And I should see "Starter" in the "Non-core starter preset" "table_row"
+    Then the following should exist in the "Site admin presets table" table:
+      | Name    | Description                                                                                                                        |
+      | Starter | Moodle with all of the most popular features, including Assignment, Feedback, Forum, H5P, Quiz and Completion tracking.            |
+      | Full    | All the Starter features plus External (LTI) tool, SCORM, Workshop, Analytics, Badges, Competencies, Learning plans and lots more. |
+      | Starter | Non-core starter preset                                                                                                            |
 
   Scenario: Export current settings
     Given I click on "Create preset" "button"

admin/tool/admin_presets/tests/event/preset_deleted_test.php

@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
  * @category   test
  * @copyright  2021 Sara Arjona (sara@moodle.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\preset_deleted
+ * @covers     \tool_admin_presets\event\preset_deleted
  */
 class preset_deleted_test extends \advanced_testcase {
 

admin/tool/admin_presets/tests/event/preset_downloaded_test.php

@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
  * @category   test
  * @copyright  2021 Sara Arjona (sara@moodle.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\preset_downloaded
+ * @covers     \tool_admin_presets\event\preset_downloaded
  */
 class preset_downloaded_test extends \advanced_testcase {
 

admin/tool/admin_presets/tests/event/preset_exported_test.php

@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
  * @category   test
  * @copyright  2021 Sara Arjona (sara@moodle.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\preset_exported
+ * @covers     \tool_admin_presets\event\preset_exported
  */
 class preset_exported_test extends \advanced_testcase {
 

admin/tool/admin_presets/tests/event/preset_imported_test.php

@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
  * @category   test
  * @copyright  2021 Sara Arjona (sara@moodle.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\preset_imported
+ * @covers     \tool_admin_presets\event\preset_imported
  */
 class preset_imported_test extends \advanced_testcase {
 

admin/tool/admin_presets/tests/event/preset_loaded_test.php

@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
  * @category   test
  * @copyright  2021 Sara Arjona (sara@moodle.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\preset_loaded
+ * @covers     \tool_admin_presets\event\preset_loaded
  */
 class preset_loaded_test extends \advanced_testcase {
 

admin/tool/admin_presets/tests/event/preset_previewed_test.php

@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
  * @category   test
  * @copyright  2021 Sara Arjona (sara@moodle.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\preset_previewed
+ * @covers     \tool_admin_presets\event\preset_previewed
  */
 class preset_previewed_test extends \advanced_testcase {
 

admin/tool/admin_presets/tests/event/preset_reverted_test.php

@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
  * @category   test
  * @copyright  2021 Sara Arjona (sara@moodle.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\preset_reverted
+ * @covers     \tool_admin_presets\event\preset_reverted
  */
 class preset_reverted_test extends \advanced_testcase {
 

admin/tool/admin_presets/tests/event/presets_listed_test.php

@@ -23,7 +23,7 @@ namespace tool_admin_presets\event;
  * @category   test
  * @copyright  2021 Sara Arjona (sara@moodle.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \tool_admin_presets\event\presets_listed
+ * @covers     \tool_admin_presets\event\presets_listed
  */
 class presets_listed_test extends \advanced_testcase {
 

admin/tool/admin_presets/version.php

@@ -26,5 +26,5 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'tool_admin_presets';
-$plugin->version = 2022041900;
-$plugin->requires = 2022041200;
+$plugin->version = 2022112800;
+$plugin->requires = 2022111800;

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

@@ -45,7 +45,7 @@ class helper {
         // Form field is PARAM_ALPHANUMEXT and we are sending fully qualified class names
         // as option names, but replacing the backslash for a string that is really unlikely
         // to ever be part of a class name.
-        return str_replace('\\', '__', $class);
+        return str_replace('\\', '__', $class ?? '');
     }
 
     /**

admin/tool/analytics/version.php

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

admin/tool/availabilityconditions/index.php

@@ -47,7 +47,7 @@ $pageurl = new moodle_url('/' . $CFG->admin . '/tool/availabilityconditions/');
 if (($plugin = optional_param('plugin', '', PARAM_PLUGIN))) {
     require_sesskey();
     if (!array_key_exists($plugin, $plugins)) {
-        print_error('invalidcomponent', 'error', $pageurl);
+        throw new \moodle_exception('invalidcomponent', 'error', $pageurl);
     }
     $action = required_param('action', PARAM_ALPHA);
     switch ($action) {

admin/tool/availabilityconditions/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2022041900;
-$plugin->requires = 2022041200;
+$plugin->version = 2022112800;
+$plugin->requires = 2022111800;
 $plugin->component = 'tool_availabilityconditions';

admin/tool/behat/amd/build/steps.min.js

@@ -0,0 +1,11 @@
+define("tool_behat/steps",["exports","core/ajax","core/templates","core/pending"],(function(_exports,_ajax,_templates,_pending){function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}
+/**
+   * Enhancements for the step definitions page.
+   *
+   * @module tool_behat/steps
+   * @copyright 2022 Catalyst IT EU
+   * @author Mark Johnson <mark.johnson@catalyst-eu.net>
+   * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,_ajax=_interopRequireDefault(_ajax),_templates=_interopRequireDefault(_templates),_pending=_interopRequireDefault(_pending);_exports.init=()=>{document.addEventListener("change",(async e=>{const entityElement=e.target.closest(".entities"),stepElement=e.target.closest(".stepcontent");if(!entityElement||!stepElement)return;const pendingPromise=new _pending.default("tool_behat/steps:change"),entityData=await(entityType=e.target.value,_ajax.default.call([{methodname:"tool_behat_get_entity_generator",args:{entitytype:entityType}}])[0]);var entityType;const{html:html,js:js}=await(entityData=>{var _entityData$required;return null!==(_entityData$required=entityData.required)&&void 0!==_entityData$required&&_entityData$required.length?_templates.default.renderForPromise("tool_behat/steprequiredfields",{fields:entityData.required}):Promise.resolve({html:"",js:""})})(entityData),stepRequiredFields=stepElement.querySelector(".steprequiredfields");stepRequiredFields?await _templates.default.replaceNode(stepRequiredFields,html,js):await _templates.default.appendNodeContents(stepElement,html,js),pendingPromise.resolve()}))}}));
+
+//# sourceMappingURL=steps.min.js.map

admin/tool/behat/amd/build/steps.min.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"steps.min.js","sources":["../src/steps.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\nimport Ajax from 'core/ajax';\nimport Templates from 'core/templates';\nimport PendingJS from 'core/pending';\n\n/**\n * Enhancements for the step definitions page.\n *\n * @module tool_behat/steps\n * @copyright 2022 Catalyst IT EU\n * @author Mark Johnson <mark.johnson@catalyst-eu.net>\n * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\n/**\n * Call the get_entity_generator web service function\n *\n * Takes the name of an entity generator and returns an object containing a list of the required fields.\n *\n * @param {String} entityType\n * @returns {Promise}\n */\nconst getGeneratorEntities = (entityType) => Ajax.call([{\n    methodname: 'tool_behat_get_entity_generator',\n    args: {entitytype: entityType}\n}])[0];\n\n/**\n * Render HTML for required fields\n *\n * Takes the entity data returned from getGeneratorEntities and renders the HTML to display the required fields.\n *\n * @param {String} entityData\n * @return {Promise}\n */\nconst getRequiredFieldsContent = (entityData) => {\n    if (!entityData.required?.length) {\n        return Promise.resolve({\n            html: '',\n            js: ''\n        });\n    }\n    return Templates.renderForPromise('tool_behat/steprequiredfields', {fields: entityData.required});\n};\n\nexport const init = () => {\n    // When an entity is selected in the \"the following exist\" step, fetch and display the required fields.\n    document.addEventListener('change', async(e) => {\n        const entityElement = e.target.closest('.entities');\n        const stepElement = e.target.closest('.stepcontent');\n        if (!entityElement || !stepElement) {\n            return;\n        }\n\n        const pendingPromise = new PendingJS('tool_behat/steps:change');\n\n        const entityData = await getGeneratorEntities(e.target.value);\n        const {html, js} = await getRequiredFieldsContent(entityData);\n\n        const stepRequiredFields = stepElement.querySelector('.steprequiredfields');\n        if (stepRequiredFields) {\n            await Templates.replaceNode(stepRequiredFields, html, js);\n        } else {\n            await Templates.appendNodeContents(stepElement, html, js);\n        }\n        pendingPromise.resolve();\n    });\n};\n"],"names":["document","addEventListener","async","entityElement","e","target","closest","stepElement","pendingPromise","PendingJS","entityData","entityType","value","Ajax","call","methodname","args","entitytype","html","js","required","_entityData$required","length","Templates","renderForPromise","fields","Promise","resolve","getRequiredFieldsContent","stepRequiredFields","querySelector","replaceNode","appendNodeContents"],"mappings":";;;;;;;;4NA2DoB,KAEhBA,SAASC,iBAAiB,UAAUC,MAAAA,UAC1BC,cAAgBC,EAAEC,OAAOC,QAAQ,aACjCC,YAAcH,EAAEC,OAAOC,QAAQ,oBAChCH,gBAAkBI,yBAIjBC,eAAiB,IAAIC,iBAAU,2BAE/BC,iBAlCgBC,WAkCwBP,EAAEC,OAAOO,MAlClBC,cAAKC,KAAK,CAAC,CACpDC,WAAY,kCACZC,KAAM,CAACC,WAAYN,eACnB,IAH0BA,IAAAA,iBAmChBO,KAACA,KAADC,GAAOA,SAtBaT,CAAAA,0EACzBA,WAAWU,0CAAXC,qBAAqBC,OAMnBC,mBAAUC,iBAAiB,gCAAiC,CAACC,OAAQf,WAAWU,WAL5EM,QAAQC,QAAQ,CACnBT,KAAM,GACNC,GAAI,MAkBiBS,CAAyBlB,YAE5CmB,mBAAqBtB,YAAYuB,cAAc,uBACjDD,yBACMN,mBAAUQ,YAAYF,mBAAoBX,KAAMC,UAEhDI,mBAAUS,mBAAmBzB,YAAaW,KAAMC,IAE1DX,eAAemB"}

admin/tool/behat/amd/src/steps.js

@@ -0,0 +1,82 @@
+// 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/>.
+
+import Ajax from 'core/ajax';
+import Templates from 'core/templates';
+import PendingJS from 'core/pending';
+
+/**
+ * Enhancements for the step definitions page.
+ *
+ * @module tool_behat/steps
+ * @copyright 2022 Catalyst IT EU
+ * @author Mark Johnson <mark.johnson@catalyst-eu.net>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * Call the get_entity_generator web service function
+ *
+ * Takes the name of an entity generator and returns an object containing a list of the required fields.
+ *
+ * @param {String} entityType
+ * @returns {Promise}
+ */
+const getGeneratorEntities = (entityType) => Ajax.call([{
+    methodname: 'tool_behat_get_entity_generator',
+    args: {entitytype: entityType}
+}])[0];
+
+/**
+ * Render HTML for required fields
+ *
+ * Takes the entity data returned from getGeneratorEntities and renders the HTML to display the required fields.
+ *
+ * @param {String} entityData
+ * @return {Promise}
+ */
+const getRequiredFieldsContent = (entityData) => {
+    if (!entityData.required?.length) {
+        return Promise.resolve({
+            html: '',
+            js: ''
+        });
+    }
+    return Templates.renderForPromise('tool_behat/steprequiredfields', {fields: entityData.required});
+};
+
+export const init = () => {
+    // When an entity is selected in the "the following exist" step, fetch and display the required fields.
+    document.addEventListener('change', async(e) => {
+        const entityElement = e.target.closest('.entities');
+        const stepElement = e.target.closest('.stepcontent');
+        if (!entityElement || !stepElement) {
+            return;
+        }
+
+        const pendingPromise = new PendingJS('tool_behat/steps:change');
+
+        const entityData = await getGeneratorEntities(e.target.value);
+        const {html, js} = await getRequiredFieldsContent(entityData);
+
+        const stepRequiredFields = stepElement.querySelector('.steprequiredfields');
+        if (stepRequiredFields) {
+            await Templates.replaceNode(stepRequiredFields, html, js);
+        } else {
+            await Templates.appendNodeContents(stepElement, html, js);
+        }
+        pendingPromise.resolve();
+    });
+};

admin/tool/behat/classes/external/get_entity_generator.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/>.
+
+/**
+ * Return data about an entity generator.
+ *
+ * @package   tool_behat
+ * @copyright 2022 onwards Catalyst IT EU {@link https://catalyst-eu.net}
+ * @author    Mark Johnson <mark.johnson@catalyst-eu.net>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace tool_behat\external;
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->libdir . '/externallib.php');
+
+/**
+ * External function for getting properties of entity generators.
+ */
+class get_entity_generator extends \external_api {
+
+    /**
+     * Define parameters for external function.
+     *
+     * The parameter is either in the format 'entity' or 'component_name > entity'. There is no appropriate param type for a
+     * string like this containing angle brackets, so we will do PARAM_RAW. The value will be parsed by
+     * behat_data_generators::parse_entity_type, which validates the format of the parameter and throws an exception if it is not
+     * correct.
+     *
+     * @return \external_function_parameters
+     */
+    public static function execute_parameters(): \external_function_parameters {
+        return new \external_function_parameters([
+            'entitytype' => new \external_value(PARAM_RAW, 'Entity type that can be created by a generator.'),
+        ]);
+    }
+
+    /**
+     * Return a list of the required fields for a given entity type.
+     *
+     * @param string $entitytype
+     * @return array
+     */
+    public static function execute(string $entitytype): array {
+        global $CFG;
+
+        // Ensure we can load Behat and Facebook namespaces in behat libraries.
+        require_once("{$CFG->dirroot}/vendor/autoload.php");
+        require_once("{$CFG->libdir}/tests/behat/behat_data_generators.php");
+
+        $params = self::validate_parameters(self::execute_parameters(), ['entitytype' => $entitytype]);
+        $context = \context_system::instance();
+        self::validate_context($context);
+        require_capability('moodle/site:config', $context);
+
+        $generators = new \behat_data_generators();
+        $entity = $generators->get_entity($params['entitytype']);
+        return ['required' => $entity['required']];
+    }
+
+    /**
+     * Define return values.
+     *
+     * Return required fields
+     *
+     * @return \external_single_structure
+     */
+    public static function execute_returns(): \external_single_structure {
+        return new \external_single_structure([
+            'required' => new \external_multiple_structure(
+                new \external_value(PARAM_TEXT, 'Required field'),
+                'Required fields',
+                VALUE_OPTIONAL
+            ),
+        ]);
+    }
+}