Moodle release 4.1.10

weekly release 4.1.9+
MDL-81267 mod_data: Additional tests
2024-04-20 15:57:26 +08:00 · 2024-04-19 17:05:41 +07:00 · 2024-04-17 10:33:42 +02:00 · 2024-04-17 10:33:42 +02:00 · 2024-04-12 11:30:23 +00:00 · 2024-04-12 11:30:23 +00:00
3218 changed files with 122204 additions and 81042 deletions
@@ -1,8 +1,12 @@
 {
  'plugins': [
-    'babel',
+    '@babel',
    'promise',
-    'jsdoc',
+    'jsdoc'
+  ],
+  'extends': [
+    'eslint:recommended',
+    'plugin:promise/recommended'
  ],
  'env': {
    'browser': true,
@@ -16,42 +20,19 @@
    '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)
@@ -63,15 +44,12 @@
    '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',
@@ -83,27 +61,22 @@
    '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' }],

@@ -136,8 +109,6 @@
    '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',
@@ -145,7 +116,6 @@
    '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',
@@ -167,7 +137,6 @@
    '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',
@@ -180,21 +149,19 @@
    'unicode-bom': 'error',
    'wrap-regex': 'off',

-    // === Promises ===
+    // === Promises (override plugin:promise/recommended) ===
    'promise/always-return': 'warn',
    'promise/no-return-wrap': 'warn',
    'promise/param-names': 'warn',
    'promise/catch-or-return': ['warn', {terminationMethod: ['catch', 'fail']}],
    'promise/no-native': 'warn',
-    'promise/no-promise-in-callback': 'warn',
-    'promise/no-callback-in-promise': 'warn',
    'promise/avoid-new': 'warn',

    // === Deprecations ===
    "no-restricted-properties": ['warn', {
        'object': 'M',
        'property': 'str',
-        'message': 'Use AMD module "core/str" or M.util.get_string()'
+        'message': 'Use "core/str" module or M.util.get_string()'
    }],
  },
  overrides: [
@@ -234,7 +201,6 @@
      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',
@@ -246,65 +212,37 @@
        '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',
-        // This is off in the original style int.
-        'babel/quotes': 'off',
-        'babel/semi': 'error',
-        'babel/no-unused-expressions': 'error',
+        '@babel/no-invalid-this': 'off',
+        '@babel/object-curly-spacing': 'warn',
+        '@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
      }
    }
  ]
@@ -7,9 +7,15 @@ on:
      - 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.0
+  php: 8.1

 jobs:
  Grunt:
@@ -17,10 +23,10 @@ jobs:

    steps:
      - name: Checking out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Configuring node & npm
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
        with:
          node-version-file: '.nvmrc'

@@ -59,14 +65,13 @@ jobs:
            extensions:
            db: mysqli
          - os: ubuntu-22.04
-            php: 8.0
+            php: 8.1
            db: pgsql
-            extensions: xmlrpc-beta

    steps:
      - name: Setting up DB mysql
        if: ${{ matrix.db == 'mysqli' }}
-        uses: johanmeiring/mysql-action@tmpfs-patch
+        uses: moodlehq/mysql-action@v1
        with:
          collation server: utf8mb4_bin
          mysql version: 5.7
@@ -74,6 +79,8 @@ jobs:
          mysql user: test
          mysql password: test
          use tmpfs: true
+          tmpfs size: '1024M'
+          extra conf: --skip-log-bin

      - name: Setting up DB pgsql
        if: ${{ matrix.db == 'pgsql' }}
@@ -96,7 +103,7 @@ jobs:
          coverage: none

      - name: Checking out code from ${{ env.GITHUB_REF_SLUG }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

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

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

    // Register the various component library tasks.
@@ -39,7 +39,7 @@ module.exports = grunt => {
                {
                    rule: {
                        _attrs: {
-                            ref: './.phpcs.xml.dist',
+                            ref: './phpcs.xml.dist',
                        },
                    },
                },
@@ -52,7 +52,7 @@ module.exports = grunt => {
            });
        });

-        grunt.file.write('.phpcs.xml', toXML(config, {
+        grunt.file.write('phpcs.xml', toXML(config, {
            header: true,
            indent: '  ',
        }) + "\n");
@@ -21,7 +21,7 @@
 */

 /**
- * Function to generate the destination for the uglify task
+ * Function to generate the destination for the minification task
 * (e.g. build/file.min.js). This function will be passed to
 * the rename property of files array when building dynamically:
 * http://gruntjs.com/configuring-tasks#building-the-files-object-dynamically
@@ -30,10 +30,9 @@
 * @param {String} srcPath the  matched src path
 * @return {String} The rewritten destination path.
 */
-
 const babelRename = function(destPath, srcPath) {
-    destPath = srcPath.replace('src', 'build');
-    destPath = destPath.replace('.js', '.min.js');
+    destPath = srcPath.replace(`amd/src`, `amd/build`);
+    destPath = destPath.replace(/\.js$/, '.min.js');
    return destPath;
 };

@@ -61,7 +60,6 @@ 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');

@@ -105,6 +103,7 @@ 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();
            });
        };
@@ -114,15 +113,17 @@ 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: async(options) => {
                return new Promise(resolve => {
                    queue.push(resolve);
                    startQueue();
+                    return options;
                });
            },

            // When an item in the queue completes, start the next item in the queue.
-            buildEnd: () => {
+            generateBundle: (options, bundle) => {
+                grunt.log.debug(`Finished output phase for ${Object.keys(bundle).join(', ')}`);
                runQueue();
            },
        };
@@ -152,24 +153,10 @@ 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'),
-                            '@babel/plugin-syntax-dynamic-import',
-                            '@babel/plugin-syntax-import-meta',
-                            ['@babel/plugin-proposal-class-properties', {'loose': false}],
-                            '@babel/plugin-proposal-json-strings'
+                            path.resolve('.grunt/babel-plugin-add-module-to-define.js')
                        ],
                        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
                            }]
@@ -20,17 +20,33 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-module.exports = grunt => {
-    // Project configuration.
-    grunt.config.merge({
-        jsdoc: {
-            dist: {
-                options: {
-                    configure: ".grunt/jsdoc/jsdoc.conf.js",
-                },
-            },
-        },
-    });
+module.exports = (grunt) => {
+    const path = require('path');

-    grunt.loadNpmTasks('grunt-jsdoc');
+    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();
+        });
+    });
 };
@@ -32,7 +32,7 @@ module.exports = grunt => {
                }
            },
            options: {
-                implementation: require('node-sass'),
+                implementation: require('sass'),
                includePaths: ["theme/boost/scss/", "theme/classic/scss/"]
            }
        },
@@ -29,6 +29,7 @@ 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.
@@ -45,7 +46,10 @@ module.exports = grunt => {
        return {
            stylelint: {
                scss: {
-                    options: {syntax: 'scss'},
+                    options: {
+                        quietDeprecationWarnings: true,
+                        customSyntax: 'postcss-scss',
+                    },
                    src: files,
                },
            },
@@ -1 +1 @@
-lts/gallium
+lts/iron
@@ -1,9 +1,14 @@
 {
+    "customSyntax": "postcss-scss",
    "plugins": [
        "stylelint-csstree-validator"
    ],
    "rules": {
-        "csstree/validator": true,
+        "csstree/validator": {
+          "syntaxExtensions": [
+            "sass"
+          ]
+        },
        "at-rule-empty-line-before": [ "always",
          {"except": [ "blockless-after-blockless"], ignore: ["after-comment", "inside-block"]}
        ],
@@ -45,7 +50,7 @@
        "function-name-case": "lower",
        "function-parentheses-newline-inside": "always-multi-line",
        "function-parentheses-space-inside": "never-single-line",
-        "function-url-scheme-blacklist": ["data"],
+        "function-url-scheme-disallowed-list": ["data"],
        "function-whitespace-after": "always",
        "indentation": 4,
        "keyframe-declaration-no-important": true,
@@ -84,12 +89,19 @@
        "selector-type-no-unknown": true,
        "string-no-newline": true,
        "time-min-milliseconds": 100,
-        "unit-blacklist": ["pt"],
+        "unit-disallowed-list": ["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": {
+      }
+    }
+  ]
 }
@@ -50,20 +50,20 @@ jobs:
          php: 7.4
          env: DB=mysqli   TASK=PHPUNIT

-        # Then, conditionally, all the highest php ones (8.0)
+        # Then, conditionally, all the highest php ones (8.1)
        - if: env(MOODLE_PHP) = "all"
-          php: 8.0
+          php: 8.1
          env: DB=none     TASK=CITEST
        - if: env(MOODLE_PHP) = "all"
-          php: 8.0
+          php: 8.1
          env: DB=none     TASK=GRUNT

        - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present)
-          php: 8.0
+          php: 8.1
          env: DB=pgsql    TASK=PHPUNIT

        - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all")
-          php: 8.0
+          php: 8.1
          env: DB=mysqli   TASK=PHPUNIT

 cache:
@@ -90,7 +90,8 @@ install:
            sudo service mysql stop
            sudo mv /var/lib/mysql /mnt/ramdisk
            sudo ln -s /mnt/ramdisk/mysql /var/lib/mysql
-            sudo service mysql restart
+            echo -e "[mysqld]\nskip-log-bin" | sudo tee -a /etc/mysql/my.cnf
+            sudo service mysql start
        fi
    - >
        if [ "$DB" = 'pgsql' ];
@@ -101,6 +102,7 @@ install:
            sudo mv /var/lib/postgresql /mnt/ramdisk
            sudo ln -s /mnt/ramdisk/postgresql /var/lib/postgresql
            sudo service postgresql start
+            sh -c 'until pg_isready -p $PGPORT; do echo "Waiting for the DB to be up..."; sleep 2; done'
        fi
    - >
        if [ "$TASK" = 'PHPUNIT' ];
@@ -127,7 +129,6 @@ install:
        fi

 before_script:
-    - if [[ ${TRAVIS_PHP_VERSION:0:1} -gt 7 ]]; then pecl install xmlrpc-beta; fi
    - echo 'max_input_vars=5000' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
    - phpenv config-rm xdebug.ini
    - >
@@ -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://docs.moodle.org/dev/Contributing_to_Moodle> for the many ways you
+See <https://moodledev.io/general/community/contribute> 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://docs.moodle.org/dev/Process>.
+For further details, see <https://moodledev.io/general/development/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://docs.moodle.org/dev/Plugin_contribution>.
+For further details, see <https://moodledev.io/general/community/plugincontribution>.
@@ -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://docs.moodle.org/dev/License>.
+License <https://moodledev.io/general/license>.

 Moodle is written in PHP and JavaScript and uses an SQL database for storing
 the data.
@@ -1,48 +1,66 @@
 MOODLE TRADEMARKS POLICY
 ========================

-The word "Moodle" is trademarked in many countries around the world. The word
-was originally coined as an acronym: Modular Object-Oriented Dynamic Learning
-Environment. The trademark is owned by Martin Dougiamas, Founder and Director
-of Moodle.
+The Moodle Trademark
+--------------------

-The law obligates trademark owners to police their marks and prevent the use of
-confusingly similar names by third parties. Through this policy we’d like to
-make it clear how Moodle-related projects, organisations, and people can use
-the Moodle trademark. We’d also like to be clear about how use of the word is
-restricted when used to promote commercial Moodle services. We do this to
-protect the very business model that allows us to continue developing Moodle
-for you.
+The brand and word "Moodle" has trade mark protection in many countries around
+the world. Various Moodle™ trade marks are owned by either Moodle Pty Ltd or
+one of its associated entities. The law obligates trade mark owners to police
+their trade marks and prevent the use of confusingly similar names by
+third parties.

-Allowed uses
------------
+We have created a more concise and thorough set of Trademark Guidelines
+(https://moodle.com/wp-content/uploads/2023/02/Moodle-Trademark-Guidelines-2023-4.pdf)
+to help you understand how to comply with Moodle's trade mark requirements.
+The Trademark Guidelines will also assist our Moodle Certified Partners and the
+community to understand some of the principles that inform Moodle's stance
+whenever potential infringement has been detected by us or our community.

-The following uses don’t require any permission at all:
+We need to be clear about use of the word "Moodle" and how we restrict its use
+when promoting commercial Moodle™ branded services. The proper use of
+trade marks reliably assures consumers about the quality of the associated
+products or services and where they have been derived from. Because the
+Moodle LMS is made available under the open source ‘GNU General Public License'
+that permits you to modify the copyrighted software, the distribution of such
+modified software in combination with Moodle trade marks can potentially
+mislead others in the community. To be clear, the GNU GPL does not include an
+implied right or licence to use Moodle's trade marks.

-* Referring to the software or the Moodle project.
-* Describing your own Moodle implementation (including within corporate
-  settings).
+We do all this to protect the very business model that allows us to continue
+developing various Moodle software solutions for you.
+
+Allowed uses of "Moodle"
+------------------------
+
+The following uses don't require any permission at all:
+
+* Referring to the software or the Moodle project as the "Moodle™ software"
+  or the "Moodle™ project"
+* Describing your own implementation of the Moodle™ software platform
+  (including within corporate settings).
 * Describing a Moodle-based community hub.
-* Describing some software you’ve made that integrates with Moodle
-  (eg a Moodle integration feature on another system).
+* Describing certain software you've made that integrates with Moodle™
+  branded software (e.g. a Moodle™ integration feature on another system).

-Restricted uses
---------------
+Restricted uses of "Moodle"
+---------------------------

 The following uses are generally prohibited without explicit and direct
 permission being granted to you by Moodle Pty Ltd. We do this to protect the
-Moodle project from software and sites which could confuse people. Please
-contact us to ask for permission in writing.
+Moodle™ project from software and sites which could confuse people. If in
+doubt, reach out for clarification at <trademarks@moodle.com>

-* You can’t use "Moodle" in the name of your software (including Mobile apps)
-* You can’t use "Moodle" in your company name
-* You can’t use "Moodle" in your domain name
-* You can’t use "Moodle" in advertising-related keywords (such as Adsense)
-* You can’t use "Moodle" to describe services around Moodle (such as hosting,
-  training, support, consulting, course creation services, theme development,
-  customisation, installation, integration and certification). This applies
-  even if you do not charge for the services. Note that usually only Moodle
-  Partners have this permission.
-
-For information about the Moodle Partner Certification Mark as well as for how
-to contact us, please see <https://moodle.com/trademarks/>.
+* You can't use the word "Moodle" or any Moodle logos for commercial purposes
+  without prior written permission from Moodle HQ.
+* You can't use "Moodle" in the name of your software (including Mobile apps).
+* You can't use "Moodle" in your company name.
+* You can't use "Moodle" in your domain name.
+* You can't use "Moodle" in advertising-related keywords (such as Adsense).
+* You can't use "Moodle" to describe services around Moodle
+  (such as hosting, training, support, consulting, course creation services,
+  theme development, customisation, installation, integration, analytics
+  and certification) that cause consumers to be confused that you are
+  associated with Moodle HQ if you are not.
+  This applies even if you do not charge for the services.
+  Note that usually only Moodle Partners have this permission.
@@ -131,8 +131,7 @@ if ($savebutton) {
    $outputhtml .= html_writer::end_tag('div');
 }

-$visiblepathtosection = array_reverse($settingspage->visiblepath);
-$PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
+$PAGE->set_title(implode(moodle_page::TITLE_SEPARATOR, $settingspage->visiblepath));
 $PAGE->set_heading($SITE->fullname);
 if ($buttons) {
    $PAGE->set_button($buttons);
@@ -57,6 +57,7 @@ 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:
@@ -98,6 +99,7 @@ list($options, $unrecognized) = cli_get_params(
        'fullname'          => '',
        'shortname'         => '',
        'summary'           => '',
+        'supportemail'      => '',
        'agree-license'     => false,
        'help'              => false
    ),
@@ -136,6 +138,15 @@ 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';
@@ -80,8 +80,8 @@ if (!$category = $DB->get_record('course_categories', ['id' => $options['categor
    throw new \moodle_exception('invalidcategoryid');
 }

-$backupdir = "restore_" . uniqid();
-$path = $CFG->tempdir . DIRECTORY_SEPARATOR . "backup" . DIRECTORY_SEPARATOR . $backupdir;
+$backupdir = restore_controller::get_tempdir_name(SITEID, $USER->id);
+$path = make_backup_temp_directory($backupdir);

 cli_heading(get_string('extractingbackupfileto', 'backup', $path));
 $fp = get_file_packer('application/vnd.moodle.backup');
@@ -0,0 +1,78 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Reset course indentation
+ *
+ * @copyright 2023 Amaia Anabitarte <amaia@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once('../../config.php');
+
+require_admin();
+
+$format = required_param('format', PARAM_PLUGIN);
+$confirm = optional_param('confirm', false, PARAM_BOOL);
+$backurl = new moodle_url('/admin/settings.php', ['section' => 'formatsetting'.$format]);
+
+$PAGE->set_url('/admin/course/resetindentation.php', ['format' => $format]);
+$PAGE->set_context(context_system::instance());
+
+if ($confirm) {
+    require_sesskey();
+    $courses = $DB->get_records('course', ['format' => $format], 'id', 'id');
+    if (!empty($courses)) {
+        $courseids = array_keys($courses);
+        list($courseinsql, $courseparams) = $DB->get_in_or_equal($courseids, SQL_PARAMS_NAMED, 'course');
+        $DB->set_field_select('course_modules', 'indent', '0', "course $courseinsql AND indent <> 0", $courseparams);
+        rebuild_course_cache(0, true);
+    }
+    redirect(
+        $backurl,
+        get_string('resetindentationsuccess', 'admin'),
+        null,
+        \core\output\notification::NOTIFY_SUCCESS
+    );
+}
+
+$strtitle = get_string('resetindentation', 'admin');
+
+$PAGE->set_title($strtitle);
+$PAGE->set_heading($strtitle);
+
+navigation_node::override_active_url(new moodle_url(
+    '/admin/course/resetindentation.php',
+    ['action' => 'confirm', 'format' => $format]
+));
+
+echo $OUTPUT->header();
+
+$displayoptions = ['confirmtitle' => get_string('resetindentation_title', 'admin')];
+$confirmbutton = new single_button(
+    new moodle_url('/admin/course/resetindentation.php', ['confirm' => 1, 'format' => $format, 'sesskey' => sesskey()]),
+    get_string('resetindentation', 'admin'),
+    'post'
+);
+$cancelbutton = new single_button($backurl, get_string('cancel'));
+echo $OUTPUT->confirm(
+    get_string('resetindentation_help', 'admin', ['format' => get_string('pluginname', 'format_'.$format)]),
+    $confirmbutton,
+    $cancelbutton,
+    $displayoptions
+);
+
+echo $OUTPUT->footer();
@@ -3371,6 +3371,7 @@
      <VENDOR name="oracle" version="11.2" />
    </DATABASE>
    <PHP version="7.3.0" level="required">
+      <RESTRICT function="restrict_php_version_81" message="unsupportedphpversion81" />
    </PHP>
    <PCREUNICODE level="optional">
      <FEEDBACK>
@@ -3557,6 +3558,7 @@
      <VENDOR name="oracle" version="11.2" />
    </DATABASE>
    <PHP version="7.3.0" level="required">
+      <RESTRICT function="restrict_php_version_81" message="unsupportedphpversion81" />
    </PHP>
    <PCREUNICODE level="optional">
      <FEEDBACK>
@@ -3749,6 +3751,7 @@
      <VENDOR name="oracle" version="19" />
    </DATABASE>
    <PHP version="7.4.0" level="required">
+      <RESTRICT function="restrict_php_version_82" message="unsupportedphpversion82" />
    </PHP>
    <PCREUNICODE level="optional">
      <FEEDBACK>
@@ -3920,6 +3923,587 @@
      </CUSTOM_CHECK>
      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_oracle_usage" level="optional">
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
+  <MOODLE version="4.2" requires="3.11.8">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.6.7" />
+      <VENDOR name="mysql" version="8.0" />
+      <VENDOR name="postgres" version="13" />
+      <VENDOR name="mssql" version="14.0" />
+      <VENDOR name="oracle" version="19" />
+    </DATABASE>
+    <PHP version="8.0.0" level="required">
+      <RESTRICT function="restrict_php_version_83" message="unsupportedphpversion83" />
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="mbstringrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+      <PHP_EXTENSION name="sodium" level="required"/>
+      <PHP_EXTENSION name="exif" level="optional"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="sixtyfourbitsrequired" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iscustomadminwarnings" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_oracle_usage" level="optional">
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
+  <MOODLE version="4.3" requires="3.11.8">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.6.7" />
+      <VENDOR name="mysql" version="8.0" />
+      <VENDOR name="postgres" version="13" />
+      <VENDOR name="mssql" version="14.0" />
+      <VENDOR name="oracle" version="19" />
+    </DATABASE>
+    <PHP version="8.0.0" level="required">
+      <RESTRICT function="restrict_php_version_83" message="unsupportedphpversion83" />
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="mbstringrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+      <PHP_EXTENSION name="sodium" level="required"/>
+      <PHP_EXTENSION name="exif" level="optional"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="sixtyfourbitsrequired" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iscustomadminwarnings" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_db_prefix_length" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_oracle_usage" level="optional">
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
+  <MOODLE version="4.4" requires="4.1.2">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.6.7" />
+      <VENDOR name="mysql" version="8.0" />
+      <VENDOR name="postgres" version="13" />
+      <VENDOR name="mssql" version="14.0" />
+      <VENDOR name="oracle" version="19" />
+    </DATABASE>
+    <PHP version="8.1.0" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="mbstringrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+      <PHP_EXTENSION name="sodium" level="required"/>
+      <PHP_EXTENSION name="exif" level="optional"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="sixtyfourbitsrequired" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iscustomadminwarnings" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_db_prefix_length" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_oracle_usage" level="optional">
+      </CUSTOM_CHECK>
    </CUSTOM_CHECKS>
  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -224,7 +224,7 @@ if (!core_tables_exist()) {
        $strlicense = get_string('license');

        $PAGE->navbar->add($strlicense);
-        $PAGE->set_title($strinstallation.' - Moodle '.$CFG->target_release);
+        $PAGE->set_title($strinstallation . moodle_page::TITLE_SEPARATOR . 'Moodle ' . $CFG->target_release, false);
        $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 '.$CFG->target_release);
+    $PAGE->set_title($strinstallation . moodle_page::TITLE_SEPARATOR . $CFG->target_release, false);
    $PAGE->set_heading($strinstallation);
    $PAGE->set_cacheable(false);

@@ -811,7 +811,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($SITE->fullname);
+    $PAGE->set_title(get_string('home'));
    $PAGE->set_heading($SITE->fullname);
    echo $OUTPUT->header();
    echo $OUTPUT->footer();
@@ -96,20 +96,16 @@ function core_admin_pluginfile($course, $cm, $context, $filearea, $args, $forced
            send_file_not_found();
        }

-        // 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)) {
+        // 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)) {
+
            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);
@@ -21,7 +21,7 @@
 * Displays the list of found local plugins, their version (if found) and
 * a link to delete the local plugin.
 *
- * @see       http://docs.moodle.org/dev/Local_customisation
+ * @see       https://moodledev.io/docs/apis/plugintypes/local
 * @package   admin
 * @copyright 2010 David Mudrak <david.mudrak@gmail.com>
 * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -6,7 +6,7 @@ require_once(__DIR__ . '/../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 include_once($CFG->dirroot.'/mnet/lib.php');

-$sort         = optional_param('sort', 'username', PARAM_ALPHA);
+$sort         = optional_param('sort', 'username', PARAM_ALPHAEXT);
 $dir          = optional_param('dir', 'ASC', PARAM_ALPHA);
 $page         = optional_param('page', 0, PARAM_INT);
 $perpage      = optional_param('perpage', 30, PARAM_INT);
@@ -153,7 +153,15 @@ foreach ($columns as $column) {
    $headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
 }
 $headings['delete'] = '';
-$acl = $DB->get_records('mnet_sso_access_control', null, "$sort $dir", '*'); //, $page * $perpage, $perpage);
+
+$sortorder = get_safe_orderby([
+    'username' => 'username',
+    'mnet_host_id' => 'mnet_host_id',
+    'access' => 'accessctrl',
+    'default' => 'username',
+], $sort, $dir, false);
+
+$acl = $DB->get_records('mnet_sso_access_control', null, $sortorder);
 $aclcount = $DB->count_records('mnet_sso_access_control');

 if (!$acl) {
@@ -46,11 +46,23 @@

            $formcontinue = new single_button(new moodle_url('index.php', array('confirm' => md5($mnet->public_key))), get_string('yes'));
            $formcancel = new single_button(new moodle_url('index.php', array()), get_string('no'));
+
+            echo $OUTPUT->header();
            echo $OUTPUT->confirm(get_string("deletekeycheck", "mnet"), $formcontinue, $formcancel);
+            echo $OUTPUT->footer();
            exit;
        } else {
            // We're deleting

+            // If no/cancel then redirect back to the network setting page.
+            if (!isset($form->confirm)) {
+                redirect(
+                    new moodle_url('/admin/mnet/index.php'),
+                    get_string('keydeletedcancelled', 'mnet'),
+                    null,
+                    \core\output\notification::NOTIFY_SUCCESS
+                );
+            }

            if (!isset($SESSION->mnet_confirm_delete_key)) {
                // fail - you're being attacked?
@@ -63,8 +75,12 @@

            if($time < time() - 60) {
                // fail - you're out of time.
-                throw new \moodle_exception ('deleteoutoftime', 'mnet', 'index.php');
-                exit;
+                redirect(
+                    new moodle_url('/admin/mnet/index.php'),
+                    get_string('deleteoutoftime', 'mnet'),
+                    null,
+                    \core\output\notification::NOTIFY_WARNING
+                );
            }

            if ($key != md5(sha1($mnet->keypair['keypair_PEM']))) {
@@ -75,7 +91,6 @@

            $mnet->replace_keys();
            redirect('index.php', get_string('keydeleted','mnet'));
-            exit;
        }
    }
    $hosts = $DB->get_records_select('mnet_host', "id <> ? AND deleted = 0", array($CFG->mnet_localhost_id), 'wwwroot ASC');
@@ -31,29 +31,20 @@

    if (!empty($hide) and confirm_sesskey()) {
        $class = \core_plugin_manager::resolve_plugininfo_class('mod');
-        $class::enable_plugin($hide, false);
-
-        admin_get_root(true, false);  // settings not required - only pages
+        if ($class::enable_plugin($hide, false)) {
+            // Settings not required - only pages.
+            admin_get_root(true, false);
+        }
        redirect(new moodle_url('/admin/modules.php'));
    }

-    if (!empty($show) and confirm_sesskey()) {
-        $canenablemodule = true;
-        $modulename = $show;
-
-        // Invoking a callback function that enables plugins to force additional actions (e.g. displaying notifications,
-        // modals, etc.) and also specify through its returned value (bool) whether the process of enabling the plugin
-        // should continue after these actions or not.
-        if (component_callback_exists("mod_{$modulename}", 'pre_enable_plugin_actions')) {
-            $canenablemodule = component_callback("mod_{$modulename}", 'pre_enable_plugin_actions');
-        }
-
-        if ($canenablemodule) {
-            $class = \core_plugin_manager::resolve_plugininfo_class('mod');
-            $class::enable_plugin($show, true);
-            admin_get_root(true, false);  // Settings not required - only pages.
-            redirect(new moodle_url('/admin/modules.php'));
+    if (!empty($show) && confirm_sesskey()) {
+        $class = \core_plugin_manager::resolve_plugininfo_class('mod');
+        if ($class::enable_plugin($show, true)) {
+            // Settings not required - only pages.
+            admin_get_root(true, false);
        }
+        redirect(new moodle_url('/admin/modules.php'));
    }

    echo $OUTPUT->header();
@@ -30,25 +30,36 @@

 require_once(__DIR__ . '/../config.php');

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

 // The authorization code generated by the authorization server.
 $code = required_param('code', PARAM_RAW);
-// The state parameter we've given (used in moodle as a redirect url).
-$state = required_param('state', PARAM_LOCALURL);
-
-$redirecturl = new moodle_url($state);
-$params = $redirecturl->params();

 if (isset($params['sesskey']) and confirm_sesskey($params['sesskey'])) {
    $redirecturl->param('oauth2code', $code);
@@ -20,7 +20,7 @@
 * Displays the list of found plagiarism plugins, their version (if found) and
 * a link to uninstall the plagiarism plugin.
 *
- * @see       http://docs.moodle.org/dev/Plagiarism_API
+ * @see       https://moodledev.io/docs/apis/subsystems/plagiarism
 * @package   admin
 * @copyright 2012 Dan Marsden <dan@danmarsden.com>
 * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -16,6 +16,8 @@

 namespace core_adminpresets\local\setting;

+use admin_setting_configcheckbox;
+
 /**
 * Checkbox setting.
 *
@@ -26,15 +28,15 @@ namespace core_adminpresets\local\setting;
 */
 class adminpresets_admin_setting_configcheckbox extends adminpresets_setting {

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

-    /**
-     * Ensure that the $value values are setting choices.
-     *
-     * @param mixed $value Setting value
-     * @return mixed Returns false if wrong param value
-     */
-    protected function set_value($value) {
-        if ($value) {
-            $options = explode(',', $value);
-            foreach ($options as $option) {
-
-                foreach ($this->settingdata->choices as $key => $choice) {
-
-                    if ($key == $option) {
-                        $this->value = $option;
-                        $this->set_visiblevalue();
-                        return true;
-                    }
-                }
-            }
-
-            $value = implode(',', $options);
-        }
-        $this->value = $value;
-        $this->set_visiblevalue();
-
-        return true;
-    }
-
    protected function set_visiblevalue() {
        $values = explode(',', $this->value);
        $visiblevalues = [];

        foreach ($values as $value) {

-            if (!empty($this->settingdata->choices[$value])) {
+            // Ensure that each value exists as a setting choice.
+            if (array_key_exists($value, $this->settingdata->choices)) {
                $visiblevalues[] = $this->settingdata->choices[$value];
            }
        }
@@ -34,7 +34,7 @@ class adminpresets_admin_setting_configselect extends adminpresets_setting {
     */
    protected function set_value($value) {
        // When we intantiate the class we need the choices.
-        if (empty($this->settindata->choices) && method_exists($this->settingdata, 'load_choices')) {
+        if (empty($this->settingdata->choices) && method_exists($this->settingdata, 'load_choices')) {
            $this->settingdata->load_choices();
        }

@@ -24,6 +24,7 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

+use core_question\local\bank\question_version_status;

 require_once(__DIR__ . '/../config.php');
 require_once($CFG->libdir . '/questionlib.php');
@@ -42,36 +43,23 @@ $qtypes = question_bank::get_all_qtypes();
 $pluginmanager = core_plugin_manager::instance();

 // Get some data we will need - question counts and which types are needed.
-$hiddenstatus = \core_question\local\bank\question_version_status::QUESTION_STATUS_HIDDEN;
-$draftstatus = \core_question\local\bank\question_version_status::QUESTION_STATUS_DRAFT;
+// The second JOIN on question_versions (qv2) is to get the latest version of each question. 
+// (Using this sort of JOIN is a known trick for doing this in the fastest possible way.)
+$counts = $DB->get_records_sql("
+        SELECT q.qtype,
+               COUNT(qv.id) AS numquestions,
+               SUM(CASE WHEN qv.status = :hiddenstatus THEN 1 ELSE 0 END) AS numhidden,
+               SUM(CASE WHEN qv.status = :draftstatus THEN 1 ELSE 0 END) AS numdraft
+          FROM {question} q
+          JOIN {question_versions} qv ON q.id = qv.questionid
+     LEFT JOIN {question_versions} qv2 ON qv.questionbankentryid = qv2.questionbankentryid AND qv.version < qv2.version
+         WHERE qv2.questionbankentryid IS NULL
+      GROUP BY q.qtype
+    ", [
+        'hiddenstatus' => question_version_status::QUESTION_STATUS_HIDDEN,
+        'draftstatus' => question_version_status::QUESTION_STATUS_DRAFT,
+    ]);

-$sql = "SELECT result.qtype,
-               SUM(result.numquestions) AS numquestions,
-               SUM(result.numhidden) AS numhidden,
-               SUM(result.numdraft) AS numdraft
-          FROM (SELECT data.qtype,
-                       data.versionid,
-                       COUNT(data.numquestions) AS numquestions,
-                       (SELECT COUNT(qv.id)
-                          FROM {question_versions} qv
-                         WHERE qv.id = data.versionid
-                           AND qv.status = :hiddenstatus) AS numhidden,
-                       (SELECT COUNT(qv.id)
-                         FROM {question_versions} qv
-                        WHERE qv.id = data.versionid
-                          AND qv.status = :draftstatus) AS numdraft
-                  FROM (SELECT q.qtype, qv.id AS versionid, 1 AS numquestions
-                         FROM {question} q
-                         JOIN {question_versions} qv ON qv.questionid = q.id
-                         JOIN {question_bank_entries} qbe ON qbe.id = qv.questionbankentryid
-                         AND qv.version = (SELECT MAX(v.version)
-                                             FROM {question_versions} v
-                                             JOIN {question_bank_entries} be ON be.id = v.questionbankentryid
-                                            WHERE be.id = qbe.id)) data
-                GROUP BY data.qtype, data.versionid) result
-       GROUP BY result.qtype";
-
-$counts = $DB->get_records_sql($sql, ['hiddenstatus' => $hiddenstatus, 'draftstatus' => $draftstatus]);
 $needed = [];
 foreach ($qtypes as $qtypename => $qtype) {
    if (!isset($counts[$qtypename])) {
@@ -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, "http://docs.moodle.org/dev/License");
+        $output .= $this->confirm(get_string('doyouagree'), $continue, "https://moodledev.io/general/license");
        $output .= $this->footer();

        return $output;
@@ -746,10 +746,10 @@ class core_admin_renderer extends plugin_renderer_base {
        //////////////////////////////////////////////////////////////////////////////////////////////////
        ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
        $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
-                         '<a href="http://docs.moodle.org/dev/Releases" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
+                         '<a href="https://moodledev.io/general/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="http://docs.moodle.org/dev/License">GNU Public License</a>';
+                         '<a href="https://moodledev.io/general/license">GNU Public License</a>';
        //////////////////////////////////////////////////////////////////////////////////////////////////

        return $this->box($copyrighttext, 'copyright');
@@ -898,7 +898,8 @@ class core_admin_renderer extends plugin_renderer_base {
        $url = "https://campaign.moodle.org/current/lms/{$lang}/install/";
        $params = [
            'url' => $url,
-            'iframeid' => 'campaign-content'
+            'iframeid' => 'campaign-content',
+            'title' => get_string('campaign', 'admin'),
        ];

        return $this->render_from_template('core/external_content_banner', $params);
@@ -919,7 +920,8 @@ class core_admin_renderer extends plugin_renderer_base {
        $url = "https://campaign.moodle.org/current/lms/{$lang}/servicesandsupport/";
        $params = [
            'url' => $url,
-            'iframeid' => 'services-support-content'
+            'iframeid' => 'services-support-content',
+            'title' => get_string('supportandservices', 'admin'),
        ];

        return $this->render_from_template('core/external_content_banner', $params);
@@ -991,7 +993,7 @@ class core_admin_renderer extends plugin_renderer_base {
     * @return string HTML to output.
     */
    protected function release_notes_link() {
-        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
+        $releasenoteslink = get_string('releasenoteslink', 'admin', 'https://moodledev.io/general/releases');
        $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
        return $this->box($releasenoteslink, 'generalbox alert alert-info');
    }
@@ -533,7 +533,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi

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

@@ -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]->name;
+            $a->name = $roles[$roleid]->localname;
            $a->shortname = $roles[$roleid]->shortname;
            $a->count = $DB->count_records_select('role_assignments',
                'roleid = ?', array($roleid), 'COUNT(DISTINCT userid)');
@@ -90,6 +90,7 @@ $title = get_string('overridepermissionsforrole', 'core_role', $a);
 $currenttab = 'permissions';

 $PAGE->set_title($title);
+$PAGE->activityheader->disable();
 $PAGE->navbar->add($straction);
 switch ($context->contextlevel) {
    case CONTEXT_SYSTEM:
@@ -187,7 +187,7 @@ class provider_test extends provider_testcase {
            $writer = writer::with_context($context);
            $this->assertTrue($writer->has_any_data());
            if ($context->contextlevel == CONTEXT_MODULE) {
-                if ($data = $writer->get_data($subcontextstudent)) {
+                if ($data = (array)$writer->get_data($subcontextstudent)) {
                    $this->assertEquals($user->id, reset($data)->userid);
                }
                if ($data = (array)$writer->get_data($subcontextrc)) {
@@ -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_ALPHAEXT);
+$areaid = required_param('areaid', PARAM_ALPHANUMEXT);
 $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($PAGE->title . ': ' . $heading);
+$PAGE->set_title($areaname . ' - ' . get_string('gradualreindex', 'search', ''));
 $PAGE->navbar->add($heading);
 echo $OUTPUT->header();
 echo $OUTPUT->heading($heading);
@@ -129,9 +129,7 @@ if (empty($SITE->fullname)) {
        $PAGE->set_button($buttons);
    }

-    $visiblepathtosection = array_reverse($settingspage->visiblepath);
-
-    $PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
+    $PAGE->set_title(implode(moodle_page::TITLE_SEPARATOR, $settingspage->visiblepath));
    $PAGE->set_heading($SITE->fullname);
    echo $OUTPUT->header();

@@ -244,6 +244,18 @@ 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);
@@ -477,7 +477,8 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    $temp->add(new admin_setting_heading('automatedsettings', new lang_string('automatedsettings','backup'), new lang_string('recyclebin_desc', 'backup')));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_users', new lang_string('generalusers', 'backup'), new lang_string('configgeneralusers', 'backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_role_assignments', new lang_string('generalroleassignments','backup'), new lang_string('configgeneralroleassignments','backup'), 1));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', new lang_string('generalactivities','backup'), new lang_string('configgeneralactivities','backup'), 1));
+    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', new lang_string('generalactivities', 'backup'),
+        new lang_string('backupautoactivitiesdescription', 'backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_blocks', new lang_string('generalblocks','backup'), new lang_string('configgeneralblocks','backup'), 1));
    $temp->add(new admin_setting_configcheckbox(
            'backup/backup_auto_files',
@@ -101,7 +101,7 @@ if ($hassiteconfig) {
        new lang_string('limitconcurrentlogins', 'core_auth'),
        new lang_string('limitconcurrentlogins_desc', 'core_auth'), 0, $options));
    $temp->add(new admin_setting_configtext('alternateloginurl', new lang_string('alternateloginurl', 'auth'),
-                                            new lang_string('alternatelogin', 'auth', htmlspecialchars(get_login_url())), ''));
+                                            new lang_string('alternatelogin', 'auth', htmlspecialchars(get_login_url(), ENT_COMPAT)), ''));
    $temp->add(new admin_setting_configtext('forgottenpasswordurl', new lang_string('forgottenpasswordurl', 'auth'),
                                            new lang_string('forgottenpassword', 'auth'), '', PARAM_URL));
    $temp->add(new admin_setting_confightmleditor('auth_instructions', new lang_string('instructions', 'auth'),
@@ -145,7 +145,7 @@ 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, ';
@@ -23,12 +23,15 @@
    * 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"} ]
+        "options": [ { "name": "Option", "key": "k1", "id": "id0", "checked": true, "label": "Option label"} ],
+        "readonly": false
+
    }
 }}
 <div class="form-multicheckbox">
@@ -37,7 +40,7 @@
        <ul>
            {{#options}}
                <li>
-                    <input type="checkbox" name="{{name}}[{{key}}]" value="1" id="{{id}}_{{key}}" {{#checked}}checked{{/checked}}>
+                    <input type="checkbox" name="{{name}}[{{key}}]" value="1" id="{{id}}_{{key}}" {{#readonly}}disabled{{/readonly}} {{#checked}}checked{{/checked}}>
                    <label for="{{id}}_{{key}}">{{{label}}}</label>
                </li>
            {{/options}}
@@ -51,12 +51,13 @@
 <div class="form-password">
    <span data-passwordunmask="wrapper" data-passwordunmaskid="{{ id }}">
        <span data-passwordunmask="editor">
-            <input  type="hidden"
+            <input  type="password"
+                    autocomplete="new-password"
                    name="{{ name }}"
                    id="{{ id }}"
                    value="{{ value }}"
                    data-size="{{ size }}"
-                    class="form-control d-inline-block"
+                    class="form-control d-none"
                    >
        </span>
        <a href="#" data-passwordunmask="edit" title="{{ edithint }}">
@@ -18,7 +18,7 @@ Feature: An administrator can browse user accounts
    When I navigate to "Users > Accounts > Browse list of users" in site administration
    # Name field always present, email field is default for showidentity.
    Then the following should exist in the "users" table:
-      | First name / Surname | Email address   |
+      | First name / Last name | Email address   |
      | User One             | one@example.com |
      | User Two             | two@example.com |
    # Should not see other identity fields or non-default name fields.
@@ -34,7 +34,7 @@ Feature: An administrator can browse user accounts
      | alternativefullnameformat | firstnamephonetic lastname |
    When I navigate to "Users > Accounts > Browse list of users" in site administration
    Then the following should exist in the "users" table:
-      | First name - phonetic / Surname | Email address   |
+      | First name - phonetic / Last name | Email address   |
      | Yewzer One                      | one@example.com |
      | Yoozare Two                     | two@example.com |

@@ -43,7 +43,7 @@ Feature: An administrator can browse user accounts
      | showuseridentity | department,profile_field_frog |
    When I navigate to "Users > Accounts > Browse list of users" in site administration
    Then the following should exist in the "users" table:
-      | First name / Surname | Favourite frog  | Department |
+      | First name / Last name | Favourite frog  | Department |
      | User One             | Kermit          | Attack     |
      | User Two             | Tree            | Defence    |
    And I should not see "Email address" in the "table" "css_element"
@@ -15,7 +15,7 @@ Feature: Allowing multiple accounts to have the same email address
    And I set the following fields to these values:
      | Username      | s2      |
      | First name    | Jane    |
-      | Surname       | Doe     |
+      | Last name     | Doe     |
      | Email address | <email> |
      | New password  | test    |
    And I press "Create user"
@@ -35,9 +35,7 @@ Feature: Allowing multiple accounts to have the same email address
      | username  | firstname | lastname | email           |
      | s1        | John      | Doe      | s1@example.com  |
      | s2        | Jane      | Doe      | s2@example.com  |
-    When I log in as "admin"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I click on "Edit" "link" in the "Jane Doe" "table_row"
+    When I am on the "s2" "user > editing" page logged in as "admin"
    And I set the field "Email address" to "<email>"
    And I press "Update profile"
    Then I should <expect> "This email address is already registered."
@@ -8,7 +8,7 @@ Feature: An administrator can configure the available user list filters
    When I log in as "admin"
    And I navigate to "Users > Accounts > Browse list of users" in site administration
    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
    And I should not see "Firstname" in the "New filter" "fieldset"
    And I should not see "Username" in the "New filter" "fieldset"
    And I should not see "Email address" in the "New filter" "fieldset"
@@ -30,7 +30,7 @@ Feature: An administrator can configure the available user list filters
    And I should not see "MNet ID provider" in the "New filter" "fieldset"
    And I navigate to "Users > Accounts > Bulk user actions" in site administration
    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
    And I should not see "Firstname" in the "New filter" "fieldset"
    And I should not see "Username" in the "New filter" "fieldset"
    And I should not see "Email address" in the "New filter" "fieldset"
@@ -57,7 +57,7 @@ Feature: An administrator can configure the available user list filters
    And I log in as "admin"
    And I navigate to "Users > Accounts > Browse list of users" in site administration
    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
    And I should not see "Firstname" in the "New filter" "fieldset"
    And I should see "Username" in the "New filter" "fieldset"
    And I should see "Email address" in the "New filter" "fieldset"
@@ -79,7 +79,7 @@ Feature: An administrator can configure the available user list filters
    And I should not see "MNet ID provider" in the "New filter" "fieldset"
    And I navigate to "Users > Accounts > Bulk user actions" in site administration
    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
    And I should not see "Firstname" in the "New filter" "fieldset"
    And I should see "Username" in the "New filter" "fieldset"
    And I should see "Email address" in the "New filter" "fieldset"
@@ -106,7 +106,7 @@ Feature: An administrator can configure the available user list filters
    And I log in as "admin"
    And I navigate to "Users > Accounts > Browse list of users" in site administration
    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
    And I should not see "Firstname" in the "New filter" "fieldset"
    And I should not see "Username" in the "New filter" "fieldset"
    And I should not see "Email address" in the "New filter" "fieldset"
@@ -128,7 +128,7 @@ Feature: An administrator can configure the available user list filters
    And I should not see "MNet ID provider" in the "New filter" "fieldset"
    And I navigate to "Users > Accounts > Bulk user actions" in site administration
    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
    And I should not see "Firstname" in the "New filter" "fieldset"
    And I should not see "Username" in the "New filter" "fieldset"
    And I should not see "Email address" in the "New filter" "fieldset"
@@ -0,0 +1,113 @@
+@core @core_admin @core_course @javascript
+Feature: Reset course indentation
+  In order to reset indentation in course modules
+  As a admin
+  I want change indent value for all the modules of a course format courses in one go
+
+  Background:
+    Given the following "courses" exist:
+      | fullname        | shortname | format |
+      | Topics Course 1 | T1        | topics |
+      | Topics Course 2 | T2        | topics |
+      | Weekly Course 1 | W1        | weeks  |
+      | Weekly Course 2 | W2        | weeks  |
+    And the following "activities" exist:
+      | activity | name                 | intro                       | course | idnumber |
+      | forum    | Topics forum name    | Topics forum description    | T1     | forum1   |
+      | data     | Topics database name | Topics database description | T1     | data1    |
+      | wiki     | Topics wiki name     | Topics wiki description     | T2     | wiki1    |
+      | forum    | Weekly forum name    | Weekly forum description    | W1     | forum2   |
+      | data     | Weekly database name | Weekly database description | W1     | data2    |
+      | wiki     | Weekly wiki name     | Weekly wiki description     | W2     | wiki2    |
+    And I log in as "admin"
+    And I am on "Topics Course 1" course homepage with editing mode on
+    And I open "Topics forum name" actions menu
+    And I click on "Move right" "link" in the "Topics forum name" activity
+    And I open "Topics forum name" actions menu
+    And "Move right" "link" in the "Topics forum name" "activity" should not be visible
+    And "Move left" "link" in the "Topics forum name" "activity" should be visible
+    And I press the escape key
+    And I open "Topics database name" actions menu
+    And "Move right" "link" in the "Topics database name" "activity" should be visible
+    And "Move left" "link" in the "Topics database name" "activity" should not be visible
+    And I am on "Topics Course 2" course homepage with editing mode on
+    And I open "Topics wiki name" actions menu
+    And I click on "Move right" "link" in the "Topics wiki name" activity
+    And I open "Topics wiki name" actions menu
+    And "Move right" "link" in the "Topics wiki name" "activity" should not be visible
+    And "Move left" "link" in the "Topics wiki name" "activity" should be visible
+    And I am on "Weekly Course 1" course homepage with editing mode on
+    And I open "Weekly forum name" actions menu
+    And I click on "Move right" "link" in the "Weekly forum name" activity
+    And I open "Weekly forum name" actions menu
+    And "Move right" "link" in the "Weekly forum name" "activity" should not be visible
+    And "Move left" "link" in the "Weekly forum name" "activity" should be visible
+    And I press the escape key
+    And I open "Weekly database name" actions menu
+    And "Move right" "link" in the "Weekly database name" "activity" should be visible
+    And "Move left" "link" in the "Weekly database name" "activity" should not be visible
+    And I am on "Weekly Course 2" course homepage with editing mode on
+    And I open "Weekly wiki name" actions menu
+    And I click on "Move right" "link" in the "Weekly wiki name" activity
+    And I open "Weekly wiki name" actions menu
+    And "Move right" "link" in the "Weekly wiki name" "activity" should not be visible
+    And "Move left" "link" in the "Weekly wiki name" "activity" should be visible
+
+  Scenario Outline: Apply course indentation reset
+    Given I navigate to "Plugins > Course formats > <format> format" in site administration
+    And I wait "5" seconds
+    And "Reset indentation" "link" should exist
+    When I click on "Reset indentation" "link"
+    And I should see "Reset indentation on course page"
+    And "Reset indentation" "button" should exist
+    And I click on "Reset indentation" "button"
+    Then I should see "Indentation reset"
+    And I am on "<format> Course 1" course homepage with editing mode on
+    And I open "<format> forum name" actions menu
+    And "Move right" "link" in the "<format> forum name" "activity" should be visible
+    And "Move left" "link" in the "<format> forum name" "activity" should not be visible
+    And I press the escape key
+    And I open "<format> database name" actions menu
+    And "Move right" "link" in the "<format> database name" "activity" should be visible
+    And "Move left" "link" in the "<format> database name" "activity" should not be visible
+    And I am on "<format> Course 2" course homepage with editing mode on
+    And I open "<format> wiki name" actions menu
+    And "Move right" "link" in the "<format> wiki name" "activity" should be visible
+    And "Move left" "link" in the "<format> wiki name" "activity" should not be visible
+#   Check other course formats had not been reset
+    And I am on "<other> Course 1" course homepage with editing mode on
+    And I open "<other> forum name" actions menu
+    And "Move right" "link" in the "<other> forum name" "activity" should not be visible
+    And "Move left" "link" in the "<other> forum name" "activity" should be visible
+
+    Examples:
+      | format | other  |
+      | Topics | Weekly |
+      | Weekly | Topics |
+
+  Scenario Outline: Cancel course indentation reset
+    Given I navigate to "Plugins > Course formats > <format> format" in site administration
+    And "Reset indentation" "link" should exist
+    When I click on "Reset indentation" "link"
+    And I should see "Reset indentation on course page"
+    And "Reset indentation" "button" should exist
+    And "Cancel" "button" should exist
+    And I click on "Cancel" "button"
+    Then I should not see "Indentation reset"
+    And I am on "<format> Course 1" course homepage with editing mode on
+    And I open "<format> forum name" actions menu
+    And "Move right" "link" in the "<format> forum name" "activity" should not be visible
+    And "Move left" "link" in the "<format> forum name" "activity" should be visible
+    And I press the escape key
+    And I open "<format> database name" actions menu
+    And "Move right" "link" in the "<format> database name" "activity" should be visible
+    And "Move left" "link" in the "<format> database name" "activity" should not be visible
+    And I am on "<format> Course 2" course homepage with editing mode on
+    And I open "<format> wiki name" actions menu
+    And "Move right" "link" in the "<format> wiki name" "activity" should not be visible
+    And "Move left" "link" in the "<format> wiki name" "activity" should be visible
+
+    Examples:
+      | format |
+      | Topics |
+      | Weekly |
@@ -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'));
+        $mform->addElement('filepicker', 'xmlfile', get_string('selectfile', 'tool_admin_presets'), null,
+            ['accepted_types' => ['.xml']]);
        $mform->addRule('xmlfile', null, 'required');

        $this->add_action_buttons(true, get_string('import', 'tool_admin_presets'));
@@ -64,7 +64,7 @@ class delete extends base {
     * Delete the DB preset
     */
    public function execute(): void {
-        confirm_sesskey();
+        require_sesskey();

        $this->manager->delete_preset($this->id);

@@ -52,8 +52,6 @@ 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);

@@ -87,7 +85,7 @@ class export extends base {
     * @throws xml_writer_exception
     */
    public function download_xml(): void {
-        confirm_sesskey();
+        require_sesskey();

        list($xmlstr, $filename) = $this->manager->download_preset($this->id);

@@ -40,8 +40,6 @@ 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);

@@ -38,8 +38,6 @@ 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);

@@ -73,7 +73,7 @@ class rollback extends base {
    public function execute(): void {
        global $OUTPUT;

-        confirm_sesskey();
+        require_sesskey();

        list($presetapp, $rollback, $failures) = $this->manager->revert_preset($this->id);

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

  Scenario: Export current settings
    Given I click on "Create preset" "button"
@@ -45,7 +45,7 @@ class helper {
        // Form field is PARAM_ALPHANUMEXT and we are sending fully qualified class names
        // as option names, but replacing the backslash for a string that is really unlikely
        // to ever be part of a class name.
-        return str_replace('\\', '__', $class);
+        return str_replace('\\', '__', $class ?? '');
    }

    /**
@@ -97,28 +97,28 @@ if ($onlycli === false) {
 switch ($action) {

    case 'enable':
-        confirm_sesskey();
+        require_sesskey();

        $model->enable();
        redirect($returnurl);
        break;

    case 'disable':
-        confirm_sesskey();
+        require_sesskey();

        $model->update(0, false, false);
        redirect($returnurl);
        break;

    case 'delete':
-        confirm_sesskey();
+        require_sesskey();

        $model->delete();
        redirect($returnurl);
        break;

    case 'edit':
-        confirm_sesskey();
+        require_sesskey();

        $invalidcurrenttimesplitting = $model->invalid_timesplitting_selected();
        $potentialtimesplittings = $model->get_potential_timesplittings();
@@ -183,7 +183,7 @@ switch ($action) {
        break;

    case 'evaluate':
-        confirm_sesskey();
+        require_sesskey();

        if ($model->is_static()) {
            throw new moodle_exception('errornostaticevaluate', 'tool_analytics');
@@ -226,7 +226,7 @@ switch ($action) {
        break;

    case 'scheduledanalysis':
-        confirm_sesskey();
+        require_sesskey();

        if ($onlycli) {
            throw new moodle_exception('erroronlycli', 'tool_analytics');
@@ -292,7 +292,7 @@ switch ($action) {
        break;

    case 'clear':
-        confirm_sesskey();
+        require_sesskey();

        $model->clear();
        redirect($returnurl);
@@ -34,8 +34,11 @@ Feature: Manage availability conditions
    Given the following "courses" exist:
      | fullname | shortname | format |
      | Course 1 | C1        | topics |
+    And the following "activity" exists:
+      | activity | page |
+      | course   | C1   |
+      | name     | P1   |
    And I log in as "admin"
-    And I am on site homepage
    When I navigate to "Plugins > Availability restrictions > Manage restrictions" in site administration

    # Check the icon is there (it should be a Hide icon, meaning is currently visible).
@@ -51,8 +54,7 @@ Feature: Manage availability conditions

    # OK, toggling works. Set the grade one to Hide and we'll go see if it actually worked.
    And I click on "Hide" "icon" in the "Restriction by grade" "table_row"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "Page" to section "1"
+    And I am on the "P1" "page activity editing" page
    And I expand all fieldsets
    And I click on "Add restriction..." "button"
    And "Add restriction..." "dialogue" should be visible
@@ -0,0 +1,11 @@
+define("tool_behat/steps",["exports","core/ajax","core/templates","core/pending"],(function(_exports,_ajax,_templates,_pending){function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}
+/**
+   * Enhancements for the step definitions page.
+   *
+   * @module tool_behat/steps
+   * @copyright 2022 Catalyst IT EU
+   * @author Mark Johnson <mark.johnson@catalyst-eu.net>
+   * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,_ajax=_interopRequireDefault(_ajax),_templates=_interopRequireDefault(_templates),_pending=_interopRequireDefault(_pending);_exports.init=()=>{document.addEventListener("change",(async e=>{const entityElement=e.target.closest(".entities"),stepElement=e.target.closest(".stepcontent");if(!entityElement||!stepElement)return;const pendingPromise=new _pending.default("tool_behat/steps:change"),entityData=await(entityType=e.target.value,_ajax.default.call([{methodname:"tool_behat_get_entity_generator",args:{entitytype:entityType}}])[0]);var entityType;const{html:html,js:js}=await(entityData=>{var _entityData$required;return null!==(_entityData$required=entityData.required)&&void 0!==_entityData$required&&_entityData$required.length?_templates.default.renderForPromise("tool_behat/steprequiredfields",{fields:entityData.required}):Promise.resolve({html:"",js:""})})(entityData),stepRequiredFields=stepElement.querySelector(".steprequiredfields");stepRequiredFields?await _templates.default.replaceNode(stepRequiredFields,html,js):await _templates.default.appendNodeContents(stepElement,html,js),pendingPromise.resolve()}))}}));
+
+//# sourceMappingURL=steps.min.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"steps.min.js","sources":["../src/steps.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\nimport Ajax from 'core/ajax';\nimport Templates from 'core/templates';\nimport PendingJS from 'core/pending';\n\n/**\n * Enhancements for the step definitions page.\n *\n * @module tool_behat/steps\n * @copyright 2022 Catalyst IT EU\n * @author Mark Johnson <mark.johnson@catalyst-eu.net>\n * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\n/**\n * Call the get_entity_generator web service function\n *\n * Takes the name of an entity generator and returns an object containing a list of the required fields.\n *\n * @param {String} entityType\n * @returns {Promise}\n */\nconst getGeneratorEntities = (entityType) => Ajax.call([{\n    methodname: 'tool_behat_get_entity_generator',\n    args: {entitytype: entityType}\n}])[0];\n\n/**\n * Render HTML for required fields\n *\n * Takes the entity data returned from getGeneratorEntities and renders the HTML to display the required fields.\n *\n * @param {String} entityData\n * @return {Promise}\n */\nconst getRequiredFieldsContent = (entityData) => {\n    if (!entityData.required?.length) {\n        return Promise.resolve({\n            html: '',\n            js: ''\n        });\n    }\n    return Templates.renderForPromise('tool_behat/steprequiredfields', {fields: entityData.required});\n};\n\nexport const init = () => {\n    // When an entity is selected in the \"the following exist\" step, fetch and display the required fields.\n    document.addEventListener('change', async(e) => {\n        const entityElement = e.target.closest('.entities');\n        const stepElement = e.target.closest('.stepcontent');\n        if (!entityElement || !stepElement) {\n            return;\n        }\n\n        const pendingPromise = new PendingJS('tool_behat/steps:change');\n\n        const entityData = await getGeneratorEntities(e.target.value);\n        const {html, js} = await getRequiredFieldsContent(entityData);\n\n        const stepRequiredFields = stepElement.querySelector('.steprequiredfields');\n        if (stepRequiredFields) {\n            await Templates.replaceNode(stepRequiredFields, html, js);\n        } else {\n            await Templates.appendNodeContents(stepElement, html, js);\n        }\n        pendingPromise.resolve();\n    });\n};\n"],"names":["document","addEventListener","async","entityElement","e","target","closest","stepElement","pendingPromise","PendingJS","entityData","entityType","value","Ajax","call","methodname","args","entitytype","html","js","required","_entityData$required","length","Templates","renderForPromise","fields","Promise","resolve","getRequiredFieldsContent","stepRequiredFields","querySelector","replaceNode","appendNodeContents"],"mappings":";;;;;;;;4NA2DoB,KAEhBA,SAASC,iBAAiB,UAAUC,MAAAA,UAC1BC,cAAgBC,EAAEC,OAAOC,QAAQ,aACjCC,YAAcH,EAAEC,OAAOC,QAAQ,oBAChCH,gBAAkBI,yBAIjBC,eAAiB,IAAIC,iBAAU,2BAE/BC,iBAlCgBC,WAkCwBP,EAAEC,OAAOO,MAlClBC,cAAKC,KAAK,CAAC,CACpDC,WAAY,kCACZC,KAAM,CAACC,WAAYN,eACnB,IAH0BA,IAAAA,iBAmChBO,KAACA,KAADC,GAAOA,SAtBaT,CAAAA,0EACzBA,WAAWU,0CAAXC,qBAAqBC,OAMnBC,mBAAUC,iBAAiB,gCAAiC,CAACC,OAAQf,WAAWU,WAL5EM,QAAQC,QAAQ,CACnBT,KAAM,GACNC,GAAI,MAkBiBS,CAAyBlB,YAE5CmB,mBAAqBtB,YAAYuB,cAAc,uBACjDD,yBACMN,mBAAUQ,YAAYF,mBAAoBX,KAAMC,UAEhDI,mBAAUS,mBAAmBzB,YAAaW,KAAMC,IAE1DX,eAAemB"}
@@ -0,0 +1,82 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+import Ajax from 'core/ajax';
+import Templates from 'core/templates';
+import PendingJS from 'core/pending';
+
+/**
+ * Enhancements for the step definitions page.
+ *
+ * @module tool_behat/steps
+ * @copyright 2022 Catalyst IT EU
+ * @author Mark Johnson <mark.johnson@catalyst-eu.net>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * Call the get_entity_generator web service function
+ *
+ * Takes the name of an entity generator and returns an object containing a list of the required fields.
+ *
+ * @param {String} entityType
+ * @returns {Promise}
+ */
+const getGeneratorEntities = (entityType) => Ajax.call([{
+    methodname: 'tool_behat_get_entity_generator',
+    args: {entitytype: entityType}
+}])[0];
+
+/**
+ * Render HTML for required fields
+ *
+ * Takes the entity data returned from getGeneratorEntities and renders the HTML to display the required fields.
+ *
+ * @param {String} entityData
+ * @return {Promise}
+ */
+const getRequiredFieldsContent = (entityData) => {
+    if (!entityData.required?.length) {
+        return Promise.resolve({
+            html: '',
+            js: ''
+        });
+    }
+    return Templates.renderForPromise('tool_behat/steprequiredfields', {fields: entityData.required});
+};
+
+export const init = () => {
+    // When an entity is selected in the "the following exist" step, fetch and display the required fields.
+    document.addEventListener('change', async(e) => {
+        const entityElement = e.target.closest('.entities');
+        const stepElement = e.target.closest('.stepcontent');
+        if (!entityElement || !stepElement) {
+            return;
+        }
+
+        const pendingPromise = new PendingJS('tool_behat/steps:change');
+
+        const entityData = await getGeneratorEntities(e.target.value);
+        const {html, js} = await getRequiredFieldsContent(entityData);
+
+        const stepRequiredFields = stepElement.querySelector('.steprequiredfields');
+        if (stepRequiredFields) {
+            await Templates.replaceNode(stepRequiredFields, html, js);
+        } else {
+            await Templates.appendNodeContents(stepElement, html, js);
+        }
+        pendingPromise.resolve();
+    });
+};
@@ -0,0 +1,92 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Return data about an entity generator.
+ *
+ * @package   tool_behat
+ * @copyright 2022 onwards Catalyst IT EU {@link https://catalyst-eu.net}
+ * @author    Mark Johnson <mark.johnson@catalyst-eu.net>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace tool_behat\external;
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->libdir . '/externallib.php');
+
+/**
+ * External function for getting properties of entity generators.
+ */
+class get_entity_generator extends \external_api {
+
+    /**
+     * Define parameters for external function.
+     *
+     * The parameter is either in the format 'entity' or 'component_name > entity'. There is no appropriate param type for a
+     * string like this containing angle brackets, so we will do PARAM_RAW. The value will be parsed by
+     * behat_data_generators::parse_entity_type, which validates the format of the parameter and throws an exception if it is not
+     * correct.
+     *
+     * @return \external_function_parameters
+     */
+    public static function execute_parameters(): \external_function_parameters {
+        return new \external_function_parameters([
+            'entitytype' => new \external_value(PARAM_RAW, 'Entity type that can be created by a generator.'),
+        ]);
+    }
+
+    /**
+     * Return a list of the required fields for a given entity type.
+     *
+     * @param string $entitytype
+     * @return array
+     */
+    public static function execute(string $entitytype): array {
+        global $CFG;
+
+        // Ensure we can load Behat and Facebook namespaces in behat libraries.
+        require_once("{$CFG->dirroot}/vendor/autoload.php");
+        require_once("{$CFG->libdir}/tests/behat/behat_data_generators.php");
+
+        $params = self::validate_parameters(self::execute_parameters(), ['entitytype' => $entitytype]);
+        $context = \context_system::instance();
+        self::validate_context($context);
+        require_capability('moodle/site:config', $context);
+
+        $generators = new \behat_data_generators();
+        $entity = $generators->get_entity($params['entitytype']);
+        return ['required' => $entity['required']];
+    }
+
+    /**
+     * Define return values.
+     *
+     * Return required fields
+     *
+     * @return \external_single_structure
+     */
+    public static function execute_returns(): \external_single_structure {
+        return new \external_single_structure([
+            'required' => new \external_multiple_structure(
+                new \external_value(PARAM_TEXT, 'Required field'),
+                'Required fields',
+                VALUE_OPTIONAL
+            ),
+        ]);
+    }
+}
@@ -49,7 +49,7 @@ list($options, $unrecognized) = cli_get_params(
        'torun'    => 0,
        'optimize-runs' => '',
        'add-core-features-to-theme' => false,
-        'axe'      => false,
+        'axe'      => null,
        'disable-composer' => false,
        'composer-upgrade' => true,
        'composer-self-update' => true,
@@ -69,7 +69,7 @@ Behat utilities to initialise behat tests

 Usage:
  php init.php      [--parallel=value [--maxruns=value] [--fromrun=value --torun=value]]
-                    [--axe] [-o | --optimize-runs] [-a | --add-core-features-to-theme]
+                    [--no-axe] [-o | --optimize-runs] [-a | --add-core-features-to-theme]
                    [--no-composer-self-update] [--no-composer-upgrade]
                    [--disable-composer]
                    [--help]
@@ -79,7 +79,7 @@ Options:
 -m, --maxruns       Max parallel processes to be executed at one time
 --fromrun           Execute run starting from (Used for parallel runs on different vms)
 --torun             Execute run till (Used for parallel runs on different vms)
--axe               Include axe accessibility tests
+--no-axe            Disable axe accessibility tests.

 -o, --optimize-runs
                    Split features with specified tags in all parallel runs.
@@ -102,7 +102,7 @@ Options:
 Example from Moodle root directory:
 \$ php admin/tool/behat/cli/init.php --parallel=2

-More info in http://docs.moodle.org/dev/Acceptance_testing#Running_tests
+More info in https://moodledev.io/general/development/tools/behat/running
 ";

 if (!empty($options['help'])) {
@@ -110,6 +110,12 @@ if (!empty($options['help'])) {
    exit(0);
 }

+if ($options['axe']) {
+    echo "Axe accessibility tests are enabled by default, to disable them, use the --no-axe option.\n";
+} else if ($options['axe'] === false) {
+    echo "Axe accessibility tests have been disabled.\n";
+}
+
 // Check which util file to call.
 $utilfile = 'util_single_run.php';
 $commandoptions = "";
@@ -118,9 +124,7 @@ if ($options['parallel'] && $options['parallel'] > 1) {
    $utilfile = 'util.php';
    // Sanitize all input options, so they can be passed to util.
    foreach ($options as $option => $value) {
-        if ($value) {
-            $commandoptions .= " --$option=\"$value\"";
-        }
+        $commandoptions .= behat_get_command_flags($option, $value);
    }
 } else {
    // Only sanitize options for single run.
@@ -130,9 +134,7 @@ if ($options['parallel'] && $options['parallel'] > 1) {
    ];

    foreach ($cmdoptionsforsinglerun as $option) {
-        if (!empty($options[$option])) {
-            $commandoptions .= " --$option='$options[$option]'";
-        }
+        $commandoptions .= behat_get_command_flags($option, $options[$option]);
    }
 }

@@ -87,7 +87,7 @@ Options:
 Example from Moodle root directory:
 \$ php admin/tool/behat/cli/run.php --tags=\"@javascript\"

-More info in http://docs.moodle.org/dev/Acceptance_testing#Running_tests
+More info in https://moodledev.io/general/development/tools/behat/running
 ";

 if (!empty($options['help'])) {
@@ -278,7 +278,7 @@ if (empty($parallelrun)) {
    // Print combined run o/p from processes.
    $exitcodes = print_combined_run_output($processes, $stoponfail);
    // Time to finish run.
-    $time = round(microtime(true) - $time, 1);
+    $time = round(microtime(true) - $time, 0);
    echo "Finished in " . gmdate("G\h i\m s\s", $time) . PHP_EOL . PHP_EOL;
    ksort($exitcodes);

@@ -437,7 +437,7 @@ function print_combined_run_output($processes, $stoponfail = false) {
                        $process->stop(0);
                    }

-                    $strlentoprint = strlen($update);
+                    $strlentoprint = strlen($update ?? '');

                    // If not enough dots printed on line then just print.
                    if ($strlentoprint < $remainingprintlen) {
@@ -57,7 +57,7 @@ list($options, $unrecognized) = cli_get_params(
        'torun'       => 0,
        'optimize-runs' => '',
        'add-core-features-to-theme' => false,
-        'axe'         => false,
+        'axe'         => true,
    ),
    array(
        'h' => 'help',
@@ -73,7 +73,7 @@ $help = "
 Behat utilities to manage the test environment

 Usage:
-  php util.php [--install|--drop|--enable|--disable|--diag|--updatesteps|--axe|--help] [--parallel=value [--maxruns=value]]
+  php util.php [--install|--drop|--enable|--disable|--diag|--updatesteps|--no-axe|--help] [--parallel=value [--maxruns=value]]

 Options:
 --install      Installs the test environment for acceptance tests
@@ -82,7 +82,7 @@ Options:
 --disable      Disables test environment
 --diag         Get behat test environment status code
 --updatesteps  Update feature step file.
--axe          Include axe accessibility tests
+--no-axe       Disable axe accessibility tests.

 -j, --parallel Number of parallel behat run operation
 -m, --maxruns Max parallel processes to be executed at one time.
@@ -94,7 +94,7 @@ Options:
 Example from Moodle root directory:
 \$ php admin/tool/behat/cli/util.php --enable --parallel=4

-More info in http://docs.moodle.org/dev/Acceptance_testing#Running_tests
+More info in https://moodledev.io/general/development/tools/behat/running
 ";

 if (!empty($options['help'])) {
@@ -320,12 +320,7 @@ function commands_to_execute($options) {
    }

    foreach ($extraoptions as $option => $value) {
-        if ($options[$option]) {
-            $extra .= " --$option";
-            if ($value) {
-                $extra .= "=\"$value\"";
-            }
-        }
+        $extra .= behat_get_command_flags($option, $value);
    }

    if (empty($options['parallel'])) {
@@ -360,7 +355,7 @@ function print_combined_drop_output($processes) {
                $op = $process->getIncrementalOutput();
                if (trim($op)) {
                    $update = preg_filter('#^\s*([FS\.\-]+)(?:\s+\d+)?\s*$#', '$1', $op);
-                    $strlentoprint = strlen($update);
+                    $strlentoprint = $update ? strlen($update) : 0;

                    // If not enough dots printed on line then just print.
                    if ($strlentoprint < $remainingprintlen) {
@@ -52,7 +52,7 @@ list($options, $unrecognized) = cli_get_params(
        'updatesteps' => false,
        'optimize-runs' => '',
        'add-core-features-to-theme' => false,
-        'axe'         => false,
+        'axe'         => true,
    ),
    array(
        'h' => 'help',
@@ -79,7 +79,7 @@ Options:
 --disable        Disables test environment
 --diag           Get behat test environment status code
 --updatesteps    Update feature step file.
--axe            Include axe accessibility tests
+--no-axe         Disable axe accessibility tests.

 -o, --optimize-runs Split features with specified tags in all parallel runs.
 -a, --add-core-features-to-theme Add all core features to specified theme's
@@ -89,7 +89,7 @@ Options:
 Example from Moodle root directory:
 \$ php admin/tool/behat/cli/util_single_run.php --enable

-More info in http://docs.moodle.org/dev/Acceptance_testing#Running_tests
+More info in https://moodledev.io/general/development/tools/behat/running
 ";

 if (!empty($options['help'])) {
@@ -186,7 +186,7 @@ if ($options['install']) {
        behat_config_manager::set_behat_run_config_value('behatsiteenabled', 1);
    }

-    // Define whether to run Behat with axe tests.
+    // Configure axe according to option.
    behat_config_manager::set_behat_run_config_value('axe', $options['axe']);

    // Enable test mode.
@@ -0,0 +1,37 @@
+<?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/>.
+
+/**
+ * Define web service functions for tool_behat
+ *
+ * @package   tool_behat
+ * @copyright 2022 onwards Catalyst IT EU {@link https://catalyst-eu.net}
+ * @author    Mark Johnson <mark.johnson@catalyst-eu.net>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$functions = [
+    'tool_behat_get_entity_generator' => [
+        'classname' => 'tool_behat\\external\\get_entity_generator',
+        'methodname' => 'execute',
+        'description' => 'Get the generator details for an entity',
+        'type' => 'read',
+        'ajax' => true,
+        'capabilities' => 'moodle/site:config'
+    ]
+];
@@ -56,6 +56,7 @@ if ($components) {
 $form = new steps_definitions_form(null, array('components' => $componentswithsteps));

 // Output contents.
+$PAGE->requires->js_call_amd('tool_behat/steps', 'init');
 $renderer = $PAGE->get_renderer('tool_behat');
 echo $renderer->render_stepsdefinitions($steps, $form);

@@ -30,7 +30,7 @@ $string['errordataroot'] = '$CFG->behat_dataroot is not set or is invalid.';
 $string['errorsetconfig'] = '$CFG->behat_dataroot, $CFG->behat_prefix and $CFG->behat_wwwroot need to be set in config.php.';
 $string['erroruniqueconfig'] = '$CFG->behat_dataroot, $CFG->behat_prefix and $CFG->behat_wwwroot values need to be different than $CFG->dataroot, $CFG->prefix, $CFG->wwwroot, $CFG->phpunit_dataroot and $CFG->phpunit_prefix values.<br/>Or, if $CFG->behat_prefix is the same, $CFG->behat_dbname or $CFG->behat_dbhost need to be different from $CFG->phpunit_dbname and $CFG->phpunit_dbhost and from $CFG->dbname and $CFG->dbhost.';
 $string['fieldvalueargument'] = 'Field value arguments';
-$string['fieldvalueargument_help'] = 'This argument should be completed by a field value. There are many field types, including simple ones like checkboxes, selects or textareas, or complex ones like date selectors. See the dev documentation <a href="https://docs.moodle.org/dev/Acceptance_testing" target="_blank">Acceptance_testing</a> for details of expected field values.';
+$string['fieldvalueargument_help'] = 'This argument should be completed by a field value. There are many field types, including simple ones like checkboxes, selects or textareas, or complex ones like date selectors. See the dev documentation <a href="https://moodledev.io/general/development/tools/behat" target="_blank">Acceptance_testing</a> for details of expected field values.';
 $string['giveninfo'] = 'Given. Processes to set up the environment';
 $string['infoheading'] = 'Info';
 $string['installinfo'] = 'Read {$a} for installation and tests execution info';
@@ -24,6 +24,8 @@

 defined('MOODLE_INTERNAL') || die();

+require_once($CFG->libdir . '/behat/classes/behat_generator_base.php');
+
 /**
 * Renderer for behat tool web features
 *
@@ -106,6 +108,32 @@ class tool_behat_renderer extends plugin_renderer_base {
                },
                $stepsdefinitions
            );
+
+            $elementstrings = [];
+            $count = 1;
+            $stepsdefinitions = preg_replace_callback('/(the following ")ELEMENT\d?_STRING(" exist:)/',
+                function($matches) use (&$elementstrings, &$count) {
+                    // Replace element type arguments with a user-friendly select.
+                    if (empty($elementstrings)) {
+                        $behatgenerators = new behat_data_generators();
+                        $componententities = $behatgenerators->get_all_entities();
+                        ksort($componententities);
+                        $elementstrings = [];
+                        foreach ($componententities as $component => $entities) {
+                            asort($entities);
+                            foreach ($entities as $entity) {
+                                $string = ($component === 'core') ? $entity : $component . ' > ' . $entity;
+                                $elementstrings[$string] = $string;
+                            }
+                        }
+                    }
+                    $select = html_writer::select($elementstrings, 'entities' . $count, '', ['' => 'choosedots'],
+                            ['class' => 'entities']);
+                    $count++;
+                    return $matches[1] . $select . $matches[2];
+                },
+                $stepsdefinitions
+            );
        }

        // Steps definitions.
@@ -156,9 +184,10 @@ class tool_behat_renderer extends plugin_renderer_base {
        // Info.
        $installurl = behat_command::DOCS_URL;
        $installlink = html_writer::tag('a', $installurl, array('href' => $installurl, 'target' => '_blank'));
-        $writetestsurl = 'https://docs.moodle.org/dev/Writing acceptance tests';
+        $writetestsurl = 'https://moodledev.io/general/development/tools/behat/writing';
        $writetestslink = html_writer::tag('a', $writetestsurl, array('href' => $writetestsurl, 'target' => '_blank'));
-        $writestepsurl = 'https://docs.moodle.org/dev/Writing_new_acceptance_test_step_definitions';
+        $writestepsurl = 'https://moodledev.io/general/development/tools/behat/writing#' .
+            'writing-new-acceptance-test-step-definitions';
        $writestepslink = html_writer::tag('a', $writestepsurl, array('href' => $writestepsurl, 'target' => '_blank'));
        $infos = array(
            get_string('installinfo', 'tool_behat', $installlink),
@@ -29,3 +29,9 @@
 #page-admin-tool-behat-index .steps-definitions .stepregex {
    color: #060;
 }
+
+#page-admin-tool-behat-index .steprequiredfields {
+    font-weight: bold;
+    font-size: 1em;
+    margin-top: 1em;
+}
@@ -0,0 +1,33 @@
+{{!
+    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 <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template tool_behat/steprequiredfields
+
+    Display a Gherkin-style table row showing required columns for a step.
+
+    Example context (json):
+    {
+        "fields": [
+            "user",
+            "role",
+            "context"
+        ]
+    }
+}}
+<pre class="steprequiredfields">
+    |{{#fields}} {{{.}}} |{{/fields}}
+</pre>
@@ -100,8 +100,7 @@ Feature: Set up contextual data for tests
    And the following "course enrolments" exist:
      | user | course | role |
      | student1 | C1 | student |
-    When I log in as "student1"
-    And I am on "Course 1" course homepage
+    When I am on the "Course 1" course page logged in as student1
    Then I should see "Topic 1"

  Scenario: Add role assigns
@@ -135,17 +134,11 @@ Feature: Set up contextual data for tests
    When I log in as "user1"
    And I am on site homepage
    Then edit mode should be available on the current page
-    And I log out
-    And I log in as "user2"
-    And I am on "Course 1" course homepage
+    And I am on the "Course 1" course page logged in as user2
    Then edit mode should be available on the current page
-    And I log out
-    And I log in as "user3"
-    And I am on "Course 1" course homepage
+    And I am on the "Course 1" course page logged in as user3
    Then edit mode should be available on the current page
-    And I log out
-    And I log in as "user4"
-    And I am on "Course 1" course homepage
+    And I am on the "Course 1" course page logged in as user4
    Then edit mode should be available on the current page
    And I log out
    And I log in as "user5"
@@ -187,8 +180,7 @@ Feature: Set up contextual data for tests
    And the following "activities" exist:
      | activity   | name                            | intro                         | course | idnumber    | grade |
      | assign     | Test assignment name with scale | Test assignment description   | C1     | assign1     | Test Scale 1 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
+    When I am on the "Course 1" course page logged in as admin
    Then I should see "Test assignment name"
    # Assignment 2.2 module type is disabled by default
    # And I should see "Test assignment22 name"
@@ -304,9 +296,7 @@ Feature: Set up contextual data for tests
    And the following "grade categories" exist:
      | fullname | course | gradecategory |
      | Grade sub category 2 | C1 | Grade category 1 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "View > Grader report" in the course gradebook
+    When I am on the "Course 1" "grades > Grader report > View" page logged in as "admin"
    Then I should see "Grade category 1"
    And I should see "Grade sub category 2"

@@ -327,9 +317,7 @@ Feature: Set up contextual data for tests
      | itemname    | course | gradecategory |
      | Test Grade Item 2 | C1 | Grade category 1 |
      | Test Grade Item 3 | C1 | Grade sub category 2 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "Setup > Gradebook setup" in the course gradebook
+    When I am on the "Course 1" "grades > gradebook setup" page logged in as "admin"
    Then I should see "Test Grade Item 1"
    And I open the action menu in "Test Grade Item 1" "table_row"
    And I choose "Edit" in the open action menu
@@ -358,9 +346,7 @@ Feature: Set up contextual data for tests
    And the following "scales" exist:
      | name | scale |
      | Test Scale 1 | Disappointing, Good, Very good, Excellent |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "Scales" in the course gradebook
+    When I am on the "Course 1" "grades > scales" page logged in as admin
    Then I should see "Test Scale 1"
    And I should see "Disappointing,  Good,  Very good,  Excellent"

@@ -379,9 +365,7 @@ Feature: Set up contextual data for tests
      | Grade outcome 2 | OT2       | C1     | Test Scale 1 |
    And the following config values are set as admin:
      | enableoutcomes | 1 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "More > Outcomes" in the course gradebook
+    When I am on the "Course 1" "grades > outcomes" page logged in as admin
    Then I should see "Grade outcome 1" in the "#addoutcomes" "css_element"
    And I should see "Grade outcome 2" in the "#removeoutcomes" "css_element"
    And I press "Manage outcomes"
@@ -407,9 +391,7 @@ Feature: Set up contextual data for tests
      | Test Outcome Grade Item 1 | C1     | OT1     | Grade category 1 |
    And the following config values are set as admin:
      | enableoutcomes | 1 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "Setup > Gradebook setup" in the course gradebook
+    When I am on the "Course 1" "grades > gradebook setup" page logged in as "admin"
    Then I should see "Test Outcome Grade Item 1"
    And I open the action menu in "Test Outcome Grade Item 1" "table_row"
    And I choose "Edit" in the open action menu
@@ -425,6 +407,5 @@ Feature: Set up contextual data for tests
    And the following "blocks" exist:
      | blockname    | contextlevel | reference | pagetypepattern | defaultregion |
      | online_users | Course       | C1        | course-view-*   | site-pre      |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
+    When I am on the "Course 1" course page logged in as admin
    Then I should see "Online users"
@@ -21,12 +21,15 @@ Feature: Edit capabilities

  Scenario: Default system capabilities modification
    Given I log in as "admin"
-    And I set the following system permissions of "Teacher" role:
+    And I navigate to "Users > Permissions > Define roles" in site administration
+    And I click on "Edit Teacher role" "link"
+    And I fill the capabilities form with the following permissions:
      | capability | permission |
      | block/mnet_hosts:myaddinstance | Allow |
      | moodle/site:messageanyuser | Inherit |
      | moodle/grade:managesharedforms | Prevent |
      | moodle/course:request | Prohibit |
+    And I press "Save changes"
    When I follow "Edit Teacher role"
    Then "block/mnet_hosts:myaddinstance" capability has "Allow" permission
    And "moodle/site:messageanyuser" capability has "Not set" permission
@@ -48,16 +51,12 @@ Feature: Edit capabilities
    And "mod/forum:addquestion" capability has "Allow" permission

  Scenario: Module capabilities overrides
-    Given I log in as "teacher1"
-    And the following "activity" exists:
+    Given the following "activity" exists:
      | activity | forum                |
      | course   | C1                   |
      | idnumber | 00001                |
      | name     | I'm the name         |
-      | intro    | I'm the introduction |
-      | section  | 1                    |
-    And I am on "Course 1" course homepage with editing mode on
-    And I follow "I'm the name"
+    And I am on the "I'm the name" "forum activity" page logged in as teacher1
    And I navigate to "Permissions" in current page administration
    And I override the system permissions of "Student" role with:
      | mod/forum:deleteanypost | Prohibit |
@@ -30,10 +30,9 @@ Feature: Verify that all form fields values can be get and set
      | student2 | G2 |
      | student3 | G2 |
    And the following "activities" exist:
-      | activity | course | idnumber | name | intro | firstpagetitle | wikimode | visible |
-      | wiki | C1 | wiki1 | Test this one | Test this one | Test this one | collaborative | 0 |
-    And I log in as "admin"
-    And I am on the "Course 1" "reset" page
+      | activity | course | idnumber | name          | firstpagetitle | wikimode      | visible |
+      | wiki     | C1     | wiki1    | Test this one | Test this one  | collaborative | 0       |
+    And I am on the "Course 1" "reset" page logged in as admin
    # Select (multi-select) - Checking "the select box should contain".
    And I expand all fieldsets
    And the "Unenrol users" select box should contain "No roles"
@@ -60,16 +59,14 @@ Feature: Verify that all form fields values can be get and set
    # Checkbox - Checking "I set the field" and "The field matches value" ticked.
    And I set the field "Force format" to "1"
    And I press "Save and return to course"
-    And I am on the "Test this one" "wiki activity" page
-    And I navigate to "Settings" in current page administration
+    And I am on the "Test this one" "wiki activity editing" page
    And I expand all fieldsets
    And the field "Force format" matches value "1"
    And the field "Force format" does not match value ""
    # Checkbox - Checking "I set the field" and "The field matches value" unticked.
    And I set the field "Force format" to ""
    And I press "Save and return to course"
-    And I am on the "Test this one" "wiki activity" page
-    And I navigate to "Settings" in current page administration
+    And I am on the "Test this one" "wiki activity editing" page
    And I expand all fieldsets
    And the field "Force format" matches value ""
    And the field "Force format" does not match value "1"
@@ -77,8 +74,7 @@ Feature: Verify that all form fields values can be get and set
    And I set the following fields to these values:
      | Force format | 1 |
    And I press "Save and return to course"
-    And I am on the "Test this one" "wiki activity" page
-    And I navigate to "Settings" in current page administration
+    And I am on the "Test this one" "wiki activity editing" page
    And I expand all fieldsets
    And the following fields match these values:
      | Force format | 1 |
@@ -88,8 +84,7 @@ Feature: Verify that all form fields values can be get and set
    And I set the following fields to these values:
      | Force format | |
    And I press "Save and return to course"
-    And I am on the "Test this one" "wiki activity" page
-    And I navigate to "Settings" in current page administration
+    And I am on the "Test this one" "wiki activity editing" page
    And I expand all fieldsets
    And the following fields match these values:
      | Force format | |
@@ -142,10 +137,11 @@ Feature: Verify that all form fields values can be get and set
    And I navigate to "Settings" in current page administration
    And the field "Course ID number" matches value "Course id number"

-  Scenario: with JS disabled all form fields getters and setters works as expected
-
  @javascript
  Scenario: with JS enabled all form fields getters and setters works as expected
+    Given the following "activities" exist:
+      | activity | course | name        |
+      | lesson   | C1     | Test lesson |
    Then I am on the "Course 1" "groups" page
    # Select (multi-select & AJAX) - Checking "I set the field" and "select box should contain".
    And I set the field "groups" to "Group 2"
@@ -157,11 +153,8 @@ Feature: Verify that all form fields values can be get and set
    And the "members" select box should contain "Student 2 (s2@example.com)"
    And the "members" select box should not contain "Student 3 (s3@example.com)"
    # Checkbox (AJAX) - Checking "I set the field" and "I set the following fields to these values".
-    And I am on "Course 1" course homepage
-    And I add a "Lesson" to section "1"
+    And I am on the "Test lesson" "lesson activity editing" page
    And I set the following fields to these values:
-      | Name | Test lesson |
-      | Description | Test lesson description |
      | available[enabled] | 1 |
    And I set the field "deadline[enabled]" to "1"
    # Checkbox (AJAX) - Checking "the field matches value" before saving.
@@ -13,6 +13,10 @@ Feature: List the system steps definitions
  Scenario: Accessing the list
    Then I should see "Step definitions"
    And I should not see "There aren't steps definitions matching this filter"
+    And I should not see "the following \"ELEMENT_STRING\" exist:"
+    And "entities1" "select" should exist
+    And the "entities1" select box should contain "users"
+    And the "entities1" select box should contain "mod_assign > submissions"

  @javascript
  Scenario: Filtering by type
@@ -34,3 +38,11 @@ Feature: List the system steps definitions
    Then I should not see "There aren't steps definitions matching this filter"
    And I should see "Checks the provided element and selector type exists in the current page."
    And I should see "Checks that an element and selector type exists in another element and selector type on the current page."
+
+  @javascript
+  Scenario: Get required fields
+    Given I set the field "entities1" to "users"
+    And I should see "| username |"
+    When I set the field "entities1" to "mod_quiz > user overrides"
+    Then I should not see "| username |"
+    And I should see "| quiz | user |"
@@ -13,24 +13,24 @@ Feature: Transform steps arguments
    And I open my profile in edit mode

  Scenario: Use nasty strings on steps arguments
-    When I set the field "Surname" to "$NASTYSTRING1"
+    When I set the field "Last name" to "$NASTYSTRING1"
    And I set the field "Description" to "$NASTYSTRING2"
    And I set the field "City/town" to "$NASTYSTRING3"
    And I press "Update profile"
    And I click on "Edit profile" "link" in the "region-main" "region"
    Then I should not see "NASTYSTRING"
-    And the field "Surname" matches value "$NASTYSTRING1"
+    And the field "Last name" matches value "$NASTYSTRING1"
    And the field "City/town" matches value "$NASTYSTRING3"

  Scenario: Use nasty strings on table nodes
    When I set the following fields to these values:
-      | Surname | $NASTYSTRING1 |
+      | Last name | $NASTYSTRING1 |
      | Description | $NASTYSTRING2 |
      | City/town | $NASTYSTRING3 |
    And I press "Update profile"
    And I click on "Edit profile" "link" in the "region-main" "region"
    Then I should not see "NASTYSTRING"
-    And the field "Surname" matches value "$NASTYSTRING1"
+    And the field "Last name" matches value "$NASTYSTRING1"
    And the field "City/town" matches value "$NASTYSTRING3"

  Scenario: Use double quotes
@@ -48,11 +48,11 @@ Feature: Transform steps arguments
  Scenario: Nasty strings with other contents
    When I set the field "First name" to "My Firstname $NASTYSTRING1"
    And I set the following fields to these values:
-      | Surname | My Surname $NASTYSTRING2 |
+      | Last name | My Last name $NASTYSTRING2 |
    And I press "Update profile"
    And I click on "Edit profile" "link" in the "region-main" "region"
    Then I should not see "NASTYSTRING"
    And I should see "My Firstname"
-    And I should see "My Surname"
+    And I should see "My Last name"
    And the field "First name" matches value "My Firstname $NASTYSTRING1"
-    And the field "Surname" matches value "My Surname $NASTYSTRING2"
+    And the field "Last name" matches value "My Last name $NASTYSTRING2"
@@ -0,0 +1,34 @@
+@tool_behat
+Feature: Confirm that we can open multiple browser tabs
+  In order to use multiple browser tabs
+  As a test writer
+  I need the relevant Behat steps to work
+
+  @javascript @_switch_window
+  Scenario: Open multiple browser tabs
+    Given the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+      | Course 2 | C2        |
+      | Course 3 | C3        |
+    And I am on the "C1" "Course" page logged in as "admin"
+
+    # Open a new tab on the same page.
+    When I open a tab named "CourseViewer1" on the current page
+    And I should see "Course 1" in the "h1" "css_element"
+    And I am on the "C2" "Course" page
+
+    # Open new tab for specified page with identifier.
+    And I open a tab named "CourseViewer2" on the "C3" "Course" page
+
+    # And for a specified page without identifier.
+    And I open a tab named "CourseViewer4" on the "My courses" page
+
+    # Switch between all the tabs and confirm their different contents.
+    Then I should see "No courses"
+    And I switch to "CourseViewer2" tab
+    And "Course 3" "heading" should exist
+    And I switch to "CourseViewer1" tab
+    And "Course 2" "heading" should exist
+    And I switch to the main tab
+    And "Course 1" "heading" should exist
@@ -0,0 +1,104 @@
+<?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/>.
+
+/**
+ * Unit tests for get_entity_generator web service
+ *
+ * @package   tool_behat
+ * @copyright 2022 onwards Catalyst IT EU {@link https://catalyst-eu.net}
+ * @author    Mark Johnson <mark.johnson@catalyst-eu.net>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace tool_behat\external;
+
+/**
+ * Tests for get_entity_generator web service
+ *
+ * @covers \tool_behat\external\get_entity_generator
+ */
+class get_entity_generator_test extends \advanced_testcase {
+
+    /**
+     * Log in as admin
+     *
+     * @return void
+     */
+    public function setUp(): void {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+    }
+
+    /**
+     * Get the generator for a core entity.
+     *
+     * @return void
+     */
+    public function test_execute_core_entity(): void {
+        $generator = get_entity_generator::execute('users');
+        $this->assertEquals(['required' => ['username']], $generator);
+    }
+
+    /**
+     * Get the generator for the plugin entity.
+     *
+     * @return void
+     */
+    public function test_execute_plugin_entity(): void {
+        $generator = get_entity_generator::execute('mod_book > chapters');
+        $this->assertEquals(['required' => ['book', 'title', 'content']], $generator);
+    }
+
+    /**
+     * Get the generator for an entity with no required fields.
+     *
+     * @return void
+     */
+    public function test_execute_no_requried(): void {
+        $generator = get_entity_generator::execute('mod_forum > posts');
+        $this->assertEquals(['required' => []], $generator);
+    }
+
+    /**
+     * Attempt to get the generator for a core entity that does not exist.
+     *
+     * @return void
+     */
+    public function test_execute_invalid_entity(): void {
+        $this->expectException('coding_exception');
+        get_entity_generator::execute('foo');
+    }
+
+    /**
+     * Attempt to get a generator form a plugin that does not exist.
+     *
+     * @return void
+     */
+    public function test_execute_invalid_plugin(): void {
+        $this->expectException('coding_exception');
+        get_entity_generator::execute('foo > bar');
+    }
+
+    /**
+     * Attempt to get a generator for an entity that does not exist, from a plugin that does.
+     *
+     * @return void
+     */
+    public function test_execute_invalid_plugin_entity(): void {
+        $this->expectException('coding_exception');
+        get_entity_generator::execute('mod_book > bar');
+    }
+}
@@ -1,5 +1,7 @@
 This files describes API changes in the tool_behat code.

+=== 4.1.4 ===
+* Behat is initialised with Axe accessibility tests enabled by default, if you want to disable them please use the --no-axe option.
 === 3.7 ===
 * Behat will now look for behat step definitions in the current
  theme and any parents the theme may have.
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die();

-$plugin->version   = 2022112800;   // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2022112802;   // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires  = 2022111800;   // Requires this Moodle version.
 $plugin->component = 'tool_behat'; // Full name of the plugin (used for diagnostics)
@@ -48,12 +48,7 @@ class accessibility {
    public static function is_accessibility_enabled(): bool {
        global $CFG;

-        if (isset($CFG->enableaccessibilitytools)) {
-            return $CFG->enableaccessibilitytools;
-        }
-
-        // Enabled by default.
-        return true;
+        return !empty($CFG->enableaccessibilitytools);
    }

    /**
@@ -388,13 +383,13 @@ class accessibility {
                // Confirm if error is reported separately.
                if ($DB->record_exists_select(manager::DB_ERRORS,
                    'resultid = ? AND ' . $DB->sql_compare_text('htmlcode', 255) . ' = ' . $DB->sql_compare_text('?', 255),
-                    [$resultid, html_entity_decode($tmp->html)])) {
+                    [$resultid, html_entity_decode($tmp->html, ENT_COMPAT)])) {
                    continue;
                }
                $error = new stdClass();
                $error->resultid = $resultid;
                $error->linenumber = $tmp->line;
-                $error->htmlcode = html_entity_decode($tmp->html);
+                $error->htmlcode = html_entity_decode($tmp->html, ENT_COMPAT);
                $errors[] = $error;
            }

@@ -170,6 +170,19 @@ class brickfield_accessibility_color_test extends brickfield_accessibility_test
        'yellowgreen' => '9acd32'
    ];

+    /** @var string[] Define estimated relative font-size codes to pt values. */
+    public $fontsizenames = [
+        'xx-small' => 9,
+        'x-small' => 10,
+        'small' => 11,
+        'smaller' => 11,
+        'medium' => 12,
+        'large' => 14,
+        'larger' => 14,
+        'x-large' => 18,
+        'xx-large' => 24,
+    ];
+
    /**
     * Helper method that finds the luminosity between the provided
     * foreground and background parameters.
@@ -227,7 +240,8 @@ class brickfield_accessibility_color_test extends brickfield_accessibility_test
            $l2 = (.2126 * $r4 + 0.7152 * $g4 + 0.0722 * $b4);
        }

-        $luminosity = round(($l1 + 0.05) / ($l2 + 0.05), 2);
+        // Increase round to 4 to avoid a 4.49 contrast being round up to a false pass of 4.5.
+        $luminosity = round(($l1 + 0.05) / ($l2 + 0.05), 4);
        return $luminosity;
    }

@@ -362,4 +376,35 @@ class brickfield_accessibility_color_test extends brickfield_accessibility_test
            : $backrgb['b'] - $forergb['b'];
        return ['red' => $reddiff, 'green' => $greendiff, 'blue' => $bluediff];
    }
+
+    /**
+     * Helper method that finds the estimated font-size for the provided
+     * string font-size parameter.
+     * @param string $fontsize The css font-size, in various formats
+     * @return int The estimated font-size
+     */
+    public function get_fontsize(string $fontsize): int {
+        $newfontsize = 12; // Default value, in pt, equivalent to 16px.
+
+        // Search for rem, em, and px initially, typical font-size values.
+        $pos1 = stripos($fontsize, 'rem');
+        $pos2 = stripos($fontsize, 'em');
+        $pos3 = stripos($fontsize, 'px');
+        if ($pos1 !== false) {
+            $rem = substr($fontsize, 0, -3);
+            $newfontsize = $newfontsize * $rem;
+        } else if ($pos2 !== false) {
+            $em = substr($fontsize, 0, -2);
+            $newfontsize = $newfontsize * $em;
+        } else if ($pos3 !== false) {
+            $px = substr($fontsize, 0, -2);
+            $newfontsize = 0.75 * $px;
+        } else if (in_array($fontsize, array_keys($this->fontsizenames))) {
+            $newfontsize = $this->fontsizenames[$fontsize];
+        } else {
+            preg_match_all('!\d+!', $fontsize, $matches);
+            $newfontsize = $matches[0][0] ?? $newfontsize;
+        }
+        return (int) $newfontsize;
+    }
 }
@@ -376,19 +376,61 @@ class brickfield_accessibility_test {
        return false;
    }

+    /**
+     * Returns an array of the newwindowphrases for all enabled language packs.
+     * @return array of the newwindowphrases for all enabled language packs.
+     */
+    public static function get_all_newwindowphrases(): array {
+        // Need to process all enabled lang versions of newwindowphrases.
+        return static::get_all_phrases('newwindowphrases');
+    }
+
    /**
     * Returns an array of the invalidlinkphrases for all enabled language packs.
     * @return array of the invalidlinkphrases for all enabled language packs.
     */
    public static function get_all_invalidlinkphrases(): array {
        // Need to process all enabled lang versions of invalidlinkphrases.
+        return static::get_all_phrases('invalidlinkphrases');
+    }
+
+    /**
+     * Returns an array of the relevant phrases for all enabled language packs.
+     * @param string $stringname the language string identifier you want get the phrases for.
+     * @return array of the invalidlinkphrases for all enabled language packs.
+     */
+    protected static function get_all_phrases(string $stringname): array {
+        $stringmgr = get_string_manager();
        $allstrings = [];
-        $enabledlangs = get_string_manager()->get_list_of_translations();
+
+        // Somehow, an invalid string was requested. Add exception handling for this in the future.
+        if (!$stringmgr->string_exists($stringname, manager::PLUGINNAME)) {
+            return $allstrings;
+        }
+
+        // Need to process all enabled lang versions of invalidlinkphrases.
+        $enabledlangs = $stringmgr->get_list_of_translations();
        foreach ($enabledlangs as $lang => $value) {
-            $tmpstring = (string)new \lang_string('invalidlinkphrases', manager::PLUGINNAME, null, $lang);
+            $tmpstring = (string)new \lang_string($stringname, manager::PLUGINNAME, null, $lang);
            $tmplangarray = explode('|', $tmpstring);
            $allstrings = array_merge($allstrings, $tmplangarray);
        }
+        // Removing duplicates if a lang is enabled, yet using default 'en' due to no relevant lang file.
+        $allstrings = array_unique($allstrings);
        return $allstrings;
    }
+
+    /**
+     * Assesses whether a string contains any readable text, which is text that
+     * contains any characters other than whitespace characters.
+     *
+     * @param string $text
+     * @return bool
+     */
+    public static function is_text_readable(string $text): bool {
+        // These characters in order are a space, tab, line feed, carriage return,
+        // NUL-byte, vertical tab and non-breaking space unicode character \xc2\xa0.
+        $emptycharacters = " \t\n\r\0\x0B\xc2\xa0";
+        return trim($text, $emptycharacters) != '';
+    }
 }
@@ -39,9 +39,27 @@ class a_links_dont_open_new_window extends brickfield_accessibility_test {
     * The main check function. This is called by the parent class to actually check content.
     */
    public function check(): void {
+
+        // Need to process all enabled lang versions of newwindowphrases.
+        $text = brickfield_accessibility_test::get_all_newwindowphrases();
+
        foreach ($this->get_all_elements('a') as $a) {
            if ($a->hasAttribute('target') && !in_array($a->getAttribute('target'), $this->allowedtargets)) {
-                $this->add_report($a);
+                $phrasefound = false;
+                foreach ($text as $phrase) {
+                    // Sanity check for readable text.
+                    if (!brickfield_accessibility_test::is_text_readable($phrase)) {
+                        break;
+                    }
+                    $pos = stripos($a->nodeValue, $phrase);
+                    if ($pos !== false) {
+                        $phrasefound = true;
+                        break;
+                    }
+                }
+                if (!$phrasefound) {
+                    $this->add_report($a);
+                }
            }
        }
    }
@@ -39,9 +39,26 @@ class area_dont_open_new_window extends brickfield_accessibility_test {
     *   The main check function. This is called by the parent class to actually check content
     */
    public function check(): void {
+        // Need to process all enabled lang versions of newwindowphrases.
+        $text = brickfield_accessibility_test::get_all_newwindowphrases();
+
        foreach ($this->get_all_elements('area') as $area) {
            if ($area->hasAttribute('target') && !in_array($area->getAttribute('target'), $this->allowedtargets)) {
-                $this->add_report($area);
+                $phrasefound = false;
+                foreach ($text as $phrase) {
+                    // Sanity check for readable text.
+                    if (!brickfield_accessibility_test::is_text_readable($phrase)) {
+                        break;
+                    }
+                    $pos = stripos($area->getAttribute('alt'), $phrase);
+                    if ($pos !== false) {
+                        $phrasefound = true;
+                        break;
+                    }
+                }
+                if (!$phrasefound) {
+                    $this->add_report($area);
+                }
            }
        }
    }
@@ -92,8 +92,7 @@ class css_text_has_contrast extends brickfield_accessibility_color_test {
                    $italic = false;

                    if (isset($style['font-size'])) {
-                        preg_match_all('!\d+!', $style['font-size'], $matches);
-                        $fontsize = $matches[0][0];
+                        $fontsize = $this->get_fontsize($style['font-size']);
                    }

                    if (isset($style['font-weight'])) {
@@ -43,7 +43,7 @@ class report_array extends brickfield_accessibility_reporter {
            $output[$testname]['body'] = $translation['description'];
            foreach ($test as $k => $problem) {
                if (is_object($problem)) {
-                    $output[$testname]['problems'][$k]['element'] = htmlentities($problem->get_html());
+                    $output[$testname]['problems'][$k]['element'] = htmlentities($problem->get_html(), ENT_COMPAT);
                    $output[$testname]['problems'][$k]['line'] = $problem->get_line();
                    if ($problem->message) {
                        $output[$testname]['problems']['message'] = $problem->message;
@@ -67,7 +67,7 @@ class report_codehighlight extends \tool_brickfield\local\htmlchecker\brickfield
            }
        }
        $this->dom->formatOutput = true;
-        $html = htmlspecialchars($this->dom->saveHTML());
+        $html = htmlspecialchars($this->dom->saveHTML(), ENT_COMPAT);
        $html = str_replace('&quot;', '"', $html);
        foreach ($this->classnames as $name) {
            $html = preg_replace('/&lt;'. $name .'([^&]+)+\&gt;/', '<span \\1>', $html);
@@ -49,7 +49,7 @@ class report_xml extends brickfield_accessibility_reporter {
            $output .= "\n\t<htmlchecker:problems>";
            foreach ($test as $problem) {
                if (is_object($problem)) {
-                    $output .= "\n\t<htmlchecker:entities><![CDATA[" . htmlentities($problem->get_html()) .
+                    $output .= "\n\t<htmlchecker:entities><![CDATA[" . htmlentities($problem->get_html(), ENT_COMPAT) .
                        "]]></htmlchecker:entities>";
                    $output .= "\n\t<htmlchecker:line>". $problem->get_line() ."</htmlchecker:line>";
                    if ($problem->message) {
@@ -16,6 +16,8 @@

 namespace tool_brickfield\local\tool;

+use tool_brickfield\manager;
+
 /**
 * Class advanced.
 *
@@ -51,12 +53,36 @@ class advanced extends tool {
        return 'advanced';
    }

+    /**
+     * Builds context data used to render a single grid item on the advanced page.
+     * @param string $icon
+     * @param string $heading
+     * @param string $content
+     * @return array
+     */
+    protected function get_grid_item_context(string $icon, string $heading, string $content): array {
+        return [
+            "icon" => "pix/i/$icon.png",
+            "iconalt" => get_string("icon:$icon", manager::PLUGINNAME),
+            "heading" => get_string($heading, manager::PLUGINNAME),
+            "content" => get_string($content, manager::PLUGINNAME)
+        ];
+    }
+
    /**
     * Return the data for renderer / template display.
     * @return \stdClass
     */
    protected function fetch_data(): \stdClass {
        $data = (object)[
+            'griditems' => [
+                $this->get_grid_item_context("analytics-custom", "headingone", "contentone"),
+                $this->get_grid_item_context("tools-custom", "headingtwo", "contenttwo"),
+                $this->get_grid_item_context("file-edit-custom", "headingthree", "contentthree"),
+                $this->get_grid_item_context("search-plus-custom", "headingfour", "contentfour"),
+                $this->get_grid_item_context("wand-magic-custom", "headingfive", "contentfive"),
+                $this->get_grid_item_context("hands-helping-custom", "headingsix", "contentsix"),
+            ],
            'valid' => true,
            'error' => '',
        ];
@@ -205,7 +205,7 @@ class manager {
     * @return string
     */
    public static function get_contenthash(?string $content = null): string {
-        return sha1($content);
+        return sha1($content ?? '');
    }

    /**
@@ -180,7 +180,7 @@ class renderer extends \tool_brickfield\output\renderer {
            ];
        $data->errordata = !empty($data->errordata) ? $data->errordata : [];
        foreach ($data->errordata as $err) {
-            $err->htmlcode = htmlentities($err->htmlcode);
+            $err->htmlcode = htmlentities($err->htmlcode, ENT_COMPAT);
            $row = [$data->tarlabels[$err->component], $err->shortname, $err->errline, $err->htmlcode];
            $table->data[] = $row;
        }
@@ -254,19 +254,16 @@ class renderer extends \tool_brickfield\output\renderer {
                <tr>
                    <td>
                        <img src="' . $this->image_path() . 'tachometer-alt-solid.svg" width="15" height="15">' .
-                        ' <td style="line-height: 10px;"> ' .
                        get_string('totalactivitiescount', manager::PLUGINNAME, $data->combodata['total']) .
-                        '</td></td>
+                    '</td>
                    <td>
                        <img src="' . $this->image_path() . 'check-square-regular.svg" width="15" height="15">' .
-                        ' <td style="line-height: 10px;"> ' .
                        get_string('passedcount', manager::PLUGINNAME, $data->combodata['passed']) .
-                        '</td></td>
+                    '</td>
                    <td>
                        <img src="' . $this->image_path() . 'times-circle-regular.svg" width="15" height="15">' .
-                        ' <td style="line-height: 10px;"> ' .
                        get_string('failedcount', manager::PLUGINNAME, $data->combodata['failed']) .
-                        '</td></td>
+                    '</td>
                </tr>
            </table>';

@@ -396,8 +393,8 @@ class renderer extends \tool_brickfield\output\renderer {
        foreach ($data->groupdata as $key => $group) {
            $checkgroup = area_base::checkgroup_name($key);
            $icon = $icons[$key];
-            $tabledata[] = ['<img src="'.$icon.'" width="15" height="15">' . ' ' .' <td style="line-height: 10px;">  '.
-                get_string('checktype:' . $checkgroup, manager::PLUGINNAME).'</td>', $group->errorinstances];
+            $tabledata[] = ['<img src="'.$icon.'" width="15" height="15">' . ' ' .
+                get_string('checktype:' . $checkgroup, manager::PLUGINNAME), $group->errorinstances];
        }

        return $this->render_table(
@@ -93,6 +93,7 @@ $string['invalidcourseid'] = 'Invalid course, please check your input';
 $string['invalidlinkphrases'] = 'click|click here|here|more|more here|info|info here|information|information here|read more|read more here|further information|further information here|further details|further details here';
 $string['module'] = 'Module';
 $string['modulename'] = 'Name';
+$string['newwindowphrases'] = 'new window|new-window|new_window';
 $string['noerrorsfound'] = 'No common accessibility errors were found for your search parameters. Congratulations!';
 $string['norecords'] = 'No relevant records were found for your search parameters.';
 $string['notregistered'] = 'Your accessibility toolkit needs to be registered.';
@@ -270,3 +271,9 @@ $string['headingthree'] = 'Accessible file formats';
 $string['headingfour'] = 'Focus effort';
 $string['headingfive'] = 'HTML fixes';
 $string['headingsix'] = 'Performance support';
+$string['icon:analytics-custom'] = 'Analytics icon';
+$string['icon:tools-custom'] = 'Tools icon';
+$string['icon:file-edit-custom'] = 'Edit file icon';
+$string['icon:search-plus-custom'] = 'Search icon';
+$string['icon:wand-magic-custom'] = 'Magic wand icon';
+$string['icon:hands-helping-custom'] = 'Helping hands icon';
@@ -10,49 +10,22 @@

 /* Advanced Page CSS */

-@media only screen and (min-width: 768px) {
-    .tool_brickfield_grid_item {
-        width: 33.333333333333336%;
-    }
+#tool_brickifeld_advanced_page {
+    margin: 20px 20px 20px 10px;
 }

-@media only screen and (max-width: 767px) {
-    .tool_brickfield_grid_item {
-        width: 100%;
-    }
-}
-
-.tool_brickfield_grid {
-    max-width: 1140px;
-    margin-right: auto;
-    margin-left: auto;
-}
-
-.tool_brickfield_grid_inner {
-    width: 100%;
+.tool_brickfield_banner_heading {
    display: flex;
-    flex-wrap: wrap;
-}
-
-.tool_brickfield_grid_item_shape {
-    height: 96%;
-    background-color: #fff;
-    padding: 10% 10% 10% 10%;
-    box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.05);
-    margin: 1% 1% 1% 1%;
-    border-radius: 15px 15px 15px 70px;
-}
-
-.tool_brickfield_grid_display {
-    display: grid;
-    grid-template-columns: 0.6fr 1.4fr 1fr;
-    grid-template-rows: 1fr 1fr;
-}
-
-.tool_brickfield_grid_spacing {
+    justify-content: space-between;
    margin-bottom: 20px;
-    margin-left: auto;
-    margin-right: 1em;
+}
+
+.tool_brickfield_banner_heading > img {
+    height: 50px;
+}
+
+.tool_brickfield_banner > p {
+    text-align: center;
 }

 .tool_brickfield_grid_heading {
@@ -60,59 +33,63 @@
    font-size: 20px;
    font-weight: 400;
    color: #040d29;
+    padding-bottom: 4px;
 }

 .tool_brickfield_grid_content {
    color: #040d29;
    font-size: 16px;
    line-height: 1.4em;
-    margin: 0;
-    padding: 0;
 }

-.tool_brickfield_logo_height {
-    height: 3em;
-}
-
-.tool_brickfield_logo_position {
-    padding-bottom: 2em;
-}
-
-.tool_brickfield_icon_position {
-    line-height: 1;
-    font-size: 50px;
-}
-
-.tool_brickfield_icon_height {
+.tool_brickfield_grid_heading > img {
    height: 30px;
+    padding-right: 16px;
 }

-.tool_brickfield_center_button {
-    text-align: center;
+.tool_brickfield_grid {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    margin: 20px 20px 30px;
 }

-.tool_brickfield_advanced_button {
+.tool_brickfield_grid > div {
+    margin: 10px;
+    padding: 20px;
+    flex-basis: 30%;
+    border: 1px solid grey;
+    max-width: 500px;
+    min-width: 250px;
+    flex-grow: 4;
+    border-radius: 15px 15px 15px 50px;
+}
+
+.tool_brickfield_grid_heading {
+    display: flex;
+}
+
+.tool_brickfield_footer > a {
    font-size: 18px;
    letter-spacing: 1px;
    color: #fff;
    background-color: #4054b2;
-    border-style: solid;
-    border-color: #fff;
-    border-radius: 5px 5px 5px 5px;
-    padding: 15px 50px 15px 50px;
+    border-radius: 5px;
+    padding: 15px 50px;
    transition: 0.3s;
+    margin-bottom: 20px;
 }

-.tool_brickfield_advanced_button:hover {
+.tool_brickfield_footer {
+    text-align: center;
+}
+
+.tool_brickfield_footer > a:hover {
+    color: #fff;
    background-color: #253687;
+    text-decoration: none;
 }

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