Moodle release 4.0.2

Adds the SAFER option to the Ghostscript command to limit interaction
with IO and OS commands

.eslintrc

@@ -1,38 +1,53 @@
 {
   'plugins': [
-    '@babel',
+    'babel',
     'promise',
-    'jsdoc'
-  ],
-  'extends': [
-    'eslint:recommended',
-    'plugin:promise/recommended'
+    'jsdoc',
   ],
   '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': {
     'M': true,
     'Y': true
   },
-  // Warn about unused eslint-disable statements.
-  'reportUnusedDisableDirectives': true,
   'rules': {
     // See http://eslint.org/docs/rules/ for all rules and explanations of all
     // rules.
 
     // === Possible Errors ===
     'comma-dangle': 'off',
+    'no-compare-neg-zero': 'error',
+    'no-cond-assign': 'error',
     'no-console': 'error',
+    'no-constant-condition': 'error',
+    'no-control-regex': 'error',
+    'no-debugger': 'error',
+    'no-dupe-args': 'error',
+    'no-dupe-keys': 'error',
+    'no-duplicate-case': 'error',
     'no-empty': 'warn',
+    'no-empty-character-class': 'error',
+    'no-ex-assign': 'error',
+    'no-extra-boolean-cast': 'error',
     'no-extra-parens': 'off',
+    'no-extra-semi': 'error',
+    'no-func-assign': 'error',
+    'no-inner-declarations': 'error',
+    'no-invalid-regexp': 'error',
+    'no-irregular-whitespace': 'error',
+    'no-obj-calls': 'error',
     'no-prototype-builtins': 'off',
+    'no-regex-spaces': 'error',
+    'no-sparse-arrays': 'error',
+    'no-unexpected-multiline': 'error',
     'no-unreachable': 'warn',
+    'no-unsafe-finally': 'error',
+    'no-unsafe-negation': 'error',
+    'use-isnan': 'error',
+    'valid-jsdoc': ['warn', { 'requireReturn': false, 'requireParamDescription': false, 'requireReturnDescription': false }],
+    'valid-typeof': 'error',
 
     // === Best Practices ===
     // (these mostly match our jshint config)
@@ -44,12 +59,15 @@
     'dot-notation': 'warn',
     'no-alert': 'warn',
     'no-caller': 'error',
+    'no-case-declarations': 'error',
     'no-div-regex': 'error',
+    'no-empty-pattern': 'error',
     'no-empty-function': 'warn',
     'no-eq-null': 'error',
     'no-eval': 'error',
     'no-extend-native': 'error',
     'no-extra-bind': 'warn',
+    'no-fallthrough': 'error',
     'no-floating-decimal': 'warn',
     'no-global-assign': 'warn',
     'no-implied-eval': 'error',
@@ -61,22 +79,27 @@
     'no-multi-str': 'error',
     'no-new-func': 'error',
     'no-new-wrappers': 'error',
+    'no-octal': 'error',
     'no-octal-escape': 'error',
     'no-proto': 'error',
     'no-redeclare': 'warn',
-    'no-restricted-globals': ['error', { 'name': 'Notification' }],
     'no-return-assign': 'error',
     'no-script-url': 'error',
+    'no-self-assign': 'error',
     'no-self-compare': 'error',
     'no-sequences': 'warn',
     'no-throw-literal': 'warn',
     'no-unmodified-loop-condition': 'error',
     'no-unused-expressions': 'error',
+    'no-unused-labels': 'error',
     'no-useless-call': 'warn',
     'no-useless-escape': 'warn',
+    'no-with': 'error',
     'wrap-iife': ['error', 'any'],
 
     // === Variables ===
+    'no-delete-var': 'error',
+    'no-undef': 'error',
     'no-undef-init': 'error',
     'no-unused-vars': ['error', { 'caughtErrors': 'none' }],
 
@@ -109,6 +132,8 @@
     'max-statements-per-line': ['warn', { max: 2 }],
     'new-cap': ['warn', { 'properties': false }],
     'new-parens': 'warn',
+    'newline-after-var': 'off',
+    'newline-before-return': 'off',
     'newline-per-chained-call': 'off',
     'no-array-constructor': 'off',
     'no-bitwise': 'error',
@@ -116,6 +141,7 @@
     'no-inline-comments': 'off',
     'no-lonely-if': 'off',
     'no-mixed-operators': 'off',
+    'no-mixed-spaces-and-tabs': 'error',
     'no-multiple-empty-lines': 'warn',
     'no-negated-condition': 'off',
     'no-nested-ternary': 'warn',
@@ -137,6 +163,7 @@
     'padded-blocks': 'off',
     'quote-props': ['warn', 'as-needed', {'unnecessary': false, 'keywords': true, 'numbers': true}],
     'quotes': 'off',
+    'require-jsdoc': 'warn',
     'semi': 'error',
     'semi-spacing': ['warn', {'before': false, 'after': true}],
     'sort-vars': 'off',
@@ -149,28 +176,26 @@
     'unicode-bom': 'error',
     'wrap-regex': 'off',
 
-    // === Promises (override plugin:promise/recommended) ===
+    // === Promises ===
     'promise/always-return': 'warn',
     'promise/no-return-wrap': 'warn',
     'promise/param-names': 'warn',
     'promise/catch-or-return': ['warn', {terminationMethod: ['catch', 'fail']}],
     'promise/no-native': 'warn',
+    'promise/no-promise-in-callback': 'warn',
+    'promise/no-callback-in-promise': 'warn',
     'promise/avoid-new': 'warn',
 
     // === Deprecations ===
     "no-restricted-properties": ['warn', {
         'object': 'M',
         'property': 'str',
-        'message': 'Use "core/str" module or M.util.get_string()'
+        'message': 'Use AMD module "core/str" or M.util.get_string()'
     }],
   },
   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',
@@ -196,11 +221,16 @@
     },
     {
       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',
       // Check AMD with some slightly stricter rules.
       rules: {
+        'no-unused-vars': 'error',
         'no-implicit-globals': 'error',
         // Disable all of the rules that have babel versions.
         'new-cap': 'off',
@@ -212,37 +242,66 @@
         'semi': 'off',
         'no-unused-expressions': 'off',
         // Enable all of the babel version of these rules.
-        '@babel/new-cap': ['warn', { 'properties': false }],
+        'babel/new-cap': ['warn', { 'properties': false }],
         // Not using this rule for the time being because it isn't
         // compatible with jQuery and ES6.
-        '@babel/no-invalid-this': 'off',
-        '@babel/object-curly-spacing': 'warn',
-        '@babel/semi': 'error',
-        '@babel/no-unused-expressions': 'error',
+        'babel/no-invalid-this': 'off',
+        'babel/object-curly-spacing': 'warn',
+        // This is off in the original style int.
+        'babel/quotes': 'off',
+        'babel/semi': 'error',
+        'babel/no-unused-expressions': 'error',
         // === Promises ===
         // We have Promise now that we're using ES6.
         'promise/no-native': 'off',
         'promise/avoid-new': 'off',
 
         // === JSDocs ===
-        'jsdoc/check-access': 'error',
-        'jsdoc/check-alignment': 1, // Recommended.
-        'jsdoc/check-param-names': 'error',
-        'jsdoc/check-property-names': 'error',
-        'jsdoc/empty-tags': 'error',
-        'jsdoc/implements-on-classes': 'error',
-        'jsdoc/multiline-blocks': 'error',
-        'jsdoc/require-jsdoc': 'error',
-        'jsdoc/require-param': 'error',
-        'jsdoc/require-param-name': 'error',
-        'jsdoc/require-param-type': 'error',
-        'jsdoc/require-property': 'error',
-        'jsdoc/require-property-name': 'error',
-        'jsdoc/require-property-type': 'error'
+        "jsdoc/check-access": [
+          'error',
+        ],
+        "jsdoc/check-alignment": 1, // Recommended.
+        "jsdoc/check-param-names": [
+          'error',
+        ],
+        "jsdoc/check-property-names": [
+          'error',
+        ],
+        "jsdoc/empty-tags": [
+          'error',
+        ],
+        "jsdoc/implements-on-classes": [
+          'error',
+        ],
+        "jsdoc/multiline-blocks": [
+          'error',
+        ],
+        "jsdoc/require-jsdoc": [
+          'error',
+        ],
+        "jsdoc/require-param": [
+          'error',
+        ],
+        "jsdoc/require-param-name": [
+          'error',
+        ],
+        "jsdoc/require-param-type": [
+          'error',
+        ],
+        "jsdoc/require-property": [
+          'error',
+        ],
+        "jsdoc/require-property-name": [
+          'error',
+        ],
+        "jsdoc/require-property-type": [
+          'error',
+        ],
       },
       parserOptions: {
+        'ecmaVersion': 9,
         'sourceType': 'module',
-        'requireConfigFile': false
+        'requireConfigFile': false,
       }
     }
   ]

.github/workflows/push.yml

@@ -3,30 +3,24 @@ name: Core
 on:
   push:
     branches-ignore:
-      - main
+      - master
       - MOODLE_[0-9]+_STABLE
     tags-ignore:
       - v[0-9]+.[0-9]+.[0-9]+*
-  workflow_dispatch:
-    inputs:
-      phpunit_extra_options:
-        description: Additional options to apply to PHPUnit
-        required: false
-        default: ''
 
 env:
-  php: 8.1
+  php: 8.0
 
 jobs:
   Grunt:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checking out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Configuring node & npm
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v2
         with:
           node-version-file: '.nvmrc'
 
@@ -60,18 +54,19 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-22.04
-            php: 7.4
+          - os: ubuntu-20.04
+            php: 7.3
             extensions:
             db: mysqli
-          - os: ubuntu-22.04
-            php: 8.1
+          - os: ubuntu-20.04
+            php: 8.0
             db: pgsql
+            extensions: xmlrpc-beta
 
     steps:
       - name: Setting up DB mysql
         if: ${{ matrix.db == 'mysqli' }}
-        uses: moodlehq/mysql-action@v1
+        uses: johanmeiring/mysql-action@tmpfs-patch
         with:
           collation server: utf8mb4_bin
           mysql version: 5.7
@@ -79,20 +74,18 @@ jobs:
           mysql user: test
           mysql password: test
           use tmpfs: true
-          tmpfs size: '1024M'
-          extra conf: --skip-log-bin
 
       - name: Setting up DB pgsql
         if: ${{ matrix.db == 'pgsql' }}
         uses: m4nu56/postgresql-action@v1
         with:
-          postgresql version: 12
+          postgresql version: 10
           postgresql db: test
           postgresql user: test
           postgresql password: test
 
       - name: Configuring git vars
-        uses: rlespinasse/github-slug-action@v4
+        uses: rlespinasse/github-slug-action@v3.x
 
       - name: Setting up PHP ${{ matrix.php }}
         uses: shivammathur/setup-php@v2
@@ -103,7 +96,7 @@ jobs:
           coverage: none
 
       - name: Checking out code from ${{ env.GITHUB_REF_SLUG }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Setting up PHPUnit
         env:
@@ -119,4 +112,4 @@ jobs:
         env:
           dbtype: ${{ matrix.db }}
           phpunit_options: ${{ secrets.phpunit_options }}
-        run: vendor/bin/phpunit $phpunit_options ${{ inputs.phpunit_extra_options }}
+        run: vendor/bin/phpunit $phpunit_options

.github/workflows/windows.yml

@@ -1,144 +0,0 @@
-name: Windows Testing
-
-on:
-  workflow_dispatch
-env:
-  php: 8.1
-
-jobs:
-  Grunt:
-    runs-on: windows-latest
-
-    steps:
-      - name: Set git to use LF
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-
-      - name: Checking out code
-        uses: actions/checkout@v4
-
-      - name: Configuring node & npm
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-
-      - name: Installing node stuff
-        run: npm ci
-
-      - name: Running grunt
-        run: npx grunt
-
-      - name: Looking for uncommitted changes
-        # Add all files to the git index and then run diff --cached to see all changes.
-        # This ensures that we get the status of all files, including new files.
-        # We ignore npm-shrinkwrap.json to make the tasks immune to npm changes.
-        run: |
-          git add .
-          git reset -- npm-shrinkwrap.json
-          git diff --cached --exit-code
-
-  PHPUnit:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: windows-latest
-            php: 8.1
-            # Ideally we should use mysql/mariadb, but they are 4x slower without tweaks and configuration
-            # so let's run only postgres (1.5h vs 6h) only, If some day we want to improve the mysql runs,
-            # this is the place to enable them.
-            # db: mysqli
-            db: pgsql
-            extensions: exif, fileinfo, gd, intl, pgsql, mysql, redis, soap, sodium
-          - os: windows-latest
-            php: 8.0
-            db: pgsql
-            extensions: exif, fileinfo, gd, intl, pgsql, mysql, redis, soap, sodium
-
-    steps:
-      - name: Setting up DB mysql
-        if: ${{ matrix.db == 'mysqli' }}
-        uses: shogo82148/actions-setup-mysql@v1
-        with:
-          mysql-version: 8.0
-          user: test
-          password: test
-
-      - name: Creating DB mysql
-        if: ${{ matrix.db == 'mysqli' }}
-        run: mysql --host 127.0.0.1 -utest -ptest -e 'CREATE DATABASE IF NOT EXISTS test COLLATE = utf8mb4_bin;';
-
-      - name: Setting up DB pgsql
-        if: ${{ matrix.db == 'pgsql' }}
-        run: |
-          # TODO: Remove these conf. modifications when php74 or php80 are lowest.
-          # Change to old md5 auth, because php73 does not support it.
-          # #password_encryption = scram-sha-256
-          (Get-Content "$env:PGDATA\postgresql.conf"). `
-              replace('#password_encryption = scram-sha-256', 'password_encryption = md5') | `
-              Set-Content "$env:PGDATA\postgresql.conf"
-          (Get-Content "$env:PGDATA\pg_hba.conf"). `
-              replace('scram-sha-256', 'md5') | `
-              Set-Content "$env:PGDATA\pg_hba.conf"
-          $pgService = Get-Service -Name postgresql*
-          Set-Service -InputObject $pgService -Status running -StartupType automatic
-          Start-Process -FilePath "$env:PGBIN\pg_isready" -Wait -PassThru
-          & $env:PGBIN\psql --command="CREATE USER test PASSWORD 'test'" --command="\du"
-
-      - name: Creating DB pgsql
-        if: ${{ matrix.db == 'pgsql' }}
-        run: |
-          & $env:PGBIN\createdb --owner=test test
-          $env:PGPASSWORD = 'test'
-          & $env:PGBIN\psql --username=test --host=localhost --list test
-
-      - name: Configuring git vars
-        uses: rlespinasse/github-slug-action@v4
-
-      - name: Setting up PHP ${{ matrix.php }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: ${{ matrix.extensions }}
-          ini-values: max_input_vars=5000
-          coverage: none
-
-      - name: Set git to use LF
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-
-      - name: Checking out code from ${{ env.GITHUB_REF_SLUG }}
-        uses: actions/checkout@v4
-
-      # Needs to be done after php is available, git configured and Moodle checkout has happened.
-      - name: Setting up moodle-exttests service
-        run: |
-          git clone https://github.com/moodlehq/moodle-exttests.git
-          nssm install php-built-in C:\tools\php\php.exe -S localhost:8080 -t D:\a\moodle\moodle\moodle-exttests
-          nssm start php-built-in
-
-      - name: Setting up redis service
-        run: |
-          choco install redis-64 --version 3.0.503 --no-progress
-          nssm install redis redis-server
-          nssm start redis
-
-      - name: Setting up PHPUnit
-        env:
-          dbtype: ${{ matrix.db }}
-        shell: bash
-        run: |
-          echo "pathtophp=$(which php)" >> $GITHUB_ENV # Inject installed pathtophp to env. The template config needs it.
-          cp .github/workflows/config-template.php config.php
-          mkdir ../moodledata
-          php admin/tool/phpunit/cli/init.php --no-composer-self-update
-
-      - name: Running PHPUnit tests
-        env:
-          dbtype: ${{ matrix.db }}
-          phpunit_options: ${{ secrets.phpunit_options }}
-        run: vendor/bin/phpunit $phpunit_options

.gitignore

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

.grunt/components.js

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

.grunt/jsdoc/README.md

@@ -16,4 +16,4 @@ Moodle - the world's open source learning platform
 This generated documentation includes API documentation for JavaScript written in the AMD and ES2015 module formats within Moodle.
 
 ## Related information
-See [https://moodledev.io](https://moodledev.io) for other related Developer Documentation.
+See [https://docs.moodle.org/dev](https://docs.moodle.org/dev) for other related Developer Documentation.

.grunt/jsdoc/jsdoc.conf.js

@@ -114,7 +114,7 @@ module.exports = {
         ],
         "menu": {
             "Developer Docs": {
-                href: "https://moodledev.io",
+                href: "https://docs.moodle.org/dev",
                 target: "_blank",
                 "class": "menu-item",
                 id: "devdocs"

.grunt/tasks/componentlibrary.js

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

.grunt/tasks/ignorefiles.js

@@ -39,7 +39,7 @@ module.exports = grunt => {
                 {
                     rule: {
                         _attrs: {
-                            ref: './phpcs.xml.dist',
+                            ref: './.phpcs.xml.dist',
                         },
                     },
                 },
@@ -52,7 +52,7 @@ module.exports = grunt => {
             });
         });
 
-        grunt.file.write('phpcs.xml', toXML(config, {
+        grunt.file.write('.phpcs.xml', toXML(config, {
             header: true,
             indent: '  ',
         }) + "\n");

.grunt/tasks/javascript.js

@@ -21,7 +21,7 @@
  */
 
 /**
- * Function to generate the destination for the minification task
+ * Function to generate the destination for the uglify task
  * (e.g. build/file.min.js). This function will be passed to
  * the rename property of files array when building dynamically:
  * http://gruntjs.com/configuring-tasks#building-the-files-object-dynamically
@@ -30,9 +30,10 @@
  * @param {String} srcPath the  matched src path
  * @return {String} The rewritten destination path.
  */
+
 const babelRename = function(destPath, srcPath) {
-    destPath = srcPath.replace(`amd/src`, `amd/build`);
-    destPath = destPath.replace(/\.js$/, '.min.js');
+    destPath = srcPath.replace('src', 'build');
+    destPath = destPath.replace('.js', '.min.js');
     return destPath;
 };
 
@@ -46,9 +47,6 @@ module.exports = grunt => {
     // Load ESLint.
     require('./eslint')(grunt);
 
-    // Load jsconfig.
-    require('./jsconfig')(grunt);
-
     // Load JSDoc.
     require('./jsdoc')(grunt);
 
@@ -60,6 +58,7 @@ module.exports = grunt => {
     grunt.registerTask('js', ['amd', 'yui']);
 
     // Register NPM tasks.
+    grunt.loadNpmTasks('grunt-contrib-uglify');
     grunt.loadNpmTasks('grunt-contrib-watch');
     grunt.loadNpmTasks('grunt-rollup');
 
@@ -103,7 +102,6 @@ module.exports = grunt => {
         // The queue runner will run the next `size` items in the queue.
         const runQueue = (size = 1) => {
             queue.splice(0, size).forEach(resolve => {
-                grunt.log.debug(`Item resolved. Kicking off next one.`);
                 resolve();
             });
         };
@@ -113,17 +111,15 @@ module.exports = grunt => {
 
             // The options hook is run in parallel.
             // We can return an unresolved Promise which is queued for later resolution.
-            options: async(options) => {
+            options: async() => {
                 return new Promise(resolve => {
                     queue.push(resolve);
                     startQueue();
-                    return options;
                 });
             },
 
             // When an item in the queue completes, start the next item in the queue.
-            generateBundle: (options, bundle) => {
-                grunt.log.debug(`Finished output phase for ${Object.keys(bundle).join(', ')}`);
+            buildEnd: () => {
                 runQueue();
             },
         };
@@ -153,10 +149,24 @@ module.exports = grunt => {
                             //
                             // It also adds the Moodle plugin name to the AMD module definition
                             // so that it can be imported as expected in other modules.
-                            path.resolve('.grunt/babel-plugin-add-module-to-define.js')
+                            path.resolve('.grunt/babel-plugin-add-module-to-define.js'),
+                            '@babel/plugin-syntax-dynamic-import',
+                            '@babel/plugin-syntax-import-meta',
+                            ['@babel/plugin-proposal-class-properties', {'loose': false}],
+                            '@babel/plugin-proposal-json-strings'
                         ],
                         presets: [
                             ['@babel/preset-env', {
+                                targets: {
+                                    browsers: [
+                                        ">0.3%",
+                                        "last 2 versions",
+                                        "not ie >= 0",
+                                        "not op_mini all",
+                                        "not Opera > 0",
+                                        "not dead"
+                                    ]
+                                },
                                 modules: false,
                                 useBuiltIns: false
                             }]

.grunt/tasks/jsconfig.js

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

.grunt/tasks/jsdoc.js

@@ -20,33 +20,17 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-module.exports = (grunt) => {
-    const path = require('path');
-
-    grunt.registerTask('jsdoc', 'Generate JavaScript documentation using jsdoc', function() {
-        const done = this.async();
-        const configuration = path.resolve('.grunt/jsdoc/jsdoc.conf.js');
-
-        grunt.util.spawn({
-            cmd: 'jsdoc',
-            args: [
-                '--configure',
-                configuration,
-            ]
-        }, function(error, result, code) {
-            if (result.stdout) {
-                grunt.log.write(result.stdout);
-            }
-
-            if (result.stderr) {
-                grunt.log.error(result.stderr);
-            }
-            if (error) {
-                grunt.fail.fatal(`JSDoc failed with error code ${code}`);
-            } else {
-                grunt.log.write('JSDoc completed successfully'.green);
-            }
-            done();
-        });
+module.exports = grunt => {
+    // Project configuration.
+    grunt.config.merge({
+        jsdoc: {
+            dist: {
+                options: {
+                    configure: ".grunt/jsdoc/jsdoc.conf.js",
+                },
+            },
+        },
     });
+
+    grunt.loadNpmTasks('grunt-jsdoc');
 };

.grunt/tasks/sass.js

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

.grunt/tasks/stylelint.js

@@ -29,7 +29,6 @@ module.exports = grunt => {
                     // Use a fully-qualified path.
                     src: files,
                     options: {
-                        quietDeprecationWarnings: true,
                         configOverrides: {
                             rules: {
                                 // These rules have to be disabled in .stylelintrc for scss compat.
@@ -46,10 +45,7 @@ module.exports = grunt => {
         return {
             stylelint: {
                 scss: {
-                    options: {
-                        quietDeprecationWarnings: true,
-                        customSyntax: 'postcss-scss',
-                    },
+                    options: {syntax: 'scss'},
                     src: files,
                 },
             },

.nvmrc

@@ -1 +1 @@
-lts/iron
+lts/gallium

.phpcs.xml.dist

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ruleset name="MoodleCore">
   <rule ref="moodle"/>
-  <config name="testVersion" value="7.4-8.1"/>
 </ruleset>

.stylelintrc

@@ -1,14 +1,9 @@
 {
-    "customSyntax": "postcss-scss",
     "plugins": [
         "stylelint-csstree-validator"
     ],
     "rules": {
-        "csstree/validator": {
-          "syntaxExtensions": [
-            "sass"
-          ]
-        },
+        "csstree/validator": true,
         "at-rule-empty-line-before": [ "always",
           {"except": [ "blockless-after-blockless"], ignore: ["after-comment", "inside-block"]}
         ],
@@ -50,7 +45,7 @@
         "function-name-case": "lower",
         "function-parentheses-newline-inside": "always-multi-line",
         "function-parentheses-space-inside": "never-single-line",
-        "function-url-scheme-disallowed-list": ["data"],
+        "function-url-scheme-blacklist": ["data"],
         "function-whitespace-after": "always",
         "indentation": 4,
         "keyframe-declaration-no-important": true,
@@ -89,19 +84,12 @@
         "selector-type-no-unknown": true,
         "string-no-newline": true,
         "time-min-milliseconds": 100,
-        "unit-disallowed-list": ["pt"],
+        "unit-blacklist": ["pt"],
         "unit-case": "lower",
         "unit-no-unknown": true,
         "value-keyword-case": ["lower", {"ignoreKeywords": ["/(@|$)/"]}],
         "value-list-comma-newline-after": "always-multi-line",
         "value-list-comma-space-after": "always-single-line",
         "value-list-comma-space-before": "never",
-  },
-  "overrides": [
-    {
-      "files": ["**/yui/**/*.css"],
-      "rules": {
-      }
-    }
-  ]
+  }
 }

.travis.yml

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

CONTRIBUTING.txt

@@ -6,7 +6,7 @@ of developers, designers, teachers, testers, translators and other users. We
 work in universities, schools, companies and other places. You are very welcome
 to join us and contribute to the project.
 
-See <https://moodledev.io/general/community/contribute> for the many ways you
+See <https://docs.moodle.org/dev/Contributing_to_Moodle> for the many ways you
 can help, not only with coding.
 
 Moodle is open to community contributions to core, though all code must go
@@ -35,7 +35,7 @@ submitted patches has evolved.
 * New features are developed on the master branch. Bug fixes are also
   backported to currently supported maintenance (stable) branches.
 
-For further details, see <https://moodledev.io/general/development/process>.
+For further details, see <https://docs.moodle.org/dev/Process>.
 
 Moodle plugins
 --------------
@@ -53,4 +53,4 @@ be easily installed and updated via the Moodle administration interface.
   the plugins directory. We do not pull from your code repository; you must do
   it explicitly.
 
-For further details, see <https://moodledev.io/general/community/plugincontribution>.
+For further details, see <https://docs.moodle.org/dev/Plugin_contribution>.

README.txt

@@ -20,7 +20,7 @@ Moodle is widely used around the world by universities, schools, companies and
 all manner of organisations and individuals.
 
 Moodle is provided freely as open source software, under the GNU General Public
-License <https://moodledev.io/general/license>.
+License <https://docs.moodle.org/dev/License>.
 
 Moodle is written in PHP and JavaScript and uses an SQL database for storing
 the data.

TRADEMARK.txt

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

admin/auth.php

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

admin/blocks.php

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

admin/category.php

@@ -41,11 +41,11 @@ $adminroot = admin_get_root(); // need all settings
 $settingspage = $adminroot->locate($category, true);
 
 if (empty($settingspage) or !($settingspage instanceof admin_category)) {
-    throw new \moodle_exception('categoryerror', 'error', "$CFG->wwwroot/$CFG->admin/");
+    print_error('categoryerror', 'admin', "$CFG->wwwroot/$CFG->admin/");
 }
 
 if (!($settingspage->check_access())) {
-    throw new \moodle_exception('accessdenied', 'admin');
+    print_error('accessdenied', 'admin');
 }
 
 $hassiteconfig = has_capability('moodle/site:config', $PAGE->context);
@@ -131,7 +131,8 @@ if ($savebutton) {
     $outputhtml .= html_writer::end_tag('div');
 }
 
-$PAGE->set_title(implode(moodle_page::TITLE_SEPARATOR, $settingspage->visiblepath));
+$visiblepathtosection = array_reverse($settingspage->visiblepath);
+$PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
 $PAGE->set_heading($SITE->fullname);
 if ($buttons) {
     $PAGE->set_button($buttons);

admin/classes/local/entities/task_log.php

@@ -14,21 +14,18 @@
 // 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\reportbuilder\local\entities;
+namespace core_admin\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
@@ -63,6 +60,15 @@ 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
      *
@@ -74,12 +80,9 @@ 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)
-                ->add_condition($filter);
+            $this->add_filter($filter);
         }
 
         return $this;
@@ -91,7 +94,6 @@ class task_log extends base {
      * @return column[]
      */
     protected function get_all_columns(): array {
-        global $DB;
 
         $tablealias = $this->get_table_alias('task_log');
 
@@ -105,31 +107,20 @@ class task_log extends base {
             ->set_type(column::TYPE_TEXT)
             ->add_field("$tablealias.classname")
             ->set_is_sortable(true)
-            ->add_callback(static function(string $classname): string {
+            ->add_callback(static function(string $value): string {
                 $output = '';
-                if (class_exists($classname)) {
-                    $task = new $classname;
-                    if ($task instanceof \core\task\task_base) {
+                if (class_exists($value)) {
+                    $task = new $value;
+                    if ($task instanceof \core\task\scheduled_task) {
                         $output = $task->get_name();
                     }
                 }
-                $output .= \html_writer::tag('div', "\\{$classname}", [
-                    'class' => 'small text-muted',
+                $output .= \html_writer::tag('div', "\\{$value}", [
+                    'class' => 'task-class',
                 ]);
                 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',
@@ -137,11 +128,11 @@ class task_log extends base {
             $this->get_entity_name()
         ))
             ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_TEXT)
+            ->set_type(column::TYPE_INTEGER)
             ->add_field("{$tablealias}.type")
             ->set_is_sortable(true)
-            ->add_callback(static function($value): string {
-                if (\core\task\database_logger::TYPE_SCHEDULED === (int) $value) {
+            ->add_callback(static function(int $value): string {
+                if (\core\task\database_logger::TYPE_SCHEDULED === $value) {
                     return get_string('task_type:scheduled', 'admin');
                 }
                 return get_string('task_type:adhoc', 'admin');
@@ -159,18 +150,6 @@ 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',
@@ -211,9 +190,7 @@ class task_log extends base {
             ->add_joins($this->get_joins())
             ->set_type(column::TYPE_INTEGER)
             ->add_field("{$tablealias}.pid")
-            ->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']);
+            ->set_is_sortable(true);
 
         // Database column.
         $columns[] = (new column(
@@ -224,37 +201,13 @@ 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, ["{$tablealias}.dbreads", "{$tablealias}.dbwrites"])
+            ->set_is_sortable(true)
             ->add_callback(static function(int $value, stdClass $row): string {
                 $output = '';
                 $output .= \html_writer::div(get_string('task_stats:dbreads', 'admin', $row->dbreads));
                 $output .= \html_writer::div(get_string('task_stats:dbwrites', 'admin', $row->dbwrites));
                 return $output;
-            })
-            // 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(
@@ -263,12 +216,11 @@ class task_log extends base {
             $this->get_entity_name()
         ))
             ->add_joins($this->get_joins())
-            ->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_type(column::TYPE_INTEGER)
+            ->add_field("$tablealias.result")
             ->set_is_sortable(true)
-            ->add_callback(static function(bool $success): string {
-                if (!$success) {
+            ->add_callback(static function(int $value): string {
+                if ($value) {
                     return get_string('task_result:failed', 'admin');
                 }
                 return get_string('success');
@@ -283,128 +235,27 @@ class task_log extends base {
      * @return filter[]
      */
     protected function get_all_filters(): array {
-        global $DB;
+        $filters = [];
 
         $tablealias = $this->get_table_alias('task_log');
 
         // Name filter (Filter by classname).
         $filters[] = (new filter(
-            autocomplete::class,
+            text::class,
             'name',
             new lang_string('classname', 'tool_task'),
             $this->get_entity_name(),
             "{$tablealias}.classname"
-        ))
-            ->add_joins($this->get_joins())
-            ->set_options_callback(static function(): array {
-                global $DB;
-                $classnames = $DB->get_fieldset_sql('SELECT DISTINCT classname FROM {task_log} ORDER BY classname ASC');
-
-                $options = [];
-                foreach ($classnames as $classname) {
-                    if (class_exists($classname)) {
-                        $task = new $classname;
-                        $options[$classname] = $task->get_name();
-                    }
-                }
-
-                core_collator::asort($options);
-                return $options;
-            });
-
-        // Component filter.
-        $filters[] = (new filter(
-            text::class,
-            'component',
-            new lang_string('plugin'),
-            $this->get_entity_name(),
-            "{$tablealias}.component"
         ))
             ->add_joins($this->get_joins());
 
-        // Type filter.
-        $filters[] = (new filter(
-            select::class,
-            'type',
-            new lang_string('tasktype', 'admin'),
-            $this->get_entity_name(),
-            "{$tablealias}.type"
-        ))
-            ->add_joins($this->get_joins())
-            ->set_options([
-                \core\task\database_logger::TYPE_ADHOC => new lang_string('task_type:adhoc', 'admin'),
-                \core\task\database_logger::TYPE_SCHEDULED => new lang_string('task_type:scheduled', 'admin'),
-            ]);
-
         // Output filter (Filter by task output).
         $filters[] = (new filter(
             text::class,
             'output',
             new lang_string('task_logoutput', 'admin'),
             $this->get_entity_name(),
-            $DB->sql_cast_to_char("{$tablealias}.output")
-        ))
-            ->add_joins($this->get_joins());
-
-        // Start time filter.
-        $filters[] = (new filter(
-            date::class,
-            'timestart',
-            new lang_string('task_starttime', 'admin'),
-            $this->get_entity_name(),
-            "{$tablealias}.timestart"
-        ))
-            ->add_joins($this->get_joins())
-            ->set_limited_operators([
-                date::DATE_ANY,
-                date::DATE_RANGE,
-                date::DATE_PREVIOUS,
-                date::DATE_CURRENT,
-            ]);
-
-        // 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"
-        ))
-            ->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"
+            "{$tablealias}.output"
         ))
             ->add_joins($this->get_joins());
 
@@ -422,6 +273,32 @@ class task_log extends base {
                 self::FAILED => get_string('task_result:failed', 'admin'),
             ]);
 
+        // Start time filter.
+        $filters[] = (new filter(
+            date::class,
+            'timestart',
+            new lang_string('task_starttime', 'admin'),
+            $this->get_entity_name(),
+            "{$tablealias}.timestart"
+        ))
+            ->add_joins($this->get_joins())
+            ->set_limited_operators([
+                date::DATE_ANY,
+                date::DATE_RANGE,
+                date::DATE_PREVIOUS,
+                date::DATE_CURRENT,
+            ]);
+
+        // Duration filter.
+        $filters[] = (new filter(
+            duration::class,
+            'duration',
+            new lang_string('task_duration', 'admin'),
+            $this->get_entity_name(),
+            "${tablealias}.timeend - {$tablealias}.timestart"
+        ))
+            ->add_joins($this->get_joins());
+
         return $filters;
     }
 }

admin/classes/local/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\reportbuilder\local\systemreports;
+namespace core_admin\local\systemreports;
 
 use context_system;
-use core_admin\reportbuilder\local\entities\task_log;
+use core_admin\local\entities\task_log;
 use core_reportbuilder\local\entities\user;
 use core_reportbuilder\local\report\action;
 use lang_string;
@@ -121,7 +121,6 @@ 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/classes/reportbuilder/datasource/task_logs.php

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

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

@@ -57,7 +57,6 @@ Options:
 --fullname=STRING     Name of the site
 --shortname=STRING    Name of the site
 --summary=STRING      The summary to be displayed on the front page
---supportemail=STRING Email address for support and help.
 -h, --help            Print out this help
 
 Example:
@@ -99,7 +98,6 @@ list($options, $unrecognized) = cli_get_params(
         'fullname'          => '',
         'shortname'         => '',
         'summary'           => '',
-        'supportemail'      => '',
         'agree-license'     => false,
         'help'              => false
     ),
@@ -138,15 +136,6 @@ if (!empty($options['adminemail']) && !validate_email($options['adminemail'])) {
     cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
 }
 
-// Validate that the supportemail provided was an e-mail address.
-if (!empty($options['supportemail']) && !validate_email($options['supportemail'])) {
-    $a = (object) [
-        'option' => 'supportemail',
-        'value' => $options['supportemail']
-    ];
-    cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-}
-
 $options['lang'] = clean_param($options['lang'], PARAM_SAFEDIR);
 if (!file_exists($CFG->dirroot.'/install/lang/'.$options['lang'])) {
     $options['lang'] = 'en';

admin/cli/restore_backup.php

@@ -69,19 +69,19 @@ if ($options['showdebugging']) {
 }
 
 if (!$admin = get_admin()) {
-    throw new \moodle_exception('noadmins');
+    print_error('noadmins');
 }
 
 if (!file_exists($options['file'])) {
-    throw new \moodle_exception('filenotfound');
+    print_error('filenotfound');
 }
 
 if (!$category = $DB->get_record('course_categories', ['id' => $options['categoryid']], 'id')) {
-    throw new \moodle_exception('invalidcategoryid');
+    print_error('invalidcategoryid');
 }
 
-$backupdir = restore_controller::get_tempdir_name(SITEID, $USER->id);
-$path = make_backup_temp_directory($backupdir);
+$backupdir = "restore_" . uniqid();
+$path = $CFG->tempdir . DIRECTORY_SEPARATOR . "backup" . DIRECTORY_SEPARATOR . $backupdir;
 
 cli_heading(get_string('extractingbackupfileto', 'backup', $path));
 $fp = get_file_packer('application/vnd.moodle.backup');
@@ -102,7 +102,7 @@ try {
 } catch (Exception $e) {
     cli_heading(get_string('cleaningtempdata'));
     fulldelete($path);
-    throw new \moodle_exception('generalexceptionmessage', 'error', '', $e->getMessage());
+    print_error('generalexceptionmessage', 'error', '', $e->getMessage());
 }
 
 cli_heading(get_string('restoredcourseid', 'backup', $courseid));

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])) {
-    throw new \moodle_exception('contenttypenotfound', 'error', $return, $name);
+    print_error('contenttypenotfound', 'error', $return, $name);
 }
 
 switch ($action) {

admin/course/resetindentation.php

@@ -1,78 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Reset course indentation
- *
- * @copyright 2023 Amaia Anabitarte <amaia@moodle.com>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once('../../config.php');
-
-require_admin();
-
-$format = required_param('format', PARAM_PLUGIN);
-$confirm = optional_param('confirm', false, PARAM_BOOL);
-$backurl = new moodle_url('/admin/settings.php', ['section' => 'formatsetting'.$format]);
-
-$PAGE->set_url('/admin/course/resetindentation.php', ['format' => $format]);
-$PAGE->set_context(context_system::instance());
-
-if ($confirm) {
-    require_sesskey();
-    $courses = $DB->get_records('course', ['format' => $format], 'id', 'id');
-    if (!empty($courses)) {
-        $courseids = array_keys($courses);
-        list($courseinsql, $courseparams) = $DB->get_in_or_equal($courseids, SQL_PARAMS_NAMED, 'course');
-        $DB->set_field_select('course_modules', 'indent', '0', "course $courseinsql AND indent <> 0", $courseparams);
-        rebuild_course_cache(0, true);
-    }
-    redirect(
-        $backurl,
-        get_string('resetindentationsuccess', 'admin'),
-        null,
-        \core\output\notification::NOTIFY_SUCCESS
-    );
-}
-
-$strtitle = get_string('resetindentation', 'admin');
-
-$PAGE->set_title($strtitle);
-$PAGE->set_heading($strtitle);
-
-navigation_node::override_active_url(new moodle_url(
-    '/admin/course/resetindentation.php',
-    ['action' => 'confirm', 'format' => $format]
-));
-
-echo $OUTPUT->header();
-
-$displayoptions = ['confirmtitle' => get_string('resetindentation_title', 'admin')];
-$confirmbutton = new single_button(
-    new moodle_url('/admin/course/resetindentation.php', ['confirm' => 1, 'format' => $format, 'sesskey' => sesskey()]),
-    get_string('resetindentation', 'admin'),
-    'post'
-);
-$cancelbutton = new single_button($backurl, get_string('cancel'));
-echo $OUTPUT->confirm(
-    get_string('resetindentation_help', 'admin', ['format' => get_string('pluginname', 'format_'.$format)]),
-    $confirmbutton,
-    $cancelbutton,
-    $displayoptions
-);
-
-echo $OUTPUT->footer();

admin/courseformats.php

@@ -41,7 +41,7 @@ $formatplugins = core_plugin_manager::instance()->get_plugins_of_type('format');
 $sortorder = array_flip(array_keys($formatplugins));
 
 if (!isset($formatplugins[$formatname])) {
-    throw new \moodle_exception('courseformatnotfound', 'error', $return, $formatname);
+    print_error('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.
-    throw new \moodle_exception('cronerrorclionly', 'admin');
+    print_error('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.
-        throw new \moodle_exception('cronerrorpassword', 'admin');
+        print_error('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])) {
-    throw new \moodle_exception('customfieldnotfound', 'error', $return, $customfieldname);
+    print_error('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])) {
-    throw new \moodle_exception('courseformatnotfound', 'error', $return, $name);
+    print_error('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 . '/';
-                    throw new \moodle_exception($cd->get_error(), 'error', $PAGE->url, $a);
+                    print_error($cd->get_error(), 'error', $PAGE->url, $a);
                     die();
 
                 } else {
-                    throw new \moodle_exception($cd->get_error(), 'error', $PAGE->url);
+                    print_error($cd->get_error(), 'error', $PAGE->url);
                     die();
                 }
 

admin/environment.xml

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

admin/index.php

@@ -174,17 +174,15 @@ $documentationlink = '<a href="http://docs.moodle.org/en/Installation">Installat
 // Check some PHP server settings
 
 if (ini_get_bool('session.auto_start')) {
-    throw new \moodle_exception('phpvaroff', 'debug', '',
-        (object)array('name' => 'session.auto_start', 'link' => $documentationlink));
+    print_error('phpvaroff', 'debug', '', (object)array('name'=>'session.auto_start', 'link'=>$documentationlink));
 }
 
 if (!ini_get_bool('file_uploads')) {
-    throw new \moodle_exception('phpvaron', 'debug', '',
-        (object)array('name' => 'file_uploads', 'link' => $documentationlink));
+    print_error('phpvaron', 'debug', '', (object)array('name'=>'file_uploads', 'link'=>$documentationlink));
 }
 
 if (is_float_problem()) {
-    throw new \moodle_exception('phpfloatproblem', 'admin', '', $documentationlink);
+    print_error('phpfloatproblem', 'admin', '', $documentationlink);
 }
 
 // Set some necessary variables during set-up to avoid PHP warnings later on this page
@@ -205,7 +203,7 @@ require("$CFG->dirroot/version.php");       // defines $version, $release, $bran
 $CFG->target_release = $release;            // used during installation and upgrades
 
 if (!$version or !$release) {
-    throw new \moodle_exception('withoutversion', 'debug'); // Without version, stop.
+    print_error('withoutversion', 'debug'); // without version, stop
 }
 
 if (!core_tables_exist()) {
@@ -224,7 +222,7 @@ if (!core_tables_exist()) {
         $strlicense = get_string('license');
 
         $PAGE->navbar->add($strlicense);
-        $PAGE->set_title($strinstallation . moodle_page::TITLE_SEPARATOR . 'Moodle ' . $CFG->target_release, false);
+        $PAGE->set_title($strinstallation.' - Moodle '.$CFG->target_release);
         $PAGE->set_heading($strinstallation);
         $PAGE->set_cacheable(false);
 
@@ -267,7 +265,7 @@ if (!core_tables_exist()) {
     upgrade_init_javascript();
 
     $PAGE->navbar->add($strdatabasesetup);
-    $PAGE->set_title($strinstallation . moodle_page::TITLE_SEPARATOR . $CFG->target_release, false);
+    $PAGE->set_title($strinstallation.' - Moodle '.$CFG->target_release);
     $PAGE->set_heading($strinstallation);
     $PAGE->set_cacheable(false);
 
@@ -277,7 +275,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
-            throw new \moodle_exception('unicoderequired', 'admin');
+            print_error('unicoderequired', 'admin');
         }
     }
 
@@ -299,7 +297,7 @@ $stradministration = get_string('administration');
 $PAGE->set_context(context_system::instance());
 
 if (empty($CFG->version)) {
-    throw new \moodle_exception('missingconfigversion', 'debug');
+    print_error('missingconfigversion', 'debug');
 }
 
 // Detect config cache inconsistency, this happens when you switch branches on dev servers.
@@ -750,7 +748,7 @@ if (during_initial_install()) {
             redirect("index.php?sessionstarted=1&sessionverify=1&lang=$CFG->lang");
         } else {
             if (empty($SESSION->sessionverify)) {
-                throw new \moodle_exception('installsessionerror', 'admin', "index.php?sessionstarted=1&lang=$CFG->lang");
+                print_error('installsessionerror', 'admin', "index.php?sessionstarted=1&lang=$CFG->lang");
             }
             unset($SESSION->sessionverify);
         }
@@ -767,7 +765,7 @@ if (during_initial_install()) {
     if ($adminuser->password === 'adminsetuppending') {
         // prevent installation hijacking
         if ($adminuser->lastip !== getremoteaddr()) {
-            throw new \moodle_exception('installhijacked', 'admin');
+            print_error('installhijacked', 'admin');
         }
         // login user and let him set password and admin details
         $adminuser->newadminuser = 1;
@@ -811,7 +809,7 @@ $context = context_system::instance();
 
 if (!has_capability('moodle/site:config', $context)) {
     // Do not throw exception display an empty page with administration menu if visible for current user.
-    $PAGE->set_title(get_string('home'));
+    $PAGE->set_title($SITE->fullname);
     $PAGE->set_heading($SITE->fullname);
     echo $OUTPUT->header();
     echo $OUTPUT->footer();

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', 'favicon'])) {
+    if (in_array($filearea, ['logo', 'logocompact'])) {
         $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);
@@ -96,16 +96,20 @@ function core_admin_pluginfile($course, $cm, $context, $filearea, $args, $forced
             send_file_not_found();
         }
 
-        // Check whether width/height are specified, and we can resize the image (some types such as ICO cannot be resized).
-        if (($maxwidth === 0 && $maxheight === 0) ||
-                !$filedata = $file->resize_image($maxwidth, $maxheight)) {
-
+        // No need for resizing, but if the file should be cached we save it so we can serve it fast next time.
+        if (empty($maxwidth) && empty($maxheight)) {
             if ($lifetime) {
                 file_safe_save_content($file->get_content(), $candidate);
             }
             send_stored_file($file, $lifetime, 0, false, $options);
         }
 
+        // Proceed with the resizing.
+        $filedata = $file->resize_image($maxwidth, $maxheight);
+        if (!$filedata) {
+            send_file_not_found();
+        }
+
         // If we don't want to cached the file, serve now and quit.
         if (!$lifetime) {
             send_content_uncached($filedata, $filename);

admin/localplugins.php

@@ -21,7 +21,7 @@
  * Displays the list of found local plugins, their version (if found) and
  * a link to delete the local plugin.
  *
- * @see       https://moodledev.io/docs/apis/plugintypes/local
+ * @see       http://docs.moodle.org/dev/Local_customisation
  * @package   admin
  * @copyright 2010 David Mudrak <david.mudrak@gmail.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later

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, "==== ".date("D M d H:i:s Y", time())." ====\n");
+fwrite($fh, "==== ".strftime("%a %b %e %H:%M:%S %Y", time())." ====\n");
 fwrite($fh, "==== Commandline: " . implode(' ',$argv) . "\n");
 
 $stdin = fopen('php://stdin', 'r');

admin/mnet/access_control.php

@@ -6,7 +6,7 @@ require_once(__DIR__ . '/../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 include_once($CFG->dirroot.'/mnet/lib.php');
 
-$sort         = optional_param('sort', 'username', PARAM_ALPHAEXT);
+$sort         = optional_param('sort', 'username', PARAM_ALPHA);
 $dir          = optional_param('dir', 'ASC', PARAM_ALPHA);
 $page         = optional_param('page', 0, PARAM_INT);
 $perpage      = optional_param('perpage', 30, PARAM_INT);
@@ -15,7 +15,7 @@ $action       = trim(strtolower(optional_param('action', '', PARAM_ALPHA)));
 admin_externalpage_setup('ssoaccesscontrol');
 
 if (!extension_loaded('openssl')) {
-    throw new \moodle_exception('requiresopenssl', 'mnet');
+    print_error('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)) {
-        throw new \moodle_exception('nomodifyacl', 'mnet');
+        print_error('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))) {
-        throw new \moodle_exception('recordnoexists', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+        print_error('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') {
-                throw new \moodle_exception('invalidaccessparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+                print_error('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:
-            throw new \moodle_exception('invalidactionparam', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+            print_error('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)) {
-        throw new \moodle_exception('nomodifyacl', 'mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
+        print_error('nomodifyacl','mnet', "$CFG->wwwroot/$CFG->admin/mnet/access_control.php");
     }
     if (empty($form->username)) {
         $formerror['username'] = get_string('enterausername','mnet');
@@ -117,6 +117,7 @@ if ($form = data_submitted() and confirm_sesskey()) {
 }
 
 echo $OUTPUT->header();
+echo $OUTPUT->render(mnet_get_deprecation_notice());
 
 // Explain
 echo $OUTPUT->box(get_string('ssoacldescr','mnet'));
@@ -153,15 +154,7 @@ foreach ($columns as $column) {
     $headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
 }
 $headings['delete'] = '';
-
-$sortorder = get_safe_orderby([
-    'username' => 'username',
-    'mnet_host_id' => 'mnet_host_id',
-    'access' => 'accessctrl',
-    'default' => 'username',
-], $sort, $dir, false);
-
-$acl = $DB->get_records('mnet_sso_access_control', null, $sortorder);
+$acl = $DB->get_records('mnet_sso_access_control', null, "$sort $dir", '*'); //, $page * $perpage, $perpage);
 $aclcount = $DB->count_records('mnet_sso_access_control');
 
 if (!$acl) {

admin/mnet/index.php

@@ -17,13 +17,13 @@
     if (!extension_loaded('openssl')) {
         echo $OUTPUT->header();
         set_config('mnet_dispatcher_mode', 'off');
-        throw new \moodle_exception('requiresopenssl', 'mnet');
+        print_error('requiresopenssl', 'mnet');
     }
 
     if (!function_exists('curl_init') ) {
         echo $OUTPUT->header();
         set_config('mnet_dispatcher_mode', 'off');
-        throw new \moodle_exception('nocurl', 'mnet');
+        print_error('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 {
-                    throw new \moodle_exception('invalidaction', '', 'index.php');
+                    print_error('invalidaction', '', 'index.php');
                 }
             }
         } elseif (!empty($form->submit) && $form->submit == get_string('delete')) {
@@ -46,23 +46,11 @@
 
             $formcontinue = new single_button(new moodle_url('index.php', array('confirm' => md5($mnet->public_key))), get_string('yes'));
             $formcancel = new single_button(new moodle_url('index.php', array()), get_string('no'));
-
-            echo $OUTPUT->header();
             echo $OUTPUT->confirm(get_string("deletekeycheck", "mnet"), $formcontinue, $formcancel);
-            echo $OUTPUT->footer();
             exit;
         } else {
             // We're deleting
 
-            // If no/cancel then redirect back to the network setting page.
-            if (!isset($form->confirm)) {
-                redirect(
-                    new moodle_url('/admin/mnet/index.php'),
-                    get_string('keydeletedcancelled', 'mnet'),
-                    null,
-                    \core\output\notification::NOTIFY_SUCCESS
-                );
-            }
 
             if (!isset($SESSION->mnet_confirm_delete_key)) {
                 // fail - you're being attacked?
@@ -75,27 +63,25 @@
 
             if($time < time() - 60) {
                 // fail - you're out of time.
-                redirect(
-                    new moodle_url('/admin/mnet/index.php'),
-                    get_string('deleteoutoftime', 'mnet'),
-                    null,
-                    \core\output\notification::NOTIFY_WARNING
-                );
+                print_error ('deleteoutoftime', 'mnet', 'index.php');
+                exit;
             }
 
             if ($key != md5(sha1($mnet->keypair['keypair_PEM']))) {
                 // fail - you're being attacked?
-                throw new \moodle_exception ('deletewrongkeyvalue', 'mnet', 'index.php');
+                print_error ('deletewrongkeyvalue', 'mnet', 'index.php');
                 exit;
             }
 
             $mnet->replace_keys();
             redirect('index.php', get_string('keydeleted','mnet'));
+            exit;
         }
     }
     $hosts = $DB->get_records_select('mnet_host', "id <> ? AND deleted = 0", array($CFG->mnet_localhost_id), 'wwwroot ASC');
 
     echo $OUTPUT->header();
+    echo $OUTPUT->render(mnet_get_deprecation_notice());
 ?>
 <form method="post" action="index.php">
     <table align="center" width="635" class="generaltable" border="0" cellpadding="5" cellspacing="0">

admin/mnet/peer_forms.php

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

admin/mnet/peers.php

@@ -51,12 +51,18 @@ 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')) {
-    throw new \moodle_exception('requiresopenssl', 'mnet');
+    print_error('requiresopenssl', 'mnet');
 }
 
 if (!function_exists('curl_init') ) {
-    throw new \moodle_exception('nocurl', 'mnet');
+    print_error('nocurl', 'mnet');
+}
+
+if (!function_exists('xmlrpc_encode_request')) {
+    print_error('xmlrpc-missing', 'mnet');
 }
 
 if (!isset($CFG->mnet_dispatcher_mode)) {
@@ -86,6 +92,7 @@ if ($formdata = $simpleform->get_data()) {
     $formdata->oldpublickey = $mnet_peer->public_key; // set this so we can confirm on form post without having to recreate the mnet_peer object
     $reviewform->set_data($mnet_peer);
     echo $OUTPUT->header();
+    echo $OUTPUT->render($deprecatenotify);
     echo $OUTPUT->box_start();
     $reviewform->display();
     echo $OUTPUT->box_end();
@@ -169,10 +176,11 @@ 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 {
-        throw new \moodle_exception('invalidaction', 'error', 'index.php');
+        print_error('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();
@@ -183,6 +191,7 @@ if ($formdata = $reviewform->get_data()) {
 
 // normal flow - just display all hosts with links
 echo $OUTPUT->header();
+echo $OUTPUT->render($deprecatenotify);
 $hosts = mnet_get_hosts(true);
 
 // print the table to display the register all hosts setting

admin/mnet/tabs.php

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

admin/mnet/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') {
-    throw new \moodle_exception('mnetdisabled', 'mnet');
+    print_error('mnetdisabled', 'mnet');
 }
 
 admin_externalpage_setup('mnettestclient');
@@ -27,7 +27,7 @@ error_reporting(DEBUG_ALL);
 
 echo $OUTPUT->header();
 if (!extension_loaded('openssl')) {
-    throw new \moodle_exception('requiresopenssl', 'mnet', '', null, true);
+    print_error('requiresopenssl', 'mnet', '', NULL, true);
 }
 
 // optional drilling down parameters

admin/mnet/trustedhosts.html

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

admin/mnet/trustedhosts.php

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

admin/modules.php

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

admin/oauth2callback.php

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

admin/plagiarism.php

@@ -20,7 +20,7 @@
  * Displays the list of found plagiarism plugins, their version (if found) and
  * a link to uninstall the plagiarism plugin.
  *
- * @see       https://moodledev.io/docs/apis/subsystems/plagiarism
+ * @see       http://docs.moodle.org/dev/Plagiarism_API
  * @package   admin
  * @copyright 2012 Dan Marsden <dan@danmarsden.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later

admin/portfolio.php

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

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

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

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

@@ -26,14 +26,42 @@ namespace core_adminpresets\local\setting;
  */
 class adminpresets_admin_setting_configmultiselect extends adminpresets_setting {
 
+    /**
+     * Ensure that the $value values are setting choices.
+     *
+     * @param mixed $value Setting value
+     * @return mixed Returns false if wrong param value
+     */
+    protected function set_value($value) {
+        if ($value) {
+            $options = explode(',', $value);
+            foreach ($options as $option) {
+
+                foreach ($this->settingdata->choices as $key => $choice) {
+
+                    if ($key == $option) {
+                        $this->value = $option;
+                        $this->set_visiblevalue();
+                        return true;
+                    }
+                }
+            }
+
+            $value = implode(',', $options);
+        }
+        $this->value = $value;
+        $this->set_visiblevalue();
+
+        return true;
+    }
+
     protected function set_visiblevalue() {
         $values = explode(',', $this->value);
         $visiblevalues = [];
 
         foreach ($values as $value) {
 
-            // Ensure that each value exists as a setting choice.
-            if (array_key_exists($value, $this->settingdata->choices)) {
+            if (!empty($this->settingdata->choices[$value])) {
                 $visiblevalues[] = $this->settingdata->choices[$value];
             }
         }

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

@@ -34,7 +34,7 @@ class adminpresets_admin_setting_configselect extends adminpresets_setting {
      */
     protected function set_value($value) {
         // When we intantiate the class we need the choices.
-        if (empty($this->settingdata->choices) && method_exists($this->settingdata, 'load_choices')) {
+        if (empty($this->settindata->choices) && method_exists($this->settingdata, 'load_choices')) {
             $this->settingdata->load_choices();
         }
 

admin/qbehaviours.php

@@ -84,7 +84,7 @@ if (!empty($config->disabledbehaviours)) {
 // Disable.
 if (($disable = optional_param('disable', '', PARAM_PLUGIN)) && confirm_sesskey()) {
     if (!isset($behaviours[$disable])) {
-        throw new \moodle_exception('unknownbehaviour', 'question', $thispageurl, $disable);
+        print_error('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])) {
-        throw new \moodle_exception('unknownbehaviour', 'question', $thispageurl, $enable);
+        print_error('unknownbehaviour', 'question', $thispageurl, $enable);
     }
 
     if (!$archetypal[$enable]) {
-        throw new \moodle_exception('cannotenablebehaviour', 'question', $thispageurl, $enable);
+        print_error('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])) {
-        throw new \moodle_exception('unknownbehaviour', 'question', $thispageurl, $up);
+        print_error('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])) {
-        throw new \moodle_exception('unknownbehaviour', 'question', $thispageurl, $down);
+        print_error('unknownbehaviour', 'question', $thispageurl, $down);
     }
 
     // This function works fine for behaviours, as well as qtypes.

admin/qtypes.php

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

admin/renderer.php

@@ -44,7 +44,7 @@ class core_admin_renderer extends plugin_renderer_base {
         $output .= $this->heading(get_string('copyrightnotice'));
         $output .= $this->box($copyrightnotice, 'copyrightnotice');
         $output .= html_writer::empty_tag('br');
-        $output .= $this->confirm(get_string('doyouagree'), $continue, "https://moodledev.io/general/license");
+        $output .= $this->confirm(get_string('doyouagree'), $continue, "http://docs.moodle.org/dev/License");
         $output .= $this->footer();
 
         return $output;
@@ -746,10 +746,10 @@ class core_admin_renderer extends plugin_renderer_base {
         //////////////////////////////////////////////////////////////////////////////////////////////////
         ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
         $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
-                         '<a href="https://moodledev.io/general/releases" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
+                         '<a href="http://docs.moodle.org/dev/Releases" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
                          'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
                          'and <a href="http://moodle.org/dev">many other contributors</a>.<br />'.
-                         '<a href="https://moodledev.io/general/license">GNU Public License</a>';
+                         '<a href="http://docs.moodle.org/dev/License">GNU Public License</a>';
         //////////////////////////////////////////////////////////////////////////////////////////////////
 
         return $this->box($copyrighttext, 'copyright');
@@ -898,8 +898,7 @@ class core_admin_renderer extends plugin_renderer_base {
         $url = "https://campaign.moodle.org/current/lms/{$lang}/install/";
         $params = [
             'url' => $url,
-            'iframeid' => 'campaign-content',
-            'title' => get_string('campaign', 'admin'),
+            'iframeid' => 'campaign-content'
         ];
 
         return $this->render_from_template('core/external_content_banner', $params);
@@ -920,8 +919,7 @@ class core_admin_renderer extends plugin_renderer_base {
         $url = "https://campaign.moodle.org/current/lms/{$lang}/servicesandsupport/";
         $params = [
             'url' => $url,
-            'iframeid' => 'services-support-content',
-            'title' => get_string('supportandservices', 'admin'),
+            'iframeid' => 'services-support-content'
         ];
 
         return $this->render_from_template('core/external_content_banner', $params);
@@ -993,7 +991,7 @@ class core_admin_renderer extends plugin_renderer_base {
      * @return string HTML to output.
      */
     protected function release_notes_link() {
-        $releasenoteslink = get_string('releasenoteslink', 'admin', 'https://moodledev.io/general/releases');
+        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
         $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
         return $this->box($releasenoteslink, 'generalbox alert alert-info');
     }
@@ -2052,10 +2050,8 @@ class core_admin_renderer extends plugin_renderer_base {
                         // We are checking installed & enabled things
                         if ($environment_result->getLevel() == 'required') {
                             $stringtouse = 'environmentrequirecustomcheck';
-                        } else if ($environment_result->getLevel() == 'optional') {
-                            $stringtouse = 'environmentrecommendcustomcheck';
                         } else {
-                            $stringtouse = 'environmentshouldfixcustomcheck';
+                            $stringtouse = 'environmentrecommendcustomcheck';
                         }
 
                     } else if ($environment_result->getPart() == 'php_setting') {
@@ -2084,10 +2080,9 @@ class core_admin_renderer extends plugin_renderer_base {
                         $errorline = true;
                     } else {
                         if ($status) {                                          //Handle ok result (ok)
-                            $status = get_string('statusok');
+                            $status = get_string('ok');
                         } else {
-                            // Handle check result (warning).
-                            if (in_array($environment_result->getLevel(), ['optional', 'recommended'])) {
+                            if ($environment_result->getLevel() == 'optional') {//Handle check result (warning)
                                 $status = get_string('check');
                                 $warningline = true;
                             } else {                                            //Handle error result (error)

admin/repository.php

@@ -152,7 +152,7 @@ if (($action == 'edit') || ($action == 'new')) {
             core_plugin_manager::reset_caches();
             redirect($baseurl);
         } else {
-            throw new \moodle_exception('instancenotsaved', 'repository', $baseurl);
+            print_error('instancenotsaved', 'repository', $baseurl);
         }
         exit;
     } else {
@@ -183,14 +183,14 @@ if (($action == 'edit') || ($action == 'new')) {
     }
 } else if ($action == 'show') {
     if (!confirm_sesskey()) {
-        throw new \moodle_exception('confirmsesskeybad', '', $baseurl);
+        print_error('confirmsesskeybad', '', $baseurl);
     }
     $class = \core_plugin_manager::resolve_plugininfo_class('repository');
     $class::enable_plugin($repository, 1);
     $return = true;
 } else if ($action == 'hide') {
     if (!confirm_sesskey()) {
-        throw new \moodle_exception('confirmsesskeybad', '', $baseurl);
+        print_error('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()) {
-            throw new \moodle_exception('confirmsesskeybad', '', $baseurl);
+            print_error('confirmsesskeybad', '', $baseurl);
         }
 
         if ($repositorytype->delete($downloadcontents)) {
@@ -209,7 +209,7 @@ if (($action == 'edit') || ($action == 'new')) {
             core_plugin_manager::reset_caches();
             redirect($baseurl);
         } else {
-            throw new \moodle_exception('instancenotdeleted', 'repository', $baseurl);
+            print_error('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 {
-            throw new \moodle_exception('instancenotsaved', 'repository', $parenturl);
+            print_error('instancenotsaved', 'repository', $parenturl);
         }
         exit;
     } else {
@@ -134,7 +134,7 @@ if (!empty($edit) || !empty($new)) {
             core_plugin_manager::reset_caches();
             redirect($parenturl, $deletedstr, 3);
         } else {
-            throw new \moodle_exception('instancenotdeleted', 'repository', $parenturl);
+            print_error('instancenotdeleted', 'repository', $parenturl);
         }
         exit;
     }

admin/roles/allow.php

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

admin/roles/assign.php

@@ -75,7 +75,7 @@ if ($roleid && !isset($assignableroles[$roleid])) {
     $a = new stdClass;
     $a->roleid = $roleid;
     $a->context = $contextname;
-    throw new \moodle_exception('cannotassignrolehere', '', $context->get_url(), $a);
+    print_error('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)) {
-    throw new \moodle_exception('nopermissions', 'error', '', get_string('checkpermissions', 'core_role'));
+    print_error('nopermissions', 'error', '', get_string('checkpermissions', 'core_role'));
 }
 
 navigation_node::override_active_url($url);

admin/roles/classes/admins_existing_selector.php

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

admin/roles/classes/admins_potential_selector.php

@@ -39,28 +39,24 @@ 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, '');
 
-        [$wherecondition, $params] = $this->search_sql($search, 'u');
-        $params = array_merge($params, $this->userfieldsparams);
-
-        $fields = 'SELECT u.id, ' . $this->userfieldsselects;
+        $fields      = 'SELECT ' . $this->required_fields_sql('');
         $countfields = 'SELECT COUNT(1)';
 
-        $sql = " FROM {user} u
-                      $this->userfieldsjoin
+        $sql = " FROM {user}
                 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;
 
-        [$sort, $sortparams] = users_order_by_sql('u', $search, $this->accesscontext, $this->userfieldsmappings);
+        list($sort, $sortparams) = users_order_by_sql('', $search, $this->accesscontext);
         $order = ' ORDER BY ' . $sort;
 
         // Check to see if there are too many to show sensibly.

admin/roles/classes/define_role_table_advanced.php

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

admin/roles/manage.php

@@ -68,7 +68,7 @@ $confirmed = (optional_param('confirm', false, PARAM_BOOL) && data_submitted() &
 switch ($action) {
     case 'delete':
         if (isset($undeletableroles[$roleid])) {
-            throw new \moodle_exception('cannotdeletethisrole', '', $baseurl);
+            print_error('cannotdeletethisrole', '', $baseurl);
         }
         if (!$confirmed) {
             // Show confirmation.
@@ -76,7 +76,7 @@ switch ($action) {
             $optionsyes = array('action'=>'delete', 'roleid'=>$roleid, 'sesskey'=>sesskey(), 'confirm'=>1);
             $a = new stdClass();
             $a->id = $roleid;
-            $a->name = $roles[$roleid]->localname;
+            $a->name = $roles[$roleid]->name;
             $a->shortname = $roles[$roleid]->shortname;
             $a->count = $DB->count_records_select('role_assignments',
                 'roleid = ?', array($roleid), 'COUNT(DISTINCT userid)');
@@ -89,7 +89,7 @@ switch ($action) {
         }
         if (!delete_role($roleid)) {
             // The delete failed.
-            throw new \moodle_exception('cannotdeleterolewithid', 'error', $baseurl, $roleid);
+            print_error('cannotdeleterolewithid', 'error', $baseurl, $roleid);
         }
         // Deleted a role sitewide...
         redirect($baseurl);
@@ -108,10 +108,10 @@ switch ($action) {
                 }
             }
             if (is_null($thisrole) || is_null($prevrole)) {
-                throw new \moodle_exception('cannotmoverolewithid', 'error', '', $roleid);
+                print_error('cannotmoverolewithid', 'error', '', $roleid);
             }
             if (!switch_roles($thisrole, $prevrole)) {
-                throw new \moodle_exception('cannotmoverolewithid', 'error', '', $roleid);
+                print_error('cannotmoverolewithid', 'error', '', $roleid);
             }
         }
 
@@ -131,10 +131,10 @@ switch ($action) {
                 }
             }
             if (is_null($nextrole)) {
-                throw new \moodle_exception('cannotmoverolewithid', 'error', '', $roleid);
+                print_error('cannotmoverolewithid', 'error', '', $roleid);
             }
             if (!switch_roles($thisrole, $nextrole)) {
-                throw new \moodle_exception('cannotmoverolewithid', 'error', '', $roleid);
+                print_error('cannotmoverolewithid', 'error', '', $roleid);
             }
         }
 

admin/roles/override.php

@@ -90,11 +90,10 @@ $title = get_string('overridepermissionsforrole', 'core_role', $a);
 $currenttab = 'permissions';
 
 $PAGE->set_title($title);
-$PAGE->activityheader->disable();
 $PAGE->navbar->add($straction);
 switch ($context->contextlevel) {
     case CONTEXT_SYSTEM:
-        throw new \moodle_exception('cannotoverridebaserole', 'error');
+        print_error('cannotoverridebaserole', 'error');
         break;
     case CONTEXT_USER:
         $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));
@@ -125,7 +124,7 @@ if (empty($overridableroles[$roleid])) {
     $a = new stdClass;
     $a->roleid = $roleid;
     $a->context = $contextname;
-    throw new \moodle_exception('cannotoverriderolehere', '', $context->get_url(), $a);
+    print_error('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:
-        throw new \moodle_exception('cannotoverridebaserole', 'error');
+        print_error('cannotoverridebaserole', 'error');
         break;
     case CONTEXT_USER:
         $fullname = fullname($user, has_capability('moodle/site:viewfullnames', $context));

admin/roles/tests/privacy/provider_test.php

@@ -187,51 +187,51 @@ class provider_test extends provider_testcase {
             $writer = writer::with_context($context);
             $this->assertTrue($writer->has_any_data());
             if ($context->contextlevel == CONTEXT_MODULE) {
-                if ($data = (array)$writer->get_data($subcontextstudent)) {
+                if ($data = $writer->get_data($subcontextstudent)) {
                     $this->assertEquals($user->id, reset($data)->userid);
                 }
-                if ($data = (array)$writer->get_data($subcontextrc)) {
+                if ($data = $writer->get_data($subcontextrc)) {
                     $this->assertEquals('moodle/backup:backupactivity', reset($data)->capability);
                     $this->assertEquals($strpermissions[CAP_ALLOW], reset($data)->permission);
                 }
             }
             if ($context->contextlevel == CONTEXT_COURSE) {
-                if ($data = (array)$writer->get_data($subcontextstudent)) {
+                if ($data = $writer->get_data($subcontextstudent)) {
                     $this->assertEquals($user->id, reset($data)->userid);
                 }
-                if ($data = (array)$writer->get_data($subcontextrc)) {
+                if ($data = $writer->get_data($subcontextrc)) {
                     $this->assertEquals('moodle/backup:backupcourse', reset($data)->capability);
                 }
             }
             if ($context->contextlevel == CONTEXT_COURSECAT) {
-                if ($data = (array)$writer->get_data($subcontextmanager)) {
+                if ($data = $writer->get_data($subcontextmanager)) {
                     $this->assertEquals($user->id, reset($data)->modifierid);
                 }
-                if ($data = (array)$writer->get_data($subcontextrc)) {
+                if ($data = $writer->get_data($subcontextrc)) {
                     $this->assertEquals('moodle/category:manage', reset($data)->capability);
                 }
             }
             if ($context->contextlevel == CONTEXT_SYSTEM) {
-                if ($data = (array)$writer->get_data($subcontextmanager)) {
+                if ($data = $writer->get_data($subcontextmanager)) {
                     $this->assertEquals($user->id, reset($data)->modifierid);
                 }
-                if ($data = (array)$writer->get_data($subcontextrc)) {
+                if ($data = $writer->get_data($subcontextrc)) {
                     $this->assertEquals('moodle/backup:backupcourse', reset($data)->capability);
                 }
             }
             if ($context->contextlevel == CONTEXT_BLOCK) {
-                if ($data = (array)$writer->get_data($subcontextstudent)) {
+                if ($data = $writer->get_data($subcontextstudent)) {
                     $this->assertEquals($user->id, reset($data)->userid);
                 }
-                if ($data = (array)$writer->get_data($subcontextrc)) {
+                if ($data = $writer->get_data($subcontextrc)) {
                     $this->assertEquals('moodle/block:edit', reset($data)->capability);
                 }
             }
             if ($context->contextlevel == CONTEXT_USER) {
-                if ($data = (array)$writer->get_data($subcontextmanager)) {
+                if ($data = $writer->get_data($subcontextmanager)) {
                     $this->assertEquals($user->id, reset($data)->userid);
                 }
-                if ($data = (array)$writer->get_data($subcontextrc)) {
+                if ($data = $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 = (array)$writer->get_related_data($subcontextteacher, 'cohortroles');
+        $exported = $writer->get_related_data($subcontextteacher, 'cohortroles');
         $this->assertEquals($user->id, reset($exported)->userid);
 
         // Test User is member of a cohort which User2 is assigned to role to this cohort.
@@ -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 = (array)$writer->get_related_data($subcontextteacher, 'cohortroles');
+        $exported = $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) {
-    throw new \moodle_exception('nopermissions', 'error', '', get_string('checkpermissions', 'core_role'));
+    print_error('nopermissions', 'error', '', get_string('checkpermissions', 'core_role'));
 }
 
 if ($userid != $USER->id) {

admin/searchareas.php

@@ -163,7 +163,6 @@ $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

@@ -32,7 +32,7 @@ require_once($CFG->libdir . '/adminlib.php');
 admin_externalpage_setup('searchareas', '', null, (new moodle_url('/admin/searchreindex.php'))->out(false));
 
 // Get area parameter and check it exists.
-$areaid = required_param('areaid', PARAM_ALPHANUMEXT);
+$areaid = required_param('areaid', PARAM_ALPHAEXT);
 $area = \core_search\manager::get_search_area($areaid);
 if ($area === false) {
     throw new moodle_exception('invalidrequest');
@@ -44,7 +44,7 @@ $PAGE->set_secondary_active_tab('modules');
 
 // Start page output.
 $heading = get_string('gradualreindex', 'search', '');
-$PAGE->set_title($areaname . ' - ' . get_string('gradualreindex', 'search', ''));
+$PAGE->set_title($PAGE->title . ': ' . $heading);
 $PAGE->navbar->add($heading);
 echo $OUTPUT->header();
 echo $OUTPUT->heading($heading);

admin/settings.php

@@ -23,13 +23,13 @@ if (empty($settingspage) or !($settingspage instanceof admin_settingpage)) {
     if (moodle_needs_upgrading()) {
         redirect(new moodle_url('/admin/index.php'));
     } else {
-        throw new \moodle_exception('sectionerror', 'admin', "$CFG->wwwroot/$CFG->admin/");
+        print_error('sectionerror', 'admin', "$CFG->wwwroot/$CFG->admin/");
     }
     die;
 }
 
 if (!($settingspage->check_access())) {
-    throw new \moodle_exception('accessdenied', 'admin');
+    print_error('accessdenied', 'admin');
     die;
 }
 
@@ -129,7 +129,9 @@ if (empty($SITE->fullname)) {
         $PAGE->set_button($buttons);
     }
 
-    $PAGE->set_title(implode(moodle_page::TITLE_SEPARATOR, $settingspage->visiblepath));
+    $visiblepathtosection = array_reverse($settingspage->visiblepath);
+
+    $PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
     $PAGE->set_heading($SITE->fullname);
     echo $OUTPUT->header();
 

admin/settings/appearance.php

@@ -82,14 +82,6 @@ reports,core_reportbuilder|/reportbuilder/index.php',
     $setting->set_updatedcallback('theme_reset_all_caches');
     $temp->add($setting);
 
-    // Favicon file setting.
-    $title = get_string('favicon', 'admin');
-    $description = get_string('favicon_desc', 'admin');
-    $setting = new admin_setting_configstoredfile('core_admin/favicon', $title, $description, 'favicon', 0,
-        ['maxfiles' => 1, 'accepted_types' => ['image']]);
-    $setting->set_updatedcallback('theme_reset_all_caches');
-    $temp->add($setting);
-
     $ADMIN->add('appearance', $temp);
 
     // Course colours section.
@@ -244,18 +236,6 @@ reports,core_reportbuilder|/reportbuilder/index.php',
 
     // "htmlsettings" settingpage
     $temp = new admin_settingpage('htmlsettings', new lang_string('htmlsettings', 'admin'));
-    $sitenameintitleoptions = [
-        'shortname' => new lang_string('shortname'),
-        'fullname' => new lang_string('fullname'),
-    ];
-    $sitenameintitleconfig = new admin_setting_configselect(
-        'sitenameintitle',
-        new lang_string('sitenameintitle', 'admin'),
-        new lang_string('sitenameintitle_help', 'admin'),
-        'shortname',
-        $sitenameintitleoptions
-    );
-    $temp->add($sitenameintitleconfig);
     $temp->add(new admin_setting_configcheckbox('formatstringstriptags', new lang_string('stripalltitletags', 'admin'), new lang_string('configstripalltitletags', 'admin'), 1));
     $temp->add(new admin_setting_emoticons());
     $ADMIN->add('appearance', $temp);

admin/settings/courses.php

@@ -477,8 +477,7 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $temp->add(new admin_setting_heading('automatedsettings', new lang_string('automatedsettings','backup'), new lang_string('recyclebin_desc', 'backup')));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_users', new lang_string('generalusers', 'backup'), new lang_string('configgeneralusers', 'backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_role_assignments', new lang_string('generalroleassignments','backup'), new lang_string('configgeneralroleassignments','backup'), 1));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', new lang_string('generalactivities', 'backup'),
-        new lang_string('backupautoactivitiesdescription', 'backup'), 1));
+    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', new lang_string('generalactivities','backup'), new lang_string('configgeneralactivities','backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_blocks', new lang_string('generalblocks','backup'), new lang_string('configgeneralblocks','backup'), 1));
     $temp->add(new admin_setting_configcheckbox(
             'backup/backup_auto_files',

admin/settings/mnet.php

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

admin/settings/plugins.php

@@ -101,7 +101,7 @@ if ($hassiteconfig) {
         new lang_string('limitconcurrentlogins', 'core_auth'),
         new lang_string('limitconcurrentlogins_desc', 'core_auth'), 0, $options));
     $temp->add(new admin_setting_configtext('alternateloginurl', new lang_string('alternateloginurl', 'auth'),
-                                            new lang_string('alternatelogin', 'auth', htmlspecialchars(get_login_url(), ENT_COMPAT)), ''));
+                                            new lang_string('alternatelogin', 'auth', htmlspecialchars(get_login_url())), ''));
     $temp->add(new admin_setting_configtext('forgottenpasswordurl', new lang_string('forgottenpasswordurl', 'auth'),
                                             new lang_string('forgottenpassword', 'auth'), '', PARAM_URL));
     $temp->add(new admin_setting_confightmleditor('auth_instructions', new lang_string('instructions', 'auth'),

admin/settings/reportbuilder.php

@@ -49,18 +49,3 @@ $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

@@ -145,15 +145,14 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_heading('adminpresets', new lang_string('siteadminpresetspluginname', 'core_adminpresets'), ''));
     $sensiblesettingsdefault = 'recaptchapublickey@@none, recaptchaprivatekey@@none, googlemapkey3@@none, ';
     $sensiblesettingsdefault .= 'secretphrase@@url, cronremotepassword@@none, smtpuser@@none, ';
-    $sensiblesettingsdefault .= 'smtppass@@none, proxypassword@@none, quizpassword@@quiz, allowedip@@none, blockedip@@none, ';
+    $sensiblesettingsdefault .= 'smtppass@none, proxypassword@@none, quizpassword@@quiz, allowedip@@none, blockedip@@none, ';
     $sensiblesettingsdefault .= 'dbpass@@logstore_database, messageinbound_hostpass@@none, ';
     $sensiblesettingsdefault .= 'bind_pw@@auth_cas, pass@@auth_db, bind_pw@@auth_ldap, ';
     $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 .= 'badges_badgesalt@@none, calendar_exportsalt@@none, ';
-    $sensiblesettingsdefault .= 'bigbluebuttonbn_shared_secret@@none';
+    $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,16 +61,6 @@ 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.
@@ -182,11 +172,6 @@ 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'));
@@ -452,35 +437,9 @@ 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/tasklogs.php

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

admin/templates/setting_configmulticheckbox.mustache

@@ -23,15 +23,12 @@
     * name - form element name
     * hasoptions - there are some options
     * options - list of options containing name, key, id, checked, label
-    * readonly - bool
 
     Example context (json):
     {
         "name": "test",
         "hasoptions": true,
-        "options": [ { "name": "Option", "key": "k1", "id": "id0", "checked": true, "label": "Option label"} ],
-        "readonly": false
-
+        "options": [ { "name": "Option", "key": "k1", "id": "id0", "checked": true, "label": "Option label"} ]
     }
 }}
 <div class="form-multicheckbox">
@@ -40,7 +37,7 @@
         <ul>
             {{#options}}
                 <li>
-                    <input type="checkbox" name="{{name}}[{{key}}]" value="1" id="{{id}}_{{key}}" {{#readonly}}disabled{{/readonly}} {{#checked}}checked{{/checked}}>
+                    <input type="checkbox" name="{{name}}[{{key}}]" value="1" id="{{id}}_{{key}}" {{#checked}}checked{{/checked}}>
                     <label for="{{id}}_{{key}}">{{{label}}}</label>
                 </li>
             {{/options}}

admin/templates/setting_configpasswordunmask.mustache

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

admin/tests/behat/browse_users.feature

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

admin/tests/behat/enable_multiple_accounts_use_same_email.feature

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

admin/tests/behat/filter_users_settings.feature

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

admin/tests/behat/outgoing_mail.feature

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

admin/tests/behat/resetindentation.feature

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

admin/tests/behat/task_logs.feature

@@ -15,6 +15,7 @@ Feature: View task logs report and use its filters
     And I navigate to "Server > Tasks > Task logs" in site administration
     When I click on "Filters" "button"
     And I set the following fields in the "Class name" "core_reportbuilder > Filter" to these values:
+      | Class name operator | Contains |
       | Class name value    | <name>   |
     And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
     Then I should see "Filters applied"
@@ -26,9 +27,9 @@ Feature: View task logs report and use its filters
       | Type      | Name       |
       | Scheduled | <nonmatch> |
     Examples:
-      | name                         | match                        | nonmatch                     |
-      | Cleanup event monitor events | Cleanup event monitor events | Incoming email pickup        |
-      | Incoming email pickup        | Incoming email pickup        | Cleanup event monitor events |
+      | name               | match                        | nonmatch                     |
+      | task\\clean_events | Cleanup event monitor events | Incoming email pickup        |
+      | task\\pickup_task  | 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.
@@ -48,3 +49,25 @@ Feature: View task logs report and use its filters
       | operator     | shouldornotsee |
       | Less than    | should not see |
       | Greater than | should see     |
+
+  @javascript
+  Scenario: Reset task log filters
+    Given I log in as "admin"
+    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 "Result" "core_reportbuilder > Filter" to these values:
+      | Result operator | Is equal to |
+      | Result value    | Fail        |
+    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"
+    And I should see "Nothing to display"
+    And I click on "Reset" "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"
+    And "[data-region='report-filters']" "css_element" should be visible
+    And the following fields in the "Result" "core_reportbuilder > Filter" match these values:
+      | Result operator | Is any value |
+    And I should not see "Nothing to display"

admin/tests/reportbuilder/datasource/task_logs_test.php

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

@@ -42,8 +42,8 @@ class import_form extends moodleform {
         $mform->setType('name', PARAM_TEXT);
 
         // File upload.
-        $mform->addElement('filepicker', 'xmlfile', get_string('selectfile', 'tool_admin_presets'), null,
-            ['accepted_types' => ['.xml']]);
+        $mform->addElement('filepicker', 'xmlfile',
+            get_string('selectfile', 'tool_admin_presets'));
         $mform->addRule('xmlfile', null, 'required');
 
         $this->add_action_buttons(true, get_string('import', 'tool_admin_presets'));

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

@@ -64,7 +64,7 @@ class delete extends base {
      * Delete the DB preset
      */
     public function execute(): void {
-        require_sesskey();
+        confirm_sesskey();
 
         $this->manager->delete_preset($this->id);
 

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

@@ -52,6 +52,8 @@ class export extends base {
      * Stores a preset into the DB.
      */
     public function execute(): void {
+        confirm_sesskey();
+
         $url = new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'export', 'mode' => 'execute']);
         $this->moodleform = new export_form($url);
 
@@ -85,7 +87,7 @@ class export extends base {
      * @throws xml_writer_exception
      */
     public function download_xml(): void {
-        require_sesskey();
+        confirm_sesskey();
 
         list($xmlstr, $filename) = $this->manager->download_preset($this->id);
 

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

@@ -40,6 +40,8 @@ class import extends base {
      * Imports the xmlfile into DB
      */
     public function execute(): void {
+        confirm_sesskey();
+
         $url = new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'import', 'mode' => 'execute']);
         $this->moodleform = new import_form($url);
 

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

@@ -38,6 +38,8 @@ class load extends base {
     public function execute(): void {
         global $OUTPUT;
 
+        confirm_sesskey();
+
         $url = new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'load', 'mode' => 'execute']);
         $this->moodleform = new load_form($url);
 

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

@@ -52,7 +52,7 @@ class rollback extends base {
             );
 
             $context->applications[] = [
-                'timeapplied' => \core_date::strftime($format, (int)$application->time),
+                'timeapplied' => strftime($format, $application->time),
                 'user' => fullname($user),
                 'action' => $rollbacklink->out(false),
             ];
@@ -73,7 +73,7 @@ class rollback extends base {
     public function execute(): void {
         global $OUTPUT;
 
-        require_sesskey();
+        confirm_sesskey();
 
         list($presetapp, $rollback, $failures) = $this->manager->revert_preset($this->id);
 

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

@@ -1,20 +1,18 @@
 @tool @tool_admin_presets
 Feature: I can download a preset
+
   Background:
-    Given the following "tool_admin_presets > preset" exist:
+    Given I log in as "admin"
+    And the following "tool_admin_presets > preset" exist:
       | name       |
       | Custom preset |
+    And I navigate to "Site admin presets" in site administration
 
   @javascript
-  Scenario: Custom preset settings can be downloaded
+  Scenario: Core and 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
-
-  @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
+    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