Moodle release 4.2.1

MDL-45580 introduced the readonlypages filearea, and when loading
page images for an attempt, the code would check if the pages existed
, creating them if not. The code inside this block also contained
a guard clause for the case where no readonly pages existed - which
is a situation that should not happen. Whenever readonly pages are
requested, they should exist.

MDL-66626 introduced a situation where page counts not matching would
also retrigger page generation. However this led to a situation where
the guard clause could be entered when requesting readonly pages.

This patch refactors the guard clause, and improves the logic to
regenerate pages.

.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', 'always'], allowFinally: true}],
+    '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,
       }
     }
   ]

.gitattributes

@@ -1,6 +1,3 @@
 **/yui/build/** -diff
 **/amd/build/** -diff
 lib/dml/oci_native_moodle_package.sql text eol=lf
-**.js.map -diff
-**-min.js -diff
-**.min.js -diff

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 # Primary donations pages.
-custom: ["https://moodle.com/donations/", "https://fund.moodle.org"]
+custom: ["https://moodle.com/donations/", moodle.org]

.github/workflows/onebyone.yml

@@ -1,143 +0,0 @@
-name: One by One Testing
-# Run all the individual unit tests one by one, with
-# fully independent PHPUnit executions. Useful to
-# detect issues with some tests that are using stuff
-# that has been made available by others, but is not
-# available when running individually.
-#
-# Note that we aren't using PHPUnit's own isolation
-# here but completely separated runs, one for each
-# test.
-#
-# The workflow will fail reporting all the tests
-# that have failed (and will pass if no failure is
-# detected, of course).
-#
-# It's only executed via workflow dispatch (automated
-# or manual), not by push/tag. And acceptd configuration
-# of phpunit, specially useful to run it with PHPUnit's
-# own isolation or any other option.
-
-on:
-  workflow_dispatch:
-    inputs:
-      phpunit_extra_options:
-        description: Additional options to apply to PHPUnit
-        required: false
-        default: ''
-
-env:
-  chunks: 7
-
-jobs:
-  collect:
-    name: Collect individual unit tests
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{steps.individual-tests.outputs.matrix }}
-
-    steps:
-      - name: Checking out code
-        uses: actions/checkout@v4
-
-      - name: Looking for all individual tests
-        id: individual-tests
-        run: |
-          count=0  # Number of individual tests found.
-          while read -r testfile; do # For each test file.
-              while read -r testname; do # For each unit test in a file.
-                  count=$((count + 1))
-                  # Sent it to the correct chunk file.
-                  chunk=$(((($count % $chunks)) + 1))
-                  echo "$testname $testfile" >> ./chunk_$chunk.txt
-              done < <(grep "function test_" "${testfile}" | sed -r "s/^.*function (test_[a-zA-Z0-9_]+).*/\1/")
-          done < <(find . -name "*_test.php")
-          # Generate the matrix to run tests.
-          echo "matrix=$(ls -1 chunk_*.txt | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
-          echo "$count individual tests collected in $chunks files"
-
-      - name: Upload individual tests files
-        uses: actions/upload-artifact@v4
-        with:
-          name: individual_tests
-          path: chunk_*.txt
-          retention-days: 1
-
-  test:
-    name: Run tests
-    needs: collect
-    runs-on: ubuntu-latest
-    services:
-      exttests:
-        image: moodlehq/moodle-exttests
-        ports:
-          - 8080:80
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-    strategy:
-      fail-fast: false
-      matrix:
-        file: ${{ fromJson(needs.collect.outputs.matrix) }}
-
-    steps:
-      - name: Setting up DB pgsql
-        uses: m4nu56/postgresql-action@v1
-        with:
-          postgresql version: 13
-          postgresql db: test
-          postgresql user: test
-          postgresql password: test
-
-      - name: Setting up PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 8.2
-          ini-values: max_input_vars=5000
-          coverage: none
-
-      - name: Checking out code
-        uses: actions/checkout@v4
-
-      - name: Download individual test files
-        uses: actions/download-artifact@v4
-        with:
-          name: individual_tests # Make all the chunk files available for the next steps.
-
-      - name: Setting up PHPUnit
-        env:
-          dbtype: pgsql
-        run: |
-          echo "pathtophp=$(which php)" >> $GITHUB_ENV
-          cp .github/workflows/config-template.php config.php
-          mkdir ../moodledata
-          sudo locale-gen en_AU.UTF-8
-          php admin/tool/phpunit/cli/init.php --no-composer-self-update
-
-      - name: Run PHPUnit test (one by one)
-        env:
-          dbtype: pgsql
-        run: |
-          status=0
-          count=0
-          while read -r line; do # For each line in the chunk file
-              count=$((count + 1))
-              filter="${line% *}"
-              file="${line#* }"
-              # Run the individual unit test and report problems if needed to.
-              if ! php vendor/bin/phpunit \
-                      --fail-on-empty-test-suite \
-                      --fail-on-warning \
-                      --fail-on-risky \
-                      --filter "$filter" ${{ inputs.phpunit_extra_options }} \
-                      "$file" >/dev/null 2>&1; then
-                  if [ $status -eq 0 ]; then
-                      echo "Problems found, list of PHPUnit commands failing:"
-                  fi
-                  echo "vendor/bin/phpunit --filter '${filter}' ${{ inputs.phpunit_extra_options }} $file"
-                  status=$((status + 1))
-              fi
-          done < ${{ matrix.file }}
-          echo "Finished: $count individual tests executed, $status tests failed"
-          exit $status

.github/workflows/push.yml

@@ -3,19 +3,13 @@ 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.2
+  php: 8.1
 
 jobs:
   Grunt:
@@ -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'
 
@@ -67,7 +61,7 @@ jobs:
             db: mysqli
           # PostgreSQL builds always run with the highest PHP supported version.
           - os: ubuntu-22.04
-            php: 8.2
+            php: 8.1
             db: pgsql
 
     steps:
@@ -105,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:
@@ -121,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/web-installer-test.yml

@@ -1,23 +0,0 @@
-name: Web Installer Testing
-
-on:
-  workflow_dispatch:
-
-jobs:
-  InstallationTest:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        php: [8.1, 8.3]
-    steps:
-      - name: Construct repository URL
-        run: echo "REPOSITORY_URL=${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" >> $GITHUB_ENV
-        shell: bash
-
-      - uses: moodlehq/moodle-webinstaller-test@main
-        with:
-          repository: ${{ env.REPOSITORY_URL }}
-          branch: ${{ github.ref_name }}
-          php: ${{ matrix.php }}

.github/workflows/windows.yml

@@ -1,14 +1,9 @@
 name: Windows Testing
 
 on:
-  workflow_dispatch:
-    inputs:
-      phpunit_extra_options:
-        description: Additional options to apply to PHPUnit
-        required: false
-        default: ''
+  workflow_dispatch
 env:
-  php: 8.2
+  php: 8.1
 
 jobs:
   Grunt:
@@ -21,10 +16,10 @@ jobs:
           git config --global core.eol lf
 
       - 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'
 
@@ -51,13 +46,13 @@ jobs:
       matrix:
         include:
           - os: windows-latest
-            php: 8.2
+            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, zip
+            extensions: exif, fileinfo, gd, intl, pgsql, mysql, redis, soap, sodium
           - os: windows-latest
             php: 8.0
             db: pgsql
@@ -117,7 +112,7 @@ jobs:
           git config --global core.eol lf
 
       - name: Checking out code from ${{ env.GITHUB_REF_SLUG }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       # Needs to be done after php is available, git configured and Moodle checkout has happened.
       - name: Setting up moodle-exttests service
@@ -146,4 +141,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

.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
@@ -60,6 +60,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 +104,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 +113,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 +151,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,
                 },
             },

.nvmrc

@@ -1 +1 @@
-lts/jod
+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": {
-      }
-    }
-  ]
+  }
 }

CONTRIBUTING.txt

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

README.txt

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

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/reportbuilder/datasource/task_logs.php

@@ -78,17 +78,6 @@ class task_logs extends datasource {
         ];
     }
 
-    /**
-     * Return the column sorting that will be added to the report upon creation
-     *
-     * @return int[]
-     */
-    public function get_default_column_sorting(): array {
-        return [
-            'task_log:starttime' => SORT_DESC,
-        ];
-    }
-
     /**
      * Return the filters that will be added to the report upon creation
      *

admin/classes/table/block_management_table.php

@@ -35,29 +35,28 @@ class block_management_table extends \core_admin\table\plugin_management_table {
     /** @var stdClass[] A list of basic block data */
     protected array $blockdata;
 
-    /** @var array<string,int> A list of course counts */
-    protected array $courseblocks;
-
     public function __construct() {
         global $DB;
         parent::__construct();
         $this->undeletableblocktypes = \block_manager::get_undeletable_block_types();
 
-        $sql = 'SELECT b.name,
-                       b.id,
-                       COUNT(DISTINCT binst.id) as totalcount
-                  FROM {block} b
-             LEFT JOIN {block_instances} binst ON binst.blockname = b.name
-              GROUP BY b.id,
-                       b.name
-              ORDER BY b.name ASC';
-        $this->blockdata = $DB->get_records_sql($sql);
+        $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;
 
-        $sql = "SELECT blockname
-                  FROM {block_instances}
-                 WHERE pagetypepattern = 'course-view-*'
-              GROUP BY blockname";
-        $this->courseblocks = $DB->get_records_sql($sql);
+        $this->blockdata = $DB->get_records_sql($sql);
     }
 
     protected function get_plugintype(): string {
@@ -103,10 +102,11 @@ class block_management_table extends \core_admin\table\plugin_management_table {
      */
     protected function col_instances(stdClass $row): string {
         $blockdata = $this->blockdata[$row->plugininfo->name];
-        if (array_key_exists($blockdata->name, $this->courseblocks)) {
+        if ($blockdata->courseviewcount > 0) {
             return html_writer::link(
                 new moodle_url('/course/search.php', [
-                    'blocklist' => $blockdata->id,
+                    'blocklist' => $row->plugininfo->name,
+                    'sesskey' => sesskey(),
                 ]),
                 $blockdata->totalcount,
             );

admin/classes/table/hook_list_table.php

@@ -1,285 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-namespace core_admin\table;
-
-use core_plugin_manager;
-use flexible_table;
-use html_writer;
-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
- */
-class hook_list_table extends flexible_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;
-
-    /** @var stdClass[] The list of emitted hooks with metadata */
-    protected array $emitters;
-
-    public function __construct() {
-        global $CFG;
-
-        $this->define_baseurl('/admin/hooks.php');
-        parent::__construct('core_admin-hook_list_table');
-
-        // Add emitted hooks.
-        $this->emitters = \core\hook\manager::discover_known_hooks();
-
-        $this->setup_column_configuration();
-        $this->setup();
-    }
-
-    /**
-     * Set up the column configuration for this table.
-     */
-    protected function setup_column_configuration(): void {
-        $columnlist = [
-            'details' => get_string('hookname', 'core_admin'),
-            'callbacks' => get_string('hookcallbacks', 'core_admin'),
-            'deprecates' => get_string('hookdeprecates', 'core_admin'),
-        ];
-        $this->define_columns(array_keys($columnlist));
-        $this->define_headers(array_values($columnlist));
-
-        $columnswithhelp = [
-            'callbacks' => new \help_icon('hookcallbacks', 'admin'),
-        ];
-        $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);
-    }
-
-    /**
-     * Print the table.
-     */
-    public function out(): void {
-        // All hook consumers referenced from the db/hooks.php files.
-        $hookmanager = \core\hook\manager::get_instance();
-        $allhooks = (array)$hookmanager->get_all_callbacks();
-
-        // Add any unused hooks.
-        foreach (array_keys($this->emitters) as $classname) {
-            if (isset($allhooks[$classname])) {
-                continue;
-            }
-            $allhooks[$classname] = [];
-        }
-
-        // Order rows by hook name, putting core first.
-        \core_collator::ksort($allhooks);
-        $corehooks = [];
-        foreach ($allhooks as $classname => $consumers) {
-            if (str_starts_with($classname, 'core\\')) {
-                $corehooks[$classname] = $consumers;
-                unset($allhooks[$classname]);
-            }
-        }
-        $allhooks = array_merge($corehooks, $allhooks);
-
-        foreach ($allhooks as $classname => $consumers) {
-            $this->add_data_keyed(
-                $this->format_row((object) [
-                    'classname' => $classname,
-                    'callbacks' => $consumers,
-                ]),
-                $this->get_row_class($classname),
-            );
-        }
-
-        $this->finish_output(false);
-    }
-
-    protected function col_details(stdClass $row): string {
-        return $row->classname .
-            $this->get_description($row) .
-            html_writer::div($this->get_tags_for_row($row));
-    }
-
-    /**
-     * Show the name column content.
-     *
-     * @param stdClass $row
-     * @return string
-     */
-    protected function get_description(stdClass $row): string {
-        if (!array_key_exists($row->classname, $this->emitters)) {
-            return '';
-        }
-
-        return html_writer::tag(
-            'small',
-            clean_text(markdown_to_html($this->emitters[$row->classname]['description']), FORMAT_HTML),
-        );
-    }
-
-    protected function col_deprecates(stdClass $row): string {
-        if (!class_exists($row->classname)) {
-            return '';
-        }
-
-        $rc = new \ReflectionClass($row->classname);
-        if (!$rc->implementsInterface(\core\hook\deprecated_callback_replacement::class)) {
-            return '';
-        }
-        $deprecates = call_user_func([$row->classname, 'get_deprecated_plugin_callbacks']);
-        if (count($deprecates) === 0) {
-            return '';
-        }
-        $content = html_writer::start_tag('ul');
-
-        foreach ($deprecates as $deprecatedmethod) {
-            $content .= html_writer::tag('li', $deprecatedmethod);
-        }
-        $content .= html_writer::end_tag('ul');
-        return $content;
-    }
-
-    protected function col_callbacks(stdClass $row): string {
-        global $CFG;
-
-        $hookclass = $row->classname;
-        $cbinfo = [];
-        foreach ($row->callbacks as $definition) {
-            $iscallable = is_callable($definition['callback'], false, $callbackname);
-            $isoverridden = isset($CFG->hooks_callback_overrides[$hookclass][$definition['callback']]);
-            $info = "{$callbackname}&nbsp;({$definition['priority']})";
-            if (!$iscallable) {
-                $info .= '&nbsp;';
-                $info .= $this->get_tag(
-                    get_string('error'),
-                    'danger',
-                    get_string('hookcallbacknotcallable', 'core_admin', $callbackname),
-                );
-            }
-            if ($isoverridden) {
-                // The lang string meaning should be close enough here.
-                $info .= $this->get_tag(
-                    get_string('hookconfigoverride', 'core_admin'),
-                    'warning',
-                    get_string('hookconfigoverride_help', 'core_admin'),
-                );
-            }
-
-            $cbinfo[] = $info;
-        }
-
-        if ($cbinfo) {
-            $output = html_writer::start_tag('ol');
-            foreach ($cbinfo as $callback) {
-                $class = '';
-                if ($definition['disabled']) {
-                    $class = 'dimmed_text';
-                }
-                $output .= html_writer::tag('li', $callback, ['class' => $class]);
-            }
-            $output .= html_writer::end_tag('ol');
-            return $output;
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Get the HTML to display the badge with tooltip.
-     *
-     * @param string $tag The main text to display
-     * @param null|string $type The pill type
-     * @param null|string $tooltip The content of the tooltip
-     * @return string
-     */
-    protected function get_tag(
-        string $tag,
-        ?string $type = null,
-        ?string $tooltip = null,
-    ): string {
-        $attributes = [];
-
-        if ($type === null) {
-            $type = 'info';
-        }
-
-        if ($tooltip) {
-            $attributes['data-toggle'] = 'tooltip';
-            $attributes['title'] = $tooltip;
-        }
-        return html_writer::span($tag, "badge badge-{$type}", $attributes);
-    }
-
-    /**
-     * Get the code to display a set of tags for this table row.
-     *
-     * @param stdClass $row
-     * @return string
-     */
-    protected function get_tags_for_row(stdClass $row): string {
-        if (!array_key_exists($row->classname, $this->emitters)) {
-            // This hook has been defined in the db/hooks.php file
-            // but does not refer to a hook in this version of Moodle.
-            return $this->get_tag(
-                get_string('hookunknown', 'core_admin'),
-                'warning',
-                get_string('hookunknown_desc', 'core_admin'),
-            );
-        }
-
-        if (!class_exists($row->classname)) {
-            // This hook has been defined in a hook discovery agent, but the class it refers to could not be found.
-            return $this->get_tag(
-                get_string('hookclassmissing', 'core_admin'),
-                'warning',
-                get_string('hookclassmissing_desc', 'core_admin'),
-            );
-        }
-
-        $tags = $this->emitters[$row->classname]['tags'] ?? [];
-        $taglist = array_map(function($tag): string {
-            if (is_array($tag)) {
-                return $this->get_tag(...$tag);
-            }
-            return $this->get_tag($tag, 'badge badge-info');
-        }, $tags);
-
-        return implode("\n", $taglist);
-    }
-
-    protected function get_row_class(string $classname): string {
-        return '';
-    }
-}

admin/classes/table/plugin_management_table.php

@@ -500,15 +500,4 @@ abstract class plugin_management_table extends flexible_table implements dynamic
     protected function supports_ordering(): bool {
         return $this->plugininfoclass::plugintype_supports_ordering();
     }
-
-    /**
-     * Check if the user has the capability to access this table.
-     *
-     * Default implementation for plugin management tables is to require 'moodle/site:config' capability
-     *
-     * @return bool Return true if capability check passed.
-     */
-    public function has_capability(): bool {
-        return has_capability('moodle/site:config', $this->get_context());
-    }
 }

admin/classes/table/tool_plugin_management_table.php

@@ -19,7 +19,7 @@ namespace core_admin\table;
 use moodle_url;
 
 /**
- * Admin tool settings.
+ * Tiny admin settings.
  *
  * @package core_admin
  * @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
@@ -30,6 +30,12 @@ class tool_plugin_management_table extends \core_admin\table\plugin_management_t
         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();
 
@@ -39,6 +45,6 @@ class tool_plugin_management_table extends \core_admin\table\plugin_management_t
     }
 
     protected function get_action_url(array $params = []): moodle_url {
-        return new moodle_url('/admin/settings.php', array_merge(['section' => 'toolsmanagement'], $params));
+        return new moodle_url('/admin/tool.php', $params);
     }
 }

admin/cli/generate_key.php

@@ -39,6 +39,8 @@ if ($unrecognized) {
     cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
 }
 
+// TODO: MDL-71421 - Remove the openssl alternative once sodium becomes a requirement in Moodle 4.2.
+
 if ($options['help']) {
     echo "Generate secure key
 
@@ -52,7 +54,9 @@ may be manually installed on multiple servers.
 
 Options:
 -h, --help         Print out this help
---method <method>  Generate key for specified encryption method instead of default (sodium)
+--method <method>  Generate key for specified encryption method instead of default.
+                   * sodium
+                   * openssl-aes-256-ctr
 
 Example:
 php admin/cli/generate_key.php

admin/cli/install.php

@@ -177,7 +177,6 @@ $CFG->admin                = array_pop($parts);
 ini_set('include_path', $CFG->libdir.'/pear' . PATH_SEPARATOR . ini_get('include_path'));
 
 require_once($CFG->libdir.'/classes/component.php');
-
 require_once($CFG->libdir.'/classes/text.php');
 require_once($CFG->libdir.'/classes/string_manager.php');
 require_once($CFG->libdir.'/classes/string_manager_install.php');
@@ -193,8 +192,13 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/componentlib.class.php');
 require_once($CFG->dirroot.'/cache/lib.php');
 
-// Register our classloader.
-\core_component::register_autoloader();
+// Register our classloader, in theory somebody might want to replace it to load other hacked core classes.
+// Required because the database checks below lead to session interaction which is going to lead us to requiring autoloaded classes.
+if (defined('COMPONENT_CLASSLOADER')) {
+    spl_autoload_register(COMPONENT_CLASSLOADER);
+} else {
+    spl_autoload_register('core_component::classloader');
+}
 
 require($CFG->dirroot.'/version.php');
 $CFG->target_release = $release;

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

@@ -36,8 +36,6 @@ list($options, $unrecognized) = cli_get_params(
         'showsql' => false,
         'showdebugging' => false,
         'force' => false,
-        'disable' => false,
-        'enable' => false,
     ], [
         'h' => 'help',
         'f' => 'force',
@@ -49,15 +47,11 @@ if ($unrecognized) {
     cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
 }
 
-$commands = ['list', 'execute', 'disable', 'enable'];
-$hascommand = count(array_filter($commands, fn($command) => $options[$command])) > 0;
-if ($options['help'] || !$hascommand) {
+if ($options['help'] or (!$options['list'] and !$options['execute'])) {
     $help =
     "Scheduled cron tasks.
 
     Options:
-    --disable=\\some\\task  Disable scheduled task
-    --enable=\\some\\task  Enable scheduled task
     --execute=\\some\\task  Execute scheduled task manually
     --list                List all scheduled tasks
     --showsql             Show sql queries before they are executed
@@ -125,43 +119,17 @@ if ($options['list']) {
     exit(0);
 }
 
-if (moodle_needs_upgrading()) {
-    mtrace("Moodle upgrade pending, cannot manage tasks.");
-    exit(1);
-}
-
-if ($disable = $options['disable']) {
-    if (!$task = \core\task\manager::get_scheduled_task($disable)) {
-        mtrace("Task '$disable' not found");
-        exit(1);
-    }
-
-    try {
-        $task->disable();
-        mtrace("Disabled '$disable'");
-    } catch (Exception $e) {
-        mtrace("$e->getMessage()");
-        exit(1);
-    }
-} else if ($enable = $options['enable']) {
-    if (!$task = \core\task\manager::get_scheduled_task($enable)) {
-        mtrace("Task '$enable' not found");
-        exit(1);
-    }
-
-    try {
-        $task->enable();
-        mtrace("Enabled '$enable'");
-    } catch (Exception $e) {
-        mtrace("$e->getMessage()");
-        exit(1);
-    }
-} else if ($execute = $options['execute']) {
+if ($execute = $options['execute']) {
     if (!$task = \core\task\manager::get_scheduled_task($execute)) {
         mtrace("Task '$execute' not found");
         exit(1);
     }
 
+    if (moodle_needs_upgrading()) {
+        mtrace("Moodle upgrade pending, cannot execute tasks.");
+        exit(1);
+    }
+
     if (!get_config('core', 'cron_enabled') && !$options['force']) {
         mtrace('Cron is disabled. Use --force to override.');
         exit(1);

admin/communication.php

@@ -1,65 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Communication and its plugins settings.
- *
- * @package    core
- * @subpackage communication
- * @copyright  2023 Huong Nguyen <huongnv13@gmail.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once('../config.php');
-require_once($CFG->libdir . '/adminlib.php');
-
-$action = required_param('action', PARAM_ALPHANUMEXT);
-$name = required_param('name', PARAM_PLUGIN);
-
-$syscontext = context_system::instance();
-$PAGE->set_url('/admin/communication.php');
-$PAGE->set_context($syscontext);
-
-require_admin();
-require_sesskey();
-
-$return = new moodle_url('/admin/settings.php', ['section' => 'managecommunicationproviders']);
-
-$plugins = core_plugin_manager::instance()->get_plugins_of_type('communication');
-$sortorder = array_flip(array_keys($plugins));
-
-if (!isset($plugins[$name])) {
-    throw new moodle_exception('communicationprovidernotfound', 'core_communication', $return, $name);
-}
-
-$plugintypename = $plugins[$name]->type . '_' . $plugins[$name]->name;
-
-switch ($action) {
-    case 'disable':
-        if ($plugins[$name]->is_enabled()) {
-            $class = core_plugin_manager::resolve_plugininfo_class('communication');
-            $class::enable_plugin($name, false);
-        }
-        break;
-    case 'enable':
-        if (!$plugins[$name]->is_enabled()) {
-            $class = core_plugin_manager::resolve_plugininfo_class('communication');
-            $class::enable_plugin($name, true);
-        }
-        break;
-}
-
-redirect($return);

admin/environment.xml

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

admin/hooks.php

@@ -1,41 +0,0 @@
-<?php
-// This file is part of Moodle - https://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 <https://www.gnu.org/licenses/>.
-
-/**
- * Hooks overview page.
- *
- * @package   core
- * @author    Petr Skoda
- * @copyright 2022 Open LMS
- * @license   https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(__DIR__ . '/../config.php');
-require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->libdir . '/tablelib.php');
-
-admin_externalpage_setup('hooksoverview');
-require_capability('moodle/site:config', \core\context\system::instance());
-
-$hookmanager = \core\hook\manager::get_instance();
-
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('hooksoverview', 'core_admin'));
-
-$table = new \core_admin\table\hook_list_table();
-$table->out();
-
-echo $OUTPUT->footer();

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);
 
@@ -818,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/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/local/setting/adminpresets_admin_setting_configmultiselect.php

@@ -26,8 +26,34 @@ namespace core_adminpresets\local\setting;
  */
 class adminpresets_admin_setting_configmultiselect extends adminpresets_setting {
 
-    /** @var \admin_setting_configmultiselect $settingdata */
-    protected $settingdata;
+    /**
+     * 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);
@@ -35,8 +61,7 @@ class adminpresets_admin_setting_configmultiselect extends adminpresets_setting
 
         foreach ($values as $value) {
 
-            // Ensure that each value exists as a setting choice.
-            if (array_key_exists($value, $this->settingdata->choices)) {
+            if (!empty($this->settingdata->choices[$value])) {
                 $visiblevalues[] = $this->settingdata->choices[$value];
             }
         }

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

@@ -26,9 +26,6 @@ namespace core_adminpresets\local\setting;
  */
 class adminpresets_admin_setting_configselect extends adminpresets_setting {
 
-    /** @var \admin_setting_configselect $settingdata */
-    protected $settingdata;
-
     /**
      * Sets the setting value cleaning it.
      *

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

@@ -26,9 +26,6 @@ namespace core_adminpresets\local\setting;
  */
 class adminpresets_admin_setting_configtime extends adminpresets_setting {
 
-    /** @var \admin_setting_configtime $settingdata */
-    protected $settingdata;
-
     /**
      * To check that the value is one of the options
      *

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

@@ -19,8 +19,6 @@ namespace core_adminpresets\local\setting;
 /**
  * Reimplementation to allow human friendly view of the selected regexps.
  *
- * @deprecated Moodle 4.3 MDL-78468 - No longer used since the devicedetectregex was removed.
- * @todo Final deprecation on Moodle 4.7 MDL-79052
  * @package          core_adminpresets
  * @copyright        2021 Pimenko <support@pimenko.com><pimenko.com>
  * @author           Jordan Kesraoui | Sylvain Revenu | Pimenko based on David Monllaó <david.monllao@urv.cat> code
@@ -28,16 +26,7 @@ namespace core_adminpresets\local\setting;
  */
 class adminpresets_admin_setting_devicedetectregex extends adminpresets_admin_setting_configtext {
 
-    /**
-     * @deprecated Moodle 4.3 MDL-78468 - No longer used since the devicedetectregex was removed.
-     * @todo Final deprecation on Moodle 4.7 MDL-79052
-     */
     public function set_visiblevalue() {
-        debugging(
-            __FUNCTION__ . '() is deprecated.' .
-                'All functions associated with devicedetectregex theme setting are being removed.',
-            DEBUG_DEVELOPER
-        );
         $values = json_decode($this->get_value());
 
         if (!$values) {

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

@@ -28,9 +28,6 @@ namespace core_adminpresets\local\setting;
  */
 class adminpresets_admin_setting_special_backupdays extends adminpresets_setting {
 
-    /** @var \admin_setting_special_backupdays $settingdata */
-    protected $settingdata;
-
     protected function set_value($value) {
         $this->value = clean_param($value, PARAM_SEQUENCE);
         $this->set_visiblevalue();

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

@@ -26,9 +26,6 @@ namespace core_adminpresets\local\setting;
  */
 class adminpresets_admin_setting_users_with_capability extends adminpresets_admin_setting_configmultiselect {
 
-    /** @var \admin_setting_configmultiselect $settingdata */
-    protected $settingdata;
-
     protected function set_behaviors() {
         $this->behaviors['loadchoices'] = &$this->settingdata;
     }

admin/presets/classes/manager.php

@@ -761,8 +761,8 @@ class manager {
     public function delete_preset(int $presetid): void {
         global $DB;
 
-        // Check the preset exists (cannot delete the pre-installed core "Starter" and "Full" presets).
-        $preset = $DB->get_record('adminpresets', ['id' => $presetid, 'iscore' => self::NONCORE_PRESET]);
+        // Check the preset exists.
+        $preset = $DB->get_record('adminpresets', ['id' => $presetid]);
         if (!$preset) {
             throw new moodle_exception('errordeleting', 'core_adminpresets');
         }

admin/presets/tests/generator_test.php

@@ -25,7 +25,7 @@ namespace core_adminpresets;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass core_adminpresets_generator
  */
-final class generator_test extends \advanced_testcase {
+class generator_test extends \advanced_testcase {
 
     /**
      * Test the behaviour of create_preset() method.
@@ -180,7 +180,7 @@ final class generator_test extends \advanced_testcase {
      *
      * @return array
      */
-    public static function create_preset_provider(): array {
+    public function create_preset_provider(): array {
         return [
             'Default values' => [
             ],

admin/presets/tests/helper_test.php

@@ -25,7 +25,7 @@ namespace core_adminpresets;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass helper
  */
-final class helper_test extends \advanced_testcase {
+class helper_test extends \advanced_testcase {
 
     /**
      * Test the behaviour of create_preset() method.
@@ -84,7 +84,7 @@ final class helper_test extends \advanced_testcase {
      *
      * @return array
      */
-    public static function create_preset_provider(): array {
+    public function create_preset_provider(): array {
         return [
             'Default values' => [
             ],
@@ -177,7 +177,7 @@ final class helper_test extends \advanced_testcase {
      *
      * @return array
      */
-    public static function add_item_provider(): array {
+    public function add_item_provider(): array {
         return [
             'Setting without plugin' => [
                 'name' => 'settingname',
@@ -239,7 +239,7 @@ final class helper_test extends \advanced_testcase {
      *
      * @return array
      */
-    public static function add_plugin_provider(): array {
+    public function add_plugin_provider(): array {
         return [
             'Plugin: enabled (using int)' => [
                 'type' => 'plugintype',
@@ -321,7 +321,7 @@ final class helper_test extends \advanced_testcase {
      *
      * @return array
      */
-    public static function change_default_preset_provider(): array {
+    public function change_default_preset_provider(): array {
         return [
             'Starter preset' => [
                 'preset' => 'starter',

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

@@ -25,7 +25,7 @@ namespace core_adminpresets\local\setting;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \core_adminpresets\local\setting\adminpresets_admin_setting_bloglevel
  */
-final class adminpresets_admin_setting_bloglevel_test extends \advanced_testcase {
+class adminpresets_admin_setting_bloglevel_test extends \advanced_testcase {
 
     /**
      * Test the behaviour of save_value() method.
@@ -72,7 +72,7 @@ final class adminpresets_admin_setting_bloglevel_test extends \advanced_testcase
      *
      * @return array
      */
-    public static function save_value_provider(): array {
+    public function save_value_provider(): array {
         return [
             'Save the bloglevel and set blog_menu block visibility to true' => [
                 'setttingvalue' => BLOG_USER_LEVEL,

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

@@ -25,7 +25,7 @@ namespace core_adminpresets\local\setting;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \core_adminpresets\local\setting\adminpresets_admin_setting_sitesettext
  */
-final class adminpresets_admin_setting_sitesettext_test extends \advanced_testcase {
+class adminpresets_admin_setting_sitesettext_test extends \advanced_testcase {
 
     /**
      * Test the behaviour of save_value() method.
@@ -66,7 +66,7 @@ final class adminpresets_admin_setting_sitesettext_test extends \advanced_testca
      *
      * @return array
      */
-    public static function save_value_provider(): array {
+    public function save_value_provider(): array {
         return [
             'Fullname: different value' => [
                 'settingname' => 'fullname',

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

@@ -25,7 +25,7 @@ namespace core_adminpresets\local\setting;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \core_adminpresets\local\setting\adminpresets_setting
  */
-final class adminpresets_setting_test extends \advanced_testcase {
+class adminpresets_setting_test extends \advanced_testcase {
 
     /**
      * Test the behaviour of save_value() method.
@@ -77,7 +77,7 @@ final class adminpresets_setting_test extends \advanced_testcase {
      *
      * @return array
      */
-    public static function save_value_provider(): array {
+    public function save_value_provider(): array {
         return [
             'Core setting with the same value is not saved' => [
                 'category' => 'optionalsubsystems',
@@ -167,7 +167,7 @@ final class adminpresets_setting_test extends \advanced_testcase {
      *
      * @return array
      */
-    public static function save_attributes_values_provider(): array {
+    public function save_attributes_values_provider(): array {
         return [
             'Plugin setting with the same value is not saved' => [
                 'category' => 'modsettinglesson',

admin/presets/tests/manager_test.php

@@ -16,7 +16,6 @@
 
 namespace core_adminpresets;
 
-use moodle_exception;
 use stdClass;
 
 /**
@@ -28,15 +27,7 @@ use stdClass;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \core_adminpresets\manager
  */
-final class manager_test extends \advanced_testcase {
-    /**
-     * Include required libraries.
-     */
-    public static function setUpBeforeClass(): void {
-        global $CFG;
-        require_once($CFG->libdir.'/adminlib.php');
-    }
-
+class manager_test extends \advanced_testcase {
     /**
      * Test the behaviour of protected get_site_settings method.
      *
@@ -367,7 +358,7 @@ final class manager_test extends \advanced_testcase {
      *
      * @return array
      */
-    public static function export_preset_provider(): array {
+    public function export_preset_provider(): array {
         return [
             'Export settings and plugins, excluding sensible' => [
                 'includesensible' => false,
@@ -530,7 +521,7 @@ final class manager_test extends \advanced_testcase {
      *
      * @return array
      */
-    public static function import_preset_provider(): array {
+    public function import_preset_provider(): array {
         return [
             'Import settings from an empty file' => [
                 'filecontents' => '',
@@ -608,28 +599,10 @@ final class manager_test extends \advanced_testcase {
 
         $manager = new manager();
 
-        $this->expectException(moodle_exception::class);
-        $this->expectExceptionMessage('Error deleting from database');
+        $this->expectException(\moodle_exception::class);
         $manager->delete_preset($unexistingid);
     }
 
-    /**
-     * Test trying to delete the core/pre-defined presets
-     *
-     * @covers ::delete_preset
-     */
-    public function test_delete_preset_core(): void {
-        global $DB;
-
-        $this->resetAfterTest();
-
-        $starterpreset = $DB->get_record('adminpresets', ['iscore' => manager::STARTER_PRESET]);
-
-        $this->expectException(moodle_exception::class);
-        $this->expectExceptionMessage('Error deleting from database');
-        (new manager())->delete_preset($starterpreset->id);
-    }
-
     /**
      * Test the behaviour of delete_preset() method.
      *

admin/presets/tests/privacy/privacy_provider_test.php

@@ -30,7 +30,7 @@ use core_privacy\tests\provider_testcase;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @coversDefaultClass \core_adminpresets\privacy\provider
  */
-final class privacy_provider_test extends provider_testcase {
+class privacy_provider_test extends provider_testcase {
 
     /**
      * Test for provider::get_metadata().

admin/qbankplugins.php

@@ -27,8 +27,7 @@
 require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 
-use core\event\qbank_plugin_enabled;
-use core\event\qbank_plugin_disabled;
+use qbank_columnsortorder\column_manager;
 
 $action = required_param('action', PARAM_ALPHANUMEXT);
 $name   = required_param('name', PARAM_PLUGIN);
@@ -50,11 +49,12 @@ if (!isset($plugins[$name])) {
 }
 
 $plugintypename = $plugins[$name]->type . '_' . $plugins[$name]->name;
+$columnsortordermanager = new column_manager();
 
 switch ($action) {
     case 'disable':
         if ($plugins[$name]->is_enabled()) {
-            qbank_plugin_disabled::create_for_plugin($plugintypename)->trigger();
+            $columnsortordermanager->disable_columns($plugintypename);
             $class = \core_plugin_manager::resolve_plugininfo_class('qbank');
             $class::enable_plugin($name, false);
             set_config('disabled', 1, 'qbank_'. $name);
@@ -62,7 +62,7 @@ switch ($action) {
         break;
     case 'enable':
         if (!$plugins[$name]->is_enabled()) {
-            qbank_plugin_enabled::create_for_plugin($plugintypename)->trigger();
+            $columnsortordermanager->enable_columns($plugintypename);
             $class = \core_plugin_manager::resolve_plugininfo_class('qbank');
             $class::enable_plugin($name, true);
         }

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;
@@ -745,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');
@@ -874,8 +874,8 @@ class core_admin_renderer extends plugin_renderer_base {
     protected function mobile_configuration_warning($mobileconfigured) {
         $output = '';
         if (!$mobileconfigured) {
-            $settingslink = new moodle_url('/admin/search.php', ['query' => 'enablemobilewebservice']);
-            $configurebutton = $this->single_button($settingslink, get_string('enablemobilewebservice', 'admin'), 'get');
+            $settingslink = new moodle_url('/admin/settings.php', ['section' => 'mobilesettings']);
+            $configurebutton = $this->single_button($settingslink, get_string('enablemobilewebservice', 'admin'));
             $output .= $this->warning(get_string('mobilenotconfiguredwarning', 'admin') . '&nbsp;' . $configurebutton);
         }
 
@@ -897,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);
@@ -919,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);
@@ -992,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');
     }
@@ -2051,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') {
@@ -2085,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)

admin/repository.php

@@ -49,11 +49,26 @@ if ($action == 'newon') {
 
 admin_externalpage_setup($pagename);
 
-// The URL used for redirection, and that all edit related URLs will be based off.
-$baseurl = new moodle_url('/admin/repository.php');
+$sesskeyurl = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php?sesskey=' . sesskey();
+$baseurl    = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php';
+
+$configstr  = get_string('manage', 'repository');
 
 $return = true;
 
+if (!empty($action)) {
+    require_sesskey();
+}
+
+/**
+ * Helper function that generates a moodle_url object
+ * relevant to the repository
+ */
+function repository_action_url($repository) {
+    global $baseurl;
+    return new moodle_url($baseurl, array('sesskey'=>sesskey(), 'repos'=>$repository));
+}
+
 if (($action == 'edit') || ($action == 'new')) {
     $pluginname = '';
     if ($action == 'edit') {
@@ -167,12 +182,16 @@ if (($action == 'edit') || ($action == 'new')) {
         }
     }
 } else if ($action == 'show') {
-    require_sesskey();
+    if (!confirm_sesskey()) {
+        throw new \moodle_exception('confirmsesskeybad', '', $baseurl);
+    }
     $class = \core_plugin_manager::resolve_plugininfo_class('repository');
     $class::enable_plugin($repository, 1);
     $return = true;
 } else if ($action == 'hide') {
-    require_sesskey();
+    if (!confirm_sesskey()) {
+        throw new \moodle_exception('confirmsesskeybad', '', $baseurl);
+    }
     $class = \core_plugin_manager::resolve_plugininfo_class('repository');
     $class::enable_plugin($repository, 0);
     $return = true;
@@ -180,7 +199,9 @@ if (($action == 'edit') || ($action == 'new')) {
     $repositorytype = repository::get_type_by_typename($repository);
     if ($sure) {
         $PAGE->set_pagetype('admin-repository-' . $repository);
-        require_sesskey();
+        if (!confirm_sesskey()) {
+            throw new \moodle_exception('confirmsesskeybad', '', $baseurl);
+        }
 
         if ($repositorytype->delete($downloadcontents)) {
             // Include this information into config changes table.
@@ -199,15 +220,20 @@ if (($action == 'edit') || ($action == 'new')) {
         $output = $OUTPUT->box_start('generalbox', 'notice');
         $output .= html_writer::tag('p', $message);
 
-        $removeurl = new moodle_url($baseurl, [
+        $removeurl = new moodle_url($sesskeyurl);
+        $removeurl->params(array(
             'action' =>'delete',
             'repos' => $repository,
             'sure' => 'yes',
-        ]);
+        ));
 
-        $removeanddownloadurl = new moodle_url($removeurl, [
+        $removeanddownloadurl = new moodle_url($sesskeyurl);
+        $removeanddownloadurl->params(array(
+            'action' =>'delete',
+            'repos'=> $repository,
+            'sure' => 'yes',
             'downloadcontents' => 1,
-        ]);
+        ));
 
         $output .= $OUTPUT->single_button($removeurl, get_string('continueuninstall', 'repository'));
         $output .= $OUTPUT->single_button($removeanddownloadurl, get_string('continueuninstallanddownload', 'repository'));
@@ -219,11 +245,9 @@ if (($action == 'edit') || ($action == 'new')) {
         $return = false;
     }
 } else if ($action == 'moveup') {
-    require_sesskey();
     $repositorytype = repository::get_type_by_typename($repository);
     $repositorytype->move_order('up');
 } else if ($action == 'movedown') {
-    require_sesskey();
     $repositorytype = repository::get_type_by_typename($repository);
     $repositorytype->move_order('down');
 } else {
@@ -315,7 +339,8 @@ if (($action == 'edit') || ($action == 'new')) {
                     $userinstancenumbertext = "";
                 }
 
-                $settings = html_writer::link(new moodle_url($baseurl, ['action' => 'edit', 'repos' => $typename]), $settingsstr);
+                $settings .= '<a href="' . $sesskeyurl . '&amp;action=edit&amp;repos=' . $typename . '">' . $settingsstr .'</a>';
+
                 $settings .= $OUTPUT->container_start('mdl-left');
                 $settings .= '<br/>';
                 $settings .= $admininstancenumbertext;
@@ -332,34 +357,22 @@ if (($action == 'edit') || ($action == 'new')) {
                 $currentaction = 'hide';
             }
 
-            // Active toggle.
-            $selectaction = new moodle_url($baseurl, ['sesskey' => sesskey(), 'repos' => $typename]);
-            $select = new single_select($selectaction, 'action', $actionchoicesforexisting, $currentaction, null,
-                'applyto' . basename($typename));
+            $select = new single_select(repository_action_url($typename, 'repos'), 'action', $actionchoicesforexisting, $currentaction, null, 'applyto' . basename($typename));
             $select->set_label(get_string('action'), array('class' => 'accesshide'));
-
             // Display up/down link
             $updown = '';
             $spacer = $OUTPUT->spacer(array('height'=>15, 'width'=>15)); // should be done with CSS instead
 
             if ($updowncount > 1) {
-                $moveupaction = new moodle_url($baseurl, [
-                    'sesskey' => sesskey(),
-                    'action' => 'moveup',
-                    'repos' => $typename,
-                ]);
-                $updown .= html_writer::link($moveupaction, $OUTPUT->pix_icon('t/up', get_string('moveup'))) . '&nbsp;';
+                $updown .= "<a href=\"$sesskeyurl&amp;action=moveup&amp;repos=".$typename."\">";
+                $updown .= $OUTPUT->pix_icon('t/up', get_string('moveup')) . "</a>&nbsp;";
             }
             else {
                 $updown .= $spacer;
             }
             if ($updowncount < $totalrepositorytypes) {
-                $movedownaction = new moodle_url($baseurl, [
-                    'sesskey' => sesskey(),
-                    'action' => 'movedown',
-                    'repos' => $typename,
-                ]);
-                $updown .= html_writer::link($movedownaction, $OUTPUT->pix_icon('t/down', get_string('movedown'))) . '&nbsp;';
+                $updown .= "<a href=\"$sesskeyurl&amp;action=movedown&amp;repos=".$typename."\">";
+                $updown .= $OUTPUT->pix_icon('t/down', get_string('movedown')) . "</a>&nbsp;";
             }
             else {
                 $updown .= $spacer;
@@ -387,9 +400,7 @@ if (($action == 'edit') || ($action == 'new')) {
         foreach ($plugins as $plugin => $dir) {
             // Check that it has not already been listed
             if (!in_array($plugin, $alreadyplugins)) {
-                $selectaction = new moodle_url($baseurl, ['sesskey' => sesskey(), 'repos' => $plugin]);
-                $select = new single_select($selectaction, 'action', $actionchoicesfornew, 'delete', null,
-                    'applyto' . basename($plugin));
+                $select = new single_select(repository_action_url($plugin, 'repos'), 'action', $actionchoicesfornew, 'delete', null, 'applyto' . basename($plugin));
                 $select->set_label(get_string('action'), array('class' => 'accesshide'));
                 $uninstall = '';
                 if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('repository_' . $plugin, 'manage')) {

admin/repositoryinstance.php

@@ -18,6 +18,8 @@ require_once(__DIR__ . '/../config.php');
 require_once($CFG->dirroot . '/repository/lib.php');
 require_once($CFG->libdir . '/adminlib.php');
 
+require_sesskey();
+
 // id of repository
 $edit    = optional_param('edit', 0, PARAM_INT);
 $new     = optional_param('new', '', PARAM_PLUGIN);
@@ -41,8 +43,12 @@ if ($edit){
 
 admin_externalpage_setup($pagename, '', null, new moodle_url('/admin/repositoryinstance.php'));
 
-// The URL used for redirection, and that all edit related URLs will be based off.
-$parenturl = new moodle_url('/admin/repository.php', ['action' => 'edit']);
+$baseurl = new moodle_url("/$CFG->admin/repositoryinstance.php", array('sesskey'=>sesskey()));
+
+$parenturl = new moodle_url("/$CFG->admin/repository.php", array(
+    'sesskey'=>sesskey(),
+    'action'=>'edit',
+));
 
 if ($new) {
     $parenturl->param('repos', $new);
@@ -110,7 +116,6 @@ if (!empty($edit) || !empty($new)) {
         $return = false;
     }
 } else if (!empty($hide)) {
-    require_sesskey();
     $instance = repository::get_type_by_typename($hide);
     $instance->hide();
     core_plugin_manager::reset_caches();
@@ -124,7 +129,6 @@ if (!empty($edit) || !empty($new)) {
         throw new repository_exception('nopermissiontoaccess', 'repository');
     }
     if ($sure) {
-        require_sesskey();
         if ($instance->delete($downloadcontents)) {
             $deletedstr = get_string('instancedeleted', 'repository');
             core_plugin_manager::reset_caches();
@@ -137,17 +141,14 @@ if (!empty($edit) || !empty($new)) {
 
     echo $OUTPUT->header();
     echo $OUTPUT->box_start('generalbox', 'notice');
-
-    $continueurl = new moodle_url($PAGE->url, [
+    $continueurl = new moodle_url($baseurl, array(
         'type' => $type,
         'delete' => $delete,
         'sure' => 'yes',
-    ]);
-
+    ));
     $continueanddownloadurl = new moodle_url($continueurl, array(
         'downloadcontents' => 1
     ));
-
     $message = get_string('confirmdelete', 'repository', $instance->name);
     echo html_writer::tag('p', $message);
 

admin/roles/admins.php

@@ -38,19 +38,6 @@ if (!is_siteadmin()) {
 }
 
 $admisselector = new core_role_admins_existing_selector();
-
-if (array_key_exists('siteadmins', $CFG->config_php_settings)) {
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('manageadmins', 'core_role'), 3);
-    echo $OUTPUT->notification(get_string('siteadministratorsconfigphp', 'core_role'), \core\output\notification::NOTIFY_INFO);
-    echo $OUTPUT->box_start();
-    echo $OUTPUT->paragraph(get_string('existingadmins', 'core_role'));
-    $admisselector->display();
-    echo $OUTPUT->box_end();
-    echo $OUTPUT->footer();
-    die();
-}
-
 $potentialadmisselector = new core_role_admins_potential_selector();
 
 if ($addusersaction) {

admin/roles/classes/allow_role_page.php

@@ -141,6 +141,7 @@ abstract class core_role_allow_role_page {
         $table->cellspacing = 0;
         $table->width = '90%';
         $table->align = array('left');
+        $table->rotateheaders = true;
         $table->head = array(' ');
         $table->colclasses = array('');
 

admin/roles/classes/reportbuilder/local/entities/role.php

@@ -1,171 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-namespace core_role\reportbuilder\local\entities;
-
-use context;
-use context_helper;
-use lang_string;
-use stdClass;
-use core_reportbuilder\local\entities\base;
-use core_reportbuilder\local\filters\select;
-use core_reportbuilder\local\report\{column, filter};
-
-/**
- * Role entity
- *
- * @package     core_role
- * @copyright   2023 Paul Holden <paulh@moodle.com>
- * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class role extends base {
-
-    /**
-     * Database tables that this entity uses and their default aliases
-     *
-     * @return array
-     */
-    protected function get_default_table_aliases(): array {
-        return [
-            'context' => 'rctx',
-            'role' => 'r',
-        ];
-    }
-
-    /**
-     * The default title for this entity
-     *
-     * @return lang_string
-     */
-    protected function get_default_entity_title(): lang_string {
-        return new lang_string('role');
-    }
-
-    /**
-     * Initialise the entity
-     *
-     * @return base
-     */
-    public function initialise(): base {
-        $columns = $this->get_all_columns();
-        foreach ($columns as $column) {
-            $this->add_column($column);
-        }
-
-        // All the filters defined by the entity can also be used as conditions.
-        $filters = $this->get_all_filters();
-        foreach ($filters as $filter) {
-            $this
-                ->add_filter($filter)
-                ->add_condition($filter);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns list of all available columns
-     *
-     * @return column[]
-     */
-    protected function get_all_columns(): array {
-        global $DB;
-
-        $contextalias = $this->get_table_alias('context');
-        $rolealias = $this->get_table_alias('role');
-
-        // Name column.
-        $columns[] = (new column(
-            'name',
-            new lang_string('rolefullname', 'core_role'),
-            $this->get_entity_name()
-        ))
-            ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_TEXT)
-            ->add_fields("{$rolealias}.name, {$rolealias}.shortname, {$rolealias}.id, {$contextalias}.id AS contextid")
-            ->add_fields(context_helper::get_preload_record_columns_sql($contextalias))
-            ->set_is_sortable(true, ["CASE WHEN {$rolealias}.name = '' THEN {$rolealias}.shortname ELSE {$rolealias}.name END"])
-            ->set_callback(static function($name, stdClass $role): string {
-                if ($name === null) {
-                    return '';
-                }
-
-                context_helper::preload_from_record($role);
-                $context = context::instance_by_id($role->contextid);
-
-                return role_get_name($role, $context, ROLENAME_BOTH);
-            });
-
-        // Short name column.
-        $columns[] = (new column(
-            'shortname',
-            new lang_string('roleshortname', 'core_role'),
-            $this->get_entity_name()
-        ))
-            ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_TEXT)
-            ->add_fields("{$rolealias}.shortname")
-            ->set_is_sortable(true);
-
-        // Description column.
-        $descriptionfieldsql = "{$rolealias}.description";
-        if ($DB->get_dbfamily() === 'oracle') {
-            $descriptionfieldsql = $DB->sql_order_by_text($descriptionfieldsql, 1024);
-        }
-        $columns[] = (new column(
-            'description',
-            new lang_string('description'),
-            $this->get_entity_name()
-        ))
-            ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_LONGTEXT)
-            ->add_field($descriptionfieldsql, 'description')
-            ->add_field("{$rolealias}.shortname")
-            ->set_callback(static function($description, stdClass $role): string {
-                if ($description === null) {
-                    return '';
-                }
-
-                return role_get_description($role);
-            });
-
-        return $columns;
-    }
-
-    /**
-     * Return list of all available filters
-     *
-     * @return filter[]
-     */
-    protected function get_all_filters(): array {
-        $rolealias = $this->get_table_alias('role');
-
-        // Name filter.
-        $filters[] = (new filter(
-            select::class,
-            'name',
-            new lang_string('rolefullname', 'core_role'),
-            $this->get_entity_name(),
-            "{$rolealias}.id"
-        ))
-            ->add_joins($this->get_joins())
-            ->set_options_callback(static function(): array {
-                return role_get_names(null, ROLENAME_ORIGINAL, true);
-            });
-
-        return $filters;
-    }
-}

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

@@ -26,8 +26,8 @@ use core_role_preset;
  * @copyright 2013 Petr Skoda {@link http://skodak.org}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class preset_test extends \advanced_testcase {
-    public function test_xml(): void {
+class preset_test extends \advanced_testcase {
+    public function test_xml() {
         global $DB;
 
         $roles = $DB->get_records('role');

admin/roles/tests/privacy/provider_test.php

@@ -40,7 +40,7 @@ use core_privacy\local\request\approved_userlist;
  * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class provider_test extends provider_testcase {
+class provider_test extends provider_testcase {
     /**
      * Test to check export_user_preferences.
      * returns user preferences data.

admin/searchreindex.php

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

admin/settings.php

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

@@ -46,6 +46,8 @@ reports,core_reportbuilder|/reportbuilder/index.php',
         '50',
         '10'
     ));
+    $temp->add(new admin_setting_configcheckbox('enabledevicedetection', new lang_string('enabledevicedetection', 'admin'), new lang_string('configenabledevicedetection', 'admin'), 1));
+    $temp->add(new admin_setting_devicedetectregex('devicedetectregex', new lang_string('devicedetectregex', 'admin'), new lang_string('devicedetectregex_desc', 'admin'), ''));
     $ADMIN->add('themes', $temp);
     $ADMIN->add('themes', new admin_externalpage('themeselector', new lang_string('themeselector','admin'), $CFG->wwwroot . '/theme/index.php'));
 
@@ -200,14 +202,14 @@ reports,core_reportbuilder|/reportbuilder/index.php',
     ));
 
     $choices = [HOMEPAGE_SITE => new lang_string('home')];
-    if (!isset($CFG->enabledashboard) || $CFG->enabledashboard) {
+    if (!empty($CFG->enabledashboard)) {
         $choices[HOMEPAGE_MY] = new lang_string('mymoodle', 'admin');
     }
     $choices[HOMEPAGE_MYCOURSES] = new lang_string('mycourses', 'admin');
     $choices[HOMEPAGE_USER] = new lang_string('userpreference', 'admin');
     $temp->add(new admin_setting_configselect('defaulthomepage', new lang_string('defaulthomepage', 'admin'),
             new lang_string('configdefaulthomepage', 'admin'), get_default_home_page(), $choices));
-    if (!isset($CFG->enabledashboard) || $CFG->enabledashboard) {
+    if (!empty($CFG->enabledashboard)) {
         $temp->add(new admin_setting_configcheckbox(
             'allowguestmymoodle',
             new lang_string('allowguestmymoodle', 'admin'),
@@ -242,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);

admin/settings/courses.php

@@ -43,6 +43,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
             array('moodle/category:manage', 'moodle/course:create')
         )
     );
+    $ADMIN->add('courses',
+        new admin_externalpage('course_customfield', new lang_string('course_customfield', 'admin'),
+            $CFG->wwwroot . '/course/customfield.php',
+            array('moodle/course:configurecustomfields')
+        )
+    );
     $ADMIN->add('courses',
         new admin_externalpage('addcategory', new lang_string('addcategory', 'admin'),
             new moodle_url('/course/editcategory.php', array('parent' => 0)),
@@ -62,49 +68,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
         )
     );
 
-    // Download course content.
-    $downloadcoursedefaulturl = new moodle_url('/admin/settings.php', ['section' => 'coursesettings']);
-    $temp = new admin_settingpage('downloadcoursecontent', new lang_string('downloadcoursecontent', 'course'));
-    $temp->add(new admin_setting_configcheckbox('downloadcoursecontentallowed',
-            new lang_string('downloadcoursecontentallowed', 'admin'),
-            new lang_string('downloadcoursecontentallowed_desc', 'admin', $downloadcoursedefaulturl->out()), 0));
-
-    // 50MB default maximum size per file when downloading course content.
-    $defaultmaxdownloadsize = 50 * filesize::UNIT_MB;
-    $temp->add(new filesize('maxsizeperdownloadcoursefile', new lang_string('maxsizeperdownloadcoursefile', 'admin'),
-            new lang_string('maxsizeperdownloadcoursefile_desc', 'admin'), $defaultmaxdownloadsize, filesize::UNIT_MB));
-    $temp->hide_if('maxsizeperdownloadcoursefile', 'downloadcoursecontentallowed');
-
-    $ADMIN->add('courses', $temp);
-
-    // "courserequests" settingpage.
-    $temp = new admin_settingpage('courserequest', new lang_string('courserequest'));
-    $temp->add(new admin_setting_configcheckbox('enablecourserequests',
-        new lang_string('enablecourserequests', 'admin'),
-        new lang_string('configenablecourserequests', 'admin'), 1));
-    $temp->add(new admin_settings_coursecat_select('defaultrequestcategory',
-        new lang_string('defaultrequestcategory', 'admin'),
-        new lang_string('configdefaultrequestcategory', 'admin'), 1));
-    $temp->add(new admin_setting_configcheckbox('lockrequestcategory',
-        new lang_string('lockrequestcategory', 'admin'),
-        new lang_string('configlockrequestcategory', 'admin'), 0));
-    $temp->add(new admin_setting_users_with_capability(
-        'courserequestnotify',
-        new lang_string('courserequestnotify', 'admin'),
-        new lang_string('configcourserequestnotify2', 'admin'),
-        [],
-        'moodle/site:approvecourse'
-    ));
-    $ADMIN->add('courses', $temp);
-
-    // Pending course requests.
-    if (!empty($CFG->enablecourserequests)) {
-        $ADMIN->add('courses', new admin_externalpage('coursespending', new lang_string('pendingrequests'),
-                $CFG->wwwroot . '/course/pending.php', array('moodle/site:approvecourse')));
-    }
-
-    // Add a category for the course Default settings.
-    $ADMIN->add('courses', new admin_category('coursedefaultsettings', new lang_string('defaultsettingscategory', 'course')));
     // Course Default Settings Page.
     // NOTE: these settings must be applied after all other settings because they depend on them.
 
@@ -251,73 +214,42 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $temp->add(new admin_setting_configselect('moodlecourse/groupmode', new lang_string('groupmode'), '', key($choices),$choices));
     $temp->add(new admin_setting_configselect('moodlecourse/groupmodeforce', new lang_string('force'), new lang_string('coursehelpforce'), 0,array(0 => new lang_string('no'), 1 => new lang_string('yes'))));
 
-    // Communication.
-    $temp->add(new admin_setting_heading('communication',
-        new lang_string('communication', 'core_communication'), ''));
+    $ADMIN->add('courses', $temp);
 
-    list($communicationproviders, $defaulprovider) = \core_communication\api::
-        get_enabled_providers_and_default();
+    // Download course content.
+    $downloadcoursedefaulturl = new moodle_url('/admin/settings.php', ['section' => 'coursesettings']);
+    $temp = new admin_settingpage('downloadcoursecontent', new lang_string('downloadcoursecontent', 'course'));
+    $temp->add(new admin_setting_configcheckbox('downloadcoursecontentallowed',
+            new lang_string('downloadcoursecontentallowed', 'admin'),
+            new lang_string('downloadcoursecontentallowed_desc', 'admin', $downloadcoursedefaulturl->out()), 0));
 
-    $temp->add(new admin_setting_configselect('moodlecourse/coursecommunicationprovider',
-        new lang_string('selectcommunicationprovider', 'communication'),
-        new lang_string('coursecommunication_desc', 'course'),
-        $defaulprovider, $communicationproviders));
+    // 50MB default maximum size per file when downloading course content.
+    $defaultmaxdownloadsize = 50 * filesize::UNIT_MB;
+    $temp->add(new filesize('maxsizeperdownloadcoursefile', new lang_string('maxsizeperdownloadcoursefile', 'admin'),
+            new lang_string('maxsizeperdownloadcoursefile_desc', 'admin'), $defaultmaxdownloadsize, filesize::UNIT_MB));
+    $temp->hide_if('maxsizeperdownloadcoursefile', 'downloadcoursecontentallowed');
 
-    $ADMIN->add('coursedefaultsettings', $temp);
-    if (!empty($CFG->enablecompletion)) {
-        $ADMIN->add('coursedefaultsettings', new admin_externalpage(
-                'sitedefaultcompletion',
-                new lang_string('defaultcompletion', 'completion'),
-                new moodle_url('/course/defaultcompletion.php', ['id' => $SITE->id]),
-                ['moodle/course:manageactivities'])
-        );
+    $ADMIN->add('courses', $temp);
+
+    // "courserequests" settingpage.
+    $temp = new admin_settingpage('courserequest', new lang_string('courserequest'));
+    $temp->add(new admin_setting_configcheckbox('enablecourserequests',
+        new lang_string('enablecourserequests', 'admin'),
+        new lang_string('configenablecourserequests', 'admin'), 1));
+    $temp->add(new admin_settings_coursecat_select('defaultrequestcategory',
+        new lang_string('defaultrequestcategory', 'admin'),
+        new lang_string('configdefaultrequestcategory', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('lockrequestcategory',
+        new lang_string('lockrequestcategory', 'admin'),
+        new lang_string('configlockrequestcategory', 'admin'), 0));
+    $temp->add(new admin_setting_users_with_capability('courserequestnotify', new lang_string('courserequestnotify', 'admin'), new lang_string('configcourserequestnotify2', 'admin'), array(), 'moodle/site:approvecourse'));
+    $ADMIN->add('courses', $temp);
+
+    // Pending course requests.
+    if (!empty($CFG->enablecourserequests)) {
+        $ADMIN->add('courses', new admin_externalpage('coursespending', new lang_string('pendingrequests'),
+                $CFG->wwwroot . '/course/pending.php', array('moodle/site:approvecourse')));
     }
-    $ADMIN->add('coursedefaultsettings', new admin_externalpage(
-        'course_customfield',
-        new lang_string('course_customfield', 'admin'),
-        $CFG->wwwroot . '/course/customfield.php',
-        ['moodle/course:configurecustomfields'])
-    );
-
-    $temp = new admin_settingpage('activitychoosersettings', new lang_string('activitychoosersettings', 'course'));
-    // Tab mode for the activity chooser.
-    $temp->add(
-        new admin_setting_configselect(
-            'activitychoosertabmode',
-            new lang_string('activitychoosertabmode', 'course'),
-            new lang_string('activitychoosertabmode_desc', 'course'),
-            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'),
-            ]
-        )
-    );
-
-    // Add a category for the Groups.
-    $ADMIN->add('courses', new admin_category('groups', new lang_string('groups')));
-    $ADMIN->add(
-        'groups',
-        new admin_externalpage(
-            'group_customfield',
-            new lang_string('group_customfield', 'admin'),
-            $CFG->wwwroot . '/group/customfield.php',
-            ['moodle/group:configurecustomfields']
-        )
-    );
-    $ADMIN->add(
-        'groups',
-        new admin_externalpage(
-            'grouping_customfield',
-            new lang_string('grouping_customfield', 'admin'),
-            $CFG->wwwroot . '/group/grouping_customfield.php',
-            ['moodle/group:configurecustomfields']
-        )
-    );
 
     // Add a category for the Activity Chooser.
     $ADMIN->add('courses', new admin_category('activitychooser', new lang_string('activitychoosercategory', 'course')));

admin/settings/development.php

@@ -38,11 +38,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
         new lang_string('enablesharingtomoodlenet', 'core_admin'),
         new lang_string('enablesharingtomoodlenet_desc', 'core_admin'), 0));
 
-    // New communication subsystem setting.
-    $temp->add(new admin_setting_configcheckbox('enablecommunicationsubsystem',
-        new lang_string('enablecommunicationsubsystem', 'core_admin'),
-        new lang_string('enablecommunicationsubsystem_desc', 'core_admin'), 0));
-
     $ADMIN->add('experimental', $temp);
 
     // "debugging" settingpage
@@ -121,7 +116,4 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
             "$CFG->wwwroot/$CFG->admin/purgecaches.php"));
 
     $ADMIN->add('development', new admin_externalpage('thirdpartylibs', new lang_string('thirdpartylibs','admin'), "$CFG->wwwroot/$CFG->admin/thirdpartylibs.php"));
-
-    $ADMIN->add('development', new admin_externalpage('hooksoverview',
-        new lang_string('hooksoverview', 'admin'), "$CFG->wwwroot/$CFG->admin/hooks.php"));
 } // end of speedup

admin/settings/h5p.php

@@ -41,18 +41,4 @@ if (!empty($defaulth5plib)) {
 
     $settings->add(new admin_settings_h5plib_handler_select('h5plibraryhandler', new lang_string('h5plibraryhandler', 'core_h5p'),
         new lang_string('h5plibraryhandler_help', 'core_h5p'), $defaulth5plib));
-
-    $setting = new admin_setting_configtextarea(
-        'core_h5p/h5pcustomcss',
-        new lang_string('h5pcustomcss', 'core_h5p'),
-        new lang_string('h5pcustomcss_help', 'core_h5p'),
-        '',
-        PARAM_NOTAGS
-    );
-    $setting->set_updatedcallback(function () {
-        // Enables use of file_storage constants.
-        \core_h5p\local\library\autoloader::register();
-        \core_h5p\file_storage::generate_custom_styles();
-    });
-    $settings->add($setting);
 }

admin/settings/plugins.php

@@ -116,17 +116,6 @@ if ($hassiteconfig) {
     $temp->add($setting);
     $temp->add(new admin_setting_configcheckbox('verifychangedemail', new lang_string('verifychangedemail', 'admin'), new lang_string('configverifychangedemail', 'admin'), 1));
 
-    // ReCaptcha.
-    $temp->add(new admin_setting_configselect('enableloginrecaptcha',
-        new lang_string('auth_loginrecaptcha', 'auth'),
-        new lang_string('auth_loginrecaptcha_desc', 'auth'),
-        0,
-        [
-            new lang_string('no'),
-            new lang_string('yes'),
-        ],
-    ));
-
     $setting = new admin_setting_configtext('recaptchapublickey', new lang_string('recaptchapublickey', 'admin'), new lang_string('configrecaptchapublickey', 'admin'), '', PARAM_NOTAGS);
     $setting->set_force_ltr(true);
     $temp->add($setting);
@@ -792,20 +781,6 @@ if ($hassiteconfig) {
     }
 }
 
-// Communication plugins.
-if ($hassiteconfig && core_communication\api::is_available()) {
-    $ADMIN->add('modules', new admin_category('communicationsettings', new lang_string('communication', 'core_communication')));
-    $temp = new admin_settingpage('managecommunicationproviders',
-        new lang_string('managecommunicationproviders', 'core_communication'));
-    $temp->add(new \core_communication\admin\manage_communication_providers_page());
-    $ADMIN->add('communicationsettings', $temp);
-    $plugins = core_plugin_manager::instance()->get_plugins_of_type('communication');
-    foreach ($plugins as $plugin) {
-        /** @var \core\plugininfo\communication $plugin */
-        $plugin->load_settings($ADMIN, 'communicationsettings', $hassiteconfig);
-    }
-}
-
 // Content bank content types.
 if ($hassiteconfig) {
     $ADMIN->add('modules', new admin_category('contentbanksettings', new lang_string('contentbank')));

admin/settings/security.php

@@ -145,16 +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, apikey@@tiny_premium, ';
-    $sensiblesettingsdefault .= 'matrixaccesstoken@@communication_matrix';
+    $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'),
@@ -166,6 +164,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp = new admin_settingpage('httpsecurity', new lang_string('httpsecurity', 'admin'));
 
     $temp->add(new admin_setting_configcheckbox('cookiesecure', new lang_string('cookiesecure', 'admin'), new lang_string('configcookiesecure', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('cookiehttponly', new lang_string('cookiehttponly', 'admin'), new lang_string('configcookiehttponly', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('allowframembedding', new lang_string('allowframembedding', 'admin'), new lang_string('allowframembedding_help', 'admin'), 0));
 
     // Settings elements used by the \core\files\curl_security_helper class.

admin/settings/server.php

@@ -453,12 +453,6 @@ if ($hassiteconfig) {
     // Outgoing mail configuration.
     $temp = new admin_settingpage('outgoingmailconfig', new lang_string('outgoingmailconfig', 'admin'));
 
-    if (!empty($CFG->noemailever)) {
-        $noemaileverwarning = new \core\output\notification(get_string('noemaileverwarning', 'admin'),
-        \core\output\notification::NOTIFY_ERROR);
-        $temp->add(new admin_setting_heading('outgoingmaildisabled', '', $OUTPUT->render($noemaileverwarning)));
-    }
-
     $temp->add(new admin_setting_heading('smtpheading', new lang_string('smtp', 'admin'),
         new lang_string('smtpdetail', 'admin')));
 
@@ -522,12 +516,8 @@ if ($hassiteconfig) {
     $temp->add(new admin_setting_heading('noreplydomainheading', new lang_string('noreplydomain', 'admin'),
         new lang_string('noreplydomaindetail', 'admin')));
 
-    $default = clean_param('noreply@' . get_host_from_url($CFG->wwwroot), PARAM_EMAIL);
-    if (!$default) {
-        $default = null;
-    }
     $temp->add(new admin_setting_configtext('noreplyaddress', new lang_string('noreplyaddress', 'admin'),
-        new lang_string('confignoreplyaddress', 'admin'), $default, PARAM_EMAIL));
+        new lang_string('confignoreplyaddress', 'admin'), 'noreply@' . get_host_from_url($CFG->wwwroot), PARAM_EMAIL));
 
     $temp->add(new admin_setting_configtextarea('allowedemaildomains',
         new lang_string('allowedemaildomains', 'admin'),

admin/settings/subsystems.php

@@ -31,6 +31,8 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
         1 => get_string('completionactivitydefault', 'completion'),
         0 => get_string('completion_none', 'completion')
     );
+    $optionalsubsystems->add(new admin_setting_configselect('completiondefault', new lang_string('completiondefault', 'completion'),
+            new lang_string('configcompletiondefault', 'completion'), 1, $options));
 
     $optionalsubsystems->add($checkbox = new admin_setting_configcheckbox('enableavailability',
             new lang_string('enableavailability', 'availability'),

admin/templates/setting_configcheckbox.mustache

@@ -38,6 +38,6 @@
     }
 }}
 <div class="form-checkbox defaultsnext">
-    {{^readonly}}<input type="hidden" name="{{name}}" value="{{no}}">{{/readonly}}
+    <input type="hidden" name="{{name}}" value="{{no}}">
     <input {{#readonly}}disabled{{/readonly}} type="checkbox" name="{{name}}" value="{{value}}" id="{{id}}" {{#checked}}checked{{/checked}}>
 </div>

admin/templates/setting_configmulticheckbox.mustache

@@ -23,24 +23,21 @@
     * 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">
-    {{^readonly}}<input type="hidden" name="{{name}}[xxxxx]" value="1">{{/readonly}}
+    <input type="hidden" name="{{name}}[xxxxx]" value="1">
     {{#hasoptions}}
         <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_configmultiselect.mustache

@@ -40,7 +40,7 @@
     Setting configmultiselect.
 }}
 <div class="form-select">
-    {{^readonly}}<input type="hidden" name="{{name}}[xxxxx]" value="1">{{/readonly}}
+    <input type="hidden" name="{{name}}[xxxxx]" value="1">
     <select {{#readonly}}disabled{{/readonly}} id="{{id}}" name="{{name}}[]" size="{{size}}" class="form-control" multiple>
         {{#options}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>

admin/templates/setting_configmultiselect_optgroup.mustache

@@ -59,7 +59,7 @@
     Setting configmultiselect with optgroup support.
 }}
 <div class="form-select">
-    {{^readonly}}<input type="hidden" name="{{name}}[xxxxx]" value="1">{{/readonly}}
+    <input type="hidden" name="{{name}}[xxxxx]" value="1">
     <select {{#readonly}}disabled{{/readonly}} id="{{id}}" name="{{name}}[]" size="{{size}}" class="form-control" multiple>
     {{#options}}
         <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>

admin/templates/setting_devicedetectregex.mustache

@@ -15,8 +15,6 @@
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
 {{!
-    @deprecated since Moodle 4.3
-    @todo Final deprecation on Moodle 4.7 MDL-79052
     @template core_admin/setting_devicedetectregex
 
     Admin devicedetectregex setting template.

admin/templates/webservice_token_new.mustache

@@ -1,47 +0,0 @@
-{{!
-    This file is part of Moodle - http://moodle.org/
-
-    Moodle is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Moodle is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
-    @template core_admin/webservice_token_new
-
-    This is the template for displaying the newly created webservice token.
-
-    Context variable required for this template:
-    * token - Token value
-
-    Example context (json):
-    {
-        "token": "ef9ee4d0c6eed5eab8453a63b93b5b8b"
-    }
-}}
-
-<div class="d-inline-block">
-    <div class="alert alert-warning">
-        <div class="lead">{{#str}}tokennewmessage, webservice{{/str}}</div>
-    </div>
-    <div class="alert alert-primary">
-        <div class="lead">{{tokenname}}</div>
-        <div class="d-flex justify-content-start align-middle">
-            <div class="lead text-break pt-1" id="copytoclipboardtoken">{{token}}</div>
-            <button class="btn btn-primary ml-2" data-action="copytoclipboard" data-clipboard-target="#copytoclipboardtoken" data-clipboard-success-message="{{#str}}tokencopied, webservice{{/str}}">
-            {{#pix}}t/copy, core {{/pix}}{{#str}}copytoclipboard{{/str}}</button>
-        </div>
-    </div>
-</div>
-
-{{#js}}
-    require(['core/copy_to_clipboard']);
-{{/js}}

admin/testoutgoingmailconf.php

@@ -40,12 +40,6 @@ if ($form->is_cancelled()) {
 echo $OUTPUT->header();
 echo $OUTPUT->heading($headingtitle);
 
-// Displaying noemailever warning.
-if (!empty($CFG->noemailever)) {
-    $msg = get_string('noemaileverwarning', 'admin');
-    echo $OUTPUT->notification($msg, \core\output\notification::NOTIFY_ERROR);
-}
-
 $data = $form->get_data();
 if ($data) {
     $emailuser = new stdClass();

admin/tests/behat/assign.feature

@@ -56,7 +56,7 @@ Feature: Staff can assign user roles
   Scenario: Enrol at activity level using custom field search
     When I am on the "page1" "Activity" page logged in as "admin"
     And I navigate to "Permissions" in current page administration
-    And I set the field "Participants tertiary navigation" to "Locally assigned roles"
+    And I select "Locally assigned roles" from the "jump" singleselect
     And I follow "Teacher"
     And I set the field "addselect_searchtext" to "Kermit"
     # The Behat 'I should see' step doesn't work for optgroup labels.
@@ -72,7 +72,7 @@ Feature: Staff can assign user roles
       | user1 | editingteacher | Activity module | page1     |
     When I am on the "page1" "Activity" page logged in as "admin"
     And I navigate to "Permissions" in current page administration
-    And I set the field "Participants tertiary navigation" to "Locally assigned roles"
+    And I select "Locally assigned roles" from the "jump" singleselect
     And I follow "Teacher"
     And I set the field "removeselect_searchtext" to "Kermit"
     # The Behat 'I should see' step doesn't work for optgroup labels.

admin/tests/behat/behat_admin.php

@@ -82,8 +82,6 @@ class behat_admin extends behat_base {
 
             $this->execute('behat_forms::i_set_the_field_with_xpath_to', [$fieldxpath, $value]);
             $this->execute("behat_general::i_click_on", [get_string('savechanges'), 'button']);
-            // Wait for the page to be redirected.
-            $this->execute("behat_general::i_wait_to_be_redirected");
         }
     }
 

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

@@ -28,7 +28,7 @@ Feature: Staff can check user permissions
   @javascript
   Scenario: Search for a user (enrolled on the course) by custom field and select them to see permissions
     When I am on the "C1" "permissions" page logged in as "admin"
-    And I set the field "Participants tertiary navigation" to "Check permissions"
+    And I select "Check permissions" from the "jump" singleselect
     And I set the field "Search" to "Kermit"
     # The Behat 'I should see' step doesn't work for optgroup labels.
     Then "optgroup[label='Matching enrolled users (1)']" "css_element" should exist
@@ -42,7 +42,7 @@ Feature: Staff can check user permissions
   @javascript
   Scenario: Search for a user (not enrolled on the course) by custom field and select them to see permissions
     When I am on the "C1" "permissions" page logged in as "admin"
-    And I set the field "Participants tertiary navigation" to "Check permissions"
+    And I select "Check permissions" from the "jump" singleselect
     And I set the field "Search" to "Kermit"
     # The Behat 'I should see' step doesn't work for optgroup labels.
     Then "optgroup[label*='Potential users matching'][label*=' (1)']" "css_element" should exist

admin/tests/behat/manage_tokens.feature

@@ -19,32 +19,19 @@ Feature: Manage external services tokens
     And I am on site homepage
     And I navigate to "Server > Web services > Manage tokens" in site administration
     And I press "Create token"
-    And I set the field "Name" to "Webservice1"
     And I set the field "User" to "Firstname1 Lastname1"
     And I set the field "Service" to "Moodle mobile web service"
     And I set the field "IP restriction" to "127.0.0.1"
     When I press "Save changes"
-    Then the following should exist in the "generaltable" table:
-      | Name        | First name           | Service                   | IP restriction | Last access |
-      | Webservice1 | Firstname1 Lastname1 | Moodle mobile web service | 127.0.0.1      | Never       |
-
-    # Verify the message and the "Copy to clipboard" button.
-    And I should see "Copy the token now. It won't be shown again once you leave this page."
-    And "Copy to clipboard" "button" should exist
-
-    # New token can only read once.
-    And I reload the page
-    And I should not see "Copy the token now. It won't be shown again once you leave this page."
-    And "Copy to clipboard" "button" should not exist
-
-    # Delete token.
-    And I click on "Delete" "link" in the "Webservice1" "table_row"
+    Then I should see "Moodle mobile web service" in the "Firstname1 Lastname1" "table_row"
+    And I should see "127.0.0.1" in the "Firstname1 Lastname1" "table_row"
+    And I click on "Delete" "link" in the "Firstname1 Lastname1" "table_row"
     And I should see "Do you really want to delete this web service token for Firstname1 Lastname1 on the service Moodle mobile web service?"
     And I press "Delete"
-    And "Webservice1" "table_row" should not exist
+    And "Firstname1 Lastname1" "table_row" should not exist
 
   @javascript @skip_chrome_zerosize
-  Scenario: Tokens can be filtered by name (case-insensitive), by user and by service
+  Scenario: Tokens can be filtered by user and by service
     Given the following "core_webservice > Service" exists:
       | name      | Site information              |
       | shortname | siteinfo                      |
@@ -53,10 +40,10 @@ Feature: Manage external services tokens
       | service   | siteinfo                      |
       | functions | core_webservice_get_site_info |
     And the following "core_webservice > Tokens" exist:
-      | user      | service                       | name           |
-      | user2     | siteinfo                      | WEBservice1    |
-      | user3     | moodle_mobile_app             | webservicE3     |
-      | user4     | siteinfo                      | New service2   |
+      | user      | service                       |
+      | user2     | siteinfo                      |
+      | user3     | moodle_mobile_app             |
+      | user4     | siteinfo                      |
     When I log in as "admin"
     And I navigate to "Server > Web services > Manage tokens" in site administration
 
@@ -66,20 +53,6 @@ Feature: Manage external services tokens
     And I should see "Moodle mobile web service" in the "Firstname3 Lastname3" "table_row"
     And I should see "Site information" in the "Firstname4 Lastname4" "table_row"
 
-    # Filter tokens by by name (case-insensitive).
-    And I click on "Tokens filter" "link"
-    And I set the field "Name" to "webservice"
-    And I press "Show only matching tokens"
-    And I should see "Site information" in the "Firstname2 Lastname2" "table_row"
-    And I should see "Moodle mobile web service" in the "Firstname3 Lastname3" "table_row"
-    And "Firstname4 Lastname4" "table_row" should not exist
-
-    # Reset the filter.
-    And I press "Show all tokens"
-    And I should see "Site information" in the "Firstname2 Lastname2" "table_row"
-    And I should see "Moodle mobile web service" in the "Firstname3 Lastname3" "table_row"
-    And I should see "Site information" in the "Firstname4 Lastname4" "table_row"
-
     # Filter tokens by user (note we can select the user by the identity field here).
     When I click on "Tokens filter" "link"
     And I set the field "User" to "user2@example.com"

admin/tests/behat/plugins_overview.feature

@@ -1,40 +0,0 @@
-@core @core_admin
-Feature: Plugins overview page
-  In order to manage plugin and settings
-  As an admin
-  I can access the plugins overview page
-
-  Background:
-    Given I am logged in as "admin"
-    And I navigate to "Plugins > Plugins overview" in site administration
-
-  Scenario: An administrator can view plugins overview page
-    Then "Plugins overview" "text" should exist
-    And "Check for available updates" "button" should exist
-    And "All plugins" "link" should exist
-    And "Additional plugins" "link" should exist
-
-  Scenario: An administrator can access list of activities when activity modules cog icon is pressed
-    When I click on "Settings" "link" in the "Activity modules" "table_row"
-    Then "Activities" "text" should exist
-    And "Manage activities" "text" should exist in the ".breadcrumb" "css_element"
-    And "Activity modules" "link" should exist in the ".breadcrumb" "css_element"
-
-  Scenario: An administrator can access plugin settings
-    When I click on "Settings" "link" in the "Assignment" "table_row"
-    Then "Assignment settings" "text" should exist
-    And "Assignment settings" "text" should exist in the ".breadcrumb" "css_element"
-    And "Assignment" "link" should exist in the ".breadcrumb" "css_element"
-    And "Activity modules" "link" should exist in the ".breadcrumb" "css_element"
-
-  Scenario: Plugins with dependencies cannot be uninstalled
-    When I navigate to "Plugins > Plugins overview" in site administration
-    Then "Uninstall" "link" should not exist in the "Database" "table_row"
-    And "Required by: filter_data" "text" should exist in the "Database" "table_row"
-
-  Scenario: Cancelling plugin uninstall does not uninstall the selected plugin
-    When I click on "Uninstall" "link" in the "Assignment" "table_row"
-    Then "Uninstalling Assignment" "text" should exist
-    And "You are about to uninstall the plugin Assignment. This will completely delete everything in the database associated with this plugin, including its configuration, log records, user files managed by the plugin etc. There is no way back and Moodle itself does not create any recovery backup. Are you SURE you want to continue?" "text" should exist
-    And I click on "Cancel" "button"
-    And "Uninstall" "link" should exist in the "Assignment" "table_row"

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

@@ -31,7 +31,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php');
  * @copyright   2023 Andrew Lyons <andrew@nicols.co.uk>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class set_block_protection_test extends \externallib_advanced_testcase {
+class set_block_protection_test extends \externallib_advanced_testcase {
     /**
      * Test execute method with no login.
      */
@@ -85,7 +85,7 @@ final class set_block_protection_test extends \externallib_advanced_testcase {
      *
      * @return array
      */
-    public static function execute_provider(): array {
+    public function execute_provider(): array {
         return [
             [
                 'block_login',

admin/tests/external/set_plugin_order_test.php

@@ -33,7 +33,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php');
  * @copyright   2023 Andrew Lyons <andrew@nicols.co.uk>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class set_plugin_order_test extends \externallib_advanced_testcase {
+class set_plugin_order_test extends \externallib_advanced_testcase {
     /**
      * Text execute method for editor plugins, which support ordering.
      *
@@ -72,36 +72,28 @@ final class set_plugin_order_test extends \externallib_advanced_testcase {
      *
      * @return array
      */
-    public static function execute_editor_provider(): array {
-        $pluginmanager = \core_plugin_manager::instance();
-        $allplugins = array_keys($pluginmanager->get_plugins_of_type('editor'));
-
-        // Disabled editors are listed alphabetically at the end.
-        $getorder = function (array $plugins) use ($allplugins) {
-            return array_merge(
-                $plugins,
-                array_diff($allplugins, array_values($plugins)),
-            );
-        };
+    public function execute_editor_provider(): array {
         return [
             [
                 'initialstate' => 'textarea,tiny',
                 'pluginname' => 'editor_textarea',
                 'direction' => 1, // DOWN.
-                'expected' => $getorder([
+                'expected' => [
                     'tiny',
                     'textarea',
-                ]),
+                    'atto',
+                ],
                 'newtexteditors' => 'tiny,textarea',
             ],
             [
                 'initialstate' => 'textarea,tiny',
                 'pluginname' => 'editor_textarea',
                 'direction' => -1, // UP.
-                'expected' => $getorder([
+                'expected' => [
                     'textarea',
                     'tiny',
-                ]),
+                    'atto',
+                ],
                 'newtexteditors' => 'textarea,tiny',
             ],
             [
@@ -109,10 +101,11 @@ final class set_plugin_order_test extends \externallib_advanced_testcase {
                 'pluginname' => 'editor_tiny',
                 'direction' => 1, // DOWN.
                 // Tiny is already at the bottom of the list of enabled plugins.
-                'expected' => $getorder([
+                'expected' => [
                     'textarea',
                     'tiny',
-                ]),
+                    'atto',
+                ],
                 'newtexteditors' => 'textarea,tiny',
             ],
             [
@@ -120,10 +113,11 @@ final class set_plugin_order_test extends \externallib_advanced_testcase {
                 'pluginname' => 'editor_atto',
                 'direction' => 1, // DOWN.
                 // Atto is not enabled. Disabled editors are listed lexically after enabled editors.
-                'expected' => $getorder([
+                'expected' => [
                     'textarea',
                     'tiny',
-                ]),
+                    'atto',
+                ],
                 'newtexteditors' => 'textarea,tiny',
             ],
         ];
@@ -142,7 +136,7 @@ final class set_plugin_order_test extends \externallib_advanced_testcase {
         $this->assertIsArray(set_plugin_order::execute($plugin, 1));
     }
 
-    public static function execute_non_orderable_provider(): array {
+    public function execute_non_orderable_provider(): array {
         return [
             // Activities do not support ordering.
             ['mod_assign'],

admin/tests/external/set_plugin_state_test.php

@@ -31,7 +31,7 @@ require_once($CFG->dirroot . '/webservice/tests/helpers.php');
  * @copyright   2023 Andrew Lyons <andrew@nicols.co.uk>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class set_plugin_state_test extends \externallib_advanced_testcase {
+class set_plugin_state_test extends \externallib_advanced_testcase {
     /**
      * Text execute method.
      *
@@ -66,7 +66,7 @@ final class set_plugin_state_test extends \externallib_advanced_testcase {
      *
      * @return array
      */
-    public static function execute_standard_provider(): array {
+    public function execute_standard_provider(): array {
         $generatetestsfor = function (string $plugin): array {
             return [
                 [

admin/tests/reportbuilder/datasource/task_logs_test.php

@@ -20,9 +20,14 @@ namespace core_admin\reportbuilder\datasource;
 
 use core\task\database_logger;
 use core_reportbuilder_generator;
+use core_reportbuilder_testcase;
 use core_reportbuilder\local\filters\{boolean_select, date, duration, number, select, text};
 use core_reportbuilder\task\send_schedules;
-use core_reportbuilder\tests\core_reportbuilder_testcase;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
 
 /**
  * Unit tests for task logs datasource
@@ -32,7 +37,7 @@ use core_reportbuilder\tests\core_reportbuilder_testcase;
  * @copyright   2022 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-final class task_logs_test extends core_reportbuilder_testcase {
+class task_logs_test extends core_reportbuilder_testcase {
 
     /**
      * Test default datasource
@@ -41,24 +46,17 @@ final class task_logs_test extends core_reportbuilder_testcase {
         $this->resetAfterTest();
 
         $this->generate_task_log_data(true, 3, 2, 1654038000, 1654038060);
-        $this->generate_task_log_data(false, 5, 1, 1654556400, 1654556700);
 
         /** @var core_reportbuilder_generator $generator */
         $generator = $this->getDataGenerator()->get_plugin_generator('core_reportbuilder');
         $report = $generator->create_report(['name' => 'Tasks', 'source' => task_logs::class, 'default' => 1]);
 
         $content = $this->get_custom_report_content($report->get('id'));
-        $this->assertCount(2, $content);
+        $this->assertCount(1, $content);
 
-        // Default columns are name, start time, duration, result. Sorted by start time descending.
+        // Default columns are name, starttime, duration, result.
         [$name, $timestart, $duration, $result] = array_values($content[0]);
         $this->assertStringContainsString(send_schedules::class, $name);
-        $this->assertEquals('7/06/22, 07:00:00', $timestart);
-        $this->assertEquals('5 mins', $duration);
-        $this->assertEquals('Fail', $result);
-
-        [$name, $timestart, $duration, $result] = array_values($content[1]);
-        $this->assertStringContainsString(send_schedules::class, $name);
         $this->assertEquals('1/06/22, 07:00:00', $timestart);
         $this->assertEquals('1 min', $duration);
         $this->assertEquals('Success', $result);
@@ -105,7 +103,7 @@ final class task_logs_test extends core_reportbuilder_testcase {
      *
      * @return array[]
      */
-    public static function datasource_filters_provider(): array {
+    public function datasource_filters_provider(): array {
         return [
             'Filter name' => ['task_log:name', [
                 'task_log:name_values' => [send_schedules::class],

admin/tool/admin_presets/classes/form/import_form.php

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

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

@@ -16,7 +16,6 @@
 
 namespace tool_admin_presets\local\action;
 
-use core_adminpresets\manager;
 use moodle_exception;
 
 /**
@@ -35,8 +34,8 @@ class delete extends base {
     public function show(): void {
         global $DB, $OUTPUT;
 
-        // Check the preset exists (cannot delete the pre-installed core "Starter" and "Full" presets).
-        $presetdata = $DB->get_record('adminpresets', ['id' => $this->id, 'iscore' => manager::NONCORE_PRESET], 'name');
+        // Getting the preset name.
+        $presetdata = $DB->get_record('adminpresets', ['id' => $this->id], 'name');
 
         if ($presetdata) {
             $deletetext = get_string('deletepreset', 'tool_admin_presets', $presetdata->name);
@@ -65,7 +64,7 @@ class delete extends base {
      * Delete the DB preset
      */
     public function execute(): void {
-        require_sesskey();
+        confirm_sesskey();
 
         $this->manager->delete_preset($this->id);
 

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

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

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

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

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

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

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

@@ -73,7 +73,7 @@ class rollback extends base {
     public function execute(): void {
         global $OUTPUT;
 
-        require_sesskey();
+        confirm_sesskey();
 
         list($presetapp, $rollback, $failures) = $this->manager->revert_preset($this->id);
 

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

@@ -5,18 +5,16 @@ Feature: I can download a preset
       | name       |
       | Custom preset |
 
+  @javascript
   Scenario: Custom preset settings can be downloaded
     Given I log in as "admin"
     And I navigate to "Site admin presets" in site administration
     When I open the action menu in "Custom preset" "table_row"
-    Then following "Download" in the "Custom preset" "table_row" should download a file that:
-      | Has mimetype                 | text/xml      |
-      | Contains text in xml element | Custom preset |
+    Then following "Download" "link" in the "Custom preset" "table_row" should download between "0" and "5000" bytes
 
+  @javascript
   Scenario: Core preset settings can be downloaded
     Given I log in as "admin"
     And I navigate to "Site admin presets" in site administration
     When I open the action menu in "Starter" "table_row"
-    Then following "Download" in the "Starter" "table_row" should download a file that:
-      | Has mimetype                 | text/xml |
-      | Contains text in xml element | Starter  |
+    Then following "Download" "link" in the "Starter" "table_row" should download between "0" and "5000" bytes

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

@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers     \tool_admin_presets\event\preset_deleted
  */
-final class preset_deleted_test extends \advanced_testcase {
+class preset_deleted_test extends \advanced_testcase {
 
     /**
      * Test preset_deleted event.

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

@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers     \tool_admin_presets\event\preset_downloaded
  */
-final class preset_downloaded_test extends \advanced_testcase {
+class preset_downloaded_test extends \advanced_testcase {
 
     /**
      * Test preset_downloaded event.

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

@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers     \tool_admin_presets\event\preset_exported
  */
-final class preset_exported_test extends \advanced_testcase {
+class preset_exported_test extends \advanced_testcase {
 
     /**
      * Test preset_exported event.

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

@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers     \tool_admin_presets\event\preset_imported
  */
-final class preset_imported_test extends \advanced_testcase {
+class preset_imported_test extends \advanced_testcase {
 
     /**
      * Test preset_imported event.

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

@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers     \tool_admin_presets\event\preset_loaded
  */
-final class preset_loaded_test extends \advanced_testcase {
+class preset_loaded_test extends \advanced_testcase {
 
     /**
      * Test preset_loaded event.

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

@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers     \tool_admin_presets\event\preset_previewed
  */
-final class preset_previewed_test extends \advanced_testcase {
+class preset_previewed_test extends \advanced_testcase {
 
     /**
      * Test preset_previewed event.

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

@@ -25,7 +25,7 @@ namespace tool_admin_presets\event;
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers     \tool_admin_presets\event\preset_reverted
  */
-final class preset_reverted_test extends \advanced_testcase {
+class preset_reverted_test extends \advanced_testcase {
 
     /**
      * Test preset_reverted event.