Moodle release 4.1

Huge thanks to Eloy Lafuente for investigation

.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': {
@@ -196,6 +200,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 +229,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 +303,6 @@
         ],
       },
       parserOptions: {
-        'ecmaVersion': 9,
         'sourceType': 'module',
         'requireConfigFile': false,
       }

.github/workflows/push.yml

@@ -13,14 +13,14 @@ env:
 
 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,11 +54,11 @@ 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
+          - os: ubuntu-22.04
             php: 8.0
             db: pgsql
             extensions: xmlrpc-beta
@@ -79,13 +79,13 @@ jobs:
         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 +96,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 +111,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

@@ -233,6 +233,7 @@ const getOwningComponentDirectory = checkPath => {
 };
 
 module.exports = {
+    fetchComponentData,
     getAmdSrcGlobList,
     getComponentFromPath,
     getComponentPaths,

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

.phpcs.xml.dist

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="MoodleCore">
+  <rule ref="moodle"/>
+</ruleset>

.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,18 +36,18 @@ 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)
@@ -52,7 +56,7 @@ jobs:
           env: DB=none     TASK=CITEST
         - if: env(MOODLE_PHP) = "all"
           php: 8.0
-          env: DB=none     TASK=GRUNT    NVM_VERSION='lts/carbon'
+          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
@@ -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' ];
@@ -91,7 +100,7 @@ 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
         fi
     - >
         if [ "$TASK" = 'PHPUNIT' ];
@@ -113,8 +122,8 @@ install:
     - >
         if [ "$TASK" = 'GRUNT' ];
         then
-            nvm install $NVM_VERSION ;
-            nvm use $NVM_VERSION ;
+            nvm install
+            nvm use
         fi
 
 before_script:
@@ -146,10 +155,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 +231,7 @@ before_script:
         # We need the official upstream for comparison
         git remote add upstream https://github.com/moodle/moodle.git;
 
-        git fetch upstream master;
+        git fetch upstream MOODLE_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`

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

@@ -69,12 +69,13 @@
     echo $OUTPUT->header();
     echo $OUTPUT->heading($strmanageblocks);
 
+    echo $OUTPUT->notification(get_string('noteunneededblocks', 'admin'), 'info');
 /// Main display starts here
 
 /// Get and sort the existing blocks
 
     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,13 +41,19 @@ $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);
+if ($hassiteconfig) {
+    $PAGE->add_header_action($OUTPUT->render_from_template('core_admin/header_search_input', [
+        'action' => new moodle_url('/admin/search.php'),
+    ]));
+}
 
 $statusmsg = '';
 $errormsg  = '';

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('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/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

@@ -3539,6 +3539,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">
@@ -3733,4 +3735,191 @@
       </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>
 </COMPATIBILITY_MATRIX>

admin/filters.php

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

admin/index.php

@@ -53,6 +53,12 @@ if (!extension_loaded('xml')) {
     die();
 }
 
+// Make sure mbstring extension is available.
+if (!extension_loaded('mbstring')) {
+    echo 'Moodle requires the mbstring PHP extension. Please install or enable the mbstring extension.';
+    die();
+}
+
 define('NO_OUTPUT_BUFFERING', true);
 
 if (isset($_POST['upgradekey'])) {
@@ -168,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
@@ -197,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()) {
@@ -269,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');
         }
     }
 
@@ -291,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.
@@ -742,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);
         }
@@ -759,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;
@@ -825,6 +833,7 @@ $insecuredataroot = is_dataroot_insecure(true);
 $SESSION->admin_critical_warning = ($insecuredataroot==INSECURE_DATAROOT_ERROR);
 
 $adminroot = admin_get_root();
+$PAGE->set_primary_active_tab('siteadminnode');
 
 // Check if there are any new admin settings which have still yet to be set
 if (any_new_admin_settings($adminroot)) {

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')) {
@@ -63,13 +63,13 @@
 
             if($time < time() - 60) {
                 // fail - you're out of time.
-                print_error ('deleteoutoftime', 'mnet', 'index.php');
+                throw new \moodle_exception ('deleteoutoftime', 'mnet', 'index.php');
                 exit;
             }
 
             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;
             }
 
@@ -81,7 +81,6 @@
     $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

@@ -38,11 +38,22 @@
     }
 
     if (!empty($show) and confirm_sesskey()) {
-        $class = \core_plugin_manager::resolve_plugininfo_class('mod');
-        $class::enable_plugin($show, true);
+        $canenablemodule = true;
+        $modulename = $show;
 
-        admin_get_root(true, false);  // settings not required - only pages
-        redirect(new moodle_url('/admin/modules.php'));
+        // Invoking a callback function that enables plugins to force additional actions (e.g. displaying notifications,
+        // modals, etc.) and also specify through its returned value (bool) whether the process of enabling the plugin
+        // should continue after these actions or not.
+        if (component_callback_exists("mod_{$modulename}", 'pre_enable_plugin_actions')) {
+            $canenablemodule = component_callback("mod_{$modulename}", 'pre_enable_plugin_actions');
+        }
+
+        if ($canenablemodule) {
+            $class = \core_plugin_manager::resolve_plugininfo_class('mod');
+            $class::enable_plugin($show, true);
+            admin_get_root(true, false);  // Settings not required - only pages.
+            redirect(new moodle_url('/admin/modules.php'));
+        }
     }
 
     echo $OUTPUT->header();
@@ -51,7 +62,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
@@ -75,7 +86,7 @@
             $missing = true;
         } else {
             // took out hspace="\10\", because it does not validate. don't know what to replace with.
-            $icon = "<img src=\"" . $OUTPUT->image_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
+            $icon = "<img src=\"" . $OUTPUT->image_url('monologo', $module->name) . "\" class=\"icon\" alt=\"\" />";
             $strmodulename = $icon.' '.get_string('modulename', $module->name);
             $missing = false;
         }

admin/plugins.php

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

admin/portfolio.php

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

@@ -106,7 +106,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 +117,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 +132,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 +143,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

@@ -15,20 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Renderer for core_admin subsystem
+ * Standard HTML output renderer for core_admin subsystem.
  *
  * @package    core
  * @subpackage admin
  * @copyright  2011 David Mudrak <david@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-
-defined('MOODLE_INTERNAL') || die();
-
-
-/**
- * Standard HTML output renderer for core_admin subsystem
- */
 class core_admin_renderer extends plugin_renderer_base {
 
     /**
@@ -301,6 +294,7 @@ class core_admin_renderer extends plugin_renderer_base {
         $output = '';
 
         $output .= $this->header();
+        $output .= $this->output->heading(get_string('notifications', 'admin'));
         $output .= $this->maturity_info($maturity);
         $output .= $this->legacy_log_store_writing_error();
         $output .= empty($CFG->disableupdatenotifications) ? $this->available_updates($availableupdates, $availableupdatesfetch) : '';
@@ -1086,12 +1080,21 @@ class core_admin_renderer extends plugin_renderer_base {
             $plugintyperows = array();
 
             foreach ($plugins as $name => $plugin) {
+                $component = "{$plugin->type}_{$plugin->name}";
+
                 $sumtotal++;
                 $row = new html_table_row();
-                $row->attributes['class'] = 'type-' . $plugin->type . ' name-' . $plugin->type . '_' . $plugin->name;
+                $row->attributes['class'] = "type-{$plugin->type} name-{$component}";
 
-                if ($this->page->theme->resolve_image_location('icon', $plugin->type . '_' . $plugin->name, null)) {
-                    $icon = $this->output->pix_icon('icon', '', $plugin->type . '_' . $plugin->name, array('class' => 'smallicon pluginicon'));
+                $iconidentifier = 'icon';
+                if ($plugin->type === 'mod') {
+                    $iconidentifier = 'monologo';
+                }
+
+                if ($this->page->theme->resolve_image_location($iconidentifier, $component, null)) {
+                    $icon = $this->output->pix_icon($iconidentifier, '', $component, [
+                        'class' => 'smallicon pluginicon',
+                    ]);
                 } else {
                     $icon = '';
                 }
@@ -1804,11 +1807,20 @@ class core_admin_renderer extends plugin_renderer_base {
             }
 
             foreach ($plugins as $name => $plugin) {
-                $row = new html_table_row();
-                $row->attributes['class'] = 'type-' . $plugin->type . ' name-' . $plugin->type . '_' . $plugin->name;
+                $component = "{$plugin->type}_{$plugin->name}";
 
-                if ($this->page->theme->resolve_image_location('icon', $plugin->type . '_' . $plugin->name, null)) {
-                    $icon = $this->output->pix_icon('icon', '', $plugin->type . '_' . $plugin->name, array('class' => 'icon pluginicon'));
+                $row = new html_table_row();
+                $row->attributes['class'] = "type-{$plugin->type} name-{$component}";
+
+                $iconidentifier = 'icon';
+                if ($plugin->type === 'mod') {
+                    $iconidentifier = 'monologo';
+                }
+
+                if ($this->page->theme->resolve_image_location($iconidentifier, $component, null)) {
+                    $icon = $this->output->pix_icon($iconidentifier, '', $component, [
+                        'class' => 'icon pluginicon',
+                    ]);
                 } else {
                     $icon = $this->output->spacer();
                 }
@@ -2068,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));
@@ -49,6 +49,9 @@ if (optional_param('submit', false, PARAM_BOOL) && data_submitted() && confirm_s
     redirect($baseurl);
 }
 
+$PAGE->set_secondary_active_tab('users');
+$PAGE->set_primary_active_tab('siteadminnode');
+
 $controller->load_current_settings();
 
 // Display the editing form.

admin/roles/assign.php

@@ -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/define.php

@@ -87,6 +87,10 @@ if ($action === 'add') {
     $title = get_string('editingrolex', 'core_role', $rolenames[$roleid]->localname);
 }
 
+$PAGE->set_secondary_active_tab('users');
+$PAGE->set_primary_active_tab('siteadminnode');
+$PAGE->navbar->add($title, $baseurl);
+
 // Decide how to create new role.
 if ($action === 'add' and $resettype !== 'none') {
     $mform = new core_role_preset_form(null, array('action'=>'add', 'roleid'=>0, 'resettype'=>'0', 'return'=>'manage'));

admin/roles/manage.php

@@ -60,12 +60,15 @@ $undeletableroles[$CFG->notloggedinroleid] = 1;
 $undeletableroles[$CFG->guestroleid] = 1;
 $undeletableroles[$CFG->defaultuserroleid] = 1;
 
+$PAGE->set_primary_active_tab('siteadminnode');
+$PAGE->navbar->add(get_string('defineroles', 'role'), $PAGE->url);
+
 // Process submitted data.
 $confirmed = (optional_param('confirm', false, PARAM_BOOL) && data_submitted() && confirm_sesskey());
 switch ($action) {
     case 'delete':
         if (isset($undeletableroles[$roleid])) {
-            print_error('cannotdeletethisrole', '', $baseurl);
+            throw new \moodle_exception('cannotdeletethisrole', '', $baseurl);
         }
         if (!$confirmed) {
             // Show confirmation.
@@ -86,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);
@@ -105,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);
             }
         }
 
@@ -128,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

@@ -93,7 +93,7 @@ $PAGE->set_title($title);
 $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 +124,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/behat/siteadmin_roles_breadcrumbs.feature

@@ -0,0 +1,32 @@
+@core @core_admin @core_admin_roles @javascript
+Feature: Verify the breadcrumbs in define roles site administration pages
+  Whenever I navigate to define roles page in site administration
+  As an admin
+  The breadcrumbs should be visible
+
+  Background:
+    Given I log in as "admin"
+
+  Scenario: Verify breadcrumbs in manage roles tab
+    Given I navigate to "Users > Permissions > Define roles" in site administration
+    When "Define roles" "text" should exist in the ".breadcrumb" "css_element"
+    Then "Permissions" "link" should exist in the ".breadcrumb" "css_element"
+
+  Scenario Outline: Verify breadcrumbs in allow role tabs
+    Given I navigate to "Users > Permissions > Define roles" in site administration
+    When I click on "<allowlink>" "link"
+    Then "Define roles" "text" should exist in the ".breadcrumb" "css_element"
+    And "Permissions" "link" should exist in the ".breadcrumb" "css_element"
+
+    Examples:
+      | allowlink              |
+      | Allow role assignments |
+      | Allow role overrides   |
+      | Allow role switches    |
+      | Allow role to view     |
+
+  Scenario: Verify breadcrumbs in new role page
+    Given I navigate to "Users > Permissions > Define roles" in site administration
+    And I click on "Add a new role" "button"
+    Then "Define roles" "text" should exist in the ".breadcrumb" "css_element"
+    And "Permissions" "link" should exist in the ".breadcrumb" "css_element"

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

@@ -190,48 +190,48 @@ class provider_test extends provider_testcase {
                 if ($data = $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/search.php

@@ -12,6 +12,10 @@ $query = trim(optional_param('query', '', PARAM_NOTAGS));  // Search string
 $context = context_system::instance();
 $PAGE->set_context($context);
 
+// If we are performing a search we need to display the secondary navigation with links as opposed to just anchors.
+// NOTE: hassecondarynavigation will be overridden in classic.
+$PAGE->set_secondary_navigation(true, !$query);
+
 $hassiteconfig = has_capability('moodle/site:config', $context);
 
 if ($hassiteconfig && moodle_needs_upgrading()) {
@@ -24,18 +28,6 @@ if ($hassiteconfig && moodle_needs_upgrading()) {
 admin_externalpage_setup('search', '', array('query' => $query)); // now hidden page
 $PAGE->set_heading(get_string('administrationsite')); // Has to be after setup since it has its' own heading set_heading.
 
-if ($hassiteconfig) {
-    $data = [
-        'action' => new moodle_url('/admin/search.php'),
-        'btnclass' => 'btn-primary',
-        'inputname' => 'query',
-        'searchstring' => get_string('search'),
-        'query' => $query,
-        'extraclasses' => 'd-flex justify-content-end'
-    ];
-    $PAGE->add_header_action($OUTPUT->render_from_template('core/search_input', $data));
-}
-
 $adminroot = admin_get_root(); // need all settings here
 $adminroot->search = $query; // So we can reference it in search boxes later in this invocation
 $statusmsg = '';
@@ -89,8 +81,11 @@ if ($query && $hassiteconfig) {
 if ($showsettingslinks) {
     $node = $PAGE->settingsnav->find('root', navigation_node::TYPE_SITE_ADMIN);
     if ($node) {
-        $moremenu = new \core\navigation\output\more_menu($PAGE->secondarynav, 'nav-tabs');
-        $secondarynavigation = $moremenu->export_for_template($OUTPUT);
+        $secondarynavigation = false;
+        if ($PAGE->has_secondary_navigation()) {
+            $moremenu = new \core\navigation\output\more_menu($PAGE->secondarynav, 'nav-tabs', true, true);
+            $secondarynavigation = $moremenu->export_for_template($OUTPUT);
+        }
         echo $OUTPUT->render_from_template('core/settings_link_page',
             ['node' => $node, 'secondarynavigation' => $secondarynavigation]);
     }

admin/searchareas.php

@@ -26,7 +26,7 @@ require_once($CFG->libdir . '/adminlib.php');
 
 admin_externalpage_setup('searchareas');
 
-$areaid = optional_param('areaid', null, PARAM_ALPHAEXT);
+$areaid = optional_param('areaid', null, PARAM_ALPHANUMEXT);
 $action = optional_param('action', null, PARAM_ALPHA);
 $indexingenabled = \core_search\manager::is_indexing_enabled(); // This restricts many of the actions on this page.
 
@@ -37,6 +37,8 @@ try {
     // In action cases, we'll throw this exception below. In non-action cases, we produce a lang string error.
 }
 
+$PAGE->set_primary_active_tab('siteadminnode');
+
 // Handle all the actions.
 if ($action) {
     // If dealing with an areaid, we need to check that the area exists.
@@ -161,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/searchreindex.php

@@ -39,6 +39,9 @@ if ($area === false) {
 }
 $areaname = $area->get_visible_name();
 
+$PAGE->set_primary_active_tab('siteadminnode');
+$PAGE->set_secondary_active_tab('modules');
+
 // Start page output.
 $heading = get_string('gradualreindex', 'search', '');
 $PAGE->set_title($PAGE->title . ': ' . $heading);

admin/settings.php

@@ -23,16 +23,31 @@ 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;
 }
 
+// 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'),
+    ]));
+}
+
 /// WRITING SUBMITTED DATA (IF ANY) -------------------------------------------------------------------------------
 
 $statusmsg = '';

admin/settings/appearance.php

@@ -40,7 +40,8 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) { // sp
         'profile,moodle|/user/profile.php
 grades,grades|/grade/report/mygrades.php
 calendar,core_calendar|/calendar/view.php?view=month
-privatefiles,moodle|/user/files.php',
+privatefiles,moodle|/user/files.php
+reports,core_reportbuilder|/reportbuilder/index.php',
         PARAM_RAW,
         '50',
         '10'
@@ -81,6 +82,14 @@ privatefiles,moodle|/user/files.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.
@@ -185,15 +194,29 @@ privatefiles,moodle|/user/files.php',
 
     // Navigation settings
     $temp = new admin_settingpage('navigation', new lang_string('navigation'));
-    $choices = array(
-        HOMEPAGE_SITE => new lang_string('site'),
-        HOMEPAGE_MY => new lang_string('mymoodle', 'admin'),
-        HOMEPAGE_MYCOURSES => new lang_string('mycourses', 'admin'),
-        HOMEPAGE_USER => new lang_string('userpreference', 'admin')
-    );
+    $temp->add(new admin_setting_configcheckbox(
+        'enabledashboard',
+        new lang_string('enabledashboard', 'admin'),
+        new lang_string('enabledashboard_help', 'admin'),
+        1
+    ));
+
+    $choices = [HOMEPAGE_SITE => new lang_string('home')];
+    if (!empty($CFG->enabledashboard)) {
+        $choices[HOMEPAGE_MY] = new lang_string('mymoodle', 'admin');
+    }
+    $choices[HOMEPAGE_MYCOURSES] = new lang_string('mycourses', 'admin');
+    $choices[HOMEPAGE_USER] = new lang_string('userpreference', 'admin');
     $temp->add(new admin_setting_configselect('defaulthomepage', new lang_string('defaulthomepage', 'admin'),
-            new lang_string('configdefaulthomepage', 'admin'), HOMEPAGE_MY, $choices));
-    $temp->add(new admin_setting_configcheckbox('allowguestmymoodle', new lang_string('allowguestmymoodle', 'admin'), new lang_string('configallowguestmymoodle', 'admin'), 1));
+            new lang_string('configdefaulthomepage', 'admin'), get_default_home_page(), $choices));
+    if (!empty($CFG->enabledashboard)) {
+        $temp->add(new admin_setting_configcheckbox(
+            'allowguestmymoodle',
+            new lang_string('allowguestmymoodle', 'admin'),
+            new lang_string('configallowguestmymoodle', 'admin'),
+            1
+        ));
+    }
     $temp->add(new admin_setting_configcheckbox('navshowfullcoursenames', new lang_string('navshowfullcoursenames', 'admin'), new lang_string('navshowfullcoursenames_help', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('navshowcategories', new lang_string('navshowcategories', 'admin'), new lang_string('confignavshowcategories', 'admin'), 1));
     $temp->add(new admin_setting_configcheckbox('navshowmycoursecategories', new lang_string('navshowmycoursecategories', 'admin'), new lang_string('navshowmycoursecategories_help', 'admin'), 0));
@@ -236,9 +259,11 @@ privatefiles,moodle|/user/files.php',
     $temp->add(new admin_setting_configcheckbox('doctonewwindow', new lang_string('doctonewwindow', 'admin'), new lang_string('configdoctonewwindow', 'admin'), 0));
     $ADMIN->add('appearance', $temp);
 
-    $temp = new admin_externalpage('mypage', new lang_string('mypage', 'admin'), $CFG->wwwroot . '/my/indexsys.php',
-            'moodle/my:configsyspages');
-    $ADMIN->add('appearance', $temp);
+    if (!empty($CFG->enabledashboard)) {
+        $temp = new admin_externalpage('mypage', new lang_string('mypage', 'admin'), $CFG->wwwroot . '/my/indexsys.php',
+                'moodle/my:configsyspages');
+        $ADMIN->add('appearance', $temp);
+    }
 
     $temp = new admin_externalpage('profilepage', new lang_string('myprofile', 'admin'), $CFG->wwwroot . '/user/profilesys.php',
             'moodle/my:configsyspages');

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

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

@@ -251,6 +251,9 @@ if ($hassiteconfig) {
                 array('0' => new lang_string('none'), '1' => new lang_string('allfiles'), '2' => new lang_string('htmlfilesonly')));
         $items[] = new admin_setting_configcheckbox('filtermatchoneperpage', new lang_string('filtermatchoneperpage', 'admin'), new lang_string('configfiltermatchoneperpage', 'admin'), 0);
         $items[] = new admin_setting_configcheckbox('filtermatchonepertext', new lang_string('filtermatchonepertext', 'admin'), new lang_string('configfiltermatchonepertext', 'admin'), 0);
+        $items[] = new admin_setting_configcheckbox('filternavigationwithsystemcontext',
+                new lang_string('filternavigationwithsystemcontext', 'admin'),
+                new lang_string('configfilternavigationwithsystemcontext', 'admin'), 0);
         foreach ($items as $item) {
             $item->set_updatedcallback('reset_text_filters_cache');
             $temp->add($item);
@@ -325,6 +328,13 @@ if ($hassiteconfig) {
     $temp->add(new admin_setting_managedataformats());
     $ADMIN->add('dataformatsettings', $temp);
 
+    $plugins = core_plugin_manager::instance()->get_plugins_of_type('dataformat');
+    core_collator::asort_objects_by_property($plugins, 'displayname');
+    foreach ($plugins as $plugin) {
+        /** @var \core\plugininfo\dataformat $plugin */
+        $plugin->load_settings($ADMIN, 'dataformatsettings', $hassiteconfig);
+    }
+
     //== Portfolio settings ==
     require_once($CFG->libdir. '/portfoliolib.php');
     $catname = new lang_string('portfolios', 'portfolio');
@@ -517,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/security.php

@@ -151,7 +151,8 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $sensiblesettingsdefault .= 'dbpass@@enrol_database, bind_pw@@enrol_ldap, ';
     $sensiblesettingsdefault .= 'server_password@@search_solr, ssl_keypassword@@search_solr, ';
     $sensiblesettingsdefault .= 'alternateserver_password@@search_solr, alternatessl_keypassword@@search_solr, ';
-    $sensiblesettingsdefault .= 'test_password@@cachestore_redis, password@@mlbackend_python';
+    $sensiblesettingsdefault .= 'test_password@@cachestore_redis, password@@mlbackend_python, ';
+    $sensiblesettingsdefault .= 'badges_badgesalt@@none, calendar_exportsalt@@none';
     $temp->add(new admin_setting_configtextarea('adminpresets/sensiblesettings',
             get_string('sensiblesettings', 'core_adminpresets'),
             get_string('sensiblesettingstext', 'core_adminpresets'),

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/header_search_input.mustache

@@ -0,0 +1,52 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template core_admin/header_search_input
+
+    Admin search input for page header.
+
+    Example context (json):
+    {
+        "action": "http://moodle.local/admin/search.php",
+        "query": "themedesigner"
+    }
+}}
+<div class="simplesearchform d-flex justify-content-end">
+  <form autocomplete="off" action="{{action}}" method="get" accept-charset="utf-8" class="mform form-inline simplesearchform">
+    <div class="input-group">
+      <label for="searchinput-{{uniqid}}">
+        <span class="sr-only">{{#str}} search, core {{/str}}</span>
+      </label>
+      <input type="text"
+             id="searchinput-{{uniqid}}"
+             class="form-control"
+             placeholder="{{#str}} search, core {{/str}}"
+             aria-label="{{#str}} search, core {{/str}}"
+             name="query"
+             data-region="input"
+             autocomplete="off"
+             {{#query}}value="{{.}}"{{/query}}
+      >
+      <div class="input-group-append">
+        <button type="submit" class="btn btn-primary search-icon">
+          {{#pix}} a/search, core {{/pix}}
+          <span class="sr-only">{{#str}} search, core {{/str}}</span>
+        </button>
+      </div>
+    </div>
+  </form>
+</div>

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/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/siteadmin_webservice_breadcrumbs.feature

@@ -0,0 +1,31 @@
+@core @core_admin @javascript
+Feature: Verify the breadcrumbs in external webservice site administration pages
+  Whenever I navigate to external webservice page in site administration
+  As an admin
+  The breadcrumbs should be visible
+
+  Background:
+    Given I log in as "admin"
+
+  Scenario: Verify the breadcrumbs in external services page
+    Given I navigate to "Server > Web services > External services" in site administration
+    And "External services" "text" should exist in the ".breadcrumb" "css_element"
+    And "Web services" "link" should exist in the ".breadcrumb" "css_element"
+    When I click on "Edit" "link"
+    Then "Edit external service" "text" should exist in the ".breadcrumb" "css_element"
+    And "External services" "link" should exist in the ".breadcrumb" "css_element"
+    And "Web services" "link" should exist in the ".breadcrumb" "css_element"
+    And I press "Cancel"
+    And I click on "Add" "link"
+    And I set the field "Name" to "function to test"
+    And "Add external service" "text" should exist in the ".breadcrumb" "css_element"
+    And "External services" "link" should exist in the ".breadcrumb" "css_element"
+    And "Web services" "link" should exist in the ".breadcrumb" "css_element"
+    And I press "Add service"
+    And "Functions" "text" should exist in the ".breadcrumb" "css_element"
+    And "External services" "link" should exist in the ".breadcrumb" "css_element"
+    And "Web services" "link" should exist in the ".breadcrumb" "css_element"
+    And I navigate to "Server > Web services > External services" in site administration
+    And I click on "Delete" "link"
+    And "External services" "text" should exist in the ".breadcrumb" "css_element"
+    And "Web services" "link" should exist in the ".breadcrumb" "css_element"

admin/tests/behat/siteadmin_webservice_token_breadcrumbs.feature

@@ -0,0 +1,25 @@
+@core @core_admin @javascript
+Feature: Verify the breadcrumbs in webservice tokens site administration pages
+  Whenever I navigate to manage tokens page in site administration
+  As an admin
+  The breadcrumbs should be visible
+
+  Background:
+    Given I log in as "admin"
+
+  Scenario: Verify the breadcrumbs in manage tokens page as an admin
+    Given the following "users" exist:
+      | username | firstname | lastname | email          |
+      | student1 | John      | Doe      | s1@example.com |
+    And I log in as "admin"
+    And I navigate to "Server > Web services > Manage tokens" in site administration
+    And I click on "Create token" "button"
+    And "Create token" "text" should exist in the ".breadcrumb" "css_element"
+    And "Manage tokens" "link" should exist in the ".breadcrumb" "css_element"
+    And "Web services" "link" should exist in the ".breadcrumb" "css_element"
+    And I set the field "User" to "John Doe"
+    And I press "Save changes"
+    When I click on "Delete" "link"
+    Then "Delete token" "text" should exist in the ".breadcrumb" "css_element"
+    And "Manage tokens" "link" should exist in the ".breadcrumb" "css_element"
+    And "Web services" "link" should exist in the ".breadcrumb" "css_element"

admin/tests/behat/task_logs.feature

@@ -14,9 +14,8 @@ Feature: View task logs report and use its filters
     And I change window size to "large"
     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 "Name" "core_reportbuilder > Filter" to these values:
-      | Name operator | Contains |
-      | Name value    | <name>   |
+    And I set the following fields in the "Class name" "core_reportbuilder > Filter" to these values:
+      | Class name value    | <name>   |
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
     Then I should see "Filters applied"
     And I should see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
@@ -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/base.php

@@ -137,6 +137,10 @@ class base {
             $PAGE->navbar->add($title);
         }
 
+        if ($node = $PAGE->settingsnav->find('tool_admin_presets', \navigation_node::TYPE_SETTING)) {
+            $node->make_active();
+        }
+
         echo $OUTPUT->header();
         echo $OUTPUT->heading($title);
         if ($text) {

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/index.php

@@ -52,6 +52,7 @@ $url->param('mode', $mode);
 $PAGE->set_url($url);
 $PAGE->set_pagelayout('admin');
 $PAGE->set_context($context);
+$PAGE->set_primary_active_tab('siteadminnode');
 
 // Executes the required action.
 $instance = new $classname();

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

@@ -14,8 +14,10 @@ Feature: Admin preset deletion
     And I should see "Custom preset"
     When I open the action menu in "Custom preset" "table_row"
     And I should see "Delete"
+    And I press the escape key
     And I open the action menu in "Full" "table_row"
     Then I should not see "Delete"
+    And I press the escape key
     And I open the action menu in "Starter" "table_row"
     And I should not see "Delete"
 

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/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 = 2021111100;
-$plugin->requires = 2021080500;
+$plugin->version = 2022112800;
+$plugin->requires = 2022111800;

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

@@ -76,10 +76,14 @@ class helper {
 
         $PAGE->set_context($context);
         $PAGE->set_url($url);
+        $PAGE->set_secondary_active_tab('siteadminnode');
+        $PAGE->set_primary_active_tab('siteadminnode');
 
         if ($siteadmin = $PAGE->settingsnav->find('root', \navigation_node::TYPE_SITE_ADMIN)) {
-            $PAGE->navbar->add($siteadmin->get_content(), $siteadmin->action());
+            $PAGE->navbar->add($siteadmin->get_content(), $siteadmin->action(),
+                \breadcrumb_navigation_node::TYPE_SITE_ADMIN, null, 'root');
         }
+
         if ($analytics = $PAGE->settingsnav->find('analytics', \navigation_node::TYPE_SETTING)) {
             $PAGE->navbar->add($analytics->get_content(), $analytics->action());
         }

admin/tool/analytics/tests/behat/siteadmin_analytics_breadcrumbs.feature

@@ -0,0 +1,37 @@
+@core @tool @tool_analytics @javascript
+Feature: Verify the breadcrumbs in analytics site administration pages
+  Whenever I navigate to analytics page in site administration to create, import, edit or restore models
+  As an admin
+  The breadcrumbs should be visible
+
+  Background:
+    Given I log in as "admin"
+
+  Scenario: Verify the breadcrumbs in analytics models page by visiting the create model, import model, restore model and edit page
+    Given I navigate to "Analytics > Analytics models" in site administration
+    And I click on "New model" "link"
+    When I click on "Create model" "link"
+    Then "Create model" "text" should exist in the ".breadcrumb" "css_element"
+    And "Analytics model" "link" should exist in the ".breadcrumb" "css_element"
+    And "Analytics" "link" should exist in the ".breadcrumb" "css_element"
+    And I press "Cancel"
+    # Testing import model page
+    And I click on "New model" "link"
+    And I click on "Import model" "link"
+    And "Import model" "text" should exist in the ".breadcrumb" "css_element"
+    And "Analytics model" "link" should exist in the ".breadcrumb" "css_element"
+    And "Analytics" "link" should exist in the ".breadcrumb" "css_element"
+    And I press "Cancel"
+    # Testing restore defaults
+    And I click on "New model" "link"
+    And I click on "Restore default models" "link"
+    And "Restore default models" "text" should exist in the ".breadcrumb" "css_element"
+    And "Analytics model" "link" should exist in the ".breadcrumb" "css_element"
+    And "Analytics" "link" should exist in the ".breadcrumb" "css_element"
+    And I click on "Back" "link"
+    # Testing edit page
+    And I click on "Actions" "link"
+    And I click on "Edit" "link"
+    And "Edit \"Courses at risk of not starting\" model" "text" should exist in the ".breadcrumb" "css_element"
+    And "Analytics model" "link" should exist in the ".breadcrumb" "css_element"
+    And "Analytics" "link" should exist in the ".breadcrumb" "css_element"

admin/tool/analytics/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // 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 = 2021052500;
-$plugin->requires = 2021052500;
+$plugin->version = 2022112800;
+$plugin->requires = 2022111800;
 $plugin->component = 'tool_availabilityconditions';

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

@@ -24,7 +24,6 @@
 
 $string['aim'] = 'This administration tool helps developers and test writers to create .feature files describing Moodle\'s functionalities and run them automatically. Step definitions available for use in .feature files are listed below.';
 $string['allavailablesteps'] = 'All available step definitions';
-$string['errorapproot'] = '$CFG->behat_ionic_dirroot is not pointing to a valid Moodle app developer install.';
 $string['errorbehatcommand'] = 'Error running behat CLI command. Try running "{$a} --help" manually from CLI to find out more about the problem.';
 $string['errorcomposer'] = 'Composer dependencies are not installed.';
 $string['errordataroot'] = '$CFG->behat_dataroot is not set or is invalid.';

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

@@ -1,4 +1,4 @@
-@tool @tool_behat
+@tool @tool_behat @javascript
 Feature: Set up contextual data for tests
   In order to write tests quickly
   As a developer
@@ -14,7 +14,6 @@ Feature: Set up contextual data for tests
     When I log in as "testuser2"
     Then I should see "TestFirstname"
 
-  @javascript
   Scenario: Add a bunch of courses and categories
     Given the following "categories" exist:
       | name | category | idnumber |
@@ -43,7 +42,6 @@ Feature: Set up contextual data for tests
     And I follow "Category 1"
     And I should see "Course 3"
 
-  @javascript
   Scenario: Add a bunch of groups and groupings
     Given the following "courses" exist:
       | fullname | shortname |
@@ -64,7 +62,6 @@ Feature: Set up contextual data for tests
     And I should see "Grouping 1"
     And I should see "Grouping 2"
 
-  @javascript
   Scenario: Role overrides
     Given the following "users" exist:
       | username | firstname | lastname | email |
@@ -224,7 +221,6 @@ Feature: Set up contextual data for tests
     And I follow "Settings"
     And the field "Type" matches value "Scale"
 
-  @javascript
   Scenario: Add relations between users and groups
     Given the following "users" exist:
       | username | firstname | lastname | email |
@@ -284,16 +280,16 @@ Feature: Set up contextual data for tests
       | student1 | CHC    |
     When I log in as "admin"
     And I navigate to "Users > Accounts > Cohorts" in site administration
-    Then the following should exist in the "cohorts" table:
+    Then the following should exist in the "reportbuilder-table" table:
       | Name            | Cohort size |
       | System cohort A | 1           |
       | System cohort B | 2           |
     And I should not see "Cohort in category"
     And I am on course index
     And I follow "Cat 1"
-    And I follow "Cohorts"
+    And I navigate to "Cohorts" in current page administration
     And I should not see "System cohort"
-    And the following should exist in the "cohorts" table:
+    And the following should exist in the "reportbuilder-table" table:
       | Name               | Cohort size |
       | Cohort in category | 1           |
       | Empty cohort       | 0           |
@@ -335,19 +331,22 @@ Feature: Set up contextual data for tests
     And I am on "Course 1" course homepage
     And I navigate to "Setup > Gradebook setup" in the course gradebook
     Then I should see "Test Grade Item 1"
-    And I follow "Edit   Test Grade Item 1"
+    And I open the action menu in "Test Grade Item 1" "table_row"
+    And I choose "Edit" in the open action menu
     And I expand all fieldsets
     And I should see "Course 1"
     And I press "Cancel"
     And I should see "Grade category 1"
     And I should see "Test Grade Item 2"
-    And I follow "Edit   Test Grade Item 2"
+    And I open the action menu in "Test Grade Item 2" "table_row"
+    And I choose "Edit" in the open action menu
     And I expand all fieldsets
     And I should see "Grade category 1"
     And I press "Cancel"
     And I should see "Grade sub category 2"
     And I should see "Test Grade Item 3"
-    And I follow "Edit   Test Grade Item 3"
+    And I open the action menu in "Test Grade Item 3" "table_row"
+    And I choose "Edit" in the open action menu
     And I expand all fieldsets
     And I should see "Grade sub category 2"
     And I press "Cancel"
@@ -412,7 +411,8 @@ Feature: Set up contextual data for tests
     And I am on "Course 1" course homepage
     And I navigate to "Setup > Gradebook setup" in the course gradebook
     Then I should see "Test Outcome Grade Item 1"
-    And I follow "Edit   Test Outcome Grade Item 1"
+    And I open the action menu in "Test Outcome Grade Item 1" "table_row"
+    And I choose "Edit" in the open action menu
     And the field "Outcome" matches value "Grade outcome 1"
     And I expand all fieldsets
     And I should see "Grade category 1" in the "Grade category" "form_row"

admin/tool/behat/tests/behat/get_and_set_fields_in_containers.feature

@@ -7,8 +7,8 @@ Feature: Behat steps for interacting with form work
   @javascript
   Scenario: Test fields in containers
     Given the following "courses" exist:
-      | fullname | shortname |
-      | Course 1 | C1        |
+      | fullname | shortname | summary | summaryformat |
+      | Course 1 | C1        | Red     | 1             |
     When I log in as "admin"
     And I am on "Course 1" course homepage
     # Just get to any form.
@@ -17,11 +17,15 @@ Feature: Behat steps for interacting with form work
     And I set the following fields in the "Appearance" "fieldset" to these values:
       | Show activity reports   | Yes |
       | Number of announcements | 1   |
+    And I set the following fields in the "Description" "fieldset" to these values:
+      | Course summary          | Green |
     Then the field "Show activity reports" in the "Appearance" "fieldset" matches value "Yes"
     And the field "Show activity reports" in the "Appearance" "fieldset" does not match value "No"
     And the following fields in the "region-main" "region" match these values:
       | Course full name        | Frog |
       | Number of announcements | 1    |
+      | Course summary          | Green |
     And the following fields in the "region-main" "region" do not match these values:
       | Course full name        | Course 1 |
       | Number of announcements | 5        |
+      | Course summary          | Red      |