Moodle release 4.2beta

adding context to format_string

fix multilang in coursename

change context param

.eslintrc

@@ -1,12 +1,8 @@
 {
   'plugins': [
-    '@babel',
+    'babel',
     'promise',
-    'jsdoc'
-  ],
-  'extends': [
-    'eslint:recommended',
-    'plugin:promise/recommended'
+    'jsdoc',
   ],
   'env': {
     'browser': true,
@@ -20,19 +16,42 @@
     '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 +63,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 +83,28 @@
     '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 +137,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 +146,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 +168,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,19 +181,21 @@
     '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: [
@@ -201,6 +235,7 @@
       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 +247,65 @@
         '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: {
         'sourceType': 'module',
-        'requireConfigFile': false
+        'requireConfigFile': false,
       }
     }
   ]

.github/workflows/push.yml

@@ -3,16 +3,10 @@ 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
@@ -23,10 +17,10 @@ jobs:
 
     steps:
       - name: Checking out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Configuring node & npm
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
 
@@ -60,10 +54,12 @@ jobs:
       fail-fast: false
       matrix:
         include:
+          # MySQL builds always run with the lowest PHP supported version.
           - os: ubuntu-22.04
-            php: 7.4
+            php: 8.0
             extensions:
             db: mysqli
+          # PostgreSQL builds always run with the highest PHP supported version.
           - os: ubuntu-22.04
             php: 8.1
             db: pgsql
@@ -74,7 +70,7 @@ jobs:
         uses: moodlehq/mysql-action@v1
         with:
           collation server: utf8mb4_bin
-          mysql version: 5.7
+          mysql version: 8.0
           mysql database: test
           mysql user: test
           mysql password: test
@@ -86,7 +82,7 @@ jobs:
         if: ${{ matrix.db == 'pgsql' }}
         uses: m4nu56/postgresql-action@v1
         with:
-          postgresql version: 12
+          postgresql version: 13
           postgresql db: test
           postgresql user: test
           postgresql password: test
@@ -103,7 +99,7 @@ jobs:
           coverage: none
 
       - name: Checking out code from ${{ env.GITHUB_REF_SLUG }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setting up PHPUnit
         env:
@@ -119,4 +115,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

@@ -20,7 +20,6 @@
 *~
 #
 /config.php
-/lib/editor/tinymce/extra/tools/temp/
 /tags
 /TAGS
 /cscope.*

.grunt/components.js

@@ -232,6 +232,155 @@ const getOwningComponentDirectory = checkPath => {
     return null;
 };
 
+/**
+ * Get the latest tag in a remote GitHub repository.
+ *
+ * @param {string} url The remote repository.
+ * @returns {Array}
+ */
+const getRepositoryTags = async(url) => {
+    const gtr = require('git-tags-remote');
+    try {
+        const tags = await gtr.get(url);
+        if (tags !== undefined) {
+            return tags;
+        }
+    } catch (error) {
+        return [];
+    }
+    return [];
+};
+
+/**
+ * Get the list of thirdparty libraries that could be upgraded.
+ *
+ * @returns {Array}
+ */
+const getThirdPartyLibsUpgradable = async() => {
+    const libraries = getThirdPartyLibsData().filter((library) => !!library.repository);
+    const upgradableLibraries = [];
+    const versionCompare = (a, b) => {
+        if (a === b) {
+            return 0;
+        }
+
+        const aParts = a.split('.');
+        const bParts = b.split('.');
+
+        for (let i = 0; i < Math.min(aParts.length, bParts.length); i++) {
+            const aPart = parseInt(aParts[i], 10);
+            const bPart = parseInt(bParts[i], 10);
+            if (aPart > bPart) {
+                // 1.1.0 > 1.0.9
+                return 1;
+            } else if (aPart < bPart) {
+                // 1.0.9 < 1.1.0
+                return -1;
+            } else {
+                // Same version.
+                continue;
+            }
+        }
+
+        if (aParts.length > bParts.length) {
+            // 1.0.1 > 1.0
+            return 1;
+        }
+
+        // 1.0 < 1.0.1
+        return -1;
+    };
+
+    for (let library of libraries) {
+        upgradableLibraries.push(
+            getRepositoryTags(library.repository).then((tagMap) => {
+                library.version = library.version.replace(/^v/, '');
+                const currentVersion = library.version.replace(/moodle-/, '');
+                const currentMajorVersion = library.version.split('.')[0];
+                const tags = [...tagMap]
+                    .map((tagData) => tagData[0])
+                    .filter((tag) => !tag.match(/(alpha|beta|rc)/))
+                    .map((tag) => tag.replace(/^v/, ''))
+                    .sort((a, b) => versionCompare(b, a));
+                if (!tags.length) {
+                    library.warning = "Unable to find any comparable tags.";
+                    return library;
+                }
+
+                library.latestVersion = tags[0];
+                tags.some((tag) => {
+                    if (!tag) {
+                        return false;
+                    }
+
+                    // See if the version part matches.
+                    const majorVersion = tag.split('.')[0];
+                    if (majorVersion === currentMajorVersion) {
+                        library.latestSameMajorVersion = tag;
+                        return true;
+                    }
+                    return false;
+                });
+
+
+                if (versionCompare(currentVersion, library.latestVersion) > 0) {
+                    // Moodle somehow has a newer version than the latest version.
+                    library.warning = `Newer version found: ${currentVersion} > ${library.latestVersion} for ${library.name}`;
+                    return library;
+                }
+
+
+                if (library.version !== library.latestVersion) {
+                    // Delete version and add it again at the end of the array. That way, current and new will stay closer.
+                    delete library.version;
+                    library.version = currentVersion;
+                    return library;
+                }
+                return null;
+            })
+        );
+    }
+
+    return (await Promise.all(upgradableLibraries)).filter((library) => !!library);
+};
+
+/**
+ * Get the list of thirdparty libraries.
+ *
+ * @returns {Array}
+ */
+const getThirdPartyLibsData = () => {
+    const DOMParser = require('@xmldom/xmldom').DOMParser;
+    const fs = require('fs');
+    const xpath = require('xpath');
+    const path = require('path');
+
+    const libraryList = [];
+    const libraryFields = [
+        'location',
+        'name',
+        'version',
+        'repository',
+    ];
+
+    const thirdpartyfiles = getThirdPartyLibsList(fs.realpathSync('./'));
+    thirdpartyfiles.forEach(function(libraryPath) {
+        const xmlContent = fs.readFileSync(libraryPath, 'utf8');
+        const doc = new DOMParser().parseFromString(xmlContent);
+        const libraries = xpath.select("/libraries/library", doc);
+        for (const library of libraries) {
+            const libraryData = [];
+            for (const field of libraryFields) {
+                libraryData[field] = xpath.select(`${field}/text()`, library)?.toString();
+            }
+            libraryData.location = path.join(path.dirname(libraryPath), libraryData.location);
+            libraryList.push(libraryData);
+        }
+    });
+
+    return libraryList.sort((a, b) => a.location.localeCompare(b.location));
+};
+
 module.exports = {
     fetchComponentData,
     getAmdSrcGlobList,
@@ -241,4 +390,5 @@ module.exports = {
     getYuiSrcGlobList,
     getThirdPartyLibsList,
     getThirdPartyPaths,
+    getThirdPartyLibsUpgradable,
 };

.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/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;
 };
 
@@ -60,6 +61,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 +105,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 +114,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 +152,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/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/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,
                 },
             },

.grunt/tasks/upgradablelibs.js

@@ -0,0 +1,42 @@
+// 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  2023 Sara Arjona <sara@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+module.exports = grunt => {
+    /**
+     * Generate upgradable third-party libraries (utilising thirdpartylibs.xml data)
+     */
+    grunt.registerTask('upgradablelibs', 'Generate upgradable third-party libraries', async function() {
+        const done = this.async();
+
+        const path = require('path');
+        const ComponentList = require(path.join(process.cwd(), '.grunt', 'components.js'));
+
+        // An array of third party libraries that have a newer version in their repositories.
+        const thirdPartyLibs = await ComponentList.getThirdPartyLibsUpgradable({progress: true});
+        for (let library of thirdPartyLibs) {
+            grunt.log.ok(JSON.stringify(Object.assign({}, library), null, 4));
+        }
+
+        done();
+    });
+
+};

.nvmrc

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

.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

@@ -1,277 +0,0 @@
-# PLEASE NOTE: Travis is not currently utilised by the Moodle core integration
-# process (which uses our internal CI system) this file is here for the benefit
-# of community developers git clones - see MDL-51458.
-
-notifications:
-  email:
-    if: env(MOODLE_EMAIL) != no
-
-language: php
-
-os: linux
-
-dist: focal
-
-services:
-    - mysql
-    - docker
-
-addons:
-  postgresql: "12"
-  apt:
-    packages:
-      - postgresql-12
-      - postgresql-client-12
-
-branches:
-  except:
-    - master
-    - /MOODLE_[0-9]+_STABLE/
-    - /^v[0-9]+\.[0-9]+\.[0-9]+.*/
-
-jobs:
-    # Enable fast finish.
-    # This will fail the build if a single job fails (except those in allow_failures).
-    # It will not stop the jobs from running.
-    fast_finish: true
-
-    include:
-        # First all the lowest php ones (7.4)
-        - php: 7.4
-          env: DB=none     TASK=CITEST
-        - php: 7.4
-          env: DB=none     TASK=GRUNT
-
-        - if: env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present
-          php: 7.4
-          env: DB=pgsql    TASK=PHPUNIT
-
-        - if: env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all"
-          php: 7.4
-          env: DB=mysqli   TASK=PHPUNIT
-
-        # Then, conditionally, all the highest php ones (8.1)
-        - if: env(MOODLE_PHP) = "all"
-          php: 8.1
-          env: DB=none     TASK=CITEST
-        - if: env(MOODLE_PHP) = "all"
-          php: 8.1
-          env: DB=none     TASK=GRUNT
-
-        - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present)
-          php: 8.1
-          env: DB=pgsql    TASK=PHPUNIT
-
-        - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all")
-          php: 8.1
-          env: DB=mysqli   TASK=PHPUNIT
-
-cache:
-    directories:
-      - $HOME/.composer/cache
-      - $HOME/.npm
-
-before_install:
-    - docker run -d -p 127.0.0.1:8080:80 --name exttests moodlehq/moodle-exttests
-    # 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' ];
-        then
-            sudo mkdir /mnt/ramdisk
-            sudo mount -t tmpfs -o size=1024m tmpfs /mnt/ramdisk
-            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
-        fi
-    - >
-        if [ "$DB" = 'pgsql' ];
-        then
-            sudo mkdir /mnt/ramdisk
-            sudo mount -t tmpfs -o size=1024m tmpfs /mnt/ramdisk
-            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'
-        fi
-    - >
-        if [ "$TASK" = 'PHPUNIT' ];
-        then
-            if [ -n "$GITHUB_APITOKEN" ]; then
-                composer config github-oauth.github.com $GITHUB_APITOKEN;
-                echo 'auth.json' >> .git/info/exclude
-            fi
-
-            echo 'extension="redis.so"' > /tmp/redis.ini
-            phpenv config-add /tmp/redis.ini
-
-            # Install composer dependencies.
-            # We need --no-interaction in case we hit API limits for composer. This causes it to fall back to a standard clone.
-            # Typically it should be able to use the Composer cache if any other job has already completed before we started here.
-            travis_retry composer install --prefer-dist --no-interaction;
-        fi
-
-    - >
-        if [ "$TASK" = 'GRUNT' ];
-        then
-            nvm install
-            nvm use
-        fi
-
-before_script:
-    - echo 'max_input_vars=5000' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-    - phpenv config-rm xdebug.ini
-    - >
-      if [ "$TASK" = 'PHPUNIT' ];
-      then
-        # Copy generic configuration in place.
-        cp config-dist.php config.php ;
-
-        # Create the moodledata directory.
-        mkdir -p "$HOME"/roots/base
-
-        # The database name and password.
-        sed -i \
-          -e "s%= 'moodle'%= 'travis_ci_test'%" \
-          -e "s%= 'password'%= ''%" \
-          config.php ;
-
-        # The wwwroot and dataroot.
-        sed -i \
-          -e "s%http://example.com/moodle%https://localhost%" \
-          -e "s%/home/example/moodledata%/home/travis/roots/base%" \
-          config.php ;
-
-        if [ "$DB" = 'pgsql' ];
-        then
-          # Postgres-specific setup.
-          sed -i \
-            -e "s%= 'username'%= 'travis'%" \
-            -e "s%'dbsocket'  => false%'dbsocket'  => true%" \
-            config.php ;
-
-          psql -c 'CREATE DATABASE travis_ci_test;' -U travis;
-        fi
-
-        if [ "$DB" = 'mysqli' ];
-        then
-          # MySQL-specific setup.
-          sed -i \
-            -e "s%= 'pgsql'%= 'mysqli'%" \
-            -e "s%= 'username'%= 'travis'%" \
-            -e "s%=> 'utf8mb4_unicode_ci'%=> 'utf8mb4_bin'%" \
-            config.php;
-
-          mysql -u root -e 'SET GLOBAL innodb_file_format=barracuda;' ;
-          mysql -u root -e 'SET GLOBAL innodb_file_per_table=ON;' ;
-          mysql -u root -e 'SET GLOBAL innodb_large_prefix=ON;' ;
-          mysql -e 'CREATE DATABASE travis_ci_test DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_bin;' ;
-        fi
-      fi
-
-    - >
-      if [ "$TASK" = 'PHPUNIT' ];
-      then
-        # Create a directory for the phpunit dataroot.
-        mkdir -p "$HOME"/roots/phpunit
-
-        # The phpunit dataroot and prefix..
-        sed -i \
-          -e "/require_once/i \\\$CFG->phpunit_dataroot = '\/home\/travis\/roots\/phpunit';" \
-          -e "/require_once/i \\\$CFG->phpunit_prefix = 'p_';" \
-          config.php ;
-        # Enable test external resources
-        sed -i \
-          -e "/require_once/i \\define('TEST_EXTERNAL_FILES_HTTP_URL', 'http://127.0.0.1:8080');" \
-          -e "/require_once/i \\define('TEST_EXTERNAL_FILES_HTTPS_URL', 'http://127.0.0.1:8080');" \
-          config.php ;
-
-        # Redis cache store tests
-        sed -i \
-          -e "/require_once/i \\define('TEST_CACHESTORE_REDIS_TESTSERVERS', '127.0.0.1');" \
-          config.php ;
-        # Redis session tests
-        sed -i \
-          -e "/require_once/i \\define('TEST_SESSION_REDIS_HOST', '127.0.0.1');" \
-          config.php ;
-
-        # Initialise PHPUnit for Moodle.
-        php admin/tool/phpunit/cli/init.php
-      fi
-
-    - >
-      if [ "$TASK" = 'GRUNT' ];
-      then
-        npm install --no-spin;
-        npm install --no-spin -g grunt ;
-      fi
-
-    ########################################################################
-    # CI Tests
-    ########################################################################
-    - >
-      if [ "$TASK" = 'CITEST' ];
-      then
-        # Note - this is deliberately placed in the script section as we
-        # should not add any code until after phpunit has run.
-
-        # The following repositories are required.
-        # The local_ci repository does the actual checking.
-        git clone https://github.com/moodlehq/moodle-local_ci.git local/ci
-
-        # We need the official upstream for comparison
-        git remote add upstream https://github.com/moodle/moodle.git;
-
-        git fetch upstream MOODLE_401_STABLE;
-        export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`";
-        export GIT_COMMIT="$TRAVIS_COMMIT";
-        export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD`
-
-        # Variables required by our linter.
-        export gitcmd=`which git`;
-        export gitdir="$TRAVIS_BUILD_DIR";
-        export phpcmd=`which php`;
-      fi
-
-script:
-    - >
-      if [ "$TASK" = 'PHPUNIT' ];
-      then
-        vendor/bin/phpunit --fail-on-risky --disallow-test-output --verbose;
-      fi
-
-    - >
-      if [ "$TASK" = 'CITEST' ];
-      then
-        bash local/ci/php_lint/php_lint.sh;
-      fi
-
-    - >
-      if [ "$TASK" = 'GRUNT' ];
-      then
-        grunt ;
-        # 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.
-        git add . ;
-        git reset -- npm-shrinkwrap.json ;
-        git diff --cached --exit-code ;
-      fi
-
-after_script:
-    - >
-      if [ "$TASK" = 'PHPUNIT' ];
-      then
-        EXTTESTS_HITS=$(docker logs exttests 2>&1 | grep -Fv -e 'AH00558' -e '[pid 1]' | wc -l)
-        echo -e "\nTest local resources number of hits: ${EXTTESTS_HITS}.\n"
-      fi

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

Gruntfile.js

@@ -260,6 +260,8 @@ module.exports = function(grunt) {
     addTask('watch', grunt);
     addTask('startup', grunt);
 
+    addTask('upgradablelibs', grunt);
+
     // Register the default task.
     grunt.registerTask('default', ['startup']);
 };

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.

admin/amd/build/block_management_table.min.js

@@ -0,0 +1,3 @@
+define("core_admin/block_management_table",["exports","./plugin_management_table","core_table/dynamic","core/ajax","core/pending","core/notification"],(function(_exports,_plugin_management_table,_dynamic,_ajax,_pending,_notification){function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_plugin_management_table=_interopRequireDefault(_plugin_management_table),_pending=_interopRequireDefault(_pending);class _default extends _plugin_management_table.default{constructor(){super(),this.addClickHandler(this.handleBlockProtectToggle)}setBlockProtectState(plugin,state){return(0,_ajax.call)([{methodname:"core_admin_set_block_protection",args:{plugin:plugin,state:state}}])[0]}async handleBlockProtectToggle(tableRoot,e){const stateToggle=e.target.closest('[data-action="toggleprotectstate"]');if(stateToggle){e.preventDefault();const pendingPromise=new _pending.default("core_table/dynamic:processAction");await this.setBlockProtectState(stateToggle.dataset.plugin,"1"===stateToggle.dataset.targetState?1:0);const[updatedRoot]=await Promise.all([(0,_dynamic.refreshTableContent)(tableRoot),(0,_notification.fetchNotifications)()]);updatedRoot.querySelector('[data-action="toggleprotectstate"][data-plugin="'.concat(stateToggle.dataset.plugin,'"]')).focus(),pendingPromise.resolve()}}}return _exports.default=_default,_exports.default}));
+
+//# sourceMappingURL=block_management_table.min.js.map

admin/amd/build/block_management_table.min.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"block_management_table.min.js","sources":["../src/block_management_table.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\nimport PluginManagementTable from './plugin_management_table';\nimport {refreshTableContent} from 'core_table/dynamic';\nimport {call as fetchMany} from 'core/ajax';\nimport Pending from 'core/pending';\nimport {fetchNotifications} from 'core/notification';\n\nexport default class extends PluginManagementTable {\n    constructor() {\n        super();\n        this.addClickHandler(this.handleBlockProtectToggle);\n    }\n\n    /**\n     * Set the block protection state.\n     *\n     * @param {string} plugin\n     * @param {number} state\n     * @returns {Promise}\n     */\n    setBlockProtectState(plugin, state) {\n        return fetchMany([{\n            methodname: 'core_admin_set_block_protection',\n            args: {\n                plugin,\n                state,\n            },\n        }])[0];\n    }\n\n    /**\n     * Handle toggling of block protection.\n     *\n     * @param {HTMLElement} tableRoot\n     * @param {Event} e\n     */\n    async handleBlockProtectToggle(tableRoot, e) {\n        const stateToggle = e.target.closest('[data-action=\"toggleprotectstate\"]');\n        if (stateToggle) {\n            e.preventDefault();\n            const pendingPromise = new Pending('core_table/dynamic:processAction');\n\n            await this.setBlockProtectState(\n                stateToggle.dataset.plugin,\n                stateToggle.dataset.targetState === '1' ? 1 : 0\n            );\n\n            const [updatedRoot] = await Promise.all([\n                refreshTableContent(tableRoot),\n                fetchNotifications(),\n            ]);\n\n            // Refocus on the link that as pressed in the first place.\n            updatedRoot.querySelector(`[data-action=\"toggleprotectstate\"][data-plugin=\"${stateToggle.dataset.plugin}\"]`).focus();\n            pendingPromise.resolve();\n        }\n    }\n}\n"],"names":["PluginManagementTable","constructor","addClickHandler","this","handleBlockProtectToggle","setBlockProtectState","plugin","state","methodname","args","tableRoot","e","stateToggle","target","closest","preventDefault","pendingPromise","Pending","dataset","targetState","updatedRoot","Promise","all","querySelector","focus","resolve"],"mappings":"uhBAqB6BA,iCACzBC,2BAESC,gBAAgBC,KAAKC,0BAU9BC,qBAAqBC,OAAQC,cAClB,cAAU,CAAC,CACdC,WAAY,kCACZC,KAAM,CACFH,OAAAA,OACAC,MAAAA,UAEJ,kCASuBG,UAAWC,SAChCC,YAAcD,EAAEE,OAAOC,QAAQ,yCACjCF,YAAa,CACbD,EAAEI,uBACIC,eAAiB,IAAIC,iBAAQ,0CAE7Bd,KAAKE,qBACPO,YAAYM,QAAQZ,OACgB,MAApCM,YAAYM,QAAQC,YAAsB,EAAI,SAG3CC,mBAAqBC,QAAQC,IAAI,EACpC,gCAAoBZ,YACpB,wCAIJU,YAAYG,wEAAiEX,YAAYM,QAAQZ,cAAYkB,QAC7GR,eAAeS"}

admin/amd/build/plugin_management_table.min.js

@@ -0,0 +1,3 @@
+define("core_admin/plugin_management_table",["exports","core_table/dynamic","core_table/local/dynamic/selectors","core/ajax","core/pending","core/notification"],(function(_exports,_dynamic,Selectors,_ajax,_pending,_notification){var obj;function _getRequireWildcardCache(nodeInterop){if("function"!=typeof WeakMap)return null;var cacheBabelInterop=new WeakMap,cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,Selectors=function(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule)return obj;if(null===obj||"object"!=typeof obj&&"function"!=typeof obj)return{default:obj};var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj))return cache.get(obj);var newObj={},hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj)if("default"!==key&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;desc&&(desc.get||desc.set)?Object.defineProperty(newObj,key,desc):newObj[key]=obj[key]}newObj.default=obj,cache&&cache.set(obj,newObj);return newObj}(Selectors),_pending=(obj=_pending)&&obj.__esModule?obj:{default:obj};let watching=!1;return _exports.default=class{constructor(){!function(obj,key,value){key in obj?Object.defineProperty(obj,key,{value:value,enumerable:!0,configurable:!0,writable:!0}):obj[key]=value}(this,"clickHandlers",[]),this.addClickHandler(this.handleStateToggle),this.addClickHandler(this.handleMoveUpDown),this.registerEventListeners()}static init(){watching||(watching=!0,new this)}addClickHandler(handler){this.clickHandlers.push(handler.bind(this))}registerEventListeners(){document.addEventListener("click",function(e){const tableRoot=this.getTableRoot(e);tableRoot&&this.clickHandlers.forEach((handler=>handler(tableRoot,e)))}.bind(this))}getTableRoot(e){const tableRoot=e.target.closest(Selectors.main.region);return tableRoot||!1}setPluginState(methodname,plugin,state){return(0,_ajax.call)([{methodname:methodname,args:{plugin:plugin,state:state}}])[0]}setPluginOrder(methodname,plugin,direction){return(0,_ajax.call)([{methodname:methodname,args:{plugin:plugin,direction:direction}}])[0]}async handleStateToggle(tableRoot,e){const stateToggle=e.target.closest('[data-action="togglestate"][data-toggle-method]');if(stateToggle){e.preventDefault();const pendingPromise=new _pending.default("core_table/dynamic:togglestate");await this.setPluginState(stateToggle.dataset.toggleMethod,stateToggle.dataset.plugin,"1"===stateToggle.dataset.state?0:1);const[updatedRoot]=await Promise.all([(0,_dynamic.refreshTableContent)(tableRoot),(0,_notification.fetchNotifications)()]);updatedRoot.querySelector('[data-action="togglestate"][data-plugin="'.concat(stateToggle.dataset.plugin,'"]')).focus(),pendingPromise.resolve()}}async handleMoveUpDown(tableRoot,e){const actionLink=e.target.closest('[data-action="move"][data-method][data-direction]');if(!actionLink)return;e.preventDefault();const pendingPromise=new _pending.default("core_table/dynamic:processAction");await this.setPluginOrder(actionLink.dataset.method,actionLink.dataset.plugin,"up"===actionLink.dataset.direction?-1:1);const[updatedRoot]=await Promise.all([(0,_dynamic.refreshTableContent)(tableRoot),(0,_notification.fetchNotifications)()]),exactMatch=updatedRoot.querySelector('[data-action="move"][data-plugin="'.concat(actionLink.dataset.plugin,'"][data-direction="').concat(actionLink.dataset.direction,'"]'));var _updatedRoot$querySel;exactMatch?exactMatch.focus():null===(_updatedRoot$querySel=updatedRoot.querySelector('[data-action="move"][data-plugin="'.concat(actionLink.dataset.plugin,'"]')))||void 0===_updatedRoot$querySel||_updatedRoot$querySel.focus();pendingPromise.resolve()}},_exports.default}));
+
+//# sourceMappingURL=plugin_management_table.min.js.map

admin/amd/src/block_management_table.js

@@ -0,0 +1,72 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+import PluginManagementTable from './plugin_management_table';
+import {refreshTableContent} from 'core_table/dynamic';
+import {call as fetchMany} from 'core/ajax';
+import Pending from 'core/pending';
+import {fetchNotifications} from 'core/notification';
+
+export default class extends PluginManagementTable {
+    constructor() {
+        super();
+        this.addClickHandler(this.handleBlockProtectToggle);
+    }
+
+    /**
+     * Set the block protection state.
+     *
+     * @param {string} plugin
+     * @param {number} state
+     * @returns {Promise}
+     */
+    setBlockProtectState(plugin, state) {
+        return fetchMany([{
+            methodname: 'core_admin_set_block_protection',
+            args: {
+                plugin,
+                state,
+            },
+        }])[0];
+    }
+
+    /**
+     * Handle toggling of block protection.
+     *
+     * @param {HTMLElement} tableRoot
+     * @param {Event} e
+     */
+    async handleBlockProtectToggle(tableRoot, e) {
+        const stateToggle = e.target.closest('[data-action="toggleprotectstate"]');
+        if (stateToggle) {
+            e.preventDefault();
+            const pendingPromise = new Pending('core_table/dynamic:processAction');
+
+            await this.setBlockProtectState(
+                stateToggle.dataset.plugin,
+                stateToggle.dataset.targetState === '1' ? 1 : 0
+            );
+
+            const [updatedRoot] = await Promise.all([
+                refreshTableContent(tableRoot),
+                fetchNotifications(),
+            ]);
+
+            // Refocus on the link that as pressed in the first place.
+            updatedRoot.querySelector(`[data-action="toggleprotectstate"][data-plugin="${stateToggle.dataset.plugin}"]`).focus();
+            pendingPromise.resolve();
+        }
+    }
+}

admin/amd/src/plugin_management_table.js

@@ -0,0 +1,179 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+import {refreshTableContent} from 'core_table/dynamic';
+import * as Selectors from 'core_table/local/dynamic/selectors';
+import {call as fetchMany} from 'core/ajax';
+import Pending from 'core/pending';
+import {fetchNotifications} from 'core/notification';
+
+let watching = false;
+
+export default class {
+    /**
+     * @property {function[]} clickHandlers a list of handlers to call on click.
+     */
+    clickHandlers = [];
+
+    constructor() {
+        this.addClickHandler(this.handleStateToggle);
+        this.addClickHandler(this.handleMoveUpDown);
+        this.registerEventListeners();
+    }
+
+    /**
+     * Initialise an instance of the class.
+     *
+     * This is just a way of making it easier to initialise an instance of the class from PHP.
+     */
+    static init() {
+        if (watching) {
+            return;
+        }
+        watching = true;
+        new this();
+    }
+
+    /**
+     * Add a click handler to the list of handlers.
+     *
+     * @param {Function} handler A handler to call on a click event
+     */
+    addClickHandler(handler) {
+        this.clickHandlers.push(handler.bind(this));
+    }
+
+    /**
+     * Register the event listeners for this instance.
+     */
+    registerEventListeners() {
+        document.addEventListener('click', function(e) {
+            const tableRoot = this.getTableRoot(e);
+
+            if (!tableRoot) {
+                return;
+            }
+
+            this.clickHandlers.forEach((handler) => handler(tableRoot, e));
+        }.bind(this));
+    }
+
+    /**
+     * Get the table root from an event.
+     *
+     * @param {Event} e
+     * @returns {HTMLElement|bool}
+     */
+    getTableRoot(e) {
+        const tableRoot = e.target.closest(Selectors.main.region);
+        if (!tableRoot) {
+            return false;
+        }
+
+        return tableRoot;
+    }
+
+    /**
+     * Set the plugin state (enabled or disabled)
+     *
+     * @param {string} methodname The web service to call
+     * @param {string} plugin The name of the plugin to set the state for
+     * @param {number} state The state to set
+     * @returns {Promise}
+     */
+    setPluginState(methodname, plugin, state) {
+        return fetchMany([{
+            methodname,
+            args: {
+                plugin,
+                state,
+            },
+        }])[0];
+    }
+
+    setPluginOrder(methodname, plugin, direction) {
+        return fetchMany([{
+            methodname,
+            args: {
+                plugin,
+                direction,
+            },
+        }])[0];
+    }
+
+    /**
+     * Handle state toggling.
+     *
+     * @param {HTMLElement} tableRoot
+     * @param {Event} e
+     */
+    async handleStateToggle(tableRoot, e) {
+        const stateToggle = e.target.closest('[data-action="togglestate"][data-toggle-method]');
+        if (stateToggle) {
+            e.preventDefault();
+            const pendingPromise = new Pending('core_table/dynamic:togglestate');
+
+            await this.setPluginState(
+                stateToggle.dataset.toggleMethod,
+                stateToggle.dataset.plugin,
+                stateToggle.dataset.state === '1' ? 0 : 1
+            );
+
+            const [updatedRoot] = await Promise.all([
+                refreshTableContent(tableRoot),
+                fetchNotifications(),
+            ]);
+
+            // Refocus on the link that as pressed in the first place.
+            updatedRoot.querySelector(`[data-action="togglestate"][data-plugin="${stateToggle.dataset.plugin}"]`).focus();
+            pendingPromise.resolve();
+        }
+    }
+
+    async handleMoveUpDown(tableRoot, e) {
+        const actionLink = e.target.closest('[data-action="move"][data-method][data-direction]');
+        if (!actionLink) {
+            return;
+        }
+
+        e.preventDefault();
+
+        const pendingPromise = new Pending('core_table/dynamic:processAction');
+
+        await this.setPluginOrder(
+            actionLink.dataset.method,
+            actionLink.dataset.plugin,
+            actionLink.dataset.direction === 'up' ? -1 : 1,
+        );
+
+        const [updatedRoot] = await Promise.all([
+            refreshTableContent(tableRoot),
+            fetchNotifications(),
+        ]);
+
+        // Refocus on the link that as pressed in the first place.
+        const exactMatch = updatedRoot.querySelector(
+            `[data-action="move"][data-plugin="${actionLink.dataset.plugin}"][data-direction="${actionLink.dataset.direction}"]`
+        );
+        if (exactMatch) {
+            exactMatch.focus();
+        } else {
+            // The move link is not present anymore, so we need to focus on the other one.
+            updatedRoot.querySelector(`[data-action="move"][data-plugin="${actionLink.dataset.plugin}"]`)?.focus();
+        }
+
+        pendingPromise.resolve();
+    }
+}

admin/auth_config.php

@@ -1,210 +0,0 @@
-<?php
-/**
- * Edit configuration for an individual auth plugin
- */
-
-require_once '../config.php';
-require_once $CFG->libdir.'/adminlib.php';
-
-$auth = required_param('auth', PARAM_PLUGIN);
-$PAGE->set_pagetype('admin-auth-' . $auth);
-
-admin_externalpage_setup('authsetting'.$auth);
-
-$authplugin = get_auth_plugin($auth);
-$err = array();
-
-$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageauths";
-
-debugging("Use of config.html files in authentication plugins have been deprecated. " .
-          " Please migrate your plugin to use the admin settings API", DEBUG_DEVELOPER);
-
-// save configuration changes
-if ($frm = data_submitted() and confirm_sesskey()) {
-
-    $authplugin->validate_form($frm, $err);
-
-    if (count($err) == 0) {
-
-        // save plugin config
-        if ($authplugin->process_config($frm)) {
-
-            // save field lock configuration
-            foreach ($frm as $name => $value) {
-                if (preg_match('/^lockconfig_(.+?)$/', $name, $matches)) {
-                    $plugin = "auth/$auth";
-                    $name   = $matches[1];
-                    set_config($name, $value, $plugin);
-                }
-            }
-            redirect($returnurl);
-            exit;
-        }
-    } else {
-        foreach ($err as $key => $value) {
-            $focus = "form.$key";
-        }
-    }
-} else {
-    $frmlegacystyle = get_config('auth/'.$auth);
-    $frmnewstyle    = get_config('auth_'.$auth);
-    $frm = (object)array_merge((array)$frmlegacystyle, (array)$frmnewstyle);
-}
-
-$user_fields = $authplugin->userfields;
-//$user_fields = array("firstname", "lastname", "email", "phone1", "phone2", "institution", "department", "address", "city", "country", "description", "idnumber", "lang");
-
-/// Get the auth title (from core or own auth lang files)
-    $authtitle = $authplugin->get_title();
-/// Get the auth descriptions (from core or own auth lang files)
-    $authdescription = $authplugin->get_description();
-
-// output configuration form
-echo $OUTPUT->header();
-
-// choose an authentication method
-echo "<form id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
-echo "<div>\n";
-echo "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />\n";
-echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";
-
-// auth plugin description
-echo $OUTPUT->box_start();
-echo $OUTPUT->heading($authtitle);
-echo $OUTPUT->box_start('informationbox');
-echo $authdescription;
-echo $OUTPUT->box_end();
-echo "<hr />\n";
-$authplugin->config_form($frm, $err, $user_fields);
-echo $OUTPUT->box_end();
-echo '<p style="text-align: center"><input type="submit" value="' . get_string("savechanges") . "\" /></p>\n";
-echo "</div>\n";
-echo "</form>\n";
-
-$PAGE->requires->string_for_js('unmaskpassword', 'core_form');
-$PAGE->requires->yui_module('moodle-auth-passwordunmask', 'M.auth.passwordunmask');
-
-echo $OUTPUT->footer();
-exit;
-
-/// Functions /////////////////////////////////////////////////////////////////
-
-
-/**
- * auth field locking
- * Good enough for most auth plugins
- * but some may want a custom one if they are offering
- * other options
- * Note: lockconfig_ fields have special handling.
- *
- * @param string $auth authentication plugin shortname
- * @param array $user_fields user profile fields
- * @param string $helptext help text to be displayed at top of form
- * @param boolean $retrieveopts Map fields or lock only.
- * @param boolean $updateopts Allow remote updates
- * @param array $customfields list of custom profile fields
- * @deprecated since Moodle 3.3
- */
-function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts, $updateopts, $customfields = array()) {
-    global $DB, $OUTPUT;
-    debugging("The function 'print_auth_lock_options' has been deprecated, " .
-              "Please migrate your code to use the admin settings API and use the function 'display_auth_lock_options' instead. ",
-              DEBUG_DEVELOPER);
-
-    echo '<tr><td colspan="3">';
-    if ($retrieveopts) {
-        echo $OUTPUT->heading(get_string('auth_data_mapping', 'auth'));
-    } else {
-        echo $OUTPUT->heading(get_string('auth_fieldlocks', 'auth'));
-    }
-    echo '</td></tr>';
-
-    $lockoptions = array ('unlocked'        => get_string('unlocked', 'auth'),
-                          'unlockedifempty' => get_string('unlockedifempty', 'auth'),
-                          'locked'          => get_string('locked', 'auth'));
-    $updatelocaloptions = array('oncreate'  => get_string('update_oncreate', 'auth'),
-                                'onlogin'   => get_string('update_onlogin', 'auth'));
-    $updateextoptions = array('0'  => get_string('update_never', 'auth'),
-                              '1'   => get_string('update_onupdate', 'auth'));
-
-    $pluginconfig = get_config("auth/$auth");
-
-    // Helptext is on a field with rowspan.
-    if (empty($helptext)) {
-        $helptext = '&nbsp;';
-    }
-
-    // If we have custom fields then merge them with user fields.
-    if (!empty($customfields)) {
-        $user_fields = array_merge($user_fields, $customfields);
-    }
-
-    if (!empty($customfields)) {
-        $customfieldname = $DB->get_records('user_info_field', null, '', 'shortname, name');
-    }
-    foreach ($user_fields as $field) {
-        // Define some vars we'll work with.
-        if (!isset($pluginconfig->{"field_map_$field"})) {
-            $pluginconfig->{"field_map_$field"} = '';
-        }
-        if (!isset($pluginconfig->{"field_updatelocal_$field"})) {
-            $pluginconfig->{"field_updatelocal_$field"} = '';
-        }
-        if (!isset($pluginconfig->{"field_updateremote_$field"})) {
-            $pluginconfig->{"field_updateremote_$field"} = '';
-        }
-        if (!isset($pluginconfig->{"field_lock_$field"})) {
-            $pluginconfig->{"field_lock_$field"} = '';
-        }
-
-        // Define the fieldname we display to the  user.
-        $fieldname = $field;
-        if ($fieldname === 'lang') {
-            $fieldname = get_string('language');
-        } elseif (!empty($customfields) && in_array($field, $customfields)) {
-            // If custom field then pick name from database.
-            $fieldshortname = str_replace('profile_field_', '', $fieldname);
-            $fieldname = $customfieldname[$fieldshortname]->name;
-            if (core_text::strlen($fieldshortname) > 67) {
-                // If custom profile field name is longer than 67 characters we will not be able to store the setting
-                // such as 'field_updateremote_profile_field_NOTSOSHORTSHORTNAME' in the database because the character
-                // limit for the setting name is 100.
-                continue;
-            }
-        } else {
-            $fieldname = get_string($fieldname);
-        }
-        if ($retrieveopts) {
-            $varname = 'field_map_' . $field;
-
-            echo '<tr valign="top"><td align="right">';
-            echo '<label for="lockconfig_'.$varname.'">'.$fieldname.'</label>';
-            echo '</td><td>';
-
-            echo "<input id=\"lockconfig_{$varname}\" name=\"lockconfig_{$varname}\" type=\"text\" size=\"30\" value=\"{$pluginconfig->$varname}\" />";
-            echo '<div style="text-align: right">';
-            echo '<label for="menulockconfig_field_updatelocal_'.$field.'">'.get_string('auth_updatelocal', 'auth') . '</label>&nbsp;';
-            echo html_writer::select($updatelocaloptions, "lockconfig_field_updatelocal_{$field}", $pluginconfig->{"field_updatelocal_$field"}, false);
-            echo '<br />';
-            if ($updateopts) {
-                echo '<label for="menulockconfig_field_updateremote_'.$field.'">'.get_string('auth_updateremote', 'auth') . '</label>&nbsp;';
-                echo html_writer::select($updateextoptions, "lockconfig_field_updateremote_{$field}", $pluginconfig->{"field_updateremote_$field"}, false);
-                echo '<br />';
-            }
-            echo '<label for="menulockconfig_field_lock_'.$field.'">'.get_string('auth_fieldlock', 'auth') . '</label>&nbsp;';
-            echo html_writer::select($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, false);
-            echo '</div>';
-        } else {
-            echo '<tr valign="top"><td align="right">';
-            echo '<label for="menulockconfig_field_lock_'.$field.'">'.$fieldname.'</label>';
-            echo '</td><td>';
-            echo html_writer::select($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, false);
-        }
-        echo '</td>';
-        if (!empty($helptext)) {
-            echo '<td rowspan="' . count($user_fields) . '">' . $helptext . '</td>';
-            $helptext = '';
-        }
-        echo '</tr>';
-    }
-}

admin/blocks.php

@@ -1,239 +1,94 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-    // Allows the admin to configure blocks (hide/show, uninstall and configure)
+/**
+ * Allows the admin to configure blocks (hide/show, uninstall and configure)
+ *
+ * @package   core_admin
+ * @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
-    require_once('../config.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    require_once($CFG->libdir.'/blocklib.php');
-    require_once($CFG->libdir.'/tablelib.php');
+require_once('../config.php');
+require_once("{$CFG->libdir}/adminlib.php");
+require_once("{$CFG->libdir}/blocklib.php");
+require_once("{$CFG->libdir}/tablelib.php");
 
-    admin_externalpage_setup('manageblocks');
+admin_externalpage_setup('manageblocks');
 
-    $confirm  = optional_param('confirm', 0, PARAM_BOOL);
-    $hide     = optional_param('hide', 0, PARAM_INT);
-    $show     = optional_param('show', 0, PARAM_INT);
-    $unprotect = optional_param('unprotect', 0, PARAM_INT);
-    $protect = optional_param('protect', 0, PARAM_INT);
+$plugin = optional_param('plugin', '', PARAM_PLUGIN);
+$action = optional_param('action', '', PARAM_ALPHA);
+$unprotect = optional_param('unprotect', 0, PARAM_PLUGIN);
+$protect = optional_param('protect', 0, PARAM_PLUGIN);
 
-/// Print headings
+$strmanageblocks = get_string('manageblocks');
 
-    $strmanageblocks = get_string('manageblocks');
-    $struninstall = get_string('uninstallplugin', 'core_admin');
-    $strversion = get_string('version');
-    $strhide = get_string('hide');
-    $strshow = get_string('show');
-    $strsettings = get_string('settings');
-    $strcourses = get_string('blockinstances', 'admin');
-    $strname = get_string('name');
-    $strshowblockcourse = get_string('showblockcourse');
-    $strprotecthdr = get_string('blockprotect', 'admin'). $OUTPUT->help_icon('blockprotect','admin');
-    $strprotect = get_string('blockprotect', 'admin');
-    $strunprotect = get_string('blockunprotect', 'admin');
+// If data submitted, then process and store.
+if (!empty($plugin) && !empty($action) && confirm_sesskey()) {
+    $manager = \core_plugin_manager::resolve_plugininfo_class('block');
+    $pluginname = get_string('pluginname', "block_{$plugin}");
 
-
-    // If data submitted, then process and store.
-    if (!empty($hide) && confirm_sesskey()) {
-        if (!$block = $DB->get_record('block', ['id' => $hide])) {
-            throw new \moodle_exception('blockdoesnotexist', 'error');
-        }
-
-        $class = \core_plugin_manager::resolve_plugininfo_class('block');
-        $class::enable_plugin($block->name, false);
-        // Settings not required - only pages.
-        admin_get_root(true, false);
-    }
-
-    if (!empty($show) && confirm_sesskey() ) {
-        if (!$block = $DB->get_record('block', ['id' => $show])) {
-            throw new \moodle_exception('blockdoesnotexist', 'error');
-        }
-
-        $class = \core_plugin_manager::resolve_plugininfo_class('block');
-        $class::enable_plugin($block->name, true);
-        // Settings not required - only pages.
-        admin_get_root(true, false);
-    }
-
-    if (!empty($protect) && confirm_sesskey()) {
-        block_manager::protect_block((int)$protect);
-        admin_get_root(true, false);  // settings not required - only pages
-    }
-
-    if (!empty($unprotect) && confirm_sesskey()) {
-        block_manager::unprotect_block((int)$unprotect);
-        admin_get_root(true, false);  // settings not required - only pages
-    }
-
-    $undeletableblocktypes = block_manager::get_undeletable_block_types();
-
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading($strmanageblocks);
-
-    echo $OUTPUT->notification(get_string('noteunneededblocks', 'admin'), 'info');
-/// Main display starts here
-
-/// Get and sort the existing blocks
-
-    if (!$blocks = $DB->get_records('block', array(), 'name ASC')) {
-        throw new \moodle_exception('noblocks', 'error');  // Should never happen.
-    }
-
-    $incompatible = array();
-
-/// Print the table of all blocks
-
-    $table = new flexible_table('admin-blocks-compatible');
-
-    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'undeletable', 'settings', 'uninstall'));
-    $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strprotecthdr, $strsettings, $struninstall));
-    $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
-    $table->set_attribute('class', 'admintable blockstable generaltable');
-    $table->set_attribute('id', 'compatibleblockstable');
-    $table->setup();
-    $tablerows = array();
-
-    // Sort blocks using current locale.
-    $blocknames = array();
-    foreach ($blocks as $blockid=>$block) {
-        $blockname = $block->name;
-        if (file_exists("$CFG->dirroot/blocks/$blockname/block_$blockname.php")) {
-            $blocknames[$blockid] = get_string('pluginname', 'block_'.$blockname);
-        } else {
-            $blocknames[$blockid] = $blockname;
-        }
-    }
-    core_collator::asort($blocknames);
-
-    foreach ($blocknames as $blockid=>$strblockname) {
-        $block = $blocks[$blockid];
-        $blockname = $block->name;
-        $dbversion = get_config('block_'.$block->name, 'version');
-
-        if (!file_exists("$CFG->dirroot/blocks/$blockname/block_$blockname.php")) {
-            $blockobject  = false;
-            $strblockname = '<span class="notifyproblem">'.$strblockname.' ('.get_string('missingfromdisk').')</span>';
-            $plugin = new stdClass();
-            $plugin->version = $dbversion;
-
-        } else {
-            $plugin = new stdClass();
-            $plugin->version = '???';
-            if (file_exists("$CFG->dirroot/blocks/$blockname/version.php")) {
-                include("$CFG->dirroot/blocks/$blockname/version.php");
-            }
-
-            if (!$blockobject  = block_instance($block->name)) {
-                $incompatible[] = $block;
-                continue;
-            }
-        }
-
-        if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('block_'.$blockname, 'manage')) {
-            $uninstall = html_writer::link($uninstallurl, $struninstall);
-        } else {
-            $uninstall = '';
-        }
-
-        $settings = ''; // By default, no configuration
-        if ($blockobject and $blockobject->has_config()) {
-            $blocksettings = admin_get_root()->locate('blocksetting' . $block->name);
-
-            if ($blocksettings instanceof admin_externalpage) {
-                $settings = '<a href="' . $blocksettings->url .  '">' . get_string('settings') . '</a>';
-            } else if ($blocksettings instanceof admin_settingpage) {
-                $settings = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=blocksetting'.$block->name.'">'.$strsettings.'</a>';
-            } else if (!file_exists($CFG->dirroot.'/blocks/'.$block->name.'/settings.php')) {
-                // If the block's settings node was not found, we check that the block really provides the settings.php file.
-                // Note that blocks can inject their settings to other nodes in the admin tree without using the default locations.
-                // This can be done by assigning null to $setting in settings.php and it is a valid case.
-                debugging('Warning: block_'.$block->name.' returns true in has_config() but does not provide a settings.php file',
-                    DEBUG_DEVELOPER);
-            }
-        }
-
-        // MDL-11167, blocks can be placed on mymoodle, or the blogs page
-        // and it should not show up on course search page
-
-        $totalcount = $DB->count_records('block_instances', array('blockname'=>$blockname));
-        $count = $DB->count_records('block_instances', array('blockname'=>$blockname, 'pagetypepattern'=>'course-view-*'));
-
-        if ($count>0) {
-            $blocklist = "<a href=\"{$CFG->wwwroot}/course/search.php?blocklist=$blockid&amp;sesskey=".sesskey()."\" ";
-            $blocklist .= "title=\"$strshowblockcourse\" >$totalcount</a>";
-        }
-        else {
-            $blocklist = "$totalcount";
-        }
-        $class = ''; // Nothing fancy, by default
-
-        if (!$blockobject) {
-            // ignore
-            $visible = '';
-        } else if ($blocks[$blockid]->visible) {
-            $visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strhide.'">'.
-                       $OUTPUT->pix_icon('t/hide', $strhide) . '</a>';
-        } else {
-            $visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strshow.'">'.
-                       $OUTPUT->pix_icon('t/show', $strshow) . '</a>';
-            $class = 'dimmed_text';
-        }
-
-        if ($dbversion == $plugin->version) {
-            $version = $dbversion;
-        } else {
-            $version = "$dbversion ($plugin->version)";
-        }
-
-        if (!$blockobject) {
-            // ignore
-            $undeletable = '';
-        } else if (in_array($blockname, $undeletableblocktypes)) {
-            $undeletable = '<a href="blocks.php?unprotect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strunprotect.'">'.
-                       $OUTPUT->pix_icon('t/unlock', $strunprotect) . '</a>';
-        } else {
-            $undeletable = '<a href="blocks.php?protect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strprotect.'">'.
-                       $OUTPUT->pix_icon('t/lock', $strprotect) . '</a>';
-        }
-
-        $row = array(
-            $strblockname,
-            $blocklist,
-            $version,
-            $visible,
-            $undeletable,
-            $settings,
-            $uninstall,
+    if ($action === 'disable' && $manager::enable_plugin($plugin, 0)) {
+        \core\notification::add(
+            get_string('plugin_disabled', 'core_admin', $pluginname),
+            \core\notification::SUCCESS
         );
-        $table->add_data($row, $class);
+        // Settings not required - only pages.
+        admin_get_root(true, false);
+    } else if ($action === 'enable' && $manager::enable_plugin($plugin, 1)) {
+        \core\notification::add(
+            get_string('plugin_enabled', 'core_admin', $pluginname),
+            \core\notification::SUCCESS
+        );
+
+        // Settings not required - only pages.
+        admin_get_root(true, false);
     }
 
-    $table->print_html();
+    // Redirect back to the page with out any params.
+    redirect(new moodle_url('/admin/blocks.php'));
+}
 
-    if (!empty($incompatible)) {
-        echo $OUTPUT->heading(get_string('incompatibleblocks', 'blockstable', 'admin'));
+if (!empty($protect) && confirm_sesskey()) {
+    block_manager::protect_block($protect);
+    $pluginname = get_string('pluginname', "block_{$protect}");
+    \core\notification::add(
+        get_string('blockprotected', 'core_admin', $pluginname),
+        \core\notification::SUCCESS
+    );
+    // Settings not required - only pages.
+    admin_get_root(true, false);
+}
 
-        $table = new flexible_table('admin-blocks-incompatible');
+if (!empty($unprotect) && confirm_sesskey()) {
+    block_manager::unprotect_block($unprotect);
+    $pluginname = get_string('pluginname', "block_{$unprotect}");
+    \core\notification::add(
+        get_string('blockunprotected', 'core_admin', $pluginname),
+        \core\notification::SUCCESS
+    );
+    // Settings not required - only pages.
+    admin_get_root(true, false);
+}
 
-        $table->define_columns(array('block', 'uninstall'));
-        $table->define_headers(array($strname, $struninstall));
-        $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
+echo $OUTPUT->header();
+echo $OUTPUT->heading($strmanageblocks);
+echo $OUTPUT->notification(get_string('noteunneededblocks', 'admin'), 'info', false);
 
-        $table->set_attribute('class', 'incompatibleblockstable generaltable');
-
-        $table->setup();
-
-        foreach ($incompatible as $block) {
-            if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('block_'.$block->name, 'manage')) {
-                $uninstall = html_writer::link($uninstallurl, $struninstall);
-            } else {
-                $uninstall = '';
-            }
-            $table->add_data(array(
-                $block->name,
-                $uninstall,
-            ));
-        }
-        $table->print_html();
-    }
-
-    echo $OUTPUT->footer();
+// Print the table of all blocks.
+$table = new \core_admin\table\block_management_table();
+$table->out();
+echo $OUTPUT->footer();

admin/category.php

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

@@ -0,0 +1,127 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_admin\admin;
+
+use admin_setting;
+use core_plugin_manager;
+use core_text;
+
+/**
+ * Admin setting plugin manager.
+ *
+ * @package    core_admin
+ * @subpackage admin
+ * @copyright  2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class admin_setting_plugin_manager extends admin_setting {
+    /** @var core_plugin_manager The plugin manager instance */
+    protected core_plugin_manager $pluginmanager;
+
+    /** @var string The plugintype that this manager covers */
+    protected string $plugintype;
+
+    /** @var string The class of the management table to use */
+    protected string $tableclass;
+
+    public function __construct(
+        string $plugintype,
+        string $tableclass,
+        string $name,
+        string $visiblename,
+        string $description = '',
+        string $defaultsetting = '',
+    ) {
+        $this->nosave = true;
+        $this->pluginmanager = core_plugin_manager::instance();
+        $this->plugintype = $plugintype;
+        $this->tableclass = $tableclass;
+
+        parent::__construct($name, $visiblename, $description, $defaultsetting);
+    }
+
+    /**
+     * Always returns true, does nothing
+     *
+     * @return true
+     */
+    public function get_setting(): bool {
+        return true;
+    }
+
+    /**
+     * Always returns true, does nothing
+     *
+     * @return true
+     */
+    public function get_defaultsetting(): bool {
+        return true;
+    }
+
+    /**
+     * Always returns '', does not write anything
+     *
+     * @return string Always returns ''
+     */
+    // phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function write_setting($data): string {
+        // Do not write any setting.
+        return '';
+    }
+
+    /**
+     * Checks if $query is one of the available editors
+     *
+     * @param string $query The string to search for
+     * @return bool Returns true if found, false if not
+     */
+    public function is_related($query) {
+        if (parent::is_related($query)) {
+            return true;
+        }
+
+        $plugins = $this->pluginmanager->get_installed_plugins($this->plugintype);
+        foreach (array_keys($plugins) as $plugin) {
+            $plugin = "{$this->plugintype}_{$plugin}";
+            if (str_contains($plugin, $query)) {
+                return true;
+            }
+
+            $pluginname = get_string('pluginname', $plugin);
+            if (strpos(core_text::strtolower($pluginname), $query) !== false) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Builds the XHTML to display the control
+     *
+     * @param string $data Unused
+     * @param string $query
+     * @return string
+     */
+    public function output_html($data, $query = ''): string {
+        $table = new $this->tableclass();
+        if (!($table instanceof \core_admin\table\plugin_management_table)) {
+            throw new \coding_exception("{$this->tableclass} must be an instance of \\core_admin\\table\\plugin_management_table");
+        }
+        return highlight($query, $table->get_content());
+    }
+}

admin/classes/external/set_block_protection.php

@@ -0,0 +1,97 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_admin\external;
+
+use block_manager;
+use core_external\external_api;
+use core_external\external_function_parameters;
+use core_external\external_single_structure;
+use core_external\external_value;
+
+/**
+ * Web Service to control the state of a plugin.
+ *
+ * @package   core_admin
+ * @category  external
+ * @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class set_block_protection extends external_api {
+    /**
+     * Returns description of method parameters
+     *
+     * @return external_function_parameters
+     */
+    public static function execute_parameters(): external_function_parameters {
+        return new external_function_parameters([
+            'plugin' => new external_value(PARAM_PLUGIN, 'The name of the plugin', VALUE_REQUIRED),
+            'state' => new external_value(PARAM_INT, 'The target state', VALUE_REQUIRED),
+        ]);
+    }
+
+    /**
+     * Set the block protection state.
+     *
+     * @param string $plugin The name of the plugin
+     * @param int $state The target state
+     * @return null
+     */
+    public static function execute(
+        string $plugin,
+        int $state,
+    ): array {
+        [
+            'plugin' => $plugin,
+            'state' => $state,
+        ] = self::validate_parameters(self::execute_parameters(), [
+            'plugin' => $plugin,
+            'state' => $state,
+        ]);
+
+        $context = \context_system::instance();
+        self::validate_context($context);
+        require_capability('moodle/site:config', $context);
+
+        [, $pluginname] = explode('_', \core_component::normalize_componentname($plugin), 2);
+        $displayname = get_string('pluginname', $plugin);
+
+        if ($state) {
+            block_manager::protect_block($pluginname);
+            \core\notification::add(
+                get_string('blockprotected', 'core_admin', $displayname),
+                \core\notification::SUCCESS
+            );
+        } else {
+            block_manager::unprotect_block($pluginname);
+            \core\notification::add(
+                get_string('blockunprotected', 'core_admin', $displayname),
+                \core\notification::SUCCESS
+            );
+        }
+
+        return [];
+    }
+
+    /**
+     * Describe the return structure of the external service.
+     *
+     * @return external_single_structure
+     */
+    public static function execute_returns(): external_single_structure {
+        return new external_single_structure([]);
+    }
+}

admin/classes/external/set_plugin_order.php

@@ -0,0 +1,84 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_admin\external;
+
+use core_external\external_api;
+use core_external\external_function_parameters;
+use core_external\external_single_structure;
+use core_external\external_value;
+
+/**
+ * Web Service to control the order of a plugin.
+ *
+ * @package   core_admin
+ * @category  external
+ * @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class set_plugin_order extends external_api {
+    /**
+     * Returns description of method parameters
+     *
+     * @return external_function_parameters
+     */
+    public static function execute_parameters(): external_function_parameters {
+        return new external_function_parameters([
+            'plugin' => new external_value(PARAM_PLUGIN, 'The name of the plugin', VALUE_REQUIRED),
+            'direction' => new external_value(PARAM_INT, 'The direction to move', VALUE_REQUIRED),
+        ]);
+    }
+
+    /**
+     * Set the plugin state.
+     *
+     * @param string $plugin The name of the plugin
+     * @param int $direction The direction to move the plugin
+     * @return array
+     */
+    public static function execute(
+        string $plugin,
+        int $direction,
+    ): array {
+        [
+            'plugin' => $plugin,
+            'direction' => $direction,
+        ] = self::validate_parameters(self::execute_parameters(), [
+            'plugin' => $plugin,
+            'direction' => $direction,
+        ]);
+
+        $context = \context_system::instance();
+        self::validate_context($context);
+        require_capability('moodle/site:config', $context);
+
+        [$plugintype, $pluginname] = explode('_', \core_component::normalize_componentname($plugin), 2);
+
+        $manager = \core_plugin_manager::resolve_plugininfo_class($plugintype);
+        $manager::change_plugin_order($pluginname, $direction);
+
+        return [];
+    }
+
+    /**
+     * Describe the return structure of the external service.
+     *
+     * @return external_single_structure
+     */
+    public static function execute_returns(): external_single_structure {
+        return new external_single_structure([]);
+    }
+}

admin/classes/external/set_plugin_state.php

@@ -0,0 +1,98 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_admin\external;
+
+use core_external\external_api;
+use core_external\external_function_parameters;
+use core_external\external_single_structure;
+use core_external\external_value;
+
+/**
+ * Web Service to control the state of a plugin.
+ *
+ * @package   core_admin
+ * @category  external
+ * @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class set_plugin_state extends external_api {
+    /**
+     * Returns description of method parameters
+     *
+     * @return external_function_parameters
+     */
+    public static function execute_parameters(): external_function_parameters {
+        return new external_function_parameters([
+            'plugin' => new external_value(PARAM_PLUGIN, 'The name of the plugin', VALUE_REQUIRED),
+            'state' => new external_value(PARAM_INT, 'The target state', VALUE_REQUIRED),
+        ]);
+    }
+
+    /**
+     * Set the plugin state.
+     *
+     * @param string $plugin The name of the plugin
+     * @param int $state The target state
+     * @return null
+     */
+    public static function execute(
+        string $plugin,
+        int $state,
+    ): array {
+        [
+            'plugin' => $plugin,
+            'state' => $state,
+        ] = self::validate_parameters(self::execute_parameters(), [
+            'plugin' => $plugin,
+            'state' => $state,
+        ]);
+
+        $context = \context_system::instance();
+        self::validate_context($context);
+        require_capability('moodle/site:config', $context);
+
+        [$plugintype, $pluginname] = explode('_', \core_component::normalize_componentname($plugin), 2);
+
+        $manager = \core_plugin_manager::resolve_plugininfo_class($plugintype);
+        $displayname = get_string('pluginname', $plugin);
+
+        if ($manager::enable_plugin($pluginname, $state)) {
+            if (!empty($state)) {
+                \core\notification::add(
+                    get_string('plugin_enabled', 'core_admin', $displayname),
+                    \core\notification::SUCCESS
+                );
+            } else {
+                \core\notification::add(
+                    get_string('plugin_disabled', 'core_admin', $displayname),
+                    \core\notification::SUCCESS
+                );
+            }
+        }
+
+        return [];
+    }
+
+    /**
+     * Describe the return structure of the external service.
+     *
+     * @return external_single_structure
+     */
+    public static function execute_returns(): external_single_structure {
+        return new external_single_structure([]);
+    }
+}

admin/classes/table/activity_management_table.php

@@ -0,0 +1,118 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_admin\table;
+
+use core_plugin_manager;
+use dml_exception;
+use html_writer;
+use moodle_url;
+use stdClass;
+
+/**
+ * Activity Module admin settings.
+ *
+ * @package core_admin
+ * @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class activity_management_table extends plugin_management_table {
+
+    public function setup() {
+        $this->set_attribute('id', 'modules');
+        $this->set_attribute('class', 'admintable generaltable');
+        parent::setup();
+    }
+
+    protected function get_table_id(): string {
+        return 'module-administration-table';
+    }
+
+    protected function get_plugintype(): string {
+        return 'mod';
+    }
+
+    public function guess_base_url(): void {
+        $this->define_baseurl(
+            new moodle_url('/admin/modules.php')
+        );
+    }
+
+    protected function get_action_url(array $params = []): moodle_url {
+        return new moodle_url('/admin/modules.php', $params);
+    }
+
+    protected function get_column_list(): array {
+        $columns = parent::get_column_list();
+        return array_merge(
+            array_slice($columns, 0, 1, true),
+            ['activities' => get_string('activities')],
+            array_slice($columns, 1, null, true),
+        );
+    }
+
+    protected function col_name(stdClass $row): string {
+        global $OUTPUT;
+
+        $status = $row->plugininfo->get_status();
+        if ($status === core_plugin_manager::PLUGIN_STATUS_MISSING) {
+            return html_writer::span(
+                get_string('pluginmissingfromdisk', 'core', $row->plugininfo),
+                'notifyproblem'
+            );
+        }
+
+        return html_writer::span(
+            html_writer::img(
+                $OUTPUT->image_url('monologo', $row->plugininfo->name),
+                '',
+                [
+                    'class' => 'icon',
+                ],
+            ) . get_string('modulename', $row->plugininfo->name)
+        );
+    }
+
+    /**
+     * Show the number of activities present, with a link to courses containing activity if relevant.
+     *
+     * @param mixed $row
+     * @return string
+     */
+    protected function col_activities(stdClass $row): string {
+        global $DB, $OUTPUT;
+        try {
+            $count = $DB->count_records_select($row->plugininfo->name, "course <> 0");
+        } catch (dml_exception $e) {
+            $count = -1;
+        }
+
+        if ($count > 0) {
+            return $OUTPUT->action_link(
+                new moodle_url('/course/search.php', [
+                    'modulelist' => $row->plugininfo->name,
+                ]),
+                $count,
+                null,
+                ['title' => get_string('showmodulecourse')]
+            );
+        } else if ($count < 0) {
+            return get_string('error');
+        } else {
+            return $count;
+        }
+    }
+}

admin/classes/table/block_management_table.php

@@ -0,0 +1,153 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_admin\table;
+
+use html_writer;
+use moodle_url;
+use stdClass;
+
+/**
+ * Tiny admin settings.
+ *
+ * @package core_admin
+ * @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class block_management_table extends \core_admin\table\plugin_management_table {
+
+    /** @var plugininfo[] A list of blocks which cannot be deleted */
+    protected array $undeletableblocktypes;
+
+    /** @var stdClass[] A list of basic block data */
+    protected array $blockdata;
+
+    public function __construct() {
+        global $DB;
+        parent::__construct();
+        $this->undeletableblocktypes = \block_manager::get_undeletable_block_types();
+
+        $sql = <<<EOF
+            SELECT
+                b.name,
+                b.id,
+                b.name,
+                COUNT(DISTINCT binst.id) as totalcount,
+                COUNT(DISTINCT bcinst.id) as courseviewcount
+            FROM {block} b
+            LEFT JOIN {block_instances} binst ON binst.blockname = b.name
+            LEFT JOIN {block_instances} bcinst ON
+                bcinst.blockname = b.name AND
+                bcinst.pagetypepattern = 'course-view-*'
+            GROUP BY b.id, b.name, b.visible, binst.blockname, bcinst.blockname
+            ORDER BY b.name ASC
+        EOF;
+
+        $this->blockdata = $DB->get_records_sql($sql);
+    }
+
+    protected function get_plugintype(): string {
+        return 'block';
+    }
+
+    public function guess_base_url(): void {
+        $this->define_baseurl(
+            new moodle_url('/admin/blocks.php')
+        );
+    }
+
+    protected function get_action_url(array $params = []): moodle_url {
+        return new moodle_url('/admin/blocks.php', $params);
+    }
+
+
+    protected function get_table_js_module(): string {
+        return 'core_admin/block_management_table';
+    }
+
+    protected function get_column_list(): array {
+        $columns = parent::get_column_list();
+        return array_merge(
+            array_slice($columns, 0, 1, true),
+            ['instances' => get_string('blockinstances', 'admin')],
+            array_slice($columns, 1, 2, true),
+            ['protect' => get_string('blockprotect', 'admin')],
+            array_slice($columns, 3, null, true),
+        );
+    }
+
+    protected function get_columns_with_help(): array {
+        return [
+            'protect' => new \help_icon('blockprotect', 'admin'),
+        ];
+    }
+
+    /**
+     * Render the instances column
+     * @param stdClass $row
+     * @return string
+     */
+    protected function col_instances(stdClass $row): string {
+        $blockdata = $this->blockdata[$row->plugininfo->name];
+        if ($blockdata->courseviewcount > 0) {
+            return html_writer::link(
+                new moodle_url('/course/search.php', [
+                    'blocklist' => $row->plugininfo->name,
+                    'sesskey' => sesskey(),
+                ]),
+                $blockdata->totalcount,
+            );
+        }
+
+        return $blockdata->totalcount;
+    }
+
+    /**
+     * Render the protect column.
+     *
+     * @param stdClass $row
+     * @return string
+     */
+    protected function col_protect(stdClass $row): string {
+        global $OUTPUT;
+
+        $params = [
+            'sesskey' => sesskey(),
+        ];
+
+        $protected = in_array($row->plugininfo->name, $this->undeletableblocktypes);
+
+        $pluginname = $row->plugininfo->displayname;
+        if ($protected) {
+            $params['unprotect'] = $row->plugininfo->name;
+            $icon = $OUTPUT->pix_icon('t/unlock', get_string('blockunprotectblock', 'admin', $pluginname));
+        } else {
+            $params['protect'] = $row->plugininfo->name;
+            $icon = $OUTPUT->pix_icon('t/lock', get_string('blockprotectblock', 'admin', $pluginname));
+        }
+
+        return html_writer::link(
+            $this->get_action_url($params),
+            $icon,
+            [
+                'data-action' => 'toggleprotectstate',
+                'data-plugin' => $row->plugin,
+                'data-target-state' => $protected ? 0 : 1,
+            ],
+        );
+        return '';
+    }
+}

admin/classes/table/editor_management_table.php

@@ -0,0 +1,63 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_admin\table;
+
+use moodle_url;
+
+/**
+ * Tiny admin settings.
+ *
+ * @package core_admin
+ * @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class editor_management_table extends \core_admin\table\plugin_management_table {
+    protected function get_plugintype(): string {
+        return 'editor';
+    }
+
+    public function guess_base_url(): void {
+        $this->define_baseurl(
+            new moodle_url('/admin/settings.php', ['section' => 'manageeditors'])
+        );
+    }
+
+    protected function get_action_url(array $params = []): moodle_url {
+        return new moodle_url('/admin/editors.php', $params);
+    }
+
+    protected function order_plugins(array $plugins): array {
+        global $CFG;
+
+        // The Editor list is stored in an ordered string.
+        $activeeditors = explode(',', $CFG->texteditors);
+
+        $sortedplugins = [];
+        foreach ($activeeditors as $editor) {
+            if (isset($plugins[$editor])) {
+                $sortedplugins[$editor] = $plugins[$editor];
+                unset($plugins[$editor]);
+            }
+        }
+
+        $otherplugins = parent::order_plugins($plugins);
+        return array_merge(
+            $sortedplugins,
+            $otherplugins
+        );
+    }
+}

admin/classes/table/media_management_table.php

@@ -0,0 +1,71 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_admin\table;
+
+use moodle_url;
+use stdClass;
+
+/**
+ * Media plugin admin settings.
+ *
+ * @package core_admin
+ * @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class media_management_table extends \core_admin\table\plugin_management_table {
+    /** @var array The list of used extensions */
+    protected array $usedextensions = [];
+
+    protected function get_plugintype(): string {
+        return 'media';
+    }
+
+    protected function get_action_url(array $params = []): moodle_url {
+        return new moodle_url('/admin/media.php', $params);
+    }
+
+    protected function get_column_list(): array {
+        $columns = parent::get_column_list();
+        return array_merge(
+            array_slice($columns, 0, 1, true),
+            ['supports' => get_string('supports', 'core_media')],
+            array_slice($columns, 1, null, true),
+        );
+    }
+
+    protected function col_name(stdClass $row): string {
+        global $OUTPUT, $PAGE;
+
+        $name = $row->plugininfo->name;
+        if ($PAGE->theme->resolve_image_location('icon', 'media_' . $name, false)) {
+            $icon = $OUTPUT->pix_icon('icon', '', "media_{$name}", ['class' => 'icon pluginicon']);
+        } else {
+            $icon = $OUTPUT->pix_icon('spacer', '', 'moodle', ['class' => 'icon pluginicon noicon']);
+        }
+
+        $help = '';
+        if (get_string_manager()->string_exists('pluginname_help', 'media_' . $name)) {
+            $help = '&nbsp;' . $OUTPUT->help_icon('pluginname', 'media_' . $name);
+        }
+
+        return $icon . $row->plugininfo->displayname . $help;
+    }
+
+    protected function col_supports(stdClass $row): string {
+        return $row->plugininfo->supports($this->usedextensions);
+    }
+}

admin/classes/table/plugin_management_table.php

@@ -0,0 +1,503 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_admin\table;
+
+use context_system;
+use core_plugin_manager;
+use core_table\dynamic as dynamic_table;
+use flexible_table;
+use html_writer;
+use moodle_url;
+use stdClass;
+
+defined('MOODLE_INTERNAL') || die();
+require_once("{$CFG->libdir}/tablelib.php");
+
+/**
+ * Plugin Management table.
+ *
+ * @package    core_admin
+ * @copyright  2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+abstract class plugin_management_table extends flexible_table implements dynamic_table {
+
+    /** @var \core\plugininfo\base[] The plugin list */
+    protected array $plugins = [];
+
+    /** @var int The number of enabled plugins of this type */
+    protected int $enabledplugincount = 0;
+
+    /** @var core_plugin_manager */
+    protected core_plugin_manager $pluginmanager;
+
+    /** @var string The plugininfo class for this plugintype */
+    protected string $plugininfoclass;
+
+    public function __construct() {
+        global $CFG;
+
+        parent::__construct($this->get_table_id());
+        require_once($CFG->libdir . '/adminlib.php');
+
+        // Fetch the plugininfo class.
+        $this->pluginmanager = core_plugin_manager::instance();
+        $this->plugininfoclass = $this->pluginmanager::resolve_plugininfo_class($this->get_plugintype());
+
+        $this->guess_base_url();
+
+        $this->plugins = $this->get_sorted_plugins();
+        $this->enabledplugincount = count(array_filter($this->plugins, function ($plugin) {
+            return $plugin->is_enabled();
+        }));
+
+        $this->setup_column_configuration();
+        $this->set_filterset(new plugin_management_table_filterset());
+        $this->setup();
+    }
+
+    /**
+     * Get the list of sorted plugins.
+     *
+     * @return \core\plugininfo\base[]
+     */
+    protected function get_sorted_plugins(): array {
+        if ($this->plugininfoclass::plugintype_supports_ordering()) {
+            return $this->plugininfoclass::get_sorted_plugins();
+        } else {
+            $plugins = $this->pluginmanager->get_plugins_of_type($this->get_plugintype());
+            return self::sort_plugins($plugins);
+        }
+    }
+
+    /**
+     * Sort the plugins list.
+     *
+     * Note: This only applies to plugins which do not support ordering.
+     *
+     * @param \core\plugininfo\base[] $plugins
+     * @return \core\plugininfo\base[]
+     */
+    protected function sort_plugins(array $plugins): array {
+        // The asort functions work by reference.
+        \core_collator::asort_objects_by_property($plugins, 'displayname');
+
+        return $plugins;
+    }
+
+    /**
+     * Set up the column configuration for this table.
+     */
+    protected function setup_column_configuration(): void {
+        $columnlist = $this->get_column_list();
+        $this->define_columns(array_keys($columnlist));
+        $this->define_headers(array_values($columnlist));
+
+        $columnswithhelp = $this->get_columns_with_help();
+        $columnhelp = array_map(function (string $column) use ($columnswithhelp): ?\renderable {
+            if (array_key_exists($column, $columnswithhelp)) {
+                return $columnswithhelp[$column];
+            }
+
+            return null;
+        }, array_keys($columnlist));
+        $this->define_help_for_headers($columnhelp);
+    }
+
+    /**
+     * Set the standard order of the plugins.
+     *
+     * @param array $plugins
+     * @return array
+     */
+    protected function order_plugins(array $plugins): array {
+        uasort($plugins, function ($a, $b) {
+            if ($a->is_enabled() && !$b->is_enabled()) {
+                return -1;
+            } else if (!$a->is_enabled() && $b->is_enabled()) {
+                return 1;
+            }
+            return strnatcasecmp($a->name, $b->name);
+        });
+
+        return $plugins;
+    }
+
+    /**
+     * Get the plugintype for this table.
+     *
+     * @return string
+     */
+    abstract protected function get_plugintype(): string;
+
+    /**
+     * Get the action URL for this table.
+     *
+     * The action URL is used to perform all actions when JS is not available.
+     *
+     * @param array $params
+     * @return moodle_url
+     */
+    abstract protected function get_action_url(array $params = []): moodle_url;
+
+    /**
+     * Provide a default implementation for guessing the base URL from the action URL.
+     */
+    public function guess_base_url(): void {
+        $this->define_baseurl($this->get_action_url());
+    }
+
+    /**
+     * Get the web service method used to toggle state.
+     *
+     * @return null|string
+     */
+    protected function get_toggle_service(): ?string {
+        return 'core_admin_set_plugin_state';
+    }
+
+    /**
+     * Get the web service method used to order plugins.
+     *
+     * @return null|string
+     */
+    protected function get_sortorder_service(): ?string {
+        return 'core_admin_set_plugin_order';
+    }
+
+    /**
+     * Get the ID of the table.
+     *
+     * @return string
+     */
+    protected function get_table_id(): string {
+        return 'plugin_management_table-' . $this->get_plugintype();
+    }
+
+    /**
+     * Get a list of the column titles
+     * @return string[]
+     */
+    protected function get_column_list(): array {
+        $columns = [
+            'name' => get_string('name', 'core'),
+            'version' => get_string('version', 'core'),
+        ];
+
+        if ($this->supports_disabling()) {
+            $columns['enabled'] = get_string('pluginenabled', 'core_plugin');
+        }
+
+        if ($this->supports_ordering()) {
+            $columns['order'] = get_string('order', 'core');
+        }
+
+        $columns['settings'] = get_string('settings', 'core');
+        $columns['uninstall'] = get_string('uninstallplugin', 'core_admin');
+
+        return $columns;
+    }
+
+    protected function get_columns_with_help(): array {
+        return [];
+    }
+
+    /**
+     * Get the context for this table.
+     *
+     * @return context_system
+     */
+    public function get_context(): context_system {
+        return context_system::instance();
+    }
+
+    /**
+     * Get the table content.
+     */
+    public function get_content(): string {
+        ob_start();
+        $this->out();
+        $content = ob_get_contents();
+        ob_end_clean();
+        return $content;
+    }
+
+    /**
+     * Print the table.
+     */
+    public function out(): void {
+        $plugintype = $this->get_plugintype();
+        foreach ($this->plugins as $plugininfo) {
+            $plugin = "{$plugintype}_{$plugininfo->name}";
+            $rowdata = (object) [
+                'plugin' => $plugin,
+                'plugininfo' => $plugininfo,
+                'name' => $plugininfo->displayname,
+                'version' => $plugininfo->versiondb,
+            ];
+            $this->add_data_keyed(
+                $this->format_row($rowdata),
+                $this->get_row_class($rowdata)
+            );
+        }
+
+        $this->finish_output(false);
+    }
+
+    /**
+     * This table is not downloadable.
+     * @param bool $downloadable
+     * @return bool
+     */
+    // phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+    public function is_downloadable($downloadable = null): bool {
+        return false;
+    }
+
+    /**
+     * Show the name column content.
+     *
+     * @param stdClass $row
+     * @return string
+     */
+    protected function col_name(stdClass $row): string {
+        $status = $row->plugininfo->get_status();
+        if ($status === core_plugin_manager::PLUGIN_STATUS_MISSING) {
+            return html_writer::span(
+                get_string('pluginmissingfromdisk', 'core', $row->plugininfo),
+                'notifyproblem'
+            );
+        }
+
+        if ($row->plugininfo->is_installed_and_upgraded()) {
+            return $row->plugininfo->displayname;
+        }
+
+        return html_writer::span(
+            $row->plugininfo->displayname,
+            'notifyproblem'
+        );
+    }
+
+    /**
+     * Show the enable/disable column content.
+     *
+     * @param stdClass $row
+     * @return string
+     */
+    protected function col_enabled(stdClass $row): string {
+        global $OUTPUT;
+
+        $enabled = $row->plugininfo->is_enabled();
+        $params = [
+            'sesskey' => sesskey(),
+            'plugin' => $row->plugininfo->name,
+            'action' => $enabled ? 'disable' : 'enable',
+        ];
+
+        if ($enabled) {
+            $icon = $OUTPUT->pix_icon('t/hide', get_string('disableplugin', 'core_admin', $row->plugininfo->displayname));
+        } else {
+            $icon = $OUTPUT->pix_icon('t/show', get_string('enableplugin', 'core_admin', $row->plugininfo->displayname));
+        }
+
+        return html_writer::link(
+            $this->get_action_url($params),
+            $icon,
+            [
+                'data-toggle-method' => $this->get_toggle_service(),
+                'data-action' => 'togglestate',
+                'data-plugin' => $row->plugin,
+                'data-state' => $enabled ? 1 : 0,
+            ],
+        );
+    }
+
+    protected function col_order(stdClass $row): string {
+        global $OUTPUT;
+
+        if (!$this->supports_ordering()) {
+            return '';
+        }
+
+        if (!$row->plugininfo->is_enabled()) {
+            return '';
+        }
+
+        if ($this->enabledplugincount <= 1) {
+            // There is only one row.
+            return '';
+        }
+
+        $hasup = true;
+        $hasdown = true;
+
+        if (empty($this->currentrow)) {
+            // This is the top row.
+            $hasup = false;
+        }
+
+        if ($this->currentrow === ($this->enabledplugincount - 1)) {
+            // This is the last row.
+            $hasdown = false;
+        }
+
+        if ($this->supports_ordering()) {
+            $dataattributes = [
+                'data-method' => $this->get_sortorder_service(),
+                'data-action' => 'move',
+                'data-plugin' => $row->plugin,
+            ];
+        } else {
+            $dataattributes = [];
+        }
+
+        if ($hasup) {
+            $upicon = html_writer::link(
+                $this->get_action_url([
+                    'sesskey' => sesskey(),
+                    'action' => 'up',
+                    'plugin' => $row->plugininfo->name,
+                ]),
+                $OUTPUT->pix_icon('t/up', get_string('moveup')),
+                array_merge($dataattributes, ['data-direction' => 'up']),
+            );
+        } else {
+            $upicon = $OUTPUT->spacer();
+        }
+
+        if ($hasdown) {
+            $downicon = html_writer::link(
+                $this->get_action_url([
+                    'sesskey' => sesskey(),
+                    'action' => 'down',
+                    'plugin' => $row->plugininfo->name,
+                ]),
+                $OUTPUT->pix_icon('t/down', get_string('movedown')),
+                array_merge($dataattributes, ['data-direction' => 'down']),
+            );
+        } else {
+            $downicon = $OUTPUT->spacer();
+        }
+
+        // For now just add the up/down icons.
+        return html_writer::span($upicon . $downicon);
+    }
+
+    /**
+     * Show the settings column content.
+     *
+     * @param stdClass $row
+     * @return string
+     */
+    protected function col_settings(stdClass $row): string {
+        if ($settingsurl = $row->plugininfo->get_settings_url()) {
+            return html_writer::link($settingsurl, get_string('settings'));
+        }
+
+        return '';
+    }
+
+    /**
+     * Show the Uninstall column content.
+     *
+     * @param stdClass $row
+     * @return string
+     */
+    protected function col_uninstall(stdClass $row): string {
+        $status = $row->plugininfo->get_status();
+
+        if ($status === core_plugin_manager::PLUGIN_STATUS_NEW) {
+            return get_string('status_new', 'core_plugin');
+        }
+
+        if ($status === core_plugin_manager::PLUGIN_STATUS_MISSING) {
+            $uninstall = get_string('status_missing', 'core_plugin') . '<br/>';
+        } else {
+            $uninstall = '';
+        }
+
+        if ($uninstallurl = $this->pluginmanager->get_uninstall_url($row->plugin)) {
+            $uninstall .= html_writer::link($uninstallurl, get_string('uninstallplugin', 'core_admin'));
+        }
+
+        return $uninstall;
+    }
+
+    /**
+     * Get the JS module used to manage this table.
+     *
+     * This should be a class which extends 'core_admin/plugin_management_table'.
+     *
+     * @return string
+     */
+    protected function get_table_js_module(): string {
+        return 'core_admin/plugin_management_table';
+    }
+
+    /**
+     * Add JS specific to this implementation.
+     *
+     * @return string
+     */
+    protected function get_dynamic_table_html_end(): string {
+        global $PAGE;
+
+        $PAGE->requires->js_call_amd($this->get_table_js_module(), 'init');
+        return parent::get_dynamic_table_html_end();
+    }
+
+    /**
+     * Get any class to add to the row.
+     *
+     * @param mixed $row
+     * @return string
+     */
+    protected function get_row_class($row): string {
+        $plugininfo = $row->plugininfo;
+        if ($plugininfo->get_status() === core_plugin_manager::PLUGIN_STATUS_MISSING) {
+            return '';
+        }
+
+        if (!$plugininfo->is_enabled()) {
+            return 'dimmed_text';
+        }
+        return '';
+    }
+
+    public static function get_filterset_class(): string {
+        return self::class . '_filterset';
+    }
+
+    /**
+     * Whether this plugin type supports the disabling of plugins.
+     *
+     * @return bool
+     */
+    protected function supports_disabling(): bool {
+        return $this->plugininfoclass::plugintype_supports_disabling();
+    }
+
+    /**
+     * Whether this table should show ordering fields.
+     *
+     * @return bool
+     */
+    protected function supports_ordering(): bool {
+        return $this->plugininfoclass::plugintype_supports_ordering();
+    }
+}

admin/classes/table/plugin_management_table_filterset.php

@@ -0,0 +1,27 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_admin\table;
+
+/**
+ * This file contains the dynamic interface.
+ *
+ * @package core_admin
+ * @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class plugin_management_table_filterset extends \core_table\local\filter\filterset {
+}

admin/classes/table/tool_plugin_management_table.php

@@ -0,0 +1,50 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_admin\table;
+
+use moodle_url;
+
+/**
+ * Tiny admin settings.
+ *
+ * @package core_admin
+ * @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class tool_plugin_management_table extends \core_admin\table\plugin_management_table {
+    protected function get_plugintype(): string {
+        return 'tool';
+    }
+
+    public function guess_base_url(): void {
+        $this->define_baseurl(
+            new moodle_url('/admin/tools.php')
+        );
+    }
+
+    protected function get_column_list(): array {
+        $columns = parent::get_column_list();
+
+        unset($columns['settings']);
+
+        return $columns;
+    }
+
+    protected function get_action_url(array $params = []): moodle_url {
+        return new moodle_url('/admin/tool.php', $params);
+    }
+}

admin/cli/adhoc_task.php

@@ -27,23 +27,28 @@ 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(
     [
-        'execute' => false,
         'help' => false,
-        'keep-alive' => 0,
         'showsql' => false,
         'showdebugging' => false,
+        'execute' => false,
+        'keep-alive' => 0,
         'ignorelimits' => false,
         'force' => false,
+        'id' => null,
+        'classname' => null,
+        'taskslimit' => null,
+        'failed' => false,
     ], [
         'h' => 'help',
         'e' => 'execute',
         'k' => 'keep-alive',
         'i' => 'ignorelimits',
         'f' => 'force',
+        'c' => 'classname',
+        'l' => 'taskslimit',
     ]
 );
 
@@ -52,8 +57,7 @@ if ($unrecognized) {
     cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
 }
 
-if ($options['help'] or empty($options['execute'])) {
-    $help = <<<EOT
+$help = <<<EOT
 Ad hoc cron tasks.
 
 Options:
@@ -64,22 +68,32 @@ Options:
  -k, --keep-alive=N        Keep this script alive for N seconds and poll for new adhoc tasks
  -i  --ignorelimits        Ignore task_adhoc_concurrency_limit and task_adhoc_max_runtime limits
  -f, --force               Run even if cron is disabled
+     --id                  Run (failed) task with id
+ -c, --classname           Run tasks with a certain classname (FQN)
+ -l, --taskslimit=N        Run at most N tasks
+     --failed              Run only tasks that failed, ie those with a fail delay
 
-Example:
+Run all queued tasks:
 \$sudo -u www-data /usr/bin/php admin/cli/adhoc_task.php --execute
 
+Run all queued tasks of specific class:
+\$sudo -u www-data /usr/bin/php admin/cli/adhoc_task.php --classname=\\\\core_course\\\\task\\\\course_delete_modules
+
+Double backslash for the shell escape reasons.
+Run a specific task:
+\$sudo -u www-data /usr/bin/php admin/cli/adhoc_task.php --id=123456
+
+Run a specific task with debugging:
+\$sudo -u www-data /usr/bin/php admin/cli/adhoc_task.php --id=123456 --showsql --showdebugging
+
+To profile a long running task:
+\$sudo -u www-data /usr/bin/php admin/cli/adhoc_task.php --taskslimit=1 --classname='\\some\\class\\name' --ignorelimits
+
 EOT;
 
+if ($options['help']) {
     echo $help;
-    die;
-}
-
-if ($options['showdebugging']) {
-    set_debugging(DEBUG_DEVELOPER, true);
-}
-
-if ($options['showsql']) {
-    $DB->set_debug(true);
+    exit(0);
 }
 
 if (CLI_MAINTENANCE) {
@@ -92,17 +106,18 @@ if (moodle_needs_upgrading()) {
     exit(1);
 }
 
-if (empty($options['execute'])) {
-    exit(0);
-}
-
 if (!get_config('core', 'cron_enabled') && !$options['force']) {
     mtrace('Cron is disabled. Use --force to override.');
     exit(1);
 }
 
-if (empty($options['keep-alive'])) {
-    $options['keep-alive'] = 0;
+// Common debugging options.
+if ($options['showdebugging']) {
+    set_debugging(DEBUG_DEVELOPER, true);
+}
+
+if ($options['showsql']) {
+    $DB->set_debug(true);
 }
 
 if (!empty($CFG->showcronsql)) {
@@ -112,20 +127,48 @@ if (!empty($CFG->showcrondebugging)) {
     set_debugging(DEBUG_DEVELOPER, true);
 }
 
-$checklimits = empty($options['ignorelimits']);
-
+// Process params.
 core_php_time_limit::raise();
 
 // Increase memory limit.
 raise_memory_limit(MEMORY_EXTRA);
 
 // Emulate normal session - we use admin account by default.
-cron_setup_user();
-
-$humantimenow = date('r', time());
-$keepalive = (int)$options['keep-alive'];
+\core\cron::setup_user();
 
 \core\local\cli\shutdown::script_supports_graceful_exit();
-
+$humantimenow = date('r', time());
 mtrace("Server Time: {$humantimenow}\n");
-cron_run_adhoc_tasks(time(), $keepalive, $checklimits);
+
+$classname = $options['classname'];
+
+// Run a single adhoc task only, if requested.
+if (!empty($options['id'])) {
+    $taskid = (int) $options['id'];
+    \core\cron::run_adhoc_task($taskid);
+    exit(0);
+}
+
+// Run all failed tasks.
+if (!empty($options['failed'])) {
+    \core\cron::run_failed_adhoc_tasks($classname);
+    exit(0);
+}
+
+// Examine params and determine if we should run.
+$execute = (bool) $options['execute'];
+$keepalive = empty($options['keep-alive']) ? 0 : (int) $options['keep-alive'];
+$taskslimit = empty($options['taskslimit']) ? null : (int) $options['taskslimit'];
+$checklimits = empty($options['ignorelimits']);
+
+if ($classname || $keepalive || $taskslimit) {
+    $execute = true;
+}
+
+// Output the help text if no criteria for running the adhoc tasks are given.
+if (!$execute) {
+    echo $help;
+    exit(0);
+}
+
+\core\cron::run_adhoc_tasks(time(), $keepalive, $checklimits, null, $taskslimit, $classname);

admin/cli/automated_backups.php

@@ -30,7 +30,6 @@ define('CLI_SCRIPT', true);
 
 require(__DIR__.'/../../config.php');
 require_once($CFG->libdir.'/clilib.php');      // cli only functions
-require_once($CFG->libdir.'/cronlib.php');
 
 // now get cli options
 list($options, $unrecognized) = cli_get_params(array('help'=>false),
@@ -80,10 +79,10 @@ if (!empty($CFG->showcrondebugging)) {
 
 $starttime = microtime();
 
-/// emulate normal session
-cron_setup_user();
+// Emulate normal session.
+\core\cron::setup_user();
 
-/// Start output log
+// Start output log.
 $timenow = time();
 
 mtrace("Server Time: ".date('r',$timenow)."\n\n");
@@ -96,4 +95,4 @@ backup_cron_automated_helper::run_automated_backup(backup_cron_automated_helper:
 mtrace("Automated cron backups completed correctly");
 
 $difftime = microtime_diff($starttime, microtime());
-mtrace("Execution took ".$difftime." seconds");
+mtrace("Execution took ".$difftime." seconds");

admin/cli/cron.php

@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -30,12 +29,11 @@
 
 define('CLI_SCRIPT', true);
 
-require(__DIR__.'/../../config.php');
-require_once($CFG->libdir.'/clilib.php');      // cli only functions
-require_once($CFG->libdir.'/cronlib.php');
+require(__DIR__ . '/../../config.php');
+require_once($CFG->libdir . '/clilib.php');
 
-// now get cli options
-list($options, $unrecognized) = cli_get_params(
+// Now get cli option.
+[$options, $unrecognized] = cli_get_params(
     [
         'help' => false,
         'stop' => false,
@@ -44,7 +42,9 @@ list($options, $unrecognized) = cli_get_params(
         'enable' => false,
         'disable' => false,
         'disable-wait' => false,
-    ], [
+        'keep-alive' => null,
+    ],
+    [
         'h' => 'help',
         's' => 'stop',
         'l' => 'list',
@@ -52,6 +52,7 @@ list($options, $unrecognized) = cli_get_params(
         'e' => 'enable',
         'd' => 'disable',
         'w' => 'disable-wait',
+        'k' => 'keep-alive',
     ]
 );
 
@@ -62,7 +63,7 @@ if ($unrecognized) {
 
 if ($options['help']) {
     $help =
-"Execute periodic cron actions.
+    "Execute periodic cron actions.
 
 Options:
 -h, --help               Print out this help
@@ -72,6 +73,9 @@ Options:
 -e, --enable             Enable cron
 -d, --disable            Disable cron
 -w, --disable-wait=600   Disable cron and wait until all tasks finished or fail after N seconds (optional param)
+-k, --keep-alive=N       Keep this script alive for N seconds and poll for new tasks
+                         The default value can be set by administrators in:
+                         Site administration > Server > Tasks > Task processing > Keep alive time
 
 Example:
 \$sudo -u www-data /usr/bin/php admin/cli/cron.php
@@ -105,7 +109,8 @@ if ($options['list']) {
     $tasks = \core\task\manager::get_running_tasks();
     mtrace('The list of currently running tasks:');
     $format = "%7s %-12s %-9s %-20s %-52s\n";
-    printf ($format,
+    printf(
+        $format,
         'PID',
         'HOST',
         'TYPE',
@@ -113,7 +118,8 @@ if ($options['list']) {
         'CLASSNAME'
     );
     foreach ($tasks as $task) {
-        printf ($format,
+        printf(
+            $format,
             $task->pid,
             substr($task->hostname, 0, 12),
             $task->type,
@@ -137,7 +143,7 @@ if ($wait = $options['disable-wait']) {
     set_config('cron_enabled', 0);
     \core\task\manager::clear_static_caches();
     mtrace('Cron has been disabled for the site.');
-    mtrace('Allocating '. format_time($waitsec) . ' for the tasks to finish.');
+    mtrace('Allocating ' . format_time($waitsec) . ' for the tasks to finish.');
 
     $lastcount = 0;
     while ($wait) {
@@ -151,7 +157,7 @@ if ($wait = $options['disable-wait']) {
 
         if (time() - $started >= $waitsec) {
             mtrace('');
-            mtrace('Wait time ('. format_time($waitsec) . ') elapsed, but ' . count($tasks) . ' task(s) still running.');
+            mtrace('Wait time (' . format_time($waitsec) . ') elapsed, but ' . count($tasks) . ' task(s) still running.');
             mtrace('Exiting with code 1.');
             exit(1);
         }
@@ -175,4 +181,6 @@ if (!get_config('core', 'cron_enabled') && !$options['force']) {
 
 \core\local\cli\shutdown::script_supports_graceful_exit();
 
-cron_run();
+
+$keepalive = $options['keep-alive'];
+\core\cron::run_main_process($keepalive);

admin/cli/delete_course.php

@@ -28,7 +28,6 @@ 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(
     [

admin/cli/emailstop.php

@@ -0,0 +1,209 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This script allows you to view and change the emailstop flag of any user.
+ *
+ * @package    core
+ * @subpackage cli
+ * @copyright  2023 Stephan Robotta (stephan.robotta@bfh.ch)
+ * @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');
+
+// Define the input options.
+$longparams = [
+    'email' => '',
+    'help' => false,
+    'id' => '',
+    'quiet' => false,
+    'stop' => '',
+    'username' => '',
+];
+
+$shortparams = [
+    'e' => 'email',
+    'h' => 'help',
+    'i' => 'id',
+    'q' => 'quiet',
+    's' => 'stop',
+    'u' => 'username',
+];
+
+// Define exit codes.
+$exitsuccess = 0;
+$exitunknownoption = 1;
+$exitmissinguserarg = 2;
+$exittoomanyuserarg = 3;
+$exitnosearchargs = 4;
+$exitnousersfound = 5;
+$exitinvalidstopflag = 6;
+$exiterrordb = 7;
+
+// Now get cli options that are set by the caller.
+list($options, $unrecognized) = cli_get_params($longparams, $shortparams);
+
+$verbose = empty($options['quiet']);
+
+if ($unrecognized) {
+    $unrecognized = implode("\n  ", $unrecognized);
+    if ($verbose) {
+        cli_error(get_string('cliunknowoption', 'admin', $unrecognized), $exitunknownoption);
+    }
+    exit($exitunknownoption);
+}
+
+if ($options['help']) {
+    $help =
+        "Set/unset or show status of emailstop flag for a user, identified by username or email.
+
+There are no security checks here because anybody who is able to
+execute this file may execute any PHP too.
+
+Options:
+-h, --help                    Print out this help
+-e, --email=email             Specify user by email, separate many users by comma
+-i, --id=id                   Specify user by id, separate many users by comma
+-q, --quiet                   No output to stdout
+-s, --stop=0|1|off|on         Set new value for emailstop flag
+-u, --username=username       Specify user by username, separate many users by comma
+
+Example:
+\$sudo -u www-data /usr/bin/php admin/cli/emailstop.php --email=student1@example.com --stop=1
+\$sudo -u www-data /usr/bin/php admin/cli/emailstop.php --email=student1@example.com,student2@example.com
+\$sudo -u www-data /usr/bin/php admin/cli/emailstop.php --u=student1,student2 -s=on
+";
+
+    echo $help;
+    exit($exitsuccess);
+}
+
+$cntempty = 0;
+$cntfilled = 0;
+$searchargs = [];
+
+// Try to find out which option is used to fetch the users from. Also do sanitize etc.
+foreach (['email', 'username', 'id'] as $option) {
+    if (empty($options[$option])) {
+        $cntempty++;
+    } else {
+        $cntfilled++;
+        $argname = $option;
+        // The search args must be: split by the comma, trimmed, and empty elements filtered out.
+        $searchargs = array_flip(array_filter(
+            array_map(
+                function ($item) {
+                    return trim($item);
+                },
+                explode(',', $options[$option])
+            ),
+            function ($item) {
+                return $item !== '';
+            }
+        ));
+    }
+}
+if ($cntempty === 3) {
+    if ($verbose) {
+        cli_error('One of username, email, or id must be set.', $exitmissinguserarg);
+    }
+    exit($exitmissinguserarg);
+}
+if ($cntfilled > 1) {
+    if ($verbose) {
+        cli_error('Only one of email, username, or id can be set to identify a user.', $exittoomanyuserarg);
+    }
+    exit($exittoomanyuserarg);
+}
+if (empty($searchargs)) {
+    if ($verbose) {
+        cli_error('No values are provided for users.', $exitnosearchargs);
+    }
+    exit($exitnosearchargs);
+}
+try {
+    $users = $DB->get_records_list('user', $argname, array_keys($searchargs));
+} catch (Exception $e) {
+    if ($verbose) {
+        cli_error("Could not fetch data from db by {$argname}: '{$options[$argname]}'.", $exiterrordb);
+    }
+    exit($exiterrordb);
+}
+if (empty($users)) {
+    if ($verbose) {
+        cli_error("Can not find any user by {$argname}: '{$options[$argname]}'.", $exitnousersfound);
+    }
+    exit($exitnousersfound);
+}
+
+// No stop flag set, then just print the user and the current emailstop flag state.
+if ($options['stop'] === '') {
+    foreach ($users as $user) {
+        if ($verbose) {
+            echo 'user=' . $user->{$argname} . ' - emailstop=' . (int)$user->emailstop . PHP_EOL;
+            unset($searchargs[$user->{$argname}]);
+        }
+    }
+    if ($verbose) {
+        foreach (array_keys($searchargs) as $arg) {
+            echo 'user=' . $arg . ' - not found' . PHP_EOL;
+        }
+    }
+    exit($exitsuccess);
+}
+
+// Allowed values for the stop flag enabled are 1 and on, for disabled are 0 and off.
+$validvalues = ['0', '1', 'off', 'on'];
+$stopflag = strtolower($options['stop']);
+if (!in_array($stopflag, $validvalues)) {
+    if ($verbose) {
+        cli_error('Value for the emailstop flag must be one of: ' . implode(', ', $validvalues) . '.', $exitinvalidstopflag);
+    }
+    exit($exitinvalidstopflag);
+}
+
+foreach ($validvalues as $value) {
+    if ($value === $stopflag) {
+        $stopflag = ($value === '1' || $value === 'on') ? 1 : 0;
+        break;
+    }
+}
+// Update each user with the stop flag to be set if it is necessary.
+foreach ($users as $user) {
+    $line = 'Update user ' . $user->{$argname} . ($argname !== 'id' ? ' (' . $user->id . ')' : '') . ' - ';
+    if ((int)$user->emailstop !== $stopflag) {
+        $DB->set_field('user', 'emailstop', $stopflag, ['id' => $user->id]);
+        $line .= 'ok';
+    } else {
+        $line .= 'already done';
+    }
+    if ($verbose) {
+        echo $line . PHP_EOL;
+        unset($searchargs[$user->{$argname}]);
+    }
+
+}
+if ($verbose) {
+    foreach (array_keys($searchargs) as $arg) {
+        echo 'user=' . $arg . ' - not found' . PHP_EOL;
+    }
+}
+exit($exitsuccess);
+

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

@@ -80,8 +80,8 @@ if (!$category = $DB->get_record('course_categories', ['id' => $options['categor
     throw new \moodle_exception('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');

admin/cli/scheduled_task.php

@@ -27,7 +27,6 @@ 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(
     [
@@ -142,7 +141,7 @@ if ($execute = $options['execute']) {
     raise_memory_limit(MEMORY_EXTRA);
 
     // Emulate normal session - we use admin account by default.
-    cron_setup_user();
+    \core\cron::setup_user();
 
     // Execute the task.
     \core\local\cli\shutdown::script_supports_graceful_exit();
@@ -164,5 +163,5 @@ if ($execute = $options['execute']) {
         $task->set_cron_lock($cronlock);
     }
 
-    cron_run_inner_scheduled_task($task);
+    \core\cron::run_inner_scheduled_task($task);
 }

admin/cli/upgrade.php

@@ -48,12 +48,16 @@ require_once($CFG->libdir.'/environmentlib.php');
 $lang = isset($SESSION->lang) ? $SESSION->lang : $CFG->lang;
 list($options, $unrecognized) = cli_get_params(
     array(
-        'non-interactive'   => false,
-        'allow-unstable'    => false,
-        'help'              => false,
-        'lang'              => $lang,
-        'verbose-settings'  => false,
-        'is-pending'        => false,
+        'allow-unstable'            => false,
+        'help'                      => false,
+        'is-maintenance-required'   => false,
+        'is-pending'                => false,
+        'lang'                      => $lang,
+        'maintenance'               => true,
+        'non-interactive'           => false,
+        'set-ui-upgrade-lock'       => false,
+        'unset-ui-upgrade-lock'     => false,
+        'verbose-settings'          => false,
     ),
     array(
         'h' => 'help'
@@ -79,19 +83,35 @@ Please note you must execute this script with the same uid as apache!
 Site defaults may be changed via local/defaults.php.
 
 Options:
---non-interactive     No interactive questions or confirmations
---allow-unstable      Upgrade even if the version is not marked as stable yet,
-                      required in non-interactive mode.
---lang=CODE           Set preferred language for CLI output. Defaults to the
-                      site language if not set. Defaults to 'en' if the lang
-                      parameter is invalid or if the language pack is not
-                      installed.
---verbose-settings    Show new settings values. By default only the name of
-                      new core or plugin settings are displayed. This option
-                      outputs the new values as well as the setting name.
---is-pending          If an upgrade is needed it exits with an error code of
-                      2 so it distinct from other types of errors.
--h, --help            Print out this help
+--allow-unstable            Upgrade even if the version is not marked as stable yet,
+                            required in non-interactive mode.
+-h, --help                  Print out this help.
+--is-maintenance-required   Returns exit code 2 if the upgrade requires maintenance mode.
+                            Returns exit code 3 if no maintenance is required for the upgrade.
+--is-pending                Exit with error code 2 if an upgrade is required.
+--lang=CODE                 Set preferred language for CLI output. Defaults to the
+                            site language if not set. Defaults to 'en' if the lang
+                            parameter is invalid or if the language pack is not
+                            installed.
+--maintenance               Sets whether this upgrade will use maintenance mode.
+                            If not possible, the upgrade will not happen and the script will exit.
+                            WARNING: Caches (except theme) will be STALE and MUST be purged after upgrading.
+                            DO NOT USE if the upgrade contains known breaking changes to the way data
+                            and the database interact.
+                            RECOMMENDED for lightweight deployments, to allow for a graceful purge and
+                            rebuild of the cache.
+--non-interactive           No interactive questions or confirmations.
+--set-ui-upgrade-lock       Sets the upgrade to CLI only and unable to be triggered from the frontend.
+                            If called with --maintenance=false, the lock WILL NOT be released when the
+                            upgrade finishes, and MUST be manually removed.
+                            If called with --is-maintenance-required before an upgrade,
+                            The lock WILL be released when the upgrade finishes.
+--unset-ui-upgrade-lock     Removes the frontend upgrade lock, if the lock exists.
+                            Useful when an error during the upgrade leaves the upgrade locked,
+                            or there is need to control the time where the unlock happens.
+--verbose-settings          Show new settings values. By default only the name of
+                            new core or plugin settings are displayed. This option
+                            outputs the new values as well as the setting name.
 
 Example:
 \$sudo -u www-data /usr/bin/php admin/cli/upgrade.php
@@ -115,12 +135,58 @@ if ($version < $CFG->version) {
 $oldversion = "$CFG->release ($CFG->version)";
 $newversion = "$release ($version)";
 
-if (!moodle_needs_upgrading()) {
+if ($options['unset-ui-upgrade-lock']) {
+    // Unconditionally unset this config if requested.
+    set_config('outagelessupgrade', false);
+    cli_writeln(get_string('cliupgradeunsetlock', 'admin'));
+}
+
+$allhash = core_component::get_all_component_hash();
+
+// Initialise allcomponent hash if not set. It will be correctly set after upgrade.
+$CFG->allcomponenthash = $CFG->allcomponenthash ?? '';
+if (!$options['maintenance']) {
+    if ($allhash !== $CFG->allcomponenthash) {
+        // Throw an error here, we can't proceed, this needs to set maintenance.
+        cli_error(get_string('cliupgrademaintenancerequired', 'core_admin'), 2);
+    }
+
+    // Set a constant to stop any upgrade var from being set during processing.
+    // This protects against the upgrade setting timeouts and maintenance during the upgrade.
+    define('CLI_UPGRADE_RUNNING', true);
+
+    // This database control is the control to block the GUI from doing upgrade related actions.
+    set_config('outagelessupgrade', true);
+}
+
+// We should ignore all upgrade locks here.
+if (!moodle_needs_upgrading(false)) {
     cli_error(get_string('cliupgradenoneed', 'core_admin', $newversion), 0);
 }
 
-if ($options['is-pending']) {
-    cli_error(get_string('cliupgradepending', 'core_admin'), 2);
+// Handle exit based options for outputting upgrade state.
+if ($options['is-pending'] || $options['is-maintenance-required']) {
+    // If we aren't doing a maintenance check, plain pending check.
+    if (!$options['is-maintenance-required']) {
+        cli_error(get_string('cliupgradepending', 'core_admin'), 2);
+    }
+
+    // Can we do this safely with no maintenance/outage? Detect if there is a schema or other application state change.
+    if ($allhash !== $CFG->allcomponenthash) {
+        // State change here, we need to do this in maintenance.
+        cli_writeln(get_string('cliupgradepending', 'core_admin'));
+        cli_error(get_string('cliupgrademaintenancerequired', 'core_admin'), 2);
+    }
+
+    // If requested, we should always set the upgrade lock here, so this cannot be run from frontend.
+    if ($options['set-ui-upgrade-lock']) {
+        set_config('outagelessupgrade', true);
+        cli_writeln(get_string('cliupgradesetlock', 'admin'));
+    }
+
+    // We can do an upgrade without maintenance!
+    cli_writeln(get_string('cliupgradepending', 'core_admin'));
+    cli_error(get_string('cliupgrademaintenancenotrequired', 'core_admin'), 3);
 }
 
 // Test environment first.
@@ -187,12 +253,18 @@ if ($interactive) {
 }
 
 if ($version > $CFG->version) {
-    // We purge all of MUC's caches here.
-    // Caches are disabled for upgrade by CACHE_DISABLE_ALL so we must set the first arg to true.
-    // This ensures a real config object is loaded and the stores will be purged.
-    // This is the only way we can purge custom caches such as memcache or APC.
-    // Note: all other calls to caches will still used the disabled API.
-    cache_helper::purge_all(true);
+
+    // Only purge caches if this is a plain upgrade.
+    // In the case of a no-outage upgrade, we will gracefully roll caches after upgrade.
+    if ($options['maintenance']) {
+        // We purge all of MUC's caches here.
+        // Caches are disabled for upgrade by CACHE_DISABLE_ALL so we must set the first arg to true.
+        // This ensures a real config object is loaded and the stores will be purged.
+        // This is the only way we can purge custom caches such as memcache or APC.
+        // Note: all other calls to caches will still used the disabled API.
+        cache_helper::purge_all(true);
+    }
+
     upgrade_core($version, true);
 }
 set_config('release', $release);
@@ -230,4 +302,18 @@ foreach ($settingsoutput as $setting => $value) {
 upgrade_themes();
 
 echo get_string('cliupgradefinished', 'admin', $a)."\n";
+
+if (!$options['maintenance']) {
+    cli_writeln(get_string('cliupgradecompletenomaintenanceupgrade', 'admin'));
+
+    // Here we check if upgrade lock has not been specifically set during this upgrade run.
+    // This supports wider server orchestration actions happening, which should call with no-maintenance AND set-ui-upgrade-lock,
+    // such as a new docker container deployment, of which the moodle upgrade is only a component.
+    if (!$options['set-ui-upgrade-lock']) {
+        // In this case we should release the lock now, as the upgrade is finished.
+        // We weren't told to keep the lock with set-ui-upgrade-lock, so release.
+        set_config('outagelessupgrade', false);
+    }
+}
+
 exit(0); // 0 means success

admin/course/resetindentation.php

@@ -65,7 +65,8 @@ $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'
+    'post',
+    single_button::BUTTON_DANGER
 );
 $cancelbutton = new single_button($backurl, get_string('cancel'));
 echo $OUTPUT->confirm(

admin/cron.php

@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -36,6 +35,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+// phpcs:ignoreFile moodle.Files.MoodleInternal.MoodleInternalGlobalState
 
 if (defined('STDIN')) {
     fwrite(STDERR, "ERROR: This script no longer supports CLI, please use admin/cli/cron.php instead\n");
@@ -49,8 +49,7 @@ define('WEB_CRON_EMULATED_CLI', 'defined'); // ugly ugly hack, do not use elsewh
 define('NO_OUTPUT_BUFFERING', true);
 
 require('../config.php');
-require_once($CFG->libdir.'/clilib.php');
-require_once($CFG->libdir.'/cronlib.php');
+require_once($CFG->libdir . '/clilib.php');
 
 // extra safety
 \core\session\manager::write_close();
@@ -71,11 +70,11 @@ if (!empty($CFG->cronremotepassword)) {
     }
 }
 
-// send mime type and encoding
+// Send mime type and encoding.
 @header('Content-Type: text/plain; charset=utf-8');
 
-// we do not want html markup in emulated CLI
+// We do not want html markup in emulated CLI.
 @ini_set('html_errors', 'off');
 
-// execute the cron
-cron_run();
+// Execute the cron, disabling keepalive.
+\core\cron::run_main_process(0);

admin/editors.php

@@ -1,87 +1,95 @@
 <?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/>.
 
 /**
- * Allows admin to configure editors.
+ * A page to manage editor plugins.
+ *
+ * @package   core_admin
+ * @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/tablelib.php');
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->libdir . '/tablelib.php');
 
-$action  = required_param('action', PARAM_ALPHANUMEXT);
-$editor  = required_param('editor', PARAM_PLUGIN);
-$confirm = optional_param('confirm', 0, PARAM_BOOL);
+$action = required_param('action', PARAM_ALPHANUMEXT);
+$plugin = required_param('plugin', PARAM_PLUGIN);
 
-$PAGE->set_url('/admin/editors.php', array('action'=>$action, 'editor'=>$editor));
+$PAGE->set_url('/admin/editors.php', ['action' => $action, 'editor' => $plugin]);
 $PAGE->set_context(context_system::instance());
 
 require_admin();
+require_sesskey();
 
-$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageeditors";
+$returnurl = new moodle_url('/admin/settings.php', ['section' => 'manageeditors']);
 
-// get currently installed and enabled auth plugins
-$available_editors = editors_get_available();
-if (!empty($editor) and empty($available_editors[$editor])) {
-    redirect ($returnurl);
-}
-
-$active_editors = explode(',', $CFG->texteditors);
-foreach ($active_editors as $key=>$active) {
-    if (empty($available_editors[$active])) {
-        unset($active_editors[$key]);
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// process actions
-
-if (!confirm_sesskey()) {
+// Get currently installed and enabled auth plugins.
+$availableeditors = editors_get_available();
+if (!empty($plugin) && empty($availableeditors[$plugin])) {
     redirect($returnurl);
 }
 
-$return = true;
+$activeeditors = explode(',', $CFG->texteditors);
+foreach ($activeeditors as $key => $active) {
+    if (empty($availableeditors[$active])) {
+        unset($activeeditors[$key]);
+    }
+}
+
 switch ($action) {
     case 'disable':
         // Remove from enabled list.
         $class = \core_plugin_manager::resolve_plugininfo_class('editor');
-        $class::enable_plugin($editor, false);
+        $class::enable_plugin($plugin, false);
         break;
 
     case 'enable':
         // Add to enabled list.
-        if (!in_array($editor, $active_editors)) {
+        if (!in_array($plugin, $activeeditors)) {
             $class = \core_plugin_manager::resolve_plugininfo_class('editor');
-            $class::enable_plugin($editor, true);
+            $class::enable_plugin($plugin, true);
         }
         break;
 
     case 'down':
-        $key = array_search($editor, $active_editors);
-        // check auth plugin is valid
+        $key = array_search($plugin, $activeeditors);
         if ($key !== false) {
-            // move down the list
-            if ($key < (count($active_editors) - 1)) {
-                $fsave = $active_editors[$key];
-                $active_editors[$key] = $active_editors[$key + 1];
-                $active_editors[$key + 1] = $fsave;
-                add_to_config_log('editor_position', $key, $key + 1, $editor);
-                set_config('texteditors', implode(',', $active_editors));
+            // Move down the list.
+            if ($key < (count($activeeditors) - 1)) {
+                $fsave = $activeeditors[$key];
+                $activeeditors[$key] = $activeeditors[$key + 1];
+                $activeeditors[$key + 1] = $fsave;
+                add_to_config_log('editor_position', $key, $key + 1, $plugin);
+                set_config('texteditors', implode(',', $activeeditors));
                 core_plugin_manager::reset_caches();
             }
         }
         break;
 
     case 'up':
-        $key = array_search($editor, $active_editors);
-        // check auth is valid
+        $key = array_search($plugin, $activeeditors);
         if ($key !== false) {
-            // move up the list
+            // Move up the list.
             if ($key >= 1) {
-                $fsave = $active_editors[$key];
-                $active_editors[$key] = $active_editors[$key - 1];
-                $active_editors[$key - 1] = $fsave;
-                add_to_config_log('editor_position', $key, $key - 1, $editor);
-                set_config('texteditors', implode(',', $active_editors));
+                $fsave = $activeeditors[$key];
+                $activeeditors[$key] = $activeeditors[$key - 1];
+                $activeeditors[$key - 1] = $fsave;
+                add_to_config_log('editor_position', $key, $key - 1, $plugin);
+                set_config('texteditors', implode(',', $activeeditors));
                 core_plugin_manager::reset_caches();
             }
         }
@@ -91,6 +99,4 @@ switch ($action) {
         break;
 }
 
-if ($return) {
-    redirect ($returnurl);
-}
+redirect($returnurl);

admin/environment.xml

@@ -3751,7 +3751,6 @@
       <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>
@@ -3923,8 +3922,6 @@
       </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">
@@ -3941,7 +3938,6 @@
       <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>
@@ -4114,592 +4110,9 @@
       <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" />
+          <ON_ERROR message="modassignmentinuse" />
         </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>

admin/index.php

@@ -224,7 +224,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 +267,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);
 
@@ -302,262 +302,77 @@ if (empty($CFG->version)) {
     throw new \moodle_exception('missingconfigversion', 'debug');
 }
 
-// Detect config cache inconsistency, this happens when you switch branches on dev servers.
-if ($CFG->version != $DB->get_field('config', 'value', array('name'=>'version'))) {
-    purge_all_caches();
-    redirect(new moodle_url($PAGE->url), 'Config cache inconsistency detected, resetting caches...');
-}
-
-if (!$cache and $version > $CFG->version) {  // upgrade
-
-    $PAGE->set_url(new moodle_url($PAGE->url, array(
-        'confirmupgrade' => $confirmupgrade,
-        'confirmrelease' => $confirmrelease,
-        'confirmplugincheck' => $confirmplugins,
-    )));
-
-    check_upgrade_key($upgradekeyhash);
-
-    // Warning about upgrading a test site.
-    $testsite = false;
-    if (defined('BEHAT_SITE_RUNNING')) {
-        $testsite = 'behat';
+// If an upgrade is running, an admin page starting a frontend upgrade could corrupt the
+// DB if the upgrade collided with an already running upgrade process at the wrong time.
+// Pull the value direct from the DB, this needs to *always* be correct.
+$outagelessupgrade = !empty($DB->get_field('config', 'value', ['name' => 'outagelessupgrade']));
+if (!$outagelessupgrade) {
+    // Detect config cache inconsistency, this happens when you switch branches on dev servers.
+    if ($CFG->version != $DB->get_field('config', 'value', array('name' => 'version'))) {
+        purge_all_caches();
+        redirect(new moodle_url($PAGE->url), 'Config cache inconsistency detected, resetting caches...');
     }
 
-    if (isset($CFG->themerev)) {
-        // Store the themerev to restore after purging caches.
-        $themerev = $CFG->themerev;
-    }
+    if (!$cache && $version > $CFG->version && !$outagelessupgrade) {  // Upgrade.
 
-    // We purge all of MUC's caches here.
-    // Caches are disabled for upgrade by CACHE_DISABLE_ALL so we must set the first arg to true.
-    // This ensures a real config object is loaded and the stores will be purged.
-    // This is the only way we can purge custom caches such as memcache or APC.
-    // Note: all other calls to caches will still used the disabled API.
-    cache_helper::purge_all(true);
-    // We then purge the regular caches.
-    purge_all_caches();
+        $PAGE->set_url(new moodle_url($PAGE->url, array(
+            'confirmupgrade' => $confirmupgrade,
+            'confirmrelease' => $confirmrelease,
+            'confirmplugincheck' => $confirmplugins,
+        )));
 
-    if (isset($themerev)) {
-        // Restore the themerev
-        set_config('themerev', $themerev);
-    }
+        check_upgrade_key($upgradekeyhash);
 
-    $output = $PAGE->get_renderer('core', 'admin');
-
-    if (upgrade_stale_php_files_present()) {
-        $PAGE->set_title($stradministration);
-        $PAGE->set_cacheable(false);
-
-        echo $output->upgrade_stale_php_files_page();
-        die();
-    }
-
-    if (empty($confirmupgrade)) {
-        $a = new stdClass();
-        $a->oldversion = "$CFG->release (".sprintf('%.2f', $CFG->version).")";
-        $a->newversion = "$release (".sprintf('%.2f', $version).")";
-        $strdatabasechecking = get_string('databasechecking', '', $a);
-
-        $PAGE->set_title($stradministration);
-        $PAGE->set_heading($strdatabasechecking);
-        $PAGE->set_cacheable(false);
-
-        echo $output->upgrade_confirm_page($a->newversion, $maturity, $testsite);
-        die();
-
-    } else if (empty($confirmrelease)) {
-        require_once($CFG->libdir.'/environmentlib.php');
-        list($envstatus, $environmentresults) = check_moodle_environment($release, ENV_SELECT_RELEASE);
-        $strcurrentrelease = get_string('currentrelease');
-
-        $PAGE->navbar->add($strcurrentrelease);
-        $PAGE->set_title($strcurrentrelease);
-        $PAGE->set_heading($strcurrentrelease);
-        $PAGE->set_cacheable(false);
-
-        echo $output->upgrade_environment_page($release, $envstatus, $environmentresults);
-        die();
-
-    } else if (empty($confirmplugins)) {
-        $strplugincheck = get_string('plugincheck');
-
-        $PAGE->navbar->add($strplugincheck);
-        $PAGE->set_title($strplugincheck);
-        $PAGE->set_heading($strplugincheck);
-        $PAGE->set_cacheable(false);
-
-        $pluginman = core_plugin_manager::instance();
-
-        // Check for available updates.
-        if ($fetchupdates) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $updateschecker = \core\update\checker::instance();
-            if ($updateschecker->enabled()) {
-                $updateschecker->fetch();
-            }
-            redirect($PAGE->url);
+        // Warning about upgrading a test site.
+        $testsite = false;
+        if (defined('BEHAT_SITE_RUNNING')) {
+            $testsite = 'behat';
         }
 
-        // Cancel all plugin installations.
-        if ($abortinstallx) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $abortables = $pluginman->list_cancellable_installations();
-            if ($abortables) {
-                if ($confirmabortinstall) {
-                    foreach ($abortables as $plugin) {
-                        $pluginman->cancel_plugin_installation($plugin->component);
-                    }
-                    redirect($PAGE->url);
-                } else {
-                    $continue = new moodle_url($PAGE->url, array('abortinstallx' => $abortinstallx, 'confirmabortinstall' => 1));
-                    echo $output->upgrade_confirm_abort_install_page($abortables, $continue);
-                    die();
-                }
-            }
-            redirect($PAGE->url);
+        if (isset($CFG->themerev)) {
+            // Store the themerev to restore after purging caches.
+            $themerev = $CFG->themerev;
         }
 
-        // Cancel single plugin installation.
-        if ($abortinstall) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            if ($confirmabortinstall) {
-                $pluginman->cancel_plugin_installation($abortinstall);
-                redirect($PAGE->url);
-            } else {
-                $continue = new moodle_url($PAGE->url, array('abortinstall' => $abortinstall, 'confirmabortinstall' => 1));
-                $abortable = $pluginman->get_plugin_info($abortinstall);
-                if ($pluginman->can_cancel_plugin_installation($abortable)) {
-                    echo $output->upgrade_confirm_abort_install_page(array($abortable), $continue);
-                    die();
-                }
-                redirect($PAGE->url);
-            }
+        // We purge all of MUC's caches here.
+        // Caches are disabled for upgrade by CACHE_DISABLE_ALL so we must set the first arg to true.
+        // This ensures a real config object is loaded and the stores will be purged.
+        // This is the only way we can purge custom caches such as memcache or APC.
+        // Note: all other calls to caches will still used the disabled API.
+        cache_helper::purge_all(true);
+        // We then purge the regular caches.
+        purge_all_caches();
+
+        if (isset($themerev)) {
+            // Restore the themerev.
+            set_config('themerev', $themerev);
         }
 
-        // Cancel all plugins upgrades (that is, restore archived versions).
-        if ($abortupgradex) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $restorable = $pluginman->list_restorable_archives();
-            if ($restorable) {
-                upgrade_install_plugins($restorable, $confirmabortupgrade,
-                    get_string('cancelupgradehead', 'core_plugin'),
-                    new moodle_url($PAGE->url, array('abortupgradex' => 1, 'confirmabortupgrade' => 1))
-                );
-            }
-            redirect($PAGE->url);
-        }
-
-        // Cancel single plugin upgrade (that is, install the archived version).
-        if ($abortupgrade) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $restorable = $pluginman->list_restorable_archives();
-            if (isset($restorable[$abortupgrade])) {
-                $restorable = array($restorable[$abortupgrade]);
-                upgrade_install_plugins($restorable, $confirmabortupgrade,
-                    get_string('cancelupgradehead', 'core_plugin'),
-                    new moodle_url($PAGE->url, array('abortupgrade' => $abortupgrade, 'confirmabortupgrade' => 1))
-                );
-            }
-            redirect($PAGE->url);
-        }
-
-        // Install all available missing dependencies.
-        if ($installdepx) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
-            upgrade_install_plugins($installable, $confirminstalldep,
-                get_string('dependencyinstallhead', 'core_plugin'),
-                new moodle_url($PAGE->url, array('installdepx' => 1, 'confirminstalldep' => 1))
-            );
-        }
-
-        // Install single available missing dependency.
-        if ($installdep) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
-            if (!empty($installable[$installdep])) {
-                $installable = array($installable[$installdep]);
-                upgrade_install_plugins($installable, $confirminstalldep,
-                    get_string('dependencyinstallhead', 'core_plugin'),
-                    new moodle_url($PAGE->url, array('installdep' => $installdep, 'confirminstalldep' => 1))
-                );
-            }
-        }
-
-        // Install all available updates.
-        if ($installupdatex) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $installable = $pluginman->filter_installable($pluginman->available_updates());
-            upgrade_install_plugins($installable, $confirminstallupdate,
-                get_string('updateavailableinstallallhead', 'core_admin'),
-                new moodle_url($PAGE->url, array('installupdatex' => 1, 'confirminstallupdate' => 1))
-            );
-        }
-
-        // Install single available update.
-        if ($installupdate and $installupdateversion) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            if ($pluginman->is_remote_plugin_installable($installupdate, $installupdateversion)) {
-                $installable = array($pluginman->get_remote_plugin_info($installupdate, $installupdateversion, true));
-                upgrade_install_plugins($installable, $confirminstallupdate,
-                    get_string('updateavailableinstallallhead', 'core_admin'),
-                    new moodle_url($PAGE->url, array('installupdate' => $installupdate,
-                        'installupdateversion' => $installupdateversion, 'confirminstallupdate' => 1)
-                    )
-                );
-            }
-        }
-
-        echo $output->upgrade_plugin_check_page(core_plugin_manager::instance(), \core\update\checker::instance(),
-                $version, $showallplugins, $PAGE->url, new moodle_url($PAGE->url, array('confirmplugincheck' => 1)));
-        die();
-
-    } else {
-        // Always verify plugin dependencies!
-        $failed = array();
-        if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
-            echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
-                array('confirmplugincheck' => 0)));
-            die();
-        }
-        unset($failed);
-
-        // Launch main upgrade.
-        upgrade_core($version, true);
-    }
-} else if ($version < $CFG->version) {
-    // better stop here, we can not continue with plugin upgrades or anything else
-    throw new moodle_exception('downgradedcore', 'error', new moodle_url('/admin/'));
-}
-
-// Updated human-readable release version if necessary
-if (!$cache and $release <> $CFG->release) {  // Update the release version
-    set_config('release', $release);
-}
-
-if (!$cache and $branch <> $CFG->branch) {  // Update the branch
-    set_config('branch', $branch);
-}
-
-if (!$cache and moodle_needs_upgrading()) {
-
-    $PAGE->set_url(new moodle_url($PAGE->url, array(
-        'confirmrelease' => $confirmrelease,
-        'confirmplugincheck' => $confirmplugins,
-    )));
-
-    check_upgrade_key($upgradekeyhash);
-
-    if (!$PAGE->headerprinted) {
-        // means core upgrade or installation was not already done
-
-        $pluginman = core_plugin_manager::instance();
         $output = $PAGE->get_renderer('core', 'admin');
 
-        if (empty($confirmrelease)) {
-            require_once($CFG->libdir . '/environmentlib.php');
+        if (upgrade_stale_php_files_present()) {
+            $PAGE->set_title($stradministration);
+            $PAGE->set_cacheable(false);
 
+            echo $output->upgrade_stale_php_files_page();
+            die();
+        }
+
+        if (empty($confirmupgrade)) {
+            $a = new stdClass();
+            $a->oldversion = "$CFG->release (".sprintf('%.2f', $CFG->version).")";
+            $a->newversion = "$release (".sprintf('%.2f', $version).")";
+            $strdatabasechecking = get_string('databasechecking', '', $a);
+
+            $PAGE->set_title($stradministration);
+            $PAGE->set_heading($strdatabasechecking);
+            $PAGE->set_cacheable(false);
+
+            echo $output->upgrade_confirm_page($a->newversion, $maturity, $testsite);
+            die();
+
+        } else if (empty($confirmrelease)) {
+            require_once($CFG->libdir.'/environmentlib.php');
             list($envstatus, $environmentresults) = check_moodle_environment($release, ENV_SELECT_RELEASE);
             $strcurrentrelease = get_string('currentrelease');
 
@@ -569,7 +384,7 @@ if (!$cache and moodle_needs_upgrading()) {
             echo $output->upgrade_environment_page($release, $envstatus, $environmentresults);
             die();
 
-        } else if (!$confirmplugins) {
+        } else if (empty($confirmplugins)) {
             $strplugincheck = get_string('plugincheck');
 
             $PAGE->navbar->add($strplugincheck);
@@ -577,9 +392,11 @@ if (!$cache and moodle_needs_upgrading()) {
             $PAGE->set_heading($strplugincheck);
             $PAGE->set_cacheable(false);
 
+            $pluginman = core_plugin_manager::instance();
+
             // Check for available updates.
             if ($fetchupdates) {
-                require_sesskey();
+                // No sesskey support guaranteed here, because sessions might not work yet.
                 $updateschecker = \core\update\checker::instance();
                 if ($updateschecker->enabled()) {
                     $updateschecker->fetch();
@@ -589,7 +406,7 @@ if (!$cache and moodle_needs_upgrading()) {
 
             // Cancel all plugin installations.
             if ($abortinstallx) {
-                require_sesskey();
+                // No sesskey support guaranteed here, because sessions might not work yet.
                 $abortables = $pluginman->list_cancellable_installations();
                 if ($abortables) {
                     if ($confirmabortinstall) {
@@ -598,8 +415,7 @@ if (!$cache and moodle_needs_upgrading()) {
                         }
                         redirect($PAGE->url);
                     } else {
-                        $continue = new moodle_url($PAGE->url, array('abortinstallx' => $abortinstallx,
-                            'confirmabortinstall' => 1));
+                        $continue = new moodle_url($PAGE->url, ['abortinstallx' => $abortinstallx, 'confirmabortinstall' => 1]);
                         echo $output->upgrade_confirm_abort_install_page($abortables, $continue);
                         die();
                     }
@@ -609,7 +425,7 @@ if (!$cache and moodle_needs_upgrading()) {
 
             // Cancel single plugin installation.
             if ($abortinstall) {
-                require_sesskey();
+                // No sesskey support guaranteed here, because sessions might not work yet.
                 if ($confirmabortinstall) {
                     $pluginman->cancel_plugin_installation($abortinstall);
                     redirect($PAGE->url);
@@ -626,7 +442,7 @@ if (!$cache and moodle_needs_upgrading()) {
 
             // Cancel all plugins upgrades (that is, restore archived versions).
             if ($abortupgradex) {
-                require_sesskey();
+                // No sesskey support guaranteed here, because sessions might not work yet.
                 $restorable = $pluginman->list_restorable_archives();
                 if ($restorable) {
                     upgrade_install_plugins($restorable, $confirmabortupgrade,
@@ -639,7 +455,7 @@ if (!$cache and moodle_needs_upgrading()) {
 
             // Cancel single plugin upgrade (that is, install the archived version).
             if ($abortupgrade) {
-                require_sesskey();
+                // No sesskey support guaranteed here, because sessions might not work yet.
                 $restorable = $pluginman->list_restorable_archives();
                 if (isset($restorable[$abortupgrade])) {
                     $restorable = array($restorable[$abortupgrade]);
@@ -653,7 +469,7 @@ if (!$cache and moodle_needs_upgrading()) {
 
             // Install all available missing dependencies.
             if ($installdepx) {
-                require_sesskey();
+                // No sesskey support guaranteed here, because sessions might not work yet.
                 $installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
                 upgrade_install_plugins($installable, $confirminstalldep,
                     get_string('dependencyinstallhead', 'core_plugin'),
@@ -663,7 +479,7 @@ if (!$cache and moodle_needs_upgrading()) {
 
             // Install single available missing dependency.
             if ($installdep) {
-                require_sesskey();
+                // No sesskey support guaranteed here, because sessions might not work yet.
                 $installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
                 if (!empty($installable[$installdep])) {
                     $installable = array($installable[$installdep]);
@@ -676,7 +492,7 @@ if (!$cache and moodle_needs_upgrading()) {
 
             // Install all available updates.
             if ($installupdatex) {
-                require_sesskey();
+                // No sesskey support guaranteed here, because sessions might not work yet.
                 $installable = $pluginman->filter_installable($pluginman->available_updates());
                 upgrade_install_plugins($installable, $confirminstallupdate,
                     get_string('updateavailableinstallallhead', 'core_admin'),
@@ -686,7 +502,7 @@ if (!$cache and moodle_needs_upgrading()) {
 
             // Install single available update.
             if ($installupdate and $installupdateversion) {
-                require_sesskey();
+                // No sesskey support guaranteed here, because sessions might not work yet.
                 if ($pluginman->is_remote_plugin_installable($installupdate, $installupdateversion)) {
                     $installable = array($pluginman->get_remote_plugin_info($installupdate, $installupdateversion, true));
                     upgrade_install_plugins($installable, $confirminstallupdate,
@@ -698,89 +514,280 @@ if (!$cache and moodle_needs_upgrading()) {
                 }
             }
 
-            // Show plugins info.
-            echo $output->upgrade_plugin_check_page($pluginman, \core\update\checker::instance(),
-                    $version, $showallplugins,
-                    new moodle_url($PAGE->url),
-                    new moodle_url($PAGE->url, array('confirmplugincheck' => 1, 'cache' => 0)));
+            echo $output->upgrade_plugin_check_page(core_plugin_manager::instance(), \core\update\checker::instance(),
+                    $version, $showallplugins, $PAGE->url, new moodle_url($PAGE->url, array('confirmplugincheck' => 1)));
             die();
-        }
 
-        // Make sure plugin dependencies are always checked.
-        $failed = array();
-        if (!$pluginman->all_plugins_ok($version, $failed, $CFG->branch)) {
-            $output = $PAGE->get_renderer('core', 'admin');
-            echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
-                array('confirmplugincheck' => 0)));
-            die();
-        }
-        unset($failed);
-    }
-
-    // install/upgrade all plugins and other parts
-    upgrade_noncore(true);
-}
-
-// If this is the first install, indicate that this site is fully configured
-// except the admin password
-if (during_initial_install()) {
-    set_config('rolesactive', 1); // after this, during_initial_install will return false.
-    set_config('adminsetuppending', 1);
-    set_config('registrationpending', 1); // Remind to register site after all other setup is finished.
-
-    // Apply default preset, if it is defined in $CFG and has a valid value.
-    if (!empty($CFG->setsitepresetduringinstall)) {
-        \core_adminpresets\helper::change_default_preset($CFG->setsitepresetduringinstall);
-    }
-
-    // we need this redirect to setup proper session
-    upgrade_finished("index.php?sessionstarted=1&amp;lang=$CFG->lang");
-}
-
-// make sure admin user is created - this is the last step because we need
-// session to be working properly in order to edit admin account
- if (!empty($CFG->adminsetuppending)) {
-    $sessionstarted = optional_param('sessionstarted', 0, PARAM_BOOL);
-    if (!$sessionstarted) {
-        redirect("index.php?sessionstarted=1&lang=$CFG->lang");
-    } else {
-        $sessionverify = optional_param('sessionverify', 0, PARAM_BOOL);
-        if (!$sessionverify) {
-            $SESSION->sessionverify = 1;
-            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");
+            // Always verify plugin dependencies!
+            $failed = array();
+            if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
+                echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
+                    array('confirmplugincheck' => 0)));
+                die();
             }
-            unset($SESSION->sessionverify);
+            unset($failed);
+
+            // Launch main upgrade.
+            upgrade_core($version, true);
         }
+    } else if ($version < $CFG->version) {
+        // Better stop here, we can not continue with plugin upgrades or anything else.
+        throw new moodle_exception('downgradedcore', 'error', new moodle_url('/admin/'));
     }
 
-    // Cleanup SESSION to make sure other code does not complain in the future.
-    unset($SESSION->has_timed_out);
-    unset($SESSION->wantsurl);
+    // Updated human-readable release version if necessary.
+    if (!$cache && $release <> $CFG->release ) {  // Update the release version.
+        set_config('release', $release);
+    }
 
-    // at this stage there can be only one admin unless more were added by install - users may change username, so do not rely on that
-    $adminids = explode(',', $CFG->siteadmins);
-    $adminuser = get_complete_user_data('id', reset($adminids));
+    if (!$cache && $branch <> $CFG->branch) {  // Update the branch.
+        set_config('branch', $branch);
+    }
 
-    if ($adminuser->password === 'adminsetuppending') {
-        // prevent installation hijacking
-        if ($adminuser->lastip !== getremoteaddr()) {
-            throw new \moodle_exception('installhijacked', 'admin');
+    if (!$cache && moodle_needs_upgrading()) {
+
+        $PAGE->set_url(new moodle_url($PAGE->url, array(
+            'confirmrelease' => $confirmrelease,
+            'confirmplugincheck' => $confirmplugins,
+        )));
+
+        check_upgrade_key($upgradekeyhash);
+
+        if (!$PAGE->headerprinted) {
+            // Means core upgrade or installation was not already done.
+
+            $pluginman = core_plugin_manager::instance();
+            $output = $PAGE->get_renderer('core', 'admin');
+
+            if (empty($confirmrelease)) {
+                require_once($CFG->libdir . '/environmentlib.php');
+
+                list($envstatus, $environmentresults) = check_moodle_environment($release, ENV_SELECT_RELEASE);
+                $strcurrentrelease = get_string('currentrelease');
+
+                $PAGE->navbar->add($strcurrentrelease);
+                $PAGE->set_title($strcurrentrelease);
+                $PAGE->set_heading($strcurrentrelease);
+                $PAGE->set_cacheable(false);
+
+                echo $output->upgrade_environment_page($release, $envstatus, $environmentresults);
+                die();
+
+            } else if (!$confirmplugins) {
+                $strplugincheck = get_string('plugincheck');
+
+                $PAGE->navbar->add($strplugincheck);
+                $PAGE->set_title($strplugincheck);
+                $PAGE->set_heading($strplugincheck);
+                $PAGE->set_cacheable(false);
+
+                // Check for available updates.
+                if ($fetchupdates) {
+                    require_sesskey();
+                    $updateschecker = \core\update\checker::instance();
+                    if ($updateschecker->enabled()) {
+                        $updateschecker->fetch();
+                    }
+                    redirect($PAGE->url);
+                }
+
+                // Cancel all plugin installations.
+                if ($abortinstallx) {
+                    require_sesskey();
+                    $abortables = $pluginman->list_cancellable_installations();
+                    if ($abortables) {
+                        if ($confirmabortinstall) {
+                            foreach ($abortables as $plugin) {
+                                $pluginman->cancel_plugin_installation($plugin->component);
+                            }
+                            redirect($PAGE->url);
+                        } else {
+                            $continue = new moodle_url($PAGE->url, array('abortinstallx' => $abortinstallx,
+                                'confirmabortinstall' => 1));
+                            echo $output->upgrade_confirm_abort_install_page($abortables, $continue);
+                            die();
+                        }
+                    }
+                    redirect($PAGE->url);
+                }
+
+                // Cancel single plugin installation.
+                if ($abortinstall) {
+                    require_sesskey();
+                    if ($confirmabortinstall) {
+                        $pluginman->cancel_plugin_installation($abortinstall);
+                        redirect($PAGE->url);
+                    } else {
+                        $continue = new moodle_url($PAGE->url, array('abortinstall' => $abortinstall, 'confirmabortinstall' => 1));
+                        $abortable = $pluginman->get_plugin_info($abortinstall);
+                        if ($pluginman->can_cancel_plugin_installation($abortable)) {
+                            echo $output->upgrade_confirm_abort_install_page(array($abortable), $continue);
+                            die();
+                        }
+                        redirect($PAGE->url);
+                    }
+                }
+
+                // Cancel all plugins upgrades (that is, restore archived versions).
+                if ($abortupgradex) {
+                    require_sesskey();
+                    $restorable = $pluginman->list_restorable_archives();
+                    if ($restorable) {
+                        upgrade_install_plugins($restorable, $confirmabortupgrade,
+                            get_string('cancelupgradehead', 'core_plugin'),
+                            new moodle_url($PAGE->url, array('abortupgradex' => 1, 'confirmabortupgrade' => 1))
+                        );
+                    }
+                    redirect($PAGE->url);
+                }
+
+                // Cancel single plugin upgrade (that is, install the archived version).
+                if ($abortupgrade) {
+                    require_sesskey();
+                    $restorable = $pluginman->list_restorable_archives();
+                    if (isset($restorable[$abortupgrade])) {
+                        $restorable = array($restorable[$abortupgrade]);
+                        upgrade_install_plugins($restorable, $confirmabortupgrade,
+                            get_string('cancelupgradehead', 'core_plugin'),
+                            new moodle_url($PAGE->url, array('abortupgrade' => $abortupgrade, 'confirmabortupgrade' => 1))
+                        );
+                    }
+                    redirect($PAGE->url);
+                }
+
+                // Install all available missing dependencies.
+                if ($installdepx) {
+                    require_sesskey();
+                    $installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
+                    upgrade_install_plugins($installable, $confirminstalldep,
+                        get_string('dependencyinstallhead', 'core_plugin'),
+                        new moodle_url($PAGE->url, array('installdepx' => 1, 'confirminstalldep' => 1))
+                    );
+                }
+
+                // Install single available missing dependency.
+                if ($installdep) {
+                    require_sesskey();
+                    $installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
+                    if (!empty($installable[$installdep])) {
+                        $installable = array($installable[$installdep]);
+                        upgrade_install_plugins($installable, $confirminstalldep,
+                            get_string('dependencyinstallhead', 'core_plugin'),
+                            new moodle_url($PAGE->url, array('installdep' => $installdep, 'confirminstalldep' => 1))
+                        );
+                    }
+                }
+
+                // Install all available updates.
+                if ($installupdatex) {
+                    require_sesskey();
+                    $installable = $pluginman->filter_installable($pluginman->available_updates());
+                    upgrade_install_plugins($installable, $confirminstallupdate,
+                        get_string('updateavailableinstallallhead', 'core_admin'),
+                        new moodle_url($PAGE->url, array('installupdatex' => 1, 'confirminstallupdate' => 1))
+                    );
+                }
+
+                // Install single available update.
+                if ($installupdate && $installupdateversion) {
+                    require_sesskey();
+                    if ($pluginman->is_remote_plugin_installable($installupdate, $installupdateversion)) {
+                        $installable = array($pluginman->get_remote_plugin_info($installupdate, $installupdateversion, true));
+                        upgrade_install_plugins($installable, $confirminstallupdate,
+                            get_string('updateavailableinstallallhead', 'core_admin'),
+                            new moodle_url($PAGE->url, array('installupdate' => $installupdate,
+                                'installupdateversion' => $installupdateversion, 'confirminstallupdate' => 1)
+                            )
+                        );
+                    }
+                }
+
+                // Show plugins info.
+                echo $output->upgrade_plugin_check_page($pluginman, \core\update\checker::instance(),
+                        $version, $showallplugins,
+                        new moodle_url($PAGE->url),
+                        new moodle_url($PAGE->url, array('confirmplugincheck' => 1, 'cache' => 0)));
+                die();
+            }
+
+            // Make sure plugin dependencies are always checked.
+            $failed = array();
+            if (!$pluginman->all_plugins_ok($version, $failed, $CFG->branch)) {
+                $output = $PAGE->get_renderer('core', 'admin');
+                echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
+                    array('confirmplugincheck' => 0)));
+                die();
+            }
+            unset($failed);
+        }
+
+        // Install/upgrade all plugins and other parts.
+        upgrade_noncore(true);
+    }
+
+    // If this is the first install, indicate that this site is fully configured,
+    // Except the admin password.
+    if (during_initial_install()) {
+        set_config('rolesactive', 1); // After this, during_initial_install will return false.
+        set_config('adminsetuppending', 1);
+        set_config('registrationpending', 1); // Remind to register site after all other setup is finished.
+
+        // Apply default preset, if it is defined in $CFG and has a valid value.
+        if (!empty($CFG->setsitepresetduringinstall)) {
+            \core_adminpresets\helper::change_default_preset($CFG->setsitepresetduringinstall);
+        }
+
+        // We need this redirect to setup proper session.
+        upgrade_finished("index.php?sessionstarted=1&amp;lang=$CFG->lang");
+    }
+
+    // Make sure admin user is created - this is the last step,
+    // We need session to be working properly in order to edit admin account.
+    if (!empty($CFG->adminsetuppending)) {
+        $sessionstarted = optional_param('sessionstarted', 0, PARAM_BOOL);
+        if (!$sessionstarted) {
+            redirect("index.php?sessionstarted=1&lang=$CFG->lang");
+        } else {
+            $sessionverify = optional_param('sessionverify', 0, PARAM_BOOL);
+            if (!$sessionverify) {
+                $SESSION->sessionverify = 1;
+                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");
+                }
+                unset($SESSION->sessionverify);
+            }
+        }
+
+        // Cleanup SESSION to make sure other code does not complain in the future.
+        unset($SESSION->has_timed_out);
+        unset($SESSION->wantsurl);
+
+        // At this stage there can be only one admin unless more were added by install,
+        // Users may change username, so do not rely on that.
+        $adminids = explode(',', $CFG->siteadmins);
+        $adminuser = get_complete_user_data('id', reset($adminids));
+
+        if ($adminuser->password === 'adminsetuppending') {
+            // Prevent installation hijacking.
+            if ($adminuser->lastip !== getremoteaddr()) {
+                throw new \moodle_exception('installhijacked', 'admin');
+            }
+            // Login user and let him set password and admin details.
+            $adminuser->newadminuser = 1;
+            complete_user_login($adminuser);
+            redirect("$CFG->wwwroot/user/editadvanced.php?id=$adminuser->id"); // Edit thyself.
+
+        } else {
+            unset_config('adminsetuppending');
         }
-        // login user and let him set password and admin details
-        $adminuser->newadminuser = 1;
-        complete_user_login($adminuser);
-        redirect("$CFG->wwwroot/user/editadvanced.php?id=$adminuser->id"); // Edit thyself
 
     } else {
-        unset_config('adminsetuppending');
+        // Just make sure upgrade logging is properly terminated.
+        upgrade_finished('upgradesettings.php');
     }
-
-} else {
-    // just make sure upgrade logging is properly terminated
-    upgrade_finished('upgradesettings.php');
 }
 
 if (has_capability('moodle/site:config', context_system::instance())) {
@@ -811,7 +818,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

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

@@ -23,14 +23,11 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-define('NO_OUTPUT_BUFFERING', true);
-
 require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
+require_once("{$CFG->libdir}/adminlib.php");
 
-$action  = required_param('action', PARAM_ALPHANUMEXT);
-$media   = required_param('media', PARAM_PLUGIN);
-$confirm = optional_param('confirm', 0, PARAM_BOOL);
+$action = required_param('action', PARAM_ALPHANUMEXT);
+$plugin = required_param('plugin', PARAM_PLUGIN);
 
 $PAGE->set_url('/admin/media.php');
 $PAGE->set_context(context_system::instance());
@@ -38,42 +35,38 @@ $PAGE->set_context(context_system::instance());
 require_admin();
 require_sesskey();
 
-$plugins = core_plugin_manager::instance()->get_plugins_of_type('media');
-$sortorder = array_values(\core\plugininfo\media::get_enabled_plugins());
-
-$return = new moodle_url('/admin/settings.php', array('section' => 'managemediaplayers'));
-
-if (!array_key_exists($media, $plugins)) {
-    redirect($return);
-}
+$return = new moodle_url('/admin/settings.php', [
+    'section' => 'managemediaplayers',
+]);
 
+$displayname = get_string('pluginname', "media_{$plugin}");
 switch ($action) {
     case 'disable':
         $class = \core_plugin_manager::resolve_plugininfo_class('media');
-        $class::enable_plugin($media, false);
+        if ($class::enable_plugin($plugin, false)) {
+            \core\notification::add(
+                get_string('plugin_disabled', 'core_admin', $displayname),
+                \core\notification::SUCCESS
+            );
+        }
         break;
 
     case 'enable':
         $class = \core_plugin_manager::resolve_plugininfo_class('media');
-        $class::enable_plugin($media, true);
+        if ($class::enable_plugin($plugin, true)) {
+            \core\notification::add(
+                get_string('plugin_enabled', 'core_admin', $displayname),
+                \core\notification::SUCCESS
+            );
+        }
         break;
 
     case 'up':
-        if (($pos = array_search($media, $sortorder)) > 0) {
-            $tmp = $sortorder[$pos - 1];
-            $sortorder[$pos - 1] = $sortorder[$pos];
-            $sortorder[$pos] = $tmp;
-            \core\plugininfo\media::set_enabled_plugins($sortorder);
-        }
+        $class::change_plugin_order($plugin, $class::MOVE_UP);
         break;
 
     case 'down':
-        if ((($pos = array_search($media, $sortorder)) !== false) && ($pos < count($sortorder) - 1)) {
-            $tmp = $sortorder[$pos + 1];
-            $sortorder[$pos + 1] = $sortorder[$pos];
-            $sortorder[$pos] = $tmp;
-            \core\plugininfo\media::set_enabled_plugins($sortorder);
-        }
+        $class::change_plugin_order($plugin, $class::MOVE_DOWN);
         break;
 }
 

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);
@@ -153,15 +153,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/modules.php

@@ -1,142 +1,67 @@
 <?php
-      // Allows the admin to manage activity modules
+// 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/>.
 
-    require_once('../config.php');
-    require_once('../course/lib.php');
-    require_once($CFG->libdir.'/adminlib.php');
-    require_once($CFG->libdir.'/tablelib.php');
+/**
+ * A page to manage activity modules.
+ *
+ * @package   core_admin
+ * @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
-    // defines
-    define('MODULE_TABLE','module_administration_table');
+require_once('../config.php');
+require_once('../course/lib.php');
+require_once("{$CFG->libdir}/adminlib.php");
+require_once("{$CFG->libdir}/tablelib.php");
 
-    admin_externalpage_setup('managemodules');
+define('MODULE_TABLE', 'module_administration_table');
 
-    $show    = optional_param('show', '', PARAM_PLUGIN);
-    $hide    = optional_param('hide', '', PARAM_PLUGIN);
+admin_externalpage_setup('managemodules');
 
+$plugin = optional_param('plugin', '', PARAM_PLUGIN);
+$action = optional_param('action', '', PARAM_ALPHA);
 
-/// Print headings
+// If data submitted, then process and store.
+if (!empty($action) && !empty($plugin) && confirm_sesskey()) {
+    $manager = \core_plugin_manager::resolve_plugininfo_class('mod');
+    $pluginname = get_string('pluginname', $plugin);
 
-    $stractivities = get_string("activities");
-    $struninstall = get_string('uninstallplugin', 'core_admin');
-    $strversion = get_string("version");
-    $strhide = get_string("hide");
-    $strshow = get_string("show");
-    $strsettings = get_string("settings");
-    $stractivities = get_string("activities");
-    $stractivitymodule = get_string("activitymodule");
-    $strshowmodulecourse = get_string('showmodulecourse');
+    if ($action === 'disable' && $manager::enable_plugin($plugin, 0)) {
+        \core\notification::add(
+            get_string('plugin_disabled', 'core_admin', $pluginname),
+            \core\notification::SUCCESS
+        );
+        // Settings not required - only pages.
+        admin_get_root(true, false);
+    } else if ($action === 'enable' && $manager::enable_plugin($plugin, 1)) {
+        \core\notification::add(
+            get_string('plugin_enabled', 'core_admin', $pluginname),
+            \core\notification::SUCCESS
+        );
 
-/// If data submitted, then process and store.
-
-    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);
-        }
-        redirect(new moodle_url('/admin/modules.php'));
+        // Settings not required - only pages.
+        admin_get_root(true, false);
     }
 
-    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);
-        }
-        redirect(new moodle_url('/admin/modules.php'));
-    }
+    // Redirect back to the modules page with out any params.
+    redirect(new moodle_url('/admin/modules.php'));
+}
 
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading($stractivities);
-
-/// Get and sort the existing modules
-
-    if (!$modules = $DB->get_records('modules', array(), 'name ASC')) {
-        throw new \moodle_exception('moduledoesnotexist', 'error');
-    }
-
-/// Print the table of all modules
-    // construct the flexible table ready to display
-    $table = new flexible_table(MODULE_TABLE);
-    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'uninstall', 'settings'));
-    $table->define_headers(array($stractivitymodule, $stractivities, $strversion, "$strhide/$strshow", $strsettings, $struninstall));
-    $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/modules.php');
-    $table->set_attribute('id', 'modules');
-    $table->set_attribute('class', 'admintable generaltable');
-    $table->setup();
-
-    $pluginmanager = core_plugin_manager::instance();
-
-    foreach ($modules as $module) {
-        $plugininfo = $pluginmanager->get_plugin_info('mod_'.$module->name);
-        $status = $plugininfo->get_status();
-
-        if ($status === core_plugin_manager::PLUGIN_STATUS_MISSING) {
-            $strmodulename = '<span class="notifyproblem">'.$module->name.' ('.get_string('missingfromdisk').')</span>';
-            $missing = true;
-        } else {
-            // took out hspace="\10\", because it does not validate. don't know what to replace with.
-            $icon = "<img src=\"" . $OUTPUT->image_url('monologo', $module->name) . "\" class=\"icon\" alt=\"\" />";
-            $strmodulename = $icon.' '.get_string('modulename', $module->name);
-            $missing = false;
-        }
-
-        $uninstall = '';
-        if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('mod_'.$module->name, 'manage')) {
-            $uninstall = html_writer::link($uninstallurl, $struninstall);
-        }
-
-        if (file_exists("$CFG->dirroot/mod/$module->name/settings.php") ||
-                file_exists("$CFG->dirroot/mod/$module->name/settingstree.php")) {
-            $settings = "<a href=\"settings.php?section=modsetting$module->name\">$strsettings</a>";
-        } else {
-            $settings = "";
-        }
-
-        try {
-            $count = $DB->count_records_select($module->name, "course<>0");
-        } catch (dml_exception $e) {
-            $count = -1;
-        }
-        if ($count>0) {
-            $countlink = $OUTPUT->action_link(new moodle_url('/course/search.php', ['modulelist' => $module->name]),
-                $count, null, ['title' => $strshowmodulecourse]);
-        } else if ($count < 0) {
-            $countlink = get_string('error');
-        } else {
-            $countlink = "$count";
-        }
-
-        if ($missing) {
-            $visible = '';
-            $class   = '';
-        } else if ($module->visible) {
-            $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=".sesskey()."\" title=\"$strhide\">".
-                       $OUTPUT->pix_icon('t/hide', $strhide) . '</a>';
-            $class   = '';
-        } else {
-            $visible = "<a href=\"modules.php?show=$module->name&amp;sesskey=".sesskey()."\" title=\"$strshow\">".
-                       $OUTPUT->pix_icon('t/show', $strshow) . '</a>';
-            $class =   'dimmed_text';
-        }
-        if ($module->name == "forum") {
-            $uninstall = "";
-            $visible = "";
-            $class = "";
-        }
-        $version = get_config('mod_'.$module->name, 'version');
-
-        $table->add_data(array(
-            $strmodulename,
-            $countlink,
-            $version,
-            $visible,
-            $settings,
-            $uninstall,
-        ), $class);
-    }
-
-    $table->print_html();
-
-    echo $OUTPUT->footer();
+echo $OUTPUT->header();
+echo $OUTPUT->heading(get_string("activities"));
+$table = new \core_admin\table\activity_management_table();
+$table->out();
+echo $OUTPUT->footer();

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/presets/classes/helper.php

@@ -190,8 +190,8 @@ class helper {
         static::add_item($presetid, 'showdataretentionsummary', '0', 'tool_dataprivacy');
         static::add_item($presetid, 'forum_maxattachments', '3');
         static::add_item($presetid, 'guestloginbutton', '0');
-        // Set Activity chooser tabs to "Starred, All, Recommended".
-        static::add_item($presetid, 'activitychoosertabmode', '1');
+        // Set Activity chooser tabs to "Starred, Recommended, All".
+        static::add_item($presetid, 'activitychoosertabmode', '4');
 
         // Modules: Hide chat, database, external tool (lti), IMS content package (imscp), lesson, SCORM, survey, wiki, workshop.
         static::add_plugin($presetid, 'mod', 'chat', false);
@@ -278,9 +278,6 @@ class helper {
         static::add_plugin($presetid, 'repository', 'url', false);
         static::add_plugin($presetid, 'repository', 'wikimedia', false);
 
-        // Text editors: Disable TinyMCE HTML editor.
-        static::add_plugin($presetid, 'editor', 'tinymce', false);
-
         // Create the "Full" site admin preset.
         $data = [
             'name' => get_string('fullpreset', 'core_adminpresets'),
@@ -301,8 +298,8 @@ class helper {
         static::add_item($presetid, 'showdataretentionsummary', '1', 'tool_dataprivacy');
         static::add_item($presetid, 'forum_maxattachments', '9');
         static::add_item($presetid, 'guestloginbutton', '1');
-        // Set Activity chooser tabs to the default value ("Starred, All, Activities, Resources, Recommended").
-        static::add_item($presetid, 'activitychoosertabmode', '0');
+        // Set Activity chooser tabs to the default value ("Starred, Recommended, All, Activities, Resources").
+        static::add_item($presetid, 'activitychoosertabmode', '3');
 
         // Modules: Enable chat, database, external tool (lti), IMS content package (imscp), lesson, SCORM, survey, wiki, workshop.
         static::add_plugin($presetid, 'mod', 'chat', true);
@@ -383,8 +380,5 @@ class helper {
         static::add_plugin($presetid, 'repository', 'local', true);
         static::add_plugin($presetid, 'repository', 'url', true);
         static::add_plugin($presetid, 'repository', 'wikimedia', true);
-
-        // Text editors: Enable TinyMCE HTML editor.
-        static::add_plugin($presetid, 'editor', 'tinymce', true);
     }
 }

admin/presets/classes/local/setting/adminpresets_admin_setting_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_setting.php

@@ -68,6 +68,9 @@ class adminpresets_setting {
      */
     protected $attributesvalues;
 
+    /** @var array To store the behaviors. */
+    protected array $behaviors = [];
+
     /**
      * Stores the setting data and the selected value
      *
@@ -167,7 +170,7 @@ class adminpresets_setting {
     /**
      * Saves the setting attributes values
      *
-     * @return     array        Array of inserted ids (in config_log)
+     * @return array|false Array of inserted ids (in config_log) or false if nothing was inserted
      */
     public function save_attributes_values() {
         // Plugin name or null.
@@ -206,8 +209,6 @@ class adminpresets_setting {
      * @param bool $name Setting name to store.
      * @param mixed $value Setting value to store.
      * @return int|false config_log inserted id or false whenever the new value is the same as old value.
-     * @throws dml_exception
-     * @throws moodle_exception
      */
     public function save_value($name = false, $value = null) {
         // Object values if no arguments.

admin/presets/classes/manager.php

@@ -105,7 +105,6 @@ class manager {
             'adminpresets_auth_shibboleth_admin_setting_special_idp_configtextarea' => 'adminpresets_admin_setting_configtext',
             'adminpresets_auth_shibboleth_admin_setting_special_wayf_select' => 'adminpresets_admin_setting_configselect',
             'adminpresets_editor_atto_toolbar_setting' => 'adminpresets_admin_setting_configtext',
-            'adminpresets_editor_tinymce_json_setting_textarea' => 'adminpresets_admin_setting_configtext',
             'adminpresets_enrol_database_admin_setting_category' => 'adminpresets_admin_setting_configselect',
             'adminpresets_enrol_flatfile_role_setting' => 'adminpresets_admin_setting_configtext',
             'adminpresets_enrol_ldap_admin_setting_category' => 'adminpresets_admin_setting_configselect',
@@ -184,7 +183,8 @@ class manager {
      * @param boolean $sitedbvalues Indicates if $dbsettings comes from the site db or not
      * @param array $settings Array format $array['plugin']['settingname'] = settings_types child class
      * @param array|false $children Array of admin_category children or false
-     * @return    array Array format $array['plugin']['settingname'] = settings_types child class
+     * @return \core_adminpresets\local\setting\adminpresets_setting[][] Array format
+     *    $array['plugin']['settingname'] = adminpresets_setting child class
      */
     public function get_settings(array $dbsettings, bool $sitedbvalues = false, array $settings = [], $children = false): array {
         global $DB;
@@ -309,11 +309,17 @@ class manager {
 
         $classname = null;
 
-        // Getting the appropiate class to get the correct setting value.
+        // Getting the appropriate class to get the correct setting value.
         $settingtype = get_class($settingdata);
-
         // Check if it is a setting from a plugin.
-        $plugindata = explode('_', $settingtype);
+        $namespacedata = explode('\\', $settingtype);
+        if (count($namespacedata) > 1) {
+            $plugindata = explode('_', $namespacedata[0]);
+            $settingtype = end($namespacedata);
+        } else {
+            $plugindata = explode('_', $settingtype, 2);
+        }
+
         $types = \core_component::get_plugin_types();
         if (array_key_exists($plugindata[0], $types)) {
             $plugins = \core_component::get_plugin_list($plugindata[0]);

admin/presets/classes/privacy/provider.php

@@ -99,7 +99,7 @@ class provider implements
     /**
      * Delete all data for all users in the specified context.
      *
-     * @param context $context The specific context to delete data for.
+     * @param \context $context The specific context to delete data for.
      */
     public static function delete_data_for_all_users_in_context(\context $context) {
         // None of the the data from these tables should be deleted.

admin/presets/tests/manager_test.php

@@ -133,8 +133,8 @@ class manager_test extends \advanced_testcase {
         $settingpage = $adminroot->locate('modsettingquiz');
         $settingdata = $settingpage->settings->quizbrowsersecurity;;
         $result = $manager->get_setting($settingdata, '');
-        $this->assertInstanceOf('\mod_quiz\adminpresets\adminpresets_mod_quiz_admin_setting_browsersecurity', $result);
-        $this->assertNotEquals('core_adminpresets\local\setting\adminpresets_setting', get_class($result));
+        $this->assertInstanceOf(\mod_quiz\adminpresets\adminpresets_browser_security_setting::class, $result);
+        $this->assertNotEquals(\core_adminpresets\local\setting\adminpresets_setting::class, get_class($result));
 
         // Check the adminpresets_setting class is returned when no specific class exists.
         $settingpage = $adminroot->locate('managecustomfields');

admin/registration/check.php

@@ -39,7 +39,7 @@ if ($publickey !== false) {
 
 // Encrypt data.
 $message = $CFG->release;
-$success = openssl_public_encrypt(utf8_encode($message), $encrypteddata, $publickeystr);
+$success = openssl_public_encrypt(\core_text::convert($message, 'ISO-8859-1', 'UTF-8'), $encrypteddata, $publickeystr);
 
 if ($success) {
     echo base64_encode($encrypteddata);

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;
@@ -213,7 +213,7 @@ class core_admin_renderer extends plugin_renderer_base {
             $output .= $this->container_end();
         }
 
-        $button = new single_button($continueurl, get_string('upgradestart', 'admin'), 'get', true);
+        $button = new single_button($continueurl, get_string('upgradestart', 'admin'), 'get', single_button::BUTTON_PRIMARY);
         $button->class = 'continuebutton';
         $output .= $this->render($button);
         $output .= $this->footer();
@@ -296,7 +296,6 @@ class core_admin_renderer extends plugin_renderer_base {
         $output .= $this->header();
         $output .= $this->output->heading(get_string('notifications', 'admin'));
         $output .= $this->maturity_info($maturity);
-        $output .= $this->legacy_log_store_writing_error();
         $output .= empty($CFG->disableupdatenotifications) ? $this->available_updates($availableupdates, $availableupdatesfetch) : '';
         $output .= $this->insecure_dataroot_warning($insecuredataroot);
         $output .= $this->development_libs_directories_warning($devlibdir);
@@ -746,10 +745,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 +897,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 +918,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 +990,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 +2049,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') {
@@ -2086,8 +2081,7 @@ class core_admin_renderer extends plugin_renderer_base {
                         if ($status) {                                          //Handle ok result (ok)
                             $status = get_string('statusok');
                         } 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)
@@ -2197,21 +2191,6 @@ class core_admin_renderer extends plugin_renderer_base {
         return $output;
     }
 
-    /**
-     * Check to see if writing to the deprecated legacy log store is enabled.
-     *
-     * @return string An error message if writing to the legacy log store is enabled.
-     */
-    protected function legacy_log_store_writing_error() {
-        $enabled = get_config('logstore_legacy', 'loglegacy');
-        $plugins = explode(',', get_config('tool_log', 'enabled_stores'));
-        $enabled = $enabled && in_array('logstore_legacy', $plugins);
-
-        if ($enabled) {
-            return $this->warning(get_string('legacylogginginuse'));
-        }
-    }
-
     /**
      * Display message about the benefits of registering on Moodle.org
      *

admin/roles/admins.php

@@ -25,8 +25,10 @@
 require_once(__DIR__ . '/../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 
-$confirmadd = optional_param('confirmadd', 0, PARAM_INT);
-$confirmdel = optional_param('confirmdel', 0, PARAM_INT);
+$addusersaction = optional_param('add', false, PARAM_BOOL);
+$addusers = optional_param('addusers', '', PARAM_SEQUENCE);
+$removeusersaction = optional_param('remove', false, PARAM_BOOL);
+$removeusers = optional_param('removeusers', '', PARAM_SEQUENCE);
 
 $PAGE->set_url('/admin/roles/admins.php');
 
@@ -38,33 +40,47 @@ if (!is_siteadmin()) {
 $admisselector = new core_role_admins_existing_selector();
 $potentialadmisselector = new core_role_admins_potential_selector();
 
-if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
+if ($addusersaction) {
     if ($userstoadd = $potentialadmisselector->get_selected_users()) {
-        $user = reset($userstoadd);
-        $username = $potentialadmisselector->output_user($user);
+        $usernames = array_map(static function(stdClass $user) use ($potentialadmisselector): string {
+            return $potentialadmisselector->output_user($user);
+        }, $userstoadd);
+
+        $userids = implode(',', array_keys($usernames));
+
         echo $OUTPUT->header();
-        $yesurl = new moodle_url('/admin/roles/admins.php', array('confirmadd'=>$user->id, 'sesskey'=>sesskey()));
-        echo $OUTPUT->confirm(get_string('confirmaddadmin', 'core_role', $username), $yesurl, $PAGE->url);
+        echo $OUTPUT->confirm(get_string('confirmaddadmins', 'core_role') . html_writer::alist($usernames),
+            new moodle_url('/admin/roles/admins.php', ['addusers' => $userids, 'sesskey' => sesskey()]), $PAGE->url);
         echo $OUTPUT->footer();
         die;
     }
 
-} else if (optional_param('remove', false, PARAM_BOOL) and confirm_sesskey()) {
+} else if ($removeusersaction) {
     if ($userstoremove = $admisselector->get_selected_users()) {
-        $user = reset($userstoremove);
-        if ($USER->id == $user->id) {
-            // Can not remove self.
-        } else {
-            $username = $admisselector->output_user($user);
+
+        // Can not remove self.
+        $userstoremove = array_filter($userstoremove, static function(int $userid): bool {
+            global $USER;
+            return $userid != $USER->id;
+        }, ARRAY_FILTER_USE_KEY);
+
+        if ($userstoremove) {
+            $usernames = array_map(static function(stdClass $user) use ($admisselector): string {
+                return $admisselector->output_user($user);
+            }, $userstoremove);
+
+            $userids = implode(',', array_keys($usernames));
+
             echo $OUTPUT->header();
-            $yesurl = new moodle_url('/admin/roles/admins.php', array('confirmdel'=>$user->id, 'sesskey'=>sesskey()));
-            echo $OUTPUT->confirm(get_string('confirmdeladmin', 'core_role', $username), $yesurl, $PAGE->url);
+            echo $OUTPUT->confirm(get_string('confirmremoveadmins', 'core_role') . html_writer::alist($usernames),
+                new moodle_url('/admin/roles/admins.php', ['removeusers' => $userids, 'sesskey' => sesskey()]), $PAGE->url);
             echo $OUTPUT->footer();
             die;
         }
     }
 
-} else if (optional_param('main', false, PARAM_BOOL) and confirm_sesskey()) {
+} else if (optional_param('main', false, PARAM_BOOL) && confirm_sesskey()) {
+    // Setting main administrator will choose the first selected user in the case of multiple selections.
     if ($newmain = $admisselector->get_selected_users()) {
         $newmain = reset($newmain);
         $newmain = $newmain->id;
@@ -91,7 +107,7 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
         }
     }
 
-} else if ($confirmadd and confirm_sesskey()) {
+} else if ($addusers && confirm_sesskey()) {
     $admins = array();
     foreach (explode(',', $CFG->siteadmins) as $admin) {
         $admin = (int)$admin;
@@ -102,7 +118,9 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
 
     $logstringold = implode(', ', $admins);
 
-    $admins[$confirmadd] = $confirmadd;
+    foreach (explode(',', $addusers) as $userid) {
+        $admins[$userid] = $userid;
+    }
 
     $logstringnew = implode(', ', $admins);
 
@@ -111,7 +129,7 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
 
     redirect($PAGE->url);
 
-} else if ($confirmdel and confirm_sesskey() and $confirmdel != $USER->id) {
+} else if ($removeusers && confirm_sesskey()) {
     $admins = array();
     foreach (explode(',', $CFG->siteadmins) as $admin) {
         $admin = (int)$admin;
@@ -122,7 +140,12 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
 
     $logstringold = implode(', ', $admins);
 
-    unset($admins[$confirmdel]);
+    // Can not remove self.
+    foreach (explode(',', $removeusers) as $userid) {
+        if ($userid != $USER->id) {
+            unset($admins[$userid]);
+        }
+    }
 
     $logstringnew = implode(', ', $admins);
 

admin/roles/classes/admins_existing_selector.php

@@ -37,7 +37,6 @@ class core_role_admins_existing_selector extends user_selector_base {
         if (is_null($name)) {
             $name = 'removeselect';
         }
-        $options['multiselect'] = false;
         $options['includecustomfields'] = true;
         parent::__construct($name, $options);
     }

admin/roles/classes/admins_potential_selector.php

@@ -38,7 +38,6 @@ class core_role_admins_potential_selector extends user_selector_base {
         if (is_null($name)) {
             $name = 'addselect';
         }
-        $options['multiselect'] = false;
         $options['includecustomfields'] = true;
         $options['exclude'] = explode(',', $CFG->siteadmins);
         parent::__construct($name, $options);

admin/roles/classes/allow_view_page.php

@@ -54,10 +54,9 @@ class core_role_allow_view_page extends core_role_allow_role_page {
 
     /**
      * Get tool tip for cell.
-     * @param string $fromrole
-     * @param string $targetrole
+     * @param stdClass $fromrole
+     * @param stdClass $targetrole
      * @return string
-     * @throws \coding_exception
      */
     protected function get_cell_tooltip($fromrole, $targetrole) {
         $a = new stdClass;

admin/roles/classes/preset.php

@@ -80,8 +80,15 @@ class core_role_preset {
         $top->appendChild($contextlevels);
         foreach (get_role_contextlevels($roleid) as $level) {
             $name = context_helper::get_class_for_level($level);
-            $name = preg_replace('/^context_/', '', $name);
-            $contextlevels->appendChild($dom->createElement('level', $name));
+            if (strpos($name, 'core\\context\\') === 0) {
+                // Use short names of standard contexts for backwards compatibility.
+                $value = preg_replace('/^core\\\\context\\\\/', '', $name);
+            } else {
+                // Must be a custom plugin level, use numbers to work around
+                // potential duplicate short names of contexts in add-ons.
+                $value = $level;
+            }
+            $contextlevels->appendChild($dom->createElement('level', $value));
         }
 
         foreach (array('assign', 'override', 'switch', 'view') as $type) {
@@ -197,9 +204,10 @@ class core_role_preset {
             $info['contextlevels'] = array();
             $levelmap = array_flip(context_helper::get_all_levels());
             foreach ($values as $value) {
-                $level = 'context_'.$value;
-                if (isset($levelmap[$level])) {
-                    $cl = $levelmap[$level];
+                // Numbers and short names are supported since Moodle 4.2.
+                $classname = \core\context_helper::parse_external_level($value);
+                if ($classname) {
+                    $cl = $classname::LEVEL;
                     $info['contextlevels'][$cl] = $cl;
                 }
             }

admin/roles/manage.php

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

admin/roles/tests/fixtures/mixed_levels.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<role>
+  <shortname>courseviewer</shortname>
+  <name/>
+  <description/>
+  <archetype/>
+  <contextlevels>
+    <level>system</level>
+    <level>40</level>
+    <level>50</level>
+  </contextlevels>
+  <allowassign/>
+  <allowoverride/>
+  <allowswitch/>
+  <allowview>
+    <shortname>student</shortname>
+  </allowview>
+  <permissions>
+    <allow>moodle/category:viewhiddencategories</allow>
+    <allow>moodle/course:ignoreavailabilityrestrictions</allow>
+    <allow>moodle/course:viewhiddencourses</allow>
+    <allow>moodle/site:configview</allow>
+  </permissions>
+</role>

admin/roles/tests/preset_test.php

@@ -76,4 +76,20 @@ class preset_test extends \advanced_testcase {
             }
         }
     }
+
+    /**
+     * Tests covered method.
+     * @covers \core_role_preset::parse_preset
+     */
+    public function test_mixed_levels() {
+        // The problem here is that we cannot guarantee plugin contexts
+        // have unique short names, so we have to also support level numbers.
+        $xml = file_get_contents(__DIR__ . '/fixtures/mixed_levels.xml');
+        $this->assertTrue(\core_role_preset::is_valid_preset($xml));
+
+        $preset = \core_role_preset::parse_preset($xml);
+        $expected = [\core\context\system::LEVEL, \core\context\coursecat::LEVEL, \core\context\course::LEVEL];
+        $expected = array_combine($expected, $expected);
+        $this->assertSame($expected, $preset['contextlevels']);
+    }
 }

admin/roles/tests/privacy/provider_test.php

@@ -53,6 +53,7 @@ class provider_test extends provider_testcase {
         $showadvanced = 1;
         set_user_preference('definerole_showadvanced', $showadvanced);
         provider::export_user_preferences($user->id);
+        /** @var \core_privacy\tests\request\content_writer $writer */
         $writer = writer::with_context(\context_system::instance());
         $prefs = $writer->get_user_preferences('core_role');
         $this->assertEquals(transform::yesno($showadvanced), transform::yesno($prefs->definerole_showadvanced->value));
@@ -184,6 +185,7 @@ class provider_test extends provider_testcase {
         // Retrieve role capabilities and role assignments.
         provider::export_user_data($approvedcontextlist);
         foreach ($contextlist as $context) {
+            /** @var \core_privacy\tests\request\content_writer $writer */
             $writer = writer::with_context($context);
             $this->assertTrue($writer->has_any_data());
             if ($context->contextlevel == CONTEXT_MODULE) {
@@ -413,6 +415,7 @@ class provider_test extends provider_testcase {
         ];
         // Test User is assigned role teacher to cohort.
         provider::export_user_role_to_cohort($user->id);
+        /** @var \core_privacy\tests\request\content_writer $writer */
         $writer = writer::with_context($contextuserassignover);
         $this->assertTrue($writer->has_any_data());
         $exported = (array)$writer->get_related_data($subcontextteacher, 'cohortroles');
@@ -430,6 +433,7 @@ class provider_test extends provider_testcase {
         api::create_cohort_role_assignment($params);
         api::sync_all_cohort_roles();
         provider::export_user_role_to_cohort($user->id);
+        /** @var \core_privacy\tests\request\content_writer $writer */
         $writer = writer::with_context($contextuser);
         $this->assertTrue($writer->has_any_data());
         $exported = (array)$writer->get_related_data($subcontextteacher, 'cohortroles');

admin/searchareas.php

@@ -77,7 +77,7 @@ if ($action) {
                 $cancelurl = new moodle_url('/admin/searchareas.php');
                 echo $OUTPUT->header();
                 echo $OUTPUT->confirm(get_string('confirm_' . $action, 'search', $a),
-                    new single_button($actionurl, get_string('continue'), 'post', true),
+                    new single_button($actionurl, get_string('continue'), 'post', single_button::BUTTON_PRIMARY),
                     new single_button($cancelurl, get_string('cancel'), 'get'));
                 echo $OUTPUT->footer();
                 exit;

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);
@@ -83,7 +83,7 @@ if (optional_param('sesskey', '', PARAM_ALPHANUM)) {
     // Display confirmation prompt.
     echo $OUTPUT->confirm(get_string('gradualreindex_confirm', 'search', html_writer::tag('strong', $areaname)),
             new single_button(new moodle_url('/admin/searchreindex.php', ['areaid' => $areaid,
-                'sesskey' => sesskey()]), get_string('continue'), 'post', true),
+                'sesskey' => sesskey()]), get_string('continue'), 'post', single_button::BUTTON_PRIMARY),
             new single_button(new moodle_url('/admin/searchareas.php'), get_string('cancel'), 'get'));
 }
 

admin/settings.php

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

@@ -244,18 +244,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);
@@ -269,6 +257,13 @@ reports,core_reportbuilder|/reportbuilder/index.php',
     $ltemp += get_string_manager()->get_list_of_translations(true);
     $temp->add(new admin_setting_configselect('doclang', get_string('doclang', 'admin'), get_string('configdoclang', 'admin'), '', $ltemp));
     $temp->add(new admin_setting_configcheckbox('doctonewwindow', new lang_string('doctonewwindow', 'admin'), new lang_string('configdoctonewwindow', 'admin'), 0));
+    $temp->add(new admin_setting_configtext(
+        'coursecreationguide',
+        new lang_string('coursecreationguide', 'admin'),
+        new lang_string('coursecreationguide_help', 'admin'),
+        'https://moodle.academy/coursequickstart',
+        PARAM_URL
+    ));
     $ADMIN->add('appearance', $temp);
 
     if (!empty($CFG->enabledashboard)) {
@@ -306,7 +301,6 @@ reports,core_reportbuilder|/reportbuilder/index.php',
     $ADMIN->add('appearance', $temp);
 
     $temp = new admin_settingpage('ajax', new lang_string('ajaxuse'));
-    $temp->add(new admin_setting_configcheckbox('useexternalyui', new lang_string('useexternalyui', 'admin'), new lang_string('configuseexternalyui', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('yuicomboloading', new lang_string('yuicomboloading', 'admin'), new lang_string('configyuicomboloading', 'admin'), 1));
     $setting = new admin_setting_configcheckbox('cachejs', new lang_string('cachejs', 'admin'), new lang_string('cachejs_help', 'admin'), 1);
     $setting->set_updatedcallback('js_reset_all_caches');

admin/settings/courses.php

@@ -22,6 +22,10 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->libdir . '/pdflib.php');
+
 use core_admin\local\settings\filesize;
 
 $capabilities = array(
@@ -174,6 +178,19 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $temp->add(new admin_setting_configselect('moodlecourse/maxbytes', new lang_string('maximumupload'),
         new lang_string('coursehelpmaximumupload'), key($choices), $choices));
 
+    if (!empty($CFG->enablepdfexportfont)) {
+        $pdf = new \pdf;
+        $fontlist = $pdf->get_export_fontlist();
+        // Show the option if the font is defined more than one.
+        if (count($fontlist) > 1) {
+            $temp->add(new admin_setting_configselect('moodlecourse/pdfexportfont',
+                new lang_string('pdfexportfont', 'course'),
+                new lang_string('pdfexportfont_help', 'course'),
+                'freesans', $fontlist
+            ));
+        }
+    }
+
     // Completion tracking.
     $temp->add(new admin_setting_heading('progress', new lang_string('completion','completion'), ''));
     $temp->add(new admin_setting_configselect('moodlecourse/enablecompletion', new lang_string('completion', 'completion'),
@@ -243,8 +260,11 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
             'activitychoosertabmode',
             new lang_string('activitychoosertabmode', 'course'),
             new lang_string('activitychoosertabmode_desc', 'course'),
-            0,
+            3,
             [
+                3 => new lang_string('activitychoosertabmodefour', 'course'),
+                4 => new lang_string('activitychoosertabmodefive', 'course'),
+                5 => new lang_string('activitychoosertabmodesix', 'course'),
                 0 => new lang_string('activitychoosertabmodeone', 'course'),
                 1 => new lang_string('activitychoosertabmodetwo', 'course'),
                 2 => new lang_string('activitychoosertabmodethree', 'course'),
@@ -337,6 +357,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
         new lang_string('configgeneralcontentbankcontent', 'backup'),
         ['value' => 1, 'locked' => 0])
     );
+    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_xapistate',
+        new lang_string('generalxapistate', 'backup'),
+        new lang_string('configgeneralxapistate', 'backup'),
+        ['value' => 1, 'locked' => 0])
+    );
+
 
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_legacyfiles',
         new lang_string('generallegacyfiles', 'backup'),
@@ -501,6 +527,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
         new lang_string('configgeneralcontentbankcontent', 'backup'),
         1)
     );
+    $temp->add(new admin_setting_configcheckbox(
+        'backup/backup_auto_xapistate',
+        new lang_string('generalxapistate', 'backup'),
+        new lang_string('configgeneralxapistate', 'backup'),
+        1)
+    );
 
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_legacyfiles',
         new lang_string('generallegacyfiles', 'backup'),
@@ -571,6 +603,9 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_contentbankcontent',
         new lang_string('generalcontentbankcontent', 'backup'),
         new lang_string('configrestorecontentbankcontent', 'backup'), array('value' => 1, 'locked' => 0)));
+    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_xapistate',
+        new lang_string('generalxapistate', 'backup'),
+        new lang_string('configrestorexapistate', 'backup'), array('value' => 1, 'locked' => 0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_legacyfiles',
         new lang_string('generallegacyfiles', 'backup'),
         new lang_string('configlegacyfiles', 'backup'), array('value' => 1, 'locked' => 0)));

admin/settings/development.php

@@ -51,6 +51,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
              100 => new lang_string('debugsqltrace100', 'admin'))));
     $temp->add(new admin_setting_configcheckbox('debugvalidators', new lang_string('debugvalidators', 'admin'), new lang_string('configdebugvalidators', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('debugpageinfo', new lang_string('debugpageinfo', 'admin'), new lang_string('configdebugpageinfo', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('debugtemplateinfo', new lang_string('debugtemplateinfo', 'admin'), new lang_string('debugtemplateinfo_desc', 'admin'), 0));
     $ADMIN->add('development', $temp);
 
     // "Profiling" settingpage (conditionally if the 'xhprof' extension is available only).

admin/settings/language.php

@@ -18,6 +18,8 @@ if ($hassiteconfig) {
     $temp->add(new admin_setting_configcheckbox('langstringcache', new lang_string('langstringcache', 'admin'), new lang_string('configlangstringcache', 'admin'), 1));
     $temp->add(new admin_setting_configtext('locale', new lang_string('localetext', 'admin'), new lang_string('configlocale', 'admin'), '', PARAM_FILE));
     $temp->add(new admin_setting_configselect('latinexcelexport', new lang_string('latinexcelexport', 'admin'), new lang_string('configlatinexcelexport', 'admin'), '0', array('0'=>'Unicode','1'=>'Latin')));
+    $temp->add(new admin_setting_configcheckbox('enablepdfexportfont', new lang_string('enablepdfexportfont', 'admin'),
+        new lang_string('enablepdfexportfont_desc', 'admin'), 0));
     $temp->add(new setting_scheduled_task_status('langimporttaskstatus', '\tool_langimport\task\update_langpacks_task'));
 
     $ADMIN->add('language', $temp);

admin/settings/plugins.php

@@ -154,7 +154,12 @@ if ($hassiteconfig) {
 /// Editor plugins
     $ADMIN->add('modules', new admin_category('editorsettings', new lang_string('editors', 'editor')));
     $temp = new admin_settingpage('manageeditors', new lang_string('editorsettings', 'editor'));
-    $temp->add(new admin_setting_manageeditors());
+    $temp->add(new \core_admin\admin\admin_setting_plugin_manager(
+        'editor',
+        \core_admin\table\editor_management_table::class,
+        'editorsui',
+        get_string('editorsettings', 'editor'),
+    ));
     $ADMIN->add('editorsettings', $temp);
     $plugins = core_plugin_manager::instance()->get_plugins_of_type('editor');
     core_collator::asort_objects_by_property($plugins, 'displayname');
@@ -273,7 +278,12 @@ if ($hassiteconfig) {
     $temp = new admin_settingpage('managemediaplayers', new lang_string('managemediaplayers', 'media'));
     $temp->add(new admin_setting_heading('mediaformats', get_string('mediaformats', 'core_media'),
         format_text(get_string('mediaformats_desc', 'core_media'), FORMAT_MARKDOWN)));
-    $temp->add(new admin_setting_managemediaplayers());
+    $temp->add(new \core_admin\admin\admin_setting_plugin_manager(
+        'media',
+        \core_admin\table\media_management_table::class,
+        'managemediaplayers',
+        new lang_string('managemediaplayers', 'core_media'),
+    ));
     $temp->add(new admin_setting_heading('managemediaplayerscommonheading', new lang_string('commonsettings', 'admin'), ''));
     $temp->add(new admin_setting_configtext('media_default_width',
         new lang_string('defaultwidth', 'core_media'), new lang_string('defaultwidthdesc', 'core_media'),
@@ -723,8 +733,14 @@ if ($hassiteconfig) {
 /// Add all admin tools
 if ($hassiteconfig) {
     $ADMIN->add('modules', new admin_category('tools', new lang_string('tools', 'admin')));
-    $ADMIN->add('tools', new admin_externalpage('managetools', new lang_string('toolsmanage', 'admin'),
-                                                     $CFG->wwwroot . '/' . $CFG->admin . '/tools.php'));
+    $settingspage = new admin_settingpage('toolsmanagement', new lang_string('toolsmanage', 'admin'));
+    $ADMIN->add('tools', $settingspage);
+    $settingspage->add(new \core_admin\admin\admin_setting_plugin_manager(
+        'tool',
+        \core_admin\table\tool_plugin_management_table::class,
+        'managetools',
+        new lang_string('toolsmanage', 'admin')
+    ));
 }
 
 // Now add various admin tools.

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'),
@@ -170,7 +169,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
     // Settings elements used by the \core\files\curl_security_helper class.
     $blockedhostsdefault = [
-        '127.0.0.1',
+        '127.0.0.0/8',
         '192.168.0.0/16',
         '10.0.0.0/8',
         '172.16.0.0/12',

admin/settings/server.php

@@ -69,7 +69,8 @@ if ($hassiteconfig) {
             CONTACT_SUPPORT_DISABLED => new lang_string('disabled', 'admin'),
         ]
     ));
-
+    $temp->add(new admin_setting_configtext('servicespage', new lang_string('servicespage', 'admin'),
+        new lang_string('configservicespage', 'admin'), '', PARAM_URL));
 
     $ADMIN->add('server', $temp);
 
@@ -263,6 +264,14 @@ if ($hassiteconfig) {
         ]
     ));
 
+    $temp->add(new admin_setting_configduration(
+        'xapicleanupperiod',
+        new lang_string('xapicleanupperiod', 'xapi'),
+        new lang_string('xapicleanupperiod_help', 'xapi'),
+        WEEKSECS * 8,
+        WEEKSECS
+    ));
+
     $ADMIN->add('server', $temp);
 
     $temp->add(new admin_setting_configduration('filescleanupperiod',
@@ -330,6 +339,20 @@ if ($hassiteconfig) {
     $setting->set_updatedcallback('theme_reset_static_caches');
     $temp->add($setting);
 
+    $setting = new admin_setting_configduration(
+        'cron_keepalive',
+        new lang_string('cron_keepalive', 'admin'),
+        new lang_string('cron_keepalive_desc', 'admin'),
+        \core\cron::DEFAULT_MAIN_PROCESS_KEEPALIVE,
+        // The default unit is minutes.
+        MINSECS,
+    );
+
+    // Set an upper limit.
+    $setting->set_max_duration(\core\cron::MAX_MAIN_PROCESS_KEEPALIVE);
+
+    $temp->add($setting);
+
     $temp->add(
         new admin_setting_configtext(
             'task_scheduled_concurrency_limit',

admin/settings/users.php

@@ -101,7 +101,15 @@ if ($hassiteconfig
 
     $ADMIN->add('accounts', new admin_externalpage('profilefields', new lang_string('profilefields','admin'), "$CFG->wwwroot/user/profile/index.php", 'moodle/site:config'));
     $ADMIN->add('accounts', new admin_externalpage('cohorts', new lang_string('cohorts', 'cohort'), $CFG->wwwroot . '/cohort/index.php', array('moodle/cohort:manage', 'moodle/cohort:view')));
-
+    $ADMIN->add(
+        'accounts',
+        new admin_externalpage(
+            'cohort_customfield',
+            new lang_string('cohort_customfield', 'admin'),
+            $CFG->wwwroot . '/cohort/customfield.php',
+            ['moodle/cohort:configurecustomfields']
+        )
+    );
 
     // Stuff under the "roles" subcategory.
 

admin/tasklogs.php

@@ -60,7 +60,7 @@ $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_values' => trim($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_encryptedpassword.mustache

@@ -15,7 +15,7 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    @template core_admin/admin_setting_encryptedpassword
+    @template core_admin/setting_encryptedpassword
 
     Admin encrypted password template.
 

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

admin/tests/behat/manage_blocks.feature

@@ -0,0 +1,59 @@
+@core @core_admin
+Feature: An administrator can manage Block plugins
+    In order to alter the user experience
+    As an admin
+    I can manage block plugins
+
+  @javascript
+  Scenario: An administrator can control the enabled state of block plugins using JavaScript
+    Given I am logged in as "admin"
+    And I navigate to "Plugins > Blocks > Manage blocks" in site administration
+    When I click on "Disable the Latest badges plugin" "link"
+    Then I should see "The Latest badges plugin has been disabled"
+    And "Disable the Latest badges plugin" "link" should not exist
+    But "Enable the Latest badges plugin" "link" should exist
+    When I click on "Enable the Latest badges plugin" "link"
+    Then I should see "The Latest badges plugin has been enabled"
+    And "Enable the Latest badges plugin" "link" should not exist
+    But "Disable the Latest badges plugin" "link" should exist
+
+  Scenario: An administrator can control the enabled state of block plugins without JavaScript
+    Given I am logged in as "admin"
+    And I navigate to "Plugins > Blocks > Manage blocks" in site administration
+    When I click on "Disable the Latest badges plugin" "link"
+    Then I should see "The Latest badges plugin has been disabled"
+    And "Disable the Latest badges plugin" "link" should not exist
+    But "Enable the Latest badges plugin" "link" should exist
+    When I click on "Enable the Latest badges plugin" "link"
+    Then I should see "The Latest badges plugin has been enabled"
+    And "Enable the Latest badges plugin" "link" should not exist
+    But "Disable the Latest badges plugin" "link" should exist
+
+  @javascript
+  Scenario: An administrator can control the protected state of block plugins using JavaScript
+    Given I am logged in as "admin"
+    And I navigate to "Plugins > Blocks > Manage blocks" in site administration
+    When I click on "Protect instances of the Latest badges block" "link"
+    Then I should see "The Latest badges block is now protected"
+    And "Protect instances of the Latest badges block" "link" should not exist
+    But "Unprotect instances of the Latest badges block" "link" should exist
+    And "Protect instances of the Activities block" "link" should exist
+    When I click on "Unprotect instances of the Latest badges block" "link"
+    Then I should see "The Latest badges block is no longer protected"
+    And "Unprotect instances of the Activities block" "link" should not exist
+    But "Protect instances of the Latest badges block" "link" should exist
+    And "Protect instances of the Activities block" "link" should exist
+
+  Scenario: An administrator can control the protected state of block plugins without JavaScript
+    Given I am logged in as "admin"
+    And I navigate to "Plugins > Blocks > Manage blocks" in site administration
+    When I click on "Protect instances of the Latest badges block" "link"
+    Then I should see "The Latest badges block is now protected"
+    And "Protect instances of the Latest badges block" "link" should not exist
+    But "Unprotect instances of the Latest badges block" "link" should exist
+    And "Protect instances of the Activities block" "link" should exist
+    When I click on "Unprotect instances of the Latest badges block" "link"
+    Then I should see "The Latest badges block is no longer protected"
+    And "Unprotect instances of the Activities block" "link" should not exist
+    But "Protect instances of the Latest badges block" "link" should exist
+    And "Protect instances of the Activities block" "link" should exist

admin/tests/behat/manage_media.feature

@@ -0,0 +1,30 @@
+@core @core_admin
+Feature: An administrator can manage Media plugins
+    In order to alter the user experience
+    As an admin
+    I can manage media plugins
+
+  @javascript
+  Scenario: An administrator can control the enabled state of media plugins using JavaScript
+    Given I am logged in as "admin"
+    And I navigate to "Plugins > Media players > Manage media players" in site administration
+    When I click on "Disable the YouTube plugin" "link"
+    Then I should see "The YouTube plugin has been disabled"
+    And "Disable the YouTube plugin" "link" should not exist
+    But "Enable the YouTube plugin" "link" should exist
+    When I click on "Enable the YouTube plugin" "link"
+    Then I should see "The YouTube plugin has been enabled"
+    And "Enable the YouTube plugin" "link" should not exist
+    But "Disable the YouTube plugin" "link" should exist
+
+  Scenario: An administrator can control the enabled state of media plugins without JavaScript
+    Given I am logged in as "admin"
+    And I navigate to "Plugins > Media players > Manage media players" in site administration
+    When I click on "Disable the YouTube plugin" "link"
+    Then I should see "The YouTube plugin has been disabled"
+    And "Disable the YouTube plugin" "link" should not exist
+    But "Enable the YouTube plugin" "link" should exist
+    When I click on "Enable the YouTube plugin" "link"
+    Then I should see "The YouTube plugin has been enabled"
+    And "Enable the YouTube plugin" "link" should not exist
+    But "Disable the YouTube plugin" "link" should exist

admin/tests/behat/task_logs.feature

@@ -48,3 +48,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 all" "button" in the "[data-region='report-filters']" "css_element"
+    And I should see "Filters reset"
+    And I should not see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
+    And I should see "Filters" in the "#dropdownFiltersButton" "css_element"
+    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/external/set_block_protection_test.php

@@ -0,0 +1,112 @@
+<?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\external;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->dirroot . '/webservice/tests/helpers.php');
+
+/**
+ * Unit tests to test block protection changes.
+ *
+ * @package     core
+ * @covers      \core_admin\external\set_block_protection
+ * @copyright   2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class set_block_protection_test extends \externallib_advanced_testcase {
+    /**
+     * Test execute method with no login.
+     */
+    public function test_execute_no_login(): void {
+        $this->expectException(\require_login_exception::class);
+        set_block_protection::execute('block_login', 1);
+    }
+
+    /**
+     * Test execute method with no login.
+     */
+    public function test_execute_no_capability(): void {
+        $this->resetAfterTest();
+        $user = $this->getDataGenerator()->create_user();
+        $this->setUser($user);
+        $this->expectException(\required_capability_exception::class);
+        set_block_protection::execute('block_login', 1);
+    }
+
+    /**
+     * Test the execute function with a range of parameters.
+     *
+     * @dataProvider execute_provider
+     * @param string $block
+     * @param int $targetstate
+     * @param bool $isundeletable
+     */
+    public function test_execute(
+        string $block,
+        int $targetstate,
+        bool $isundeletable,
+    ): void {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        set_block_protection::execute($block, $targetstate);
+
+        $undeletable = \block_manager::get_undeletable_block_types();
+        [, $pluginname] = explode('_', $block, 2);
+
+        if ($isundeletable) {
+            $this->assertNotFalse(array_search($pluginname, $undeletable));
+        } else {
+            $this->assertFalse(array_search($pluginname, $undeletable));
+        }
+        $this->assertCount(1, \core\notification::fetch());
+    }
+
+    /**
+     * Data provider for test_execute.
+     *
+     * @return array
+     */
+    public function execute_provider(): array {
+        return [
+            [
+                'block_login',
+                1,
+                true,
+            ],
+            [
+                'block_login',
+                0,
+                false,
+            ],
+        ];
+    }
+
+    /**
+     * Assert that an exception is thrown when the block does not exist.
+     */
+    public function execute_block_does_not_exist(): void {
+        $this->expectException(\dml_missing_record_exception::class);
+
+        set_block_protection::execute('fake_block', 1);
+        $this->assertDebuggingCalledCount(1);
+    }
+}

admin/tests/external/set_plugin_order_test.php

@@ -0,0 +1,166 @@
+<?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\external;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->dirroot . '/webservice/tests/helpers.php');
+
+/**
+ * Unit tests to configure the plugin order.
+ *
+ * Note: Not all plugins can be ordered, so this test is limited to those which support it.
+ *
+ * @package     core
+ * @covers      \core_admin\external\set_plugin_state
+ * @copyright   2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class set_plugin_order_test extends \externallib_advanced_testcase {
+    /**
+     * Text execute method for editor plugins, which support ordering.
+     *
+     * @dataProvider execute_editor_provider
+     * @param string $initialstate The initial state of the plugintype
+     * @param string $plugin The name of the plugin
+     * @param int $direction
+     * @param array $neworder
+     * @param string $newstate
+     */
+    public function test_execute_editors(
+        string $initialstate,
+        string $plugin,
+        int $direction,
+        array $neworder,
+        string $newstate,
+    ): void {
+        global $CFG;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        $CFG->texteditors = $initialstate;
+
+        set_plugin_order::execute($plugin, $direction);
+
+        $this->assertSame(
+            $neworder,
+            array_keys(\core\plugininfo\editor::get_sorted_plugins()),
+        );
+        $this->assertSame($newstate, $CFG->texteditors);
+    }
+
+    /**
+     * Data provider for base tests of the execute method.
+     *
+     * @return array
+     */
+    public function execute_editor_provider(): array {
+        return [
+            [
+                'initialstate' => 'textarea,tiny',
+                'pluginname' => 'editor_textarea',
+                'direction' => 1, // DOWN.
+                'expected' => [
+                    'tiny',
+                    'textarea',
+                    'atto',
+                ],
+                'newtexteditors' => 'tiny,textarea',
+            ],
+            [
+                'initialstate' => 'textarea,tiny',
+                'pluginname' => 'editor_textarea',
+                'direction' => -1, // UP.
+                'expected' => [
+                    'textarea',
+                    'tiny',
+                    'atto',
+                ],
+                'newtexteditors' => 'textarea,tiny',
+            ],
+            [
+                'initialstate' => 'textarea,tiny',
+                'pluginname' => 'editor_tiny',
+                'direction' => 1, // DOWN.
+                // Tiny is already at the bottom of the list of enabled plugins.
+                'expected' => [
+                    'textarea',
+                    'tiny',
+                    'atto',
+                ],
+                'newtexteditors' => 'textarea,tiny',
+            ],
+            [
+                'initialstate' => 'textarea,tiny',
+                'pluginname' => 'editor_atto',
+                'direction' => 1, // DOWN.
+                // Atto is not enabled. Disabled editors are listed lexically after enabled editors.
+                'expected' => [
+                    'textarea',
+                    'tiny',
+                    'atto',
+                ],
+                'newtexteditors' => 'textarea,tiny',
+            ],
+        ];
+    }
+
+    /**
+     * Text execute method for plugins which do not support ordering.
+     *
+     * @dataProvider execute_non_orderable_provider
+     * @param string $plugin
+     */
+    public function test_execute_editors_non_orderable(string $plugin): void {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        $this->assertIsArray(set_plugin_order::execute($plugin, 1));
+    }
+
+    public function execute_non_orderable_provider(): array {
+        return [
+            // Activities do not support ordering.
+            ['mod_assign'],
+            // Nor to blocks.
+            ['block_login'],
+        ];
+    }
+
+    /**
+     * Test execute method with no login.
+     */
+    public function test_execute_no_login(): void {
+        $this->expectException(\require_login_exception::class);
+        set_plugin_order::execute('editor_tiny', 1);
+    }
+
+    /**
+     * Test execute method with no login.
+     */
+    public function test_execute_no_capability(): void {
+        $this->resetAfterTest();
+        $user = $this->getDataGenerator()->create_user();
+        $this->setUser($user);
+        $this->expectException(\required_capability_exception::class);
+        set_plugin_order::execute('editor_tiny', 1);
+    }
+}

admin/tests/external/set_plugin_state_test.php

@@ -0,0 +1,131 @@
+<?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\external;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->dirroot . '/webservice/tests/helpers.php');
+
+/**
+ * Unit tests to configure the enabled/disabled state of a plugin.
+ *
+ * @package     core
+ * @covers      \core_admin\external\set_plugin_state
+ * @copyright   2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class set_plugin_state_test extends \externallib_advanced_testcase {
+    /**
+     * Text execute method.
+     *
+     * @dataProvider execute_standard_provider
+     * @param string $plugin The name of the plugin
+     * @param int|null $initialstate The initial state of the plugin
+     * @param int $newstate The target state
+     * @param int $notificationcount The number of notifications expected
+     */
+    public function test_execute(
+        string $plugin,
+        ?int $initialstate,
+        int $newstate,
+        int $notificationcount,
+    ): void {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        if ($initialstate !== null) {
+            [$plugintype, $pluginname] = \core_component::normalize_component($plugin);
+            $manager = \core_plugin_manager::resolve_plugininfo_class($plugintype);
+            $manager::enable_plugin($pluginname, $initialstate);
+            \core\notification::fetch();
+        }
+
+        set_plugin_state::execute($plugin, $newstate);
+        $this->assertCount($notificationcount, \core\notification::fetch());
+    }
+
+    /**
+     * Data provider for base tests of the execute method.
+     *
+     * @return array
+     */
+    public function execute_standard_provider(): array {
+        $generatetestsfor = function (string $plugin): array {
+            return [
+                [
+                    'plugin' => $plugin,
+                    'initialstate' => null,
+                    'newstate' => 0,
+                    'notificationcount' => 1,
+                ],
+                [
+                    'plugin' => $plugin,
+                    'initialstate' => 1,
+                    'newstate' => 0,
+                    'notificationcount' => 1,
+                ],
+                [
+                    'plugin' => $plugin,
+                    'initialstate' => 1,
+                    'newstate' => 1,
+                    'notificationcount' => 0,
+                ],
+                [
+                    'plugin' => $plugin,
+                    'initialstate' => 0,
+                    'newstate' => 0,
+                    'notificationcount' => 0,
+                ],
+                [
+                    'plugin' => $plugin,
+                    'initialstate' => 0,
+                    'newstate' => 1,
+                    'notificationcount' => 1,
+                ],
+            ];
+        };
+
+        return array_merge(
+            $generatetestsfor('mod_assign'),
+            $generatetestsfor('editor_tiny'),
+            $generatetestsfor('tiny_h5p'),
+            $generatetestsfor('block_badges'),
+        );
+    }
+
+    /**
+     * Test execute method with no login.
+     */
+    public function test_execute_no_login(): void {
+        $this->expectException(\require_login_exception::class);
+        set_plugin_state::execute('mod_assign', 1);
+    }
+
+    /**
+     * Test execute method with no login.
+     */
+    public function test_execute_no_capability(): void {
+        $this->resetAfterTest();
+        $user = $this->getDataGenerator()->create_user();
+        $this->setUser($user);
+        $this->expectException(\required_capability_exception::class);
+        set_plugin_state::execute('mod_assign', 1);
+    }
+}

admin/tool/admin_presets/classes/event/preset_deleted.php

@@ -36,10 +36,6 @@ class preset_deleted extends base {
         return "User {$this->userid} has deleted the preset with id {$this->objectid}.";
     }
 
-    public function get_legacy_logdata(): array {
-        return [$this->courseid, 'tool_admin_presets', 'delete', '', $this->objectid, $this->contextinstanceid];
-    }
-
     protected function init(): void {
         $this->data['crud'] = 'd';
         $this->data['edulevel'] = self::LEVEL_OTHER;

admin/tool/admin_presets/classes/event/preset_exported.php

@@ -41,10 +41,6 @@ class preset_exported extends base {
             ['action' => 'load', 'mode' => 'preview', 'id' => $this->objectid]);
     }
 
-    public function get_legacy_logdata(): array {
-        return [$this->courseid, 'tool_admin_presets', 'export', '', $this->objectid, $this->contextinstanceid];
-    }
-
     protected function init(): void {
         $this->data['crud'] = 'c';
         $this->data['edulevel'] = self::LEVEL_OTHER;

admin/tool/admin_presets/classes/event/preset_imported.php

@@ -41,10 +41,6 @@ class preset_imported extends base {
             ['action' => 'load', 'mode' => 'preview', 'id' => $this->objectid]);
     }
 
-    public function get_legacy_logdata(): array {
-        return [$this->courseid, 'tool_admin_presets', 'import', '', $this->objectid, $this->contextinstanceid];
-    }
-
     protected function init(): void {
         $this->data['crud'] = 'c';
         $this->data['edulevel'] = self::LEVEL_OTHER;

admin/tool/admin_presets/classes/event/preset_loaded.php

@@ -41,10 +41,6 @@ class preset_loaded extends base {
             ['action' => 'load', 'mode' => 'preview', 'id' => $this->objectid]);
     }
 
-    public function get_legacy_logdata(): array {
-        return [$this->courseid, 'tool_admin_presets', 'load', '', $this->objectid, $this->contextinstanceid];
-    }
-
     protected function init(): void {
         $this->data['crud'] = 'u';
         $this->data['edulevel'] = self::LEVEL_OTHER;

admin/tool/admin_presets/classes/event/preset_reverted.php

@@ -36,10 +36,6 @@ class preset_reverted extends base {
         return "User {$this->userid} has reverted the preset with id {$this->objectid}.";
     }
 
-    public function get_legacy_logdata(): array {
-        return [$this->courseid, 'tool_admin_presets', 'rollback', '', $this->objectid, $this->contextinstanceid];
-    }
-
     protected function init(): void {
         $this->data['crud'] = 'u';
         $this->data['edulevel'] = self::LEVEL_OTHER;