Moodle release 4.5

Prevent `$PAGE` debugging when loading navigation branches.

.github/workflows/onebyone.yml

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

.github/workflows/push.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches-ignore:
       - main
-      - master
       - MOODLE_[0-9]+_STABLE
     tags-ignore:
       - v[0-9]+.[0-9]+.[0-9]+*
@@ -123,3 +122,6 @@ jobs:
           dbtype: ${{ matrix.db }}
           phpunit_options: ${{ secrets.phpunit_options }}
         run: vendor/bin/phpunit $phpunit_options ${{ inputs.phpunit_extra_options }}
+
+      - name: Git status
+        run: git status

.github/workflows/web-installer-test.yml

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

.gitignore

@@ -26,7 +26,9 @@
 /.patches/
 /.idea/
 .phpstorm.*
-!.phpstorm.meta.php
+!/.phpstorm.meta.php/
+/.phpstorm.meta.php/*
+!/.phpstorm.meta.php/di.php
 /nbproject/
 CVS
 .DS_Store
@@ -56,3 +58,4 @@ moodle-plugin-ci.phar
 .hugo_build.lock
 phpcs.xml
 jsconfig.json
+UPGRADING-CURRENT.md

.grunt/components.js

@@ -40,9 +40,20 @@ const fetchComponentData = () => {
     if (!Object.entries(componentData).length) {
         componentData.subsystems = {};
         componentData.pathList = [];
+        componentData.components = {};
+        componentData.standardComponents = {};
 
         // Fetch the component definiitions from the distributed JSON file.
         const components = JSON.parse(fs.readFileSync(`${gruntFilePath}/lib/components.json`));
+        const pluginData = JSON.parse(fs.readFileSync(`${gruntFilePath}/lib/plugins.json`));
+
+        componentData.pluginTypes = components.plugintypes;
+
+        const standardPlugins = Object.entries(pluginData.standard).map(
+            ([pluginType, pluginNames]) => {
+                return pluginNames.map(pluginName => `${pluginType}_${pluginName}`);
+            }
+        ).reduce((acc, val) => acc.concat(val), []);
 
         // Build the list of moodle subsystems.
         componentData.subsystems.lib = 'core';
@@ -55,8 +66,8 @@ const fetchComponentData = () => {
             }
         }
 
-        // The list of components incldues the list of subsystems.
-        componentData.components = componentData.subsystems;
+        // The list of components includes the list of subsystems.
+        componentData.components = {...componentData.subsystems};
 
         // Go through each of the plugintypes.
         Object.entries(components.plugintypes).forEach(([pluginType, pluginTypePath]) => {
@@ -87,6 +98,20 @@ const fetchComponentData = () => {
             });
         });
 
+
+        // Create a list of the standard subsystem and plugins.
+        componentData.standardComponents = Object.fromEntries(
+            Object.entries(componentData.components).filter(([, name]) => {
+                if (name === 'core' || name.startsWith('core_')) {
+                    return true;
+                }
+                return standardPlugins.indexOf(name) !== -1;
+            })
+        );
+
+        componentData.componentMapping = Object.fromEntries(
+            Object.entries(componentData.components).map(([path, name]) => [name, path])
+        );
     }
 
     return componentData;

.grunt/notes/src/components.mjs

@@ -0,0 +1,138 @@
+// 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 * as Components from '../../components.js';
+
+const componentData = Components.fetchComponentData();
+
+/**
+ * The standard components shipped with core Moodle.
+ *
+ * @type {Object}
+ */
+export const standardComponents = componentData.standardComponents;
+
+/**
+ * All components of the current Moodle instance.
+ *
+ * @type {Object}
+ */
+export const allComponents = componentData.components;
+
+/**
+ * Get all components of the current Moodle instance.
+ *
+ * @returns {Array}
+ */
+export const getAllComponents = () => {
+    let components = new Map(Object.entries(componentData.pluginTypes).map(([value, path]) => ([path,{
+        path,
+        value,
+        name: `${value} (plugin type)`,
+    }])));
+
+    Object
+        .entries(componentData.components)
+        .filter(([path, value]) => Object.values(componentData.standardComponents).includes(value))
+        .forEach(([path, value]) => {
+            const entry = {
+                path,
+                value,
+                name: value,
+            };
+            if (Object.values(componentData.subsystems).includes(value)) {
+                if (components.has(path)) {
+                    entry.name = `${value} (subsystem / plugintype)`;
+                } else {
+                    entry.name = `${value} (subsystem)`;
+                }
+            }
+
+            components.set(path, entry);
+        });
+
+        return Array.from(components.values());
+};
+
+/**
+ * Whether the specified component is a standard component shipped with core Moodle.
+ *
+ * @param {string} componentName
+ * @returns {boolean}
+ */
+export const isStandardComponent = (componentName) => {
+    if (Object.values(componentData.standardComponents).includes(componentName)) {
+        return true;
+    }
+
+    if (Object.keys(componentData.pluginTypes).includes(componentName)) {
+        return true;
+    }
+
+    return false;
+};
+
+export const rewritePlugintypeAsSubsystem = (componentName) => {
+    if (Object.keys(componentData.pluginTypes).includes(componentName)) {
+        const pluginTypePath = componentData.pluginTypes[componentName];
+        if (Object.keys(componentData.subsystems).includes(pluginTypePath)) {
+            return true;
+        }
+    }
+
+    return false;
+};
+
+/**
+ * Whether the specified component is a community component.
+ *
+ * @param {string} componentName
+ * @returns {boolean}
+ */
+export const isCommunityComponent = (componentName) => {
+    if (isStandardComponent(componentName)) {
+        return false;
+    }
+
+    return Object.values(componentData.components).indexOf(componentName) !== -1;
+};
+
+/**
+ * Sort method for components.
+ *
+ * This method sorts components putting `core` first, followed by core subsystems, then everything else.
+ *
+ * @param {String} a
+ * @param {String} b
+ * @returns {Number}
+ */
+export const sortComponents = (a, b) => {
+    // Always put 'core' first.
+    if (a === 'core') {
+        return -1;
+    } else if (b === 'core') {
+        return 1;
+    }
+
+    // Put core subsystems next.
+    if (a.startsWith('core_') && !b.startsWith('core_')) {
+        return -1;
+    } else if (b.startsWith('core_') && !a.startsWith('core_')) {
+        return 1;
+    }
+
+    // Sort alphabetically for everything else.
+    return a.localeCompare(b);
+};

.grunt/notes/src/create.mjs

@@ -0,0 +1,85 @@
+#!/usr/bin/env node
+// 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 inquirer from 'inquirer';
+import chalk from 'chalk';
+
+import { createNote } from './note.mjs';
+import { getInitialValues } from './helpers.mjs';
+import * as Prompts from './prompts.mjs';
+import logger from './logger.mjs';
+
+export default async (options) => {
+    // Processs the initial values.
+    const initialValues = getInitialValues(options);
+
+    // Fetch information.
+    const messages = [];
+    const { issueNumber } = await inquirer.prompt([
+        Prompts.getIssuePrompt(),
+    ], initialValues);
+
+    let selection = {};
+    let notePath;
+    do {
+        selection = {};
+        selection = await inquirer.prompt([
+            Prompts.getComponentsPrompt(),
+            Prompts.getTypePrompt(),
+            Prompts.getMessagePromptInput(),
+        ], initialValues);
+        if (selection.message === '') {
+            selection = Object.assign(
+                selection,
+                await inquirer.prompt([
+                    Prompts.getMessagePromptEditor(),
+                ]),
+            );
+        }
+
+            logger.info(`
+    Creating upgrade note with the following options:
+
+    - Issue:     ${chalk.bold(issueNumber)}
+    - Component: ${chalk.bold(selection.components)}
+    - Type:      ${chalk.bold(selection.type)}
+    - Message:
+    ${chalk.bold(selection.message)}
+`);
+
+        messages.push({
+            components: [selection.components],
+            type: selection.type,
+            message: selection.message,
+        });
+
+        // Save the note so far.
+        if (notePath) {
+            await createNote(issueNumber, messages, notePath);
+            logger.info(`Updated note at: ${chalk.underline(chalk.bold(notePath))}`);
+        } else {
+            notePath = await createNote(issueNumber, messages);
+            logger.info(`Note created at: ${chalk.underline(chalk.bold(notePath))}`);
+        }
+
+        selection = Object.assign(
+            selection,
+            await inquirer.prompt([
+                Prompts.getAddAnotherPrompt(),
+            ], initialValues),
+        );
+    } while (selection.addAnother);
+};

.grunt/notes/src/generate.mjs

@@ -0,0 +1,357 @@
+#!/usr/bin/env node
+// 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 chalk from 'chalk';
+import { getAllComponents } from './components.mjs';
+import { getCombinedNotesByComponent, deleteAllNotes } from './note.mjs';
+import { getNoteName } from './noteTypes.mjs';
+import { writeFile, readFile, unlink } from 'fs/promises';
+import { join as joinPath } from 'path';
+import logger from './logger.mjs';
+import { getCurrentVersion } from './helpers.mjs';
+
+/**
+ * Helper to fetch the current notes from a file.
+ *
+ * @param {string} file
+ * @returns {Promise<string>}
+ */
+const getCurrentNotes = async (file) => {
+    try {
+        return await readFile(file, 'utf8');
+    } catch (error) {
+        return null;
+    }
+}
+
+/**
+ * Update the UPGRADING.md file.
+ *
+ * @param {string} upgradeNotes
+ * @param {Object} options
+ * @param {boolean} options.deleteNotes
+ * @returns {Promise<void>}
+ */
+const updateUpgradeNotes = async (upgradeNotes, options) => {
+    const fileName = 'UPGRADING.md';
+    // Write the notes to a file.
+    logger.info(`Writing notes to ${chalk.underline(chalk.bold(fileName))}`);
+    // Prepend to the existing file.
+    const existingContent = await getCurrentNotes(fileName);
+    if (existingContent) {
+        await writeFile(fileName, getUpdatedNotes(existingContent, upgradeNotes));
+    } else {
+        // This should not normally happen.
+        await writeFile(fileName, upgradeNotes);
+    }
+
+    if (options.deleteNotes) {
+        logger.warn(`>>> Deleting all notes <<<`)
+        // Delete the notes.
+        deleteAllNotes();
+    }
+};
+
+/**
+ * Create the current summary notes.
+ *
+ * @param {string} upgradeNotes
+ * @returns {Promise<void>}
+ */
+const createCurrentSummary = async (upgradeNotes) => {
+    const fileName = 'UPGRADING-CURRENT.md';
+    const notes = `# Moodle upgrade notes\n\n${upgradeNotes}`;
+    await writeFile(fileName, notes);
+
+    logger.info(`Running upgrade notes written to ${chalk.underline(chalk.bold(fileName))}`);
+};
+
+/**
+ * Get the indexes of the lines that contain the version headings.
+ *
+ * @param {array<string>} lines
+ * @returns {array<object>}
+ */
+const getVersionLineIndexes = (lines) => {
+    const h2Indexes = [];
+    lines.forEach((line, index) => {
+        const matches = line.match(/^##\s(?<version>.*)$/);
+        if (matches) {
+            h2Indexes.push({
+                index,
+                line,
+                version: matches.groups.version,
+            });
+        }
+    });
+
+    return h2Indexes;
+};
+
+/**
+ * Find the index of the Unreleased heading.
+ *
+ * @param {array<object>} versionHeadings
+ * @returns {number}
+ */
+const findUnreleasedHeadingIndex = (versionHeadings) => versionHeadings.findIndex((heading) => {
+    if (heading.version === 'Unreleased') {
+        // Used if version cannot be guessed.
+        return true;
+    }
+
+    if (heading.version.endsWith('+')) {
+        // Weekly release for a stable branch.
+        return true;
+    }
+
+    if (heading.version.match(/beta|rc\d/)) {
+        // Beta and RC rolls are treated as weeklies.
+        return true;
+    }
+
+    if (heading.version.endsWith('dev')) {
+        // Development version.
+        return true;
+    }
+
+    return false;
+});
+
+/**
+ * Get the before and after content, to facilitate replacing any existing Unreleased notes.
+ *
+ * @param {array<string>} lines
+ * @returns {Object} {beforeContent: string, afterContent: string}
+ */
+const getBeforeAndAfterContent = (lines) => {
+    const existingLines = lines.split('\n');
+    const versionHeadings = getVersionLineIndexes(existingLines);
+
+    if (versionHeadings.length > 0) {
+        const unreleasedHeadingIndex = findUnreleasedHeadingIndex(versionHeadings);
+        if (unreleasedHeadingIndex !== -1) {
+            const beforeContent = existingLines.slice(0, versionHeadings[unreleasedHeadingIndex].index).join('\n');
+            if (versionHeadings.length > unreleasedHeadingIndex + 1) {
+                const afterContent = existingLines.slice(versionHeadings[unreleasedHeadingIndex + 1].index).join('\n');
+                return {
+                    beforeContent,
+                    afterContent,
+                };
+            }
+            return {
+                beforeContent,
+                afterContent: '',
+            };
+        }
+
+        return {
+            beforeContent: existingLines.slice(0, versionHeadings[0].index).join('\n'),
+            afterContent: existingLines.slice(versionHeadings[0].index).join('\n'),
+        };
+    }
+
+    return {
+        beforeContent: existingLines.join('\n'),
+        afterContent: '',
+    }
+};
+
+/**
+ * Get the notes for the component.
+ *
+ * @param {string} types
+ * @param {Number} headingLevel
+ * @returns {string}
+ */
+const getNotesForComponent = (types, headingLevel) => {
+    let upgradeNotes = '';
+    Object.entries(types).forEach(([type, notes]) => {
+        upgradeNotes += '#'.repeat(headingLevel);
+        upgradeNotes += ` ${getNoteName(type)}\n\n`;
+        notes.forEach(({ message, issueNumber }) => {
+            // Split the message into lines, removing empty lines.
+            const messageLines = message
+                .split('\n')
+                // Remove empty lines between tables, and list entries, but not after lists.
+                .filter((line, index, lines) => {
+                    if (line.trim().length === 0) {
+                        // This line is empty.
+
+                        // If it's the first line in the file, remove it.
+                        if (index === 0) {
+                            return false;
+                        }
+
+                        // This is the last line in the file, remove it.
+                        if (index === lines.length - 1) {
+                            return false;
+                        }
+
+                        // If the previous line relates to a table, remove this line.
+                        if (lines[index - 1].match(/^\s*\|/)) {
+                            return false;
+                        }
+
+                        // If the next line is also empty, do not remove this line.
+                        if (lines[index + 1].trim().length === 0) {
+                            return true;
+                        }
+
+                        // Do not remove the line if the previous line was a list item.
+                        if (lines[index - 1].match(/^\s*[-*]\s/)) {
+                            return true;
+                        }
+
+                        if (lines[index - 1].match(/^\s*\d+\.\s/)) {
+                            return true;
+                        }
+
+                        // Preserve all other empty lines by default.
+                        return true;
+                    }
+
+                    // Keep any line which has content.
+                    return true;
+                });
+
+
+            const firstLine = messageLines.shift().trim();
+            upgradeNotes += `- ${firstLine}\n`;
+
+            messageLines
+                .forEach((line) => {
+                    upgradeNotes += `  ${line}`.trimEnd() + `\n`;
+                });
+            upgradeNotes += `\n  For more information see [${issueNumber}](https://tracker.moodle.org/browse/${issueNumber})\n`;
+        });
+        upgradeNotes += '\n';
+    });
+
+    return upgradeNotes;
+};
+
+/**
+ * Get the updated notes mixed with existing content.
+ *
+ * @param {string} existingContent
+ * @param {string} upgradeNotes
+ */
+const getUpdatedNotes = (existingContent, upgradeNotes) => {
+    const { beforeContent, afterContent } = getBeforeAndAfterContent(existingContent);
+    const newContent = `${beforeContent}\n${upgradeNotes}\n${afterContent}`
+        .split('\n')
+        .filter((line, index, lines) => {
+            if (line === '' && lines[index - 1] === '') {
+                // Remove multiple consecutive empty lines.
+                return false;
+            }
+            return true;
+        })
+        .join('\n');
+
+    return newContent;
+};
+
+/**
+ * Update the notes for each component.
+ */
+const updateComponentNotes = (
+    notes,
+    version,
+    notesFileName = 'UPGRADING.md',
+    removeEmpty = false,
+) => {
+    return getAllComponents().map(async (component) => {
+        logger.verbose(`Updating notes for ${component.name} into ${component.path}`);
+        const fileName = joinPath(component.path, notesFileName);
+
+        const existingContent = await getCurrentNotes(fileName);
+
+        if (!existingContent) {
+            if (!notes[component.value]) {
+                // No existing notes, and no new notes to add.
+                return;
+            }
+        } else {
+            if (!notes[component.value]) {
+                // There is existing content, but nothing to add.
+                if (removeEmpty) {
+                    logger.verbose(`Removing empty notes file ${fileName}`);
+                    await unlink(fileName);
+                }
+                return;
+            }
+        }
+
+        const componentNotes = notes[component.value];
+        let upgradeNotes = `## ${version}\n\n`;
+        upgradeNotes += getNotesForComponent(componentNotes, 3);
+
+        if (existingContent) {
+            await writeFile(fileName, getUpdatedNotes(existingContent, upgradeNotes));
+        } else {
+            await writeFile(
+                fileName,
+                `# ${component.name} Upgrade notes\n\n${upgradeNotes}`,
+            );
+        }
+    });
+}
+
+/**
+ * Generate the upgrade notes for a new release.
+ *
+ * @param {string|undefined} version
+ * @param {Object} options
+ * @param {boolean} options.generateUpgradeNotes
+ * @param {boolean} options.deleteNotes
+ * @returns {Promise<void>}
+ */
+export default async (version, options = {}) => {
+    const notes = await getCombinedNotesByComponent();
+
+    if (Object.keys(notes).length === 0) {
+        logger.warn('No notes to generate');
+        return;
+    }
+
+    if (!version) {
+        version = await getCurrentVersion();
+    }
+
+    // Generate the upgrade notes for this release.
+    // We have
+    // - a title with the release name
+    // - the change types
+    // - which contain the components
+    // - which document each change
+    let upgradeNotes = `## ${version}\n\n`;
+
+    Object.entries(notes).forEach(([component, types]) => {
+        upgradeNotes += `### ${component}\n\n`;
+        upgradeNotes += getNotesForComponent(types, 4);
+    });
+
+    await Promise.all([
+        createCurrentSummary(upgradeNotes),
+        ...updateComponentNotes(notes, version, 'UPGRADING-CURRENT.md', true),
+    ]);
+    if (options.generateUpgradeNotes) {
+        await Promise.all(updateComponentNotes(notes, version));
+        await updateUpgradeNotes(upgradeNotes, options);
+    }
+};

.grunt/notes/src/helpers.mjs

@@ -0,0 +1,230 @@
+// 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 chalk from 'chalk';
+import { isStandardComponent, isCommunityComponent, rewritePlugintypeAsSubsystem } from './components.mjs';
+import { isValidNoteName } from './noteTypes.mjs';
+import logger from './logger.mjs';
+import { readFile } from 'fs/promises';
+
+/**
+ * Validate an issue number input
+ *
+ * @param {string} input
+ * @returns {string|boolean}
+ */
+export const validateIssueNumber = (input) => {
+    if (!input) {
+        return 'You must provide a tracker issue number';
+    }
+
+    if (input.match(/^[a-zA-Z]*-\d+$/)) {
+        return true;
+    }
+
+    if (input.match(/^\d+$/)) {
+        return true;
+    }
+
+    return 'The issue number was not recognised as a valid issue number';
+};
+
+/**
+ * Format an issue number input.
+ *
+ * @param {string} input
+ * @returns {string}
+ */
+export const formatIssueNumber = (input) => {
+    if (input.match(/^[a-zA-Z]*-\d+$/)) {
+        return input;
+    }
+
+    if (input.match(/^\d+$/)) {
+        return `MDL-${input}`;
+    }
+
+    return input;
+};
+
+/**
+ * Validate a component.
+ *
+ * @param {string} input
+ * @returns {string|boolean}
+ */
+export const validateComponent = (input) => {
+    if (isStandardComponent(input)) {
+        return true;
+    }
+
+    if (isCommunityComponent(input)) {
+        return 'Currently only core plugins are supported.';
+    }
+
+    return 'The component was not recognised as a standard component';
+};
+
+export const formatComponent = (input) => {
+    if (rewritePlugintypeAsSubsystem(input)) {
+        return `core_${input}`;
+    }
+    return input;
+}
+
+/**
+ * Get the initial values from the options.
+ *
+ * @param {object} options
+ * @returns {object}
+ */
+export const getInitialValues = (options) => {
+    const initialValues = {};
+
+    const type = getInitialTypeValue(options);
+    if (type) {
+        initialValues.type = type;
+    }
+
+    const issueNumber = getInitialIssueValue(options);
+    if (issueNumber) {
+        initialValues.issueNumber = issueNumber;
+    }
+
+    const component = getInitialComponentValue(options);
+    if (component) {
+        initialValues.components = component;
+    }
+
+    const message = getInitialMessageValue(options);
+    if (message) {
+        initialValues.message = message
+        initialValues.addAnother = false;
+    }
+
+    return initialValues;
+};
+
+/**
+ * Get the initial type value.
+ *
+ * @param {Object} options
+ * @returns {string|undefined}
+ */
+const getInitialTypeValue = (options) => {
+    if (!options.type) {
+        return;
+    }
+
+    options.type = options.type.trim().toLowerCase();
+
+    if (isValidNoteName(options.type)) {
+        return options.type;
+    }
+
+    logger.warn(`Note type "${chalk.underline(chalk.red(options.type))}" is not valid.`);
+};
+
+/**
+ * Get the initial issue number value.
+ *
+ * @param {Object} options
+ * @returns {string|undefined}
+ */
+
+const getInitialIssueValue = (options) => {
+    if (!options.issue) {
+        return;
+    }
+    options.issue = options.issue.trim().toUpperCase();
+
+    const issueNumberValidated = validateIssueNumber(options.issue);
+    if (issueNumberValidated === true) {
+        const issueNumber = formatIssueNumber(options.issue);
+        if (issueNumber !== options.issue) {
+            logger.warn(
+                `Issue number "${chalk.underline(chalk.red(options.issue))}" was updated to ` +
+                `"${chalk.underline(chalk.green(issueNumber))}"`
+            );
+        }
+
+        return issueNumber;
+    } else {
+        logger.warn(`Issue number "${chalk.underline(chalk.red(options.issue))}" is not valid: ${issueNumberValidated}`);
+    }
+};
+
+/**
+ * Get the initial component value.
+ *
+ * @param {Object} options
+ * @returns {string|undefined}
+ */
+const getInitialComponentValue = (options) => {
+    if (!options.component) {
+        return;
+    }
+
+    options.component = options.component.trim().toLowerCase();
+    const componentValidated = validateComponent(options.component);
+    if (componentValidated === true) {
+        const component = formatComponent(options.component);
+        if (component !== options.component) {
+            logger.warn(
+                `Component "${chalk.underline(chalk.red(options.component))}" was updated to ` +
+                `"${chalk.underline(chalk.green(component))}"`
+            );
+        }
+
+        return component;
+    } else {
+        logger.warn(`Component "${chalk.underline(chalk.red(options.component))}" is not valid: ${componentValidated}`);
+    }
+};
+
+/**
+ * Get the initial message value.
+ *
+ * @param {Object} options
+ * @returns {string|undefined}
+ */
+
+const getInitialMessageValue = (options) => {
+    if (!options.message) {
+        return;
+    }
+
+    return options.message.trim();
+};
+
+/**
+ * Get the current version from the project /version.php file.
+ *
+ * @returns {Promise<string>}
+ */
+export const getCurrentVersion = async () => {
+    const versionRegex = new RegExp(/^ *\$release *= *['\"](?<release>[^ \+]+\+?) *\(Build:.*/m);
+    try {
+        const versionFile = await readFile('version.php', 'utf8');
+        const match = versionFile.match(versionRegex);
+        if (match) {
+            return match.groups.release;
+        }
+    } catch(error) {
+        logger.error('Unable to read the version file');
+    }
+
+    return "Unreleased";
+}

.grunt/notes/src/logger.mjs

@@ -0,0 +1,30 @@
+#!/usr/bin/env node
+// 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 winston from 'winston';
+
+const logger = winston.createLogger({
+    level: 'info',
+    format: winston.format.combine(
+        winston.format.colorize(),
+        winston.format.simple()
+    ),
+    transports: [
+        new winston.transports.Console(),
+    ],
+});
+
+export default logger;

.grunt/notes/src/note.mjs

@@ -0,0 +1,194 @@
+// 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 yaml from 'js-yaml';
+import path from 'path';
+import { writeFile, mkdir, readdir, readFile, unlink } from 'fs/promises';
+import { isValidNoteName, sortNoteTypes } from './noteTypes.mjs';
+import { sortComponents } from './components.mjs';
+
+const unreleasedPath = path.resolve('.upgradenotes');
+
+/**
+ * Get the filename for the note.
+ *
+ * @param {string} issueNumnber The issue number
+ * @returns {string}
+ */
+const getFilename = (issueNumber) => {
+    const dateTimeFormat = new Intl.DateTimeFormat(undefined, {
+        year: 'numeric',
+        month: '2-digit',
+        day: '2-digit',
+        hour: '2-digit',
+        minute: '2-digit',
+        second: '2-digit',
+        fractionalSecondDigits: 2,
+        timeZone: 'UTC',
+    });
+
+    const date = Object.fromEntries(
+        dateTimeFormat.formatToParts(new Date())
+            .filter((p) => p.type !== 'literal')
+            .map((p) => ([p.type, p.value]))
+    );
+
+    const dateString = [
+        date.year,
+        date.month,
+        date.day,
+        date.hour,
+        date.minute,
+        date.second,
+        date.fractionalSecond,
+    ].join('');
+
+    return `${issueNumber}-${dateString}.yml`;
+};
+
+/**
+ * Create a new note.
+ *
+ * @param {string} issueNumber
+ * @param {[type: string]: {message: string}} messages
+ * @returns {string} The path to the note on disk
+ */
+export const createNote = async (
+    issueNumber,
+    messages,
+    notePath,
+) => {
+    const note = {
+        issueNumber,
+        notes: {},
+    };
+
+    messages.forEach(({components, type, message}) => {
+        note.notes[components] = note.notes[components] || [];
+        note.notes[components].push({message, type});
+    });
+
+    if (!notePath) {
+        notePath = path.resolve(unreleasedPath, getFilename(issueNumber));
+    }
+    const noteContent = yaml.dump(note);
+
+    await mkdir(unreleasedPath, {recursive: true});
+    await writeFile(notePath, noteContent);
+
+    return notePath;
+};
+
+/**
+ * Get all unreleased notes.
+ *
+ * @returns {Promise<{issueNumber: string, components: string[], types: {[type: string]: {message: string}[]}}[]>
+ */
+export const getAllNotes = async () => {
+    const files = await readdir(unreleasedPath);
+    const notes = files
+        .filter((file) => file.endsWith('.yml'))
+        .map(async (file) => {
+            const filePath = path.resolve(unreleasedPath, file);
+            const fileContent = await readFile(filePath, 'utf8');
+
+            return {
+                ...yaml.load(fileContent),
+                filePath,
+            };
+        });
+
+    return Promise.all(notes);
+};
+
+/**
+ * Get the list of notes, grouped by note type, then component.
+ *
+ * @returns {Promise<{[type: string]: {[components: string]: {message: string, issueNumber: string}[]}}>}
+ */
+export const getCombinedNotes = async () => {
+    const notes = await getAllNotes();
+    const combinedNotes = {};
+
+    notes.forEach((note) => {
+        Object.entries(note.notes).forEach(([components, data]) => {
+            data.forEach((entry) => {
+                if (!isValidNoteName(entry.type)) {
+                    throw new Error(`Invalid note type: "${entry.type}" in file ${note.filePath}`);
+                }
+                combinedNotes[entry.type] = combinedNotes[entry.type] || {};
+                combinedNotes[entry.type][components] = combinedNotes[entry.type][components] || [];
+                combinedNotes[entry.type][components].push({message: entry.message, issueNumber: note.issueNumber});
+            });
+        });
+    });
+
+    return combinedNotes;
+};
+
+/**
+ * Get the list of notes, grouped by component, then by note type.
+ *
+ * @returns {Promise<{[component: string]: {[type: string]: {message: string, issueNumber: string}[]}}>}
+ */
+export const getCombinedNotesByComponent = async () => {
+    const notes = await getAllNotes();
+    const combinedNotes = {};
+
+    notes.forEach((note) => {
+        Object.entries(note.notes).forEach(([component, data]) => {
+            combinedNotes[component] = combinedNotes[component] || {};
+            data.forEach((entry) => {
+                if (!isValidNoteName(entry.type)) {
+                    throw new Error(`Invalid note type: "${entry.type}" in file ${note.filePath}`);
+                }
+                combinedNotes[component][entry.type] = combinedNotes[component][entry.type] || [];
+                combinedNotes[component][entry.type].push({
+                    component,
+                    message: entry.message,
+                    issueNumber: note.issueNumber,
+                    type: entry.type,
+                });
+            });
+        });
+    });
+
+    // Sort notes by note type.
+    Object.entries(combinedNotes).forEach(([component, types]) => {
+        combinedNotes[component] = Object.fromEntries(
+            Object.entries(types).sort(([a], [b]) => sortNoteTypes(a, b))
+        );
+    });
+
+    // Sort components.
+    return Object.fromEntries(
+        Object.entries(combinedNotes).sort(([a], [b]) => sortComponents(a, b))
+    );
+};
+
+/**
+ * Delete all unreleased notes.
+ *
+ * @returns {Promise<void>}
+ */
+export const deleteAllNotes = async () => {
+    const files = await readdir(unreleasedPath);
+    return Promise.all(
+        files
+            .filter((item, index) => files.indexOf(item) === index)
+            .filter((file) => file.endsWith('.yml'))
+            .map((file) => unlink(`${unreleasedPath}/${file}`))
+    );
+};

.grunt/notes/src/noteTypes.mjs

@@ -0,0 +1,80 @@
+// 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/>.
+
+/**
+ * The note types.
+ *
+ * Matches the suggested order in https://keepachangelog.com/en/1.1.0/.
+ * @type {Object<string, string>}
+ */
+const noteTypes = {
+    'improved': 'Added',
+    'changed': 'Changed',
+    'deprecated': 'Deprecated',
+    'removed': 'Removed',
+    'fixed': 'Fixed',
+};
+
+/**
+ * The preferred order of note types.
+ *
+ * @type {string[]}
+ */
+const preferredOrder = Object.keys(noteTypes);
+
+/**
+ * Comparison method to sort note types.
+ *
+ * @param {String} a
+ * @param {String} b
+ * @returns {Number}
+ */
+export const sortNoteTypes = (a, b) => {
+    const aIndex = preferredOrder.indexOf(a);
+    const bIndex = preferredOrder.indexOf(b);
+
+    if (aIndex === -1) {
+        return 1;
+    }
+
+    if (bIndex === -1) {
+        return -1;
+    }
+
+    return aIndex - bIndex;
+};
+
+/**
+ * Get the note names.
+ *
+ * @returns {string[]}
+ */
+export const getNoteNames = () => Object.keys(noteTypes);
+
+/**
+ * Get the human-readable note name.
+ *
+ * @param {string} type
+ * @returns {string}
+ */
+export const getNoteName = (type) => noteTypes[type];
+
+/**
+ * Whether the note name is valid.
+ *
+ * @param {string} type
+ * @returns {boolean}
+ */
+export const isValidNoteName = (type) => noteTypes[type] !== undefined;

.grunt/notes/src/prompts.mjs

@@ -0,0 +1,153 @@
+// 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 inquirer from 'inquirer';
+import SearchList from 'inquirer-search-list';
+
+import { getNoteNames } from './noteTypes.mjs';
+import { getAllComponents } from './components.mjs';
+import {
+    formatComponent,
+    formatIssueNumber,
+    validateComponent,
+    validateIssueNumber,
+ } from './helpers.mjs';
+
+/**
+ * A Search List which accepts an initial value.
+ */
+class SearchListWithInitialValue extends SearchList {
+    constructor(options, ...args) {
+        super(options, ...args);
+
+        if (options.default) {
+            const pointer = this.filterList.findIndex((item) => {
+                return item.value === options.default;
+            });
+            if (pointer > -1) {
+                this.pointer = pointer;
+            }
+        }
+    }
+}
+
+inquirer.registerPrompt('search-list', SearchListWithInitialValue);
+
+/**
+ * Get the issue type prompt.
+ *
+ * @param {string} defaultData The initially selected value
+ * @returns {Object}
+ */
+export const getTypePrompt = (defaultData) => ({
+    default: defaultData,
+    type: 'search-list',
+    message: 'Type of change',
+    name: 'type',
+    choices: getNoteNames(),
+    validate: (selection) => {
+        if (selection.length < 1) {
+            return 'You must select at least one type of change';
+        }
+
+        return true;
+    },
+});
+
+/**
+ * Get the component prompt.
+ *
+ * @param {string} [defaultValue='core'] The initally selected value.
+ * @returns
+ */
+export const getComponentsPrompt = (defaultValue) => {
+    if (!defaultValue ) {
+        defaultValue = 'core';
+    }
+
+    return {
+        choices: getAllComponents(),
+        default: defaultValue,
+        type: 'search-list',
+        message: 'Component',
+        name: 'components',
+        validate: validateComponent,
+        filter: formatComponent,
+    };
+};
+
+/**
+ * Get the issue number prompt as an inline input.
+ *
+ * @param {string} defaultData
+ * @returns {object}
+ */
+export const getIssuePrompt = (defaultData) => ({
+    default: defaultData,
+    type: 'input',
+    message: 'Tracker issue number',
+    name: 'issueNumber',
+    validate: validateIssueNumber,
+    filter: formatIssueNumber,
+});
+
+/**
+ * Get a message prompt.
+ *
+ * @param {string} defaultData
+ * @returns
+ */
+export const getMessagePromptEditor = (defaultData) => ({
+    default: defaultData,
+    type: process.stdin.isTTY ? 'editor' : 'input',
+    postfix: '.md',
+    message: 'Message',
+    name: 'message',
+    waitUserInput: false,
+    validate: (input) => {
+        if (!input) {
+            return 'You must provide a message';
+        }
+        return true;
+    },
+    // Remove any trailing whitespace.
+    filter: (input) => input.split('\n').map((line) => line.trimEnd()).join('\n'),
+});
+
+/**
+ * Get a message prompt.
+ *
+ * @param {string} defaultData
+ * @returns
+ */
+export const getMessagePromptInput = (defaultData) => ({
+    default: defaultData,
+    type: 'input',
+    message: 'Message (leave empty to use editor)',
+    name: 'message',
+    filter: (input) => input.trim(),
+});
+
+/**
+ * Get a prompt to ask the user if they wish to add another entry.
+ *
+ * @returns {Object}
+ */
+export const getAddAnotherPrompt = () => ({
+    type: 'confirm',
+    message: 'Do you want to add another note?',
+    default: false,
+    name: 'addAnother',
+});

.grunt/upgradenotes.mjs

@@ -0,0 +1,103 @@
+#!/usr/bin/env node
+// 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 { Argument, Option, program } from 'commander';
+import chalk from 'chalk';
+
+import { getNoteNames } from './notes/src/noteTypes.mjs';
+import createAction from './notes/src/create.mjs';
+import generateAction from './notes/src/generate.mjs';
+import logger from './notes/src/logger.mjs';
+
+console.log(`
+${chalk.bold(chalk.underline(chalk.green('Moodle Upgrade Notes Generator')))}
+
+This tool is used to generate the upgrade notes for changes you make in Moodle.
+
+Please remember that the intended audience of these changes is
+${chalk.italic('plugin developers')} who need to know how to update their plugins
+for a new Moodle version.
+
+Upgrade notes should not be used to document changes for site administrators, or
+for internal API changes which are not expected to be used outside of the
+relevant component.
+`)
+
+program.configureHelp({
+    helpWidth: 100,
+});
+
+program.on('option:verbose', () => {
+    logger.level = 'verbose';
+});
+
+program.addOption(
+    new Option(
+        '-v, --verbose',
+        'Output more information during the generation process',
+    )
+    .default(false)
+);
+
+// Define the command line options.
+program
+    .command('create')
+    .summary('Generate a new upgrade note')
+    .addOption(
+        new Option('-t, --type <type>', `The type of change to document. Valid types are: ${getNoteNames().join(', ')}`)
+    )
+    .addOption(new Option('-i, --issue <issue>', 'The tracker issue number'))
+    .addOption(new Option('-c, --component <component>', 'The component to write a note for'))
+    .addOption(new Option(
+        '-m, --message <message>',
+        'The message to use for the upgrade note',
+    ))
+    .action((options) => createAction(options));
+
+program
+    .command('summary')
+    .summary('Generate a local copy of the upgrade notes summary')
+    .addArgument(
+        new Argument('[version]', 'The Moodle version to create the summary notes for')
+    )
+    .action((version) => generateAction(version));
+
+program
+    .command('release')
+    .summary('Generate the markdown copies of the upgrade notes for a Moodle release')
+    .addArgument(
+        new Argument('[version]', 'The Moodle version to create the release notes for')
+    )
+    .addOption(
+        new Option(
+            '--generate-upgrade-notes',
+            'Generate the UPGRADING.md notes for the release. ' +
+                'Note: This option is intended for use by the release manager when generating the upgrade notes.',
+        )
+        .default(true)
+    )
+    .addOption(
+        new Option(
+            '-d, --delete-notes',
+            'Delete the notes after generating the UPGRADING.md notes for the release. ' +
+                'Note: This option is intended for use by the release manager when generating the upgrade notes.' +
+                'This option has no effect unless --generate-upgrade-notes is also set.'
+        )
+        .default(false)
+    )
+    .action((version, options) => generateAction(version, options));
+
+program.parse();

admin/UPGRADING.md

@@ -0,0 +1,9 @@
+# core_admin (subsystem) Upgrade notes
+
+## 4.5rc1
+
+### Removed
+
+- The HTTP Server setting "Use slash arguments" (slasharguments) configuration setting and related to it has been removed. Calling the option with $CFG->slasharguments or get_config('slasharguments') is no longer available.
+
+  For more information see [MDL-62640](https://tracker.moodle.org/browse/MDL-62640)

admin/ai.php

@@ -0,0 +1,65 @@
+<?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/>.
+
+/**
+ * Manage AI subsystem plugins settings.
+ *
+ * @package    core_admin
+ * @copyright  2024 Matt Porritt <matt.porritt@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once('../config.php');
+require_once($CFG->libdir . '/adminlib.php');
+
+$action = required_param('action', PARAM_ALPHANUMEXT);
+$type = required_param('type', PARAM_PLUGIN); // Must be provider or placement.
+$name = required_param('name', PARAM_PLUGIN); // Plugin name, e.g openai.
+
+$syscontext = context_system::instance();
+$PAGE->set_url('/admin/ai.php');
+$PAGE->set_context($syscontext);
+
+require_admin();
+require_sesskey();
+
+$return = new moodle_url('/admin/settings.php', ['section' => "aisettings$type"]);
+
+$plugins = core_plugin_manager::instance()->get_plugins_of_type("ai$type");
+$sortorder = array_flip(array_keys($plugins));
+
+if (!isset($plugins[$name])) {
+    throw new moodle_exception('aipluginnotfound', 'core_ai', $return, $name);
+}
+
+$plugintypename = $plugins[$name]->type . '_' . $plugins[$name]->name;
+
+switch ($action) {
+    case 'disable':
+        if ($plugins[$name]->is_enabled()) {
+            $class = core_plugin_manager::resolve_plugininfo_class("aisettings$type");
+            $class::enable_plugin($name, false);
+        }
+        break;
+    case 'enable':
+        if (!$plugins[$name]->is_enabled()) {
+            $class = core_plugin_manager::resolve_plugininfo_class("aisettings$type");
+            $class::enable_plugin($name, true);
+        }
+        break;
+}
+
+redirect($return);

admin/amd/build/bulk_user_actions.min.js

@@ -5,6 +5,6 @@ define("core_admin/bulk_user_actions",["exports","core_reportbuilder/local/selec
    * @module     core_admin/bulk_user_actions
    * @copyright  2024 Marina Glancy
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
-   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,reportSelectors=_interopRequireWildcard(reportSelectors),tableEvents=_interopRequireWildcard(tableEvents),FormChangeChecker=_interopRequireWildcard(FormChangeChecker),CustomEvents=_interopRequireWildcard(CustomEvents),_jquery=(obj=_jquery)&&obj.__esModule?obj:{default:obj};const Selectors_bulkActionsForm="form#user-bulk-action-form",Selectors_userReportWrapper='[data-region="report-user-list-wrapper"]',Selectors_checkbox='input[type="checkbox"][data-togglegroup="report-select-all"][data-toggle="slave"]',Selectors_masterCheckbox='input[type="checkbox"][data-togglegroup="report-select-all"][data-toggle="master"]',Selectors_checkedRows='[data-togglegroup="report-select-all"][data-toggle="slave"]:checked';_exports.init=()=>{var _userBulkForm$closest;const userBulkForm=document.querySelector(Selectors_bulkActionsForm),userReport=null==userBulkForm||null===(_userBulkForm$closest=userBulkForm.closest(Selectors_userReportWrapper))||void 0===_userBulkForm$closest?void 0:_userBulkForm$closest.querySelector(reportSelectors.regions.report);if(!userBulkForm||!userReport)return;const actionSelect=userBulkForm.querySelector("select");CustomEvents.define(actionSelect,[CustomEvents.events.accessibleChange]),(0,_jquery.default)(actionSelect).on(CustomEvents.events.accessibleChange,(event=>{if(event.target.value&&"0"!=="".concat(event.target.value)){const e=new Event("submit",{cancelable:!0});userBulkForm.dispatchEvent(e),e.defaultPrevented||(FormChangeChecker.markFormSubmitted(userBulkForm),userBulkForm.submit())}}));const updateUserIds=()=>{const selectedUsers=[...userReport.querySelectorAll(Selectors_checkedRows)],selectedUserIds=selectedUsers.map((check=>parseInt(check.value)));userBulkForm.querySelector('[name="userids"]').value=selectedUserIds.join(","),actionSelect.disabled=0===selectedUsers.length;const selectedUsersNames=selectedUsers.map((check=>document.querySelector('label[for="'.concat(check.id,'"]')).textContent));userBulkForm.data={userids:selectedUserIds,usernames:selectedUsersNames}};updateUserIds(),document.addEventListener("change",(event=>{(event.target.matches(Selectors_checkbox)||event.target.matches(Selectors_masterCheckbox))&&userReport.contains(event.target)&&updateUserIds()})),document.addEventListener(tableEvents.tableContentRefreshed,(event=>{userReport.contains(event.target)&&updateUserIds()}))}}));
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,reportSelectors=_interopRequireWildcard(reportSelectors),tableEvents=_interopRequireWildcard(tableEvents),FormChangeChecker=_interopRequireWildcard(FormChangeChecker),CustomEvents=_interopRequireWildcard(CustomEvents),_jquery=(obj=_jquery)&&obj.__esModule?obj:{default:obj};const Selectors_bulkActionsForm="form#user-bulk-action-form",Selectors_userReportWrapper='[data-region="report-user-list-wrapper"]',Selectors_checkbox='input[type="checkbox"][data-togglegroup="report-select-all"][data-toggle="slave"]',Selectors_masterCheckbox='input[type="checkbox"][data-togglegroup="report-select-all"][data-toggle="master"]',Selectors_checkedRows='[data-togglegroup="report-select-all"][data-toggle="slave"]:checked';_exports.init=()=>{var _userBulkForm$closest;const userBulkForm=document.querySelector(Selectors_bulkActionsForm),userReport=null==userBulkForm||null===(_userBulkForm$closest=userBulkForm.closest(Selectors_userReportWrapper))||void 0===_userBulkForm$closest?void 0:_userBulkForm$closest.querySelector(reportSelectors.regions.report);if(!userBulkForm||!userReport)return;const actionSelect=userBulkForm.querySelector("select");CustomEvents.define(actionSelect,[CustomEvents.events.accessibleChange]),(0,_jquery.default)(actionSelect).on(CustomEvents.events.accessibleChange,(event=>{if(event.target.value&&"0"!=="".concat(event.target.value)){const e=new Event("submit",{cancelable:!0});userBulkForm.dispatchEvent(e),e.defaultPrevented||(FormChangeChecker.markFormSubmitted(userBulkForm),userBulkForm.submit())}}));const updateUserIds=()=>{const selectedUsers=[...userReport.querySelectorAll(Selectors_checkedRows)],selectedUserIds=selectedUsers.map((check=>parseInt(check.value)));userBulkForm.querySelector('[name="userids"]').value=selectedUserIds.join(","),actionSelect.disabled=0===selectedUsers.length,actionSelect.disabled&&(actionSelect.value="0");const selectedUsersNames=selectedUsers.map((check=>document.querySelector('label[for="'.concat(check.id,'"]')).textContent));userBulkForm.data={userids:selectedUserIds,usernames:selectedUsersNames}};updateUserIds(),document.addEventListener("change",(event=>{(event.target.matches(Selectors_checkbox)||event.target.matches(Selectors_masterCheckbox))&&userReport.contains(event.target)&&updateUserIds()})),document.addEventListener(tableEvents.tableContentRefreshed,(event=>{userReport.contains(event.target)&&updateUserIds()}))}}));
 
 //# sourceMappingURL=bulk_user_actions.min.js.map

admin/amd/build/expand_hash.min.js

@@ -0,0 +1,12 @@
+define("core_admin/expand_hash",["exports"],(function(_exports){Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=_exports.expandSection=void 0;
+/**
+   * Expand the collapse section element.
+   *
+   * @module      core_admin/expand_hash
+   * @copyright   Meirza <meirza.arson@moodle.com>
+   * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+   * @since       4.5
+   */
+const SELECTORS_COLLAPSE_ELEMENTS='[data-toggle="collapse"]',SELECTORS_FOCUSTHENEXPAND_ELEMENTS=".focus-expand";_exports.init=()=>{const focusexpand=document.querySelector(SELECTORS_FOCUSTHENEXPAND_ELEMENTS);null==focusexpand||focusexpand.addEventListener("click",(()=>{expandSection("".concat(focusexpand.getAttribute("href")))}))};const expandSection=hash=>{const container=document.querySelector(hash),targetContainer=null==container?void 0:container.querySelector(SELECTORS_COLLAPSE_ELEMENTS);if("false"===(null==targetContainer?void 0:targetContainer.getAttribute("aria-expanded"))){const collapseId=targetContainer.getAttribute("aria-controls"),collapseContainer=document.getElementById(collapseId);collapseContainer.classList.remove("collapse"),collapseContainer.classList.add("show"),targetContainer.setAttribute("aria-expanded","true"),targetContainer.classList.remove("collapsed");const collapseElement=document.querySelector(".collapseexpand.collapsemenu");collapseElement.setAttribute("aria-expanded","true"),collapseElement.classList.remove("collapsed")}};_exports.expandSection=expandSection}));
+
+//# sourceMappingURL=expand_hash.min.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"expand_hash.min.js","sources":["../src/expand_hash.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\n/**\n * Expand the collapse section element.\n *\n * @module      core_admin/expand_hash\n * @copyright   Meirza <meirza.arson@moodle.com>\n * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n * @since       4.5\n */\n\nconst SELECTORS = {\n    COLLAPSE_ELEMENTS: '[data-toggle=\"collapse\"]',\n    FOCUSTHENEXPAND_ELEMENTS: '.focus-expand',\n};\n\n/**\n * Initializes the focus and expand functionality.\n */\nexport const init = () => {\n    // Select all collapsible elements only.\n    const focusexpand = document.querySelector(SELECTORS.FOCUSTHENEXPAND_ELEMENTS);\n\n    // Add click event listener to the anchor element\n    focusexpand?.addEventListener('click', () => {\n        expandSection(`${focusexpand.getAttribute('href')}`);\n    });\n};\n\n/**\n * Expands a section based on the provided URL hash.\n *\n * This function takes a hash string, finds the corresponding element in the DOM,\n * and expands it if it is currently collapsed. It updates the necessary ARIA\n * attributes and classes to reflect the expanded state.\n *\n * @param {string} hash - The hash (e.g., '#elementId') of the element to expand.\n */\nexport const expandSection = (hash) => {\n    const container = document.querySelector(hash);\n    const targetContainer = container?.querySelector(SELECTORS.COLLAPSE_ELEMENTS);\n\n    if (targetContainer?.getAttribute('aria-expanded') === 'false') {\n        const collapseId = targetContainer.getAttribute('aria-controls');\n        const collapseContainer = document.getElementById(collapseId);\n\n        // Show the content.\n        collapseContainer.classList.remove('collapse');\n        collapseContainer.classList.add('show');\n\n        // Update aria-expanded attribute to reflect the new state.\n        targetContainer.setAttribute('aria-expanded', 'true');\n        targetContainer.classList.remove('collapsed');\n\n        // Get collapse expand menu element.\n        const collapseElement = document.querySelector('.collapseexpand.collapsemenu');\n        // Ensure it gets noticed to make it work.\n        collapseElement.setAttribute('aria-expanded', 'true');\n        collapseElement.classList.remove('collapsed');\n    }\n};\n"],"names":["SELECTORS","focusexpand","document","querySelector","addEventListener","expandSection","getAttribute","hash","container","targetContainer","collapseId","collapseContainer","getElementById","classList","remove","add","setAttribute","collapseElement"],"mappings":";;;;;;;;;MAwBMA,4BACiB,2BADjBA,mCAEwB,8BAMV,WAEVC,YAAcC,SAASC,cAAcH,oCAG3CC,MAAAA,aAAAA,YAAaG,iBAAiB,SAAS,KACnCC,wBAAiBJ,YAAYK,aAAa,oBAarCD,cAAiBE,aACpBC,UAAYN,SAASC,cAAcI,MACnCE,gBAAkBD,MAAAA,iBAAAA,UAAWL,cAAcH,gCAEM,WAAnDS,MAAAA,uBAAAA,gBAAiBH,aAAa,kBAA8B,OACtDI,WAAaD,gBAAgBH,aAAa,iBAC1CK,kBAAoBT,SAASU,eAAeF,YAGlDC,kBAAkBE,UAAUC,OAAO,YACnCH,kBAAkBE,UAAUE,IAAI,QAGhCN,gBAAgBO,aAAa,gBAAiB,QAC9CP,gBAAgBI,UAAUC,OAAO,mBAG3BG,gBAAkBf,SAASC,cAAc,gCAE/Cc,gBAAgBD,aAAa,gBAAiB,QAC9CC,gBAAgBJ,UAAUC,OAAO"}

admin/amd/build/plugin_management_table.min.js

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

admin/amd/build/plugins_overview.min.js

@@ -0,0 +1,11 @@
+define("core_admin/plugins_overview",["exports"],(function(_exports){Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=function(){const filters=document.querySelectorAll(SELECTORS_PLUGIN_FILTERS),pluginRows=document.querySelectorAll(SELECTORS_PLUGIN_ROWS),pluginTypeRows=document.querySelectorAll(SELECTORS_PLUGIN_TYPE_ROWS),filterPlugins=target=>{const filterBy=target.getAttribute("data-filterby"),headerVisibility={};for(const row of pluginRows){const type=[...row.classList].find((s=>s.startsWith("type-"))),visible="all"===filterBy||row.classList.contains(filterBy);row.style.display=visible?null:"none",visible&&type&&(headerVisibility[type]=!0)}for(const row of pluginTypeRows){const type=[...row.classList].find((s=>s.startsWith("type-")));if(type){const visible="all"===filterBy||headerVisibility[type];row.style.display=visible?null:"none"}}filters.forEach((el=>el.classList.remove("active"))),target.classList.add("active")};if(filters.forEach((target=>target.addEventListener("click",(e=>{e.preventDefault(),window.history.replaceState({},null,e.target.href),filterPlugins(target)})))),window.location.hash.length>1){const anchor=window.location.hash.substring(1),target=[...filters].find((t=>t.getAttribute("data-filterby")===anchor));target&&filterPlugins(target)}};
+/**
+   * Allows to filter the plugin list on plugins overview page
+   *
+   * @module     core_admin/plugins_overview
+   * @copyright  2024 Marina Glancy
+   * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+   */
+const SELECTORS_PLUGIN_FILTERS="#plugins-overview-panel [data-filterby]",SELECTORS_PLUGIN_ROWS="table#plugins-control-panel tbody tr:not(.plugintypeheader)",SELECTORS_PLUGIN_TYPE_ROWS="table#plugins-control-panel tbody tr.plugintypeheader"}));
+
+//# sourceMappingURL=plugins_overview.min.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"plugins_overview.min.js","sources":["../src/plugins_overview.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\n/**\n * Allows to filter the plugin list on plugins overview page\n *\n * @module     core_admin/plugins_overview\n * @copyright  2024 Marina Glancy\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nconst SELECTORS = {\n    PLUGIN_FILTERS: '#plugins-overview-panel [data-filterby]',\n    PLUGIN_ROWS: 'table#plugins-control-panel tbody tr:not(.plugintypeheader)',\n    PLUGIN_TYPE_ROWS: 'table#plugins-control-panel tbody tr.plugintypeheader',\n};\n\n/**\n * Initialise filters for the \"Plugins overview\" page\n */\nexport function init() {\n    const filters = document.querySelectorAll(SELECTORS.PLUGIN_FILTERS);\n    const pluginRows = document.querySelectorAll(SELECTORS.PLUGIN_ROWS);\n    const pluginTypeRows = document.querySelectorAll(SELECTORS.PLUGIN_TYPE_ROWS);\n\n    const filterPlugins = (target) => {\n        const filterBy = target.getAttribute('data-filterby');\n        const headerVisibility = {};\n\n        // Hide all plugin rows in the plugin table that do not match the filter and show all others.\n        for (const row of pluginRows) {\n            const type = [...row.classList].find(s => s.startsWith('type-'));\n            const visible = filterBy === 'all' ? true : row.classList.contains(filterBy);\n            row.style.display = visible ? null : 'none';\n            if (visible && type) {\n                headerVisibility[type] = true;\n            }\n        }\n\n        // Hide all the plugin type headers that do not have any visible plugins and show all others.\n        for (const row of pluginTypeRows) {\n            const type = [...row.classList].find(s => s.startsWith('type-'));\n            if (type) {\n                const visible = filterBy === 'all' || headerVisibility[type];\n                row.style.display = visible ? null : 'none';\n            }\n        }\n\n        // Toggle 'active' class for the selected filter.\n        filters.forEach(el => el.classList.remove('active'));\n        target.classList.add('active');\n    };\n\n    // Add event listeners for the links changing plugins filters.\n    filters\n    .forEach(target => target.addEventListener('click', (e) => {\n        e.preventDefault();\n        window.history.replaceState({}, null, e.target.href);\n        filterPlugins(target);\n    }));\n\n    // Pre-filter plugins based on the current url anchor.\n    if (window.location.hash.length > 1) {\n        const anchor = window.location.hash.substring(1);\n        const target = [...filters].find(t => t.getAttribute('data-filterby') === anchor);\n        if (target) {\n            filterPlugins(target);\n        }\n    }\n}\n"],"names":["filters","document","querySelectorAll","SELECTORS","pluginRows","pluginTypeRows","filterPlugins","target","filterBy","getAttribute","headerVisibility","row","type","classList","find","s","startsWith","visible","contains","style","display","forEach","el","remove","add","addEventListener","e","preventDefault","window","history","replaceState","href","location","hash","length","anchor","substring","t"],"mappings":"4JAiCUA,QAAUC,SAASC,iBAAiBC,0BACpCC,WAAaH,SAASC,iBAAiBC,uBACvCE,eAAiBJ,SAASC,iBAAiBC,4BAE3CG,cAAiBC,eACbC,SAAWD,OAAOE,aAAa,iBAC/BC,iBAAmB,OAGpB,MAAMC,OAAOP,WAAY,OACpBQ,KAAO,IAAID,IAAIE,WAAWC,MAAKC,GAAKA,EAAEC,WAAW,WACjDC,QAAuB,QAAbT,UAA4BG,IAAIE,UAAUK,SAASV,UACnEG,IAAIQ,MAAMC,QAAUH,QAAU,KAAO,OACjCA,SAAWL,OACXF,iBAAiBE,OAAQ,OAK5B,MAAMD,OAAON,eAAgB,OACxBO,KAAO,IAAID,IAAIE,WAAWC,MAAKC,GAAKA,EAAEC,WAAW,cACnDJ,KAAM,OACAK,QAAuB,QAAbT,UAAsBE,iBAAiBE,MACvDD,IAAIQ,MAAMC,QAAUH,QAAU,KAAO,QAK7CjB,QAAQqB,SAAQC,IAAMA,GAAGT,UAAUU,OAAO,YAC1ChB,OAAOM,UAAUW,IAAI,cAIzBxB,QACCqB,SAAQd,QAAUA,OAAOkB,iBAAiB,SAAUC,IACjDA,EAAEC,iBACFC,OAAOC,QAAQC,aAAa,GAAI,KAAMJ,EAAEnB,OAAOwB,MAC/CzB,cAAcC,aAIdqB,OAAOI,SAASC,KAAKC,OAAS,EAAG,OAC3BC,OAASP,OAAOI,SAASC,KAAKG,UAAU,GACxC7B,OAAS,IAAIP,SAASc,MAAKuB,GAAKA,EAAE5B,aAAa,mBAAqB0B,SACtE5B,QACAD,cAAcC;;;;;;;;MAvDpBJ,yBACc,0CADdA,sBAEW,8DAFXA,2BAGgB"}

admin/amd/src/bulk_user_actions.js

@@ -65,7 +65,13 @@ export const init = () => {
         const selectedUsers = [...userReport.querySelectorAll(Selectors.checkedRows)];
         const selectedUserIds = selectedUsers.map(check => parseInt(check.value));
         userBulkForm.querySelector('[name="userids"]').value = selectedUserIds.join(',');
+
+        // Disable the action selector if nothing selected, and reset the current selection.
         actionSelect.disabled = selectedUsers.length === 0;
+        if (actionSelect.disabled) {
+            actionSelect.value = "0";
+        }
+
         const selectedUsersNames = selectedUsers.map(check => document.querySelector(`label[for="${check.id}"]`).textContent);
         // Add the user ids and names to the form data attributes so they can be available from the
         // other JS modules that listen to the form submit event.

admin/amd/src/expand_hash.js

@@ -0,0 +1,74 @@
+// 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/>.
+
+/**
+ * Expand the collapse section element.
+ *
+ * @module      core_admin/expand_hash
+ * @copyright   Meirza <meirza.arson@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since       4.5
+ */
+
+const SELECTORS = {
+    COLLAPSE_ELEMENTS: '[data-toggle="collapse"]',
+    FOCUSTHENEXPAND_ELEMENTS: '.focus-expand',
+};
+
+/**
+ * Initializes the focus and expand functionality.
+ */
+export const init = () => {
+    // Select all collapsible elements only.
+    const focusexpand = document.querySelector(SELECTORS.FOCUSTHENEXPAND_ELEMENTS);
+
+    // Add click event listener to the anchor element
+    focusexpand?.addEventListener('click', () => {
+        expandSection(`${focusexpand.getAttribute('href')}`);
+    });
+};
+
+/**
+ * Expands a section based on the provided URL hash.
+ *
+ * This function takes a hash string, finds the corresponding element in the DOM,
+ * and expands it if it is currently collapsed. It updates the necessary ARIA
+ * attributes and classes to reflect the expanded state.
+ *
+ * @param {string} hash - The hash (e.g., '#elementId') of the element to expand.
+ */
+export const expandSection = (hash) => {
+    const container = document.querySelector(hash);
+    const targetContainer = container?.querySelector(SELECTORS.COLLAPSE_ELEMENTS);
+
+    if (targetContainer?.getAttribute('aria-expanded') === 'false') {
+        const collapseId = targetContainer.getAttribute('aria-controls');
+        const collapseContainer = document.getElementById(collapseId);
+
+        // Show the content.
+        collapseContainer.classList.remove('collapse');
+        collapseContainer.classList.add('show');
+
+        // Update aria-expanded attribute to reflect the new state.
+        targetContainer.setAttribute('aria-expanded', 'true');
+        targetContainer.classList.remove('collapsed');
+
+        // Get collapse expand menu element.
+        const collapseElement = document.querySelector('.collapseexpand.collapsemenu');
+        // Ensure it gets noticed to make it work.
+        collapseElement.setAttribute('aria-expanded', 'true');
+        collapseElement.classList.remove('collapsed');
+    }
+};

admin/amd/src/plugin_management_table.js

@@ -138,6 +138,10 @@ export default class {
 
             // Refocus on the link that as pressed in the first place.
             updatedRoot.querySelector(`[data-action="togglestate"][data-plugin="${stateToggle.dataset.plugin}"]`).focus();
+
+            // When clicking the toggle and it remains focused, a new tooltip will be generated.
+            // Therefore, the old tooltip should be removed.
+            this.removeTooltips();
             pendingPromise.resolve();
         }
     }
@@ -176,4 +180,16 @@ export default class {
 
         pendingPromise.resolve();
     }
+
+    /**
+     * Remove tooltips.
+     */
+    removeTooltips() {
+        const tooltips = document.querySelectorAll('[id*="tooltip"]');
+        if (tooltips.length > 0) {
+            tooltips.forEach(tooltip => {
+                tooltip.remove();
+            });
+        }
+    }
 }

admin/amd/src/plugins_overview.js

@@ -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/>.
+
+/**
+ * Allows to filter the plugin list on plugins overview page
+ *
+ * @module     core_admin/plugins_overview
+ * @copyright  2024 Marina Glancy
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+const SELECTORS = {
+    PLUGIN_FILTERS: '#plugins-overview-panel [data-filterby]',
+    PLUGIN_ROWS: 'table#plugins-control-panel tbody tr:not(.plugintypeheader)',
+    PLUGIN_TYPE_ROWS: 'table#plugins-control-panel tbody tr.plugintypeheader',
+};
+
+/**
+ * Initialise filters for the "Plugins overview" page
+ */
+export function init() {
+    const filters = document.querySelectorAll(SELECTORS.PLUGIN_FILTERS);
+    const pluginRows = document.querySelectorAll(SELECTORS.PLUGIN_ROWS);
+    const pluginTypeRows = document.querySelectorAll(SELECTORS.PLUGIN_TYPE_ROWS);
+
+    const filterPlugins = (target) => {
+        const filterBy = target.getAttribute('data-filterby');
+        const headerVisibility = {};
+
+        // Hide all plugin rows in the plugin table that do not match the filter and show all others.
+        for (const row of pluginRows) {
+            const type = [...row.classList].find(s => s.startsWith('type-'));
+            const visible = filterBy === 'all' ? true : row.classList.contains(filterBy);
+            row.style.display = visible ? null : 'none';
+            if (visible && type) {
+                headerVisibility[type] = true;
+            }
+        }
+
+        // Hide all the plugin type headers that do not have any visible plugins and show all others.
+        for (const row of pluginTypeRows) {
+            const type = [...row.classList].find(s => s.startsWith('type-'));
+            if (type) {
+                const visible = filterBy === 'all' || headerVisibility[type];
+                row.style.display = visible ? null : 'none';
+            }
+        }
+
+        // Toggle 'active' class for the selected filter.
+        filters.forEach(el => el.classList.remove('active'));
+        target.classList.add('active');
+    };
+
+    // Add event listeners for the links changing plugins filters.
+    filters
+    .forEach(target => target.addEventListener('click', (e) => {
+        e.preventDefault();
+        window.history.replaceState({}, null, e.target.href);
+        filterPlugins(target);
+    }));
+
+    // Pre-filter plugins based on the current url anchor.
+    if (window.location.hash.length > 1) {
+        const anchor = window.location.hash.substring(1);
+        const target = [...filters].find(t => t.getAttribute('data-filterby') === anchor);
+        if (target) {
+            filterPlugins(target);
+        }
+    }
+}

admin/classes/local/settings/filesize.php

@@ -62,7 +62,7 @@ class filesize extends \admin_setting {
      * @param int|null  $defaultunit    GB, MB, etc. (in bytes)
      */
     public function __construct(string $name, string $visiblename, string $description,
-            int $defaultvalue = null, int $defaultunit = null) {
+            ?int $defaultvalue = null, ?int $defaultunit = null) {
 
         $defaultsetting = self::parse_bytes($defaultvalue);
 

admin/classes/reportbuilder/local/entities/task_log.php

@@ -105,9 +105,10 @@ class task_log extends base {
         ))
             ->add_joins($this->get_joins())
             ->set_type(column::TYPE_TEXT)
-            ->add_field("$tablealias.classname")
+            ->add_fields("{$tablealias}.classname, {$tablealias}.id")
             ->set_is_sortable(true)
-            ->add_callback(static function(string $classname): string {
+            ->add_callback(static function($value, stdClass $row): string {
+                $classname = $row->classname;
                 $output = '';
                 if (class_exists($classname)) {
                     $task = new $classname;
@@ -118,6 +119,7 @@ class task_log extends base {
                 $output .= \html_writer::tag('div', "\\{$classname}", [
                     'class' => 'small text-muted',
                 ]);
+                $output = \html_writer::link(new \moodle_url('/admin/tasklogs.php', ['logid' => $row->id]), $output);
                 return $output;
             });
 
@@ -183,15 +185,7 @@ class task_log extends base {
             ->set_type(column::TYPE_FLOAT)
             ->add_field("{$tablealias}.timeend - {$tablealias}.timestart", 'duration')
             ->set_is_sortable(true)
-            ->add_callback(static function(float $value): string {
-                $duration = round($value, 2);
-                if (empty($duration)) {
-                    // The format_time function returns 'now' when the difference is exactly 0.
-                    // Note: format_time performs concatenation in exactly this fashion so we should do this for consistency.
-                    return '0 ' . get_string('secs', 'moodle');
-                }
-                return format_time($duration);
-            });
+            ->add_callback([format::class, 'format_time'], 2);
 
         // Hostname column.
         $columns[] = (new column(
@@ -211,11 +205,8 @@ class task_log extends base {
             $this->get_entity_name()
         ))
             ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_INTEGER)
             ->add_field("{$tablealias}.pid")
-            ->set_is_sortable(true)
-            // Although this is an integer column, it doesn't make sense to perform numeric aggregation on it.
-            ->set_disabled_aggregation(['avg', 'count', 'countdistinct', 'max', 'min', 'sum']);
+            ->set_is_sortable(true);
 
         // Database column.
         $columns[] = (new column(
@@ -224,17 +215,14 @@ class task_log extends base {
             $this->get_entity_name()
         ))
             ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_INTEGER)
             ->add_fields("{$tablealias}.dbreads, {$tablealias}.dbwrites")
             ->set_is_sortable(true, ["{$tablealias}.dbreads", "{$tablealias}.dbwrites"])
-            ->add_callback(static function(int $value, stdClass $row): string {
+            ->add_callback(static function($value, stdClass $row): string {
                 $output = '';
                 $output .= \html_writer::div(get_string('task_stats:dbreads', 'admin', $row->dbreads));
                 $output .= \html_writer::div(get_string('task_stats:dbwrites', 'admin', $row->dbwrites));
                 return $output;
-            })
-            // Although this is an integer column, it doesn't make sense to perform numeric aggregation on it.
-            ->set_disabled_aggregation(['avg', 'count', 'countdistinct', 'max', 'min', 'sum']);
+            });
 
         // Database reads column.
         $columns[] = (new column(

admin/classes/reportbuilder/local/systemreports/task_logs.php

@@ -143,7 +143,7 @@ class task_logs extends system_report {
             new moodle_url('/admin/tasklogs.php', ['logid' => ':id']),
             new pix_icon('e/search', ''),
             [],
-            true,
+            false,
             new lang_string('view'),
         )));
 

admin/classes/reportbuilder/local/systemreports/users.php

@@ -159,11 +159,11 @@ class users extends system_report {
                 ->add_callback(static function(string $fullname, \stdClass $row): string {
                     if ($row->suspended) {
                         $fullname .= ' ' . \html_writer::tag('span', get_string('suspended', 'moodle'),
-                            ['class' => 'badge badge-secondary ml-1']);
+                            ['class' => 'badge badge-secondary ms-1']);
                     }
                     if (!$row->confirmed) {
                         $fullname .= ' ' . \html_writer::tag('span', get_string('confirmationpending', 'admin'),
-                            ['class' => 'badge badge-danger ml-1']);
+                            ['class' => 'badge badge-danger ms-1']);
                     }
                     return $fullname;
                 });
@@ -184,6 +184,7 @@ class users extends system_report {
         $entityuseralias = $entityuser->get_table_alias('user');
 
         $filters = [
+            'user:fullname',
             'user:firstname',
             'user:lastname',
             'user:username',

admin/classes/table/availability_management_table.php

@@ -0,0 +1,85 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_admin\table;
+
+use moodle_url;
+use stdClass;
+use html_writer;
+use get_string_manager;
+
+/**
+ * Availability admin settings.
+ *
+ * @package core_admin
+ * @copyright 2024 The Open University
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class availability_management_table extends plugin_management_table {
+
+    protected function get_table_id(): string {
+        return 'availabilityconditions_administration_table';
+    }
+
+    protected function get_plugintype(): string {
+        return 'availability';
+    }
+
+    protected function get_action_url(array $params = []): moodle_url {
+        return new moodle_url('/admin/tool/availabilityconditions/', $params);
+    }
+
+    public function guess_base_url(): void {
+        $this->define_baseurl(
+            new moodle_url('/admin/tool/availabilityconditions/')
+        );
+    }
+
+    protected function get_column_list(): array {
+        return [
+            'name' => get_string('plugin'),
+            'version' => get_string('version'),
+            'enabled' => get_string('enabled', 'admin'),
+            'defaultdisplaymode' => get_string('defaultdisplaymode', 'tool_availabilityconditions'),
+        ];
+    }
+
+    public function setup(): void {
+        $this->set_attribute('id', 'availabilityconditions_administration_table');
+        $this->set_attribute('class', 'admintable generaltable');
+        parent::setup();
+    }
+
+    protected function col_name(stdClass $row): string {
+        return html_writer::span(
+           get_string('pluginname', 'availability_' . $row->plugininfo->name)
+        );
+    }
+
+    protected function col_defaultdisplaymode(stdClass $row): string {
+        global $OUTPUT, $CFG;
+        $displaymode = get_config('availability_' . $row->plugininfo->name, 'defaultdisplaymode') ? 'show' : 'hide';
+        $paramsdisplaymode = [
+            'sesskey' => sesskey(),
+            'plugin' => $row->plugininfo->name,
+            'displaymode' => $displaymode,
+        ];
+        $urldisplaymode = new moodle_url('/' . $CFG->admin . '/tool/availabilityconditions/', $paramsdisplaymode);
+
+        return html_writer::link($urldisplaymode, $OUTPUT->pix_icon('t/' . $displaymode,
+            get_string($displaymode)), ['class' => 'display-mode-' . $row->plugininfo->name]);
+    }
+}

admin/classes/table/plugin_management_table.php

@@ -303,28 +303,29 @@ abstract class plugin_management_table extends flexible_table implements dynamic
         global $OUTPUT;
 
         $enabled = $row->plugininfo->is_enabled();
-        $params = [
-            'sesskey' => sesskey(),
-            'plugin' => $row->plugininfo->name,
-            'action' => $enabled ? 'disable' : 'enable',
-        ];
-
         if ($enabled) {
-            $icon = $OUTPUT->pix_icon('t/hide', get_string('disableplugin', 'core_admin', $row->plugininfo->displayname));
+            $labelstr = get_string('disableplugin', 'core_admin', $row->plugininfo->displayname);
         } else {
-            $icon = $OUTPUT->pix_icon('t/show', get_string('enableplugin', 'core_admin', $row->plugininfo->displayname));
+            $labelstr = get_string('enableplugin', 'core_admin', $row->plugininfo->displayname);
         }
 
-        return html_writer::link(
-            $this->get_action_url($params),
-            $icon,
-            [
-                'data-toggle-method' => $this->get_toggle_service(),
-                'data-action' => 'togglestate',
-                'data-plugin' => $row->plugin,
-                'data-state' => $enabled ? 1 : 0,
+        $params = [
+            'id' => 'admin-toggle-' . $row->plugininfo->name,
+            'checked' => $enabled,
+            'dataattributes' => [
+                'name' => 'id',
+                'value' => $row->plugininfo->name,
+                'toggle-method' => $this->get_toggle_service(),
+                'action' => 'togglestate',
+                'plugin' => $row->plugin,
+                'state' => $enabled ? 1 : 0,
             ],
-        );
+            'title' => $labelstr,
+            'label' => $labelstr,
+            'labelclasses' => 'sr-only',
+        ];
+
+        return $OUTPUT->render_from_template('core_admin/setting_configtoggle', $params);
     }
 
     protected function col_order(stdClass $row): string {
@@ -500,4 +501,15 @@ abstract class plugin_management_table extends flexible_table implements dynamic
     protected function supports_ordering(): bool {
         return $this->plugininfoclass::plugintype_supports_ordering();
     }
+
+    /**
+     * Check if the user has the capability to access this table.
+     *
+     * Default implementation for plugin management tables is to require 'moodle/site:config' capability
+     *
+     * @return bool Return true if capability check passed.
+     */
+    public function has_capability(): bool {
+        return has_capability('moodle/site:config', $this->get_context());
+    }
 }

admin/cli/install.php

@@ -172,11 +172,16 @@ $CFG->debugdeveloper       = true;
 $parts = explode('/', str_replace('\\', '/', dirname(__DIR__)));
 $CFG->admin                = array_pop($parts);
 
-//point pear include path to moodles lib/pear so that includes and requires will search there for files before anywhere else
-//the problem is that we need specific version of quickforms and hacked excel files :-(
+// Point pear include path to moodles lib/pear so that includes and requires will search there for files before anywhere else
+// the problem is that we need specific version of quickforms and hacked excel files :-(.
 ini_set('include_path', $CFG->libdir.'/pear' . PATH_SEPARATOR . ini_get('include_path'));
 
+// The core_component class can be used in any scripts, it does not need anything else.
 require_once($CFG->libdir.'/classes/component.php');
+
+// Register our classloader.
+\core\component::register_autoloader();
+
 require_once($CFG->libdir.'/classes/text.php');
 require_once($CFG->libdir.'/classes/string_manager.php');
 require_once($CFG->libdir.'/classes/string_manager_install.php');
@@ -190,15 +195,6 @@ require_once($CFG->libdir.'/moodlelib.php');
 require_once($CFG->libdir.'/deprecatedlib.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/componentlib.class.php');
-require_once($CFG->dirroot.'/cache/lib.php');
-
-// Register our classloader, in theory somebody might want to replace it to load other hacked core classes.
-// Required because the database checks below lead to session interaction which is going to lead us to requiring autoloaded classes.
-if (defined('COMPONENT_CLASSLOADER')) {
-    spl_autoload_register(COMPONENT_CLASSLOADER);
-} else {
-    spl_autoload_register('core_component::classloader');
-}
 
 require($CFG->dirroot.'/version.php');
 $CFG->target_release = $release;

admin/environment.xml

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

admin/index.php

@@ -40,13 +40,6 @@ if (!function_exists('iconv')) {
     die();
 }
 
-// Make sure php5-json is available.
-if (!function_exists('json_encode') || !function_exists('json_decode')) {
-    // This also shouldn't happen.
-    echo 'Moodle requires the json PHP extension. Please install or enable the json extension.';
-    die();
-}
-
 // Make sure xml extension is available.
 if (!extension_loaded('xml')) {
     echo 'Moodle requires the xml PHP extension. Please install or enable the xml extension.';

admin/plugins.php

@@ -29,8 +29,6 @@ require_once($CFG->libdir . '/adminlib.php');
 require_once($CFG->libdir . '/filelib.php');
 
 $fetchupdates = optional_param('fetchupdates', false, PARAM_BOOL); // Check for available plugins updates.
-$updatesonly = optional_param('updatesonly', false, PARAM_BOOL); // Show updateable plugins only.
-$contribonly = optional_param('contribonly', false, PARAM_BOOL); // Show additional plugins only.
 $uninstall = optional_param('uninstall', '', PARAM_COMPONENT); // Uninstall the plugin.
 $delete = optional_param('delete', '', PARAM_COMPONENT); // Delete the plugin folder after it is uninstalled.
 $confirmed = optional_param('confirm', false, PARAM_BOOL); // Confirm the uninstall/delete action.
@@ -47,8 +45,7 @@ require_admin();
 $syscontext = context_system::instance();
 
 // URL params we want to maintain on redirects.
-$pageparams = array('updatesonly' => $updatesonly, 'contribonly' => $contribonly);
-$pageurl = new moodle_url('/admin/plugins.php', $pageparams);
+$pageurl = new moodle_url('/admin/plugins.php');
 
 $pluginman = core_plugin_manager::instance();
 
@@ -57,7 +54,7 @@ $PAGE->set_primary_active_tab('siteadminnode');
 if ($uninstall) {
 
     if (!$confirmed) {
-        admin_externalpage_setup('pluginsoverview', '', $pageparams);
+        admin_externalpage_setup('pluginsoverview');
     } else {
         $PAGE->set_url($pageurl);
         $PAGE->set_context($syscontext);
@@ -201,7 +198,7 @@ if ($installupdate and $installupdateversion) {
     }
 }
 
-admin_externalpage_setup('pluginsoverview', '', $pageparams);
+admin_externalpage_setup('pluginsoverview');
 
 /** @var core_admin_renderer $output */
 $output = $PAGE->get_renderer('core', 'admin');
@@ -214,4 +211,4 @@ if ($fetchupdates) {
     redirect($PAGE->url);
 }
 
-echo $output->plugin_management_page($pluginman, $checker, $pageparams);
+echo $output->plugin_management_page($pluginman, $checker);

admin/presets/tests/helper_test.php

@@ -23,7 +23,7 @@ namespace core_adminpresets;
  * @category   test
  * @copyright  2021 Sara Arjona (sara@moodle.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass helper
+ * @coversDefaultClass \core_adminpresets\helper
  */
 class helper_test extends \advanced_testcase {
 

admin/presets/tests/manager_test.php

@@ -29,6 +29,15 @@ use stdClass;
  * @coversDefaultClass \core_adminpresets\manager
  */
 class manager_test extends \advanced_testcase {
+    /**
+     * Include required libraries.
+     */
+    public static function setUpBeforeClass(): void {
+        global $CFG;
+        require_once($CFG->libdir.'/adminlib.php');
+        parent::setUpBeforeClass();
+    }
+
     /**
      * Test the behaviour of protected get_site_settings method.
      *
@@ -415,7 +424,7 @@ class manager_test extends \advanced_testcase {
      * @param string|null $expectedpresetname Expected preset name.
      */
     public function test_import_preset(string $filecontents, bool $expectedpreset, bool $expectedsettings = false,
-            bool $expectedplugins = false, bool $expecteddebugging = false, string $expectedexception = null,
+            bool $expectedplugins = false, bool $expecteddebugging = false, ?string $expectedexception = null,
             string $expectedpresetname = 'Imported preset'): void {
         global $DB;
 

admin/presets/tests/privacy/privacy_provider_test.php

@@ -36,7 +36,7 @@ class privacy_provider_test extends provider_testcase {
      * Test for provider::get_metadata().
      * @covers ::get_metadata
      */
-    public function test_get_metadata() {
+    public function test_get_metadata(): void {
         $collection = new collection('core_adminpresets');
         $newcollection = provider::get_metadata($collection);
         $itemcollection = $newcollection->get_collection();
@@ -49,7 +49,7 @@ class privacy_provider_test extends provider_testcase {
      * Test for provider::get_contexts_for_userid() doesn't return any context.
      * @covers ::get_contexts_for_userid
      */
-    public function test_get_contexts_for_userid() {
+    public function test_get_contexts_for_userid(): void {
         global $USER;
 
         $this->resetAfterTest();
@@ -67,7 +67,7 @@ class privacy_provider_test extends provider_testcase {
      * Test for provider::get_users_in_context() doesn't return any user.
      * @covers ::get_users_in_context
      */
-    public function test_get_users_in_context() {
+    public function test_get_users_in_context(): void {
         global $USER;
 
         $this->resetAfterTest();
@@ -88,7 +88,7 @@ class privacy_provider_test extends provider_testcase {
      * Test for provider::export_user_data().
      * @covers ::export_user_data
      */
-    public function test_export_user_data() {
+    public function test_export_user_data(): void {
         global $USER;
 
         $this->resetAfterTest();
@@ -121,7 +121,7 @@ class privacy_provider_test extends provider_testcase {
      * Test for provider::delete_data_for_all_users_in_context().
      * @covers ::delete_data_for_all_users_in_context
      */
-    public function test_delete_data_for_all_users_in_context() {
+    public function test_delete_data_for_all_users_in_context(): void {
         global $DB, $USER;
 
         $this->resetAfterTest();
@@ -146,7 +146,7 @@ class privacy_provider_test extends provider_testcase {
      * Test for provider::delete_data_for_user().
      * @covers ::delete_data_for_user
      */
-    public function test_delete_data_for_user() {
+    public function test_delete_data_for_user(): void {
         global $DB, $USER;
 
         $this->resetAfterTest();

admin/registration/index.php

@@ -125,4 +125,7 @@ if (\core\hub\registration::is_registered()) {
     echo html_writer::div(html_writer::link(new moodle_url($returnurl), get_string('skipregistration', 'hub')),
         'skipregistration mt-2');
 }
+
+$PAGE->requires->js_call_amd('core_admin/expand_hash', 'init');
+
 echo $OUTPUT->footer();

admin/renderer.php

@@ -295,6 +295,7 @@ class core_admin_renderer extends plugin_renderer_base {
 
         $output .= $this->header();
         $output .= $this->output->heading(get_string('notifications', 'admin'));
+        $output .= $this->upgrade_news_message();
         $output .= $this->maturity_info($maturity);
         $output .= empty($CFG->disableupdatenotifications) ? $this->available_updates($availableupdates, $availableupdatesfetch) : '';
         $output .= $this->insecure_dataroot_warning($insecuredataroot);
@@ -754,6 +755,22 @@ class core_admin_renderer extends plugin_renderer_base {
         return $this->box($copyrighttext, 'copyright');
     }
 
+    /**
+     * Display a transient notification for important upgrades messages for
+     * specific releases.
+     *
+     * @return string HTML to output.
+     */
+    protected function upgrade_news_message() {
+        return $this->notification(
+            get_string('importantupdates_content', 'admin'),
+            'info',
+            false,
+            get_string('importantupdates_title', 'admin'),
+            'i/circleinfo, core'
+        );
+    }
+
     /**
      * Display a warning about installing development code if necesary.
      * @param int $maturity
@@ -843,14 +860,14 @@ class core_admin_renderer extends plugin_renderer_base {
                 $registerbutton = $this->single_button(new moodle_url('/admin/registration/index.php'),
                     get_string('register', 'admin'));
                 $str = 'registrationwarning';
+                $type = 'error alert alert-danger';
             } else {
                 $registerbutton = '';
                 $str = 'registrationwarningcontactadmin';
+                $type = 'info';
             }
 
-            return $this->warning( get_string($str, 'admin')
-                    . ' ' . $this->help_icon('registration', 'admin') . $registerbutton ,
-                'error alert alert-danger');
+            return $this->warning( get_string($str, 'admin') . ' ' . $registerbutton , $type);
         }
 
         return '';
@@ -874,8 +891,8 @@ class core_admin_renderer extends plugin_renderer_base {
     protected function mobile_configuration_warning($mobileconfigured) {
         $output = '';
         if (!$mobileconfigured) {
-            $settingslink = new moodle_url('/admin/settings.php', ['section' => 'mobilesettings']);
-            $configurebutton = $this->single_button($settingslink, get_string('enablemobilewebservice', 'admin'));
+            $settingslink = new moodle_url('/admin/search.php', ['query' => 'enablemobilewebservice']);
+            $configurebutton = $this->single_button($settingslink, get_string('enablemobilewebservice', 'admin'), 'get');
             $output .= $this->warning(get_string('mobilenotconfiguredwarning', 'admin') . ' ' . $configurebutton);
         }
 
@@ -1004,7 +1021,7 @@ class core_admin_renderer extends plugin_renderer_base {
     function upgrade_reload($url) {
         return html_writer::empty_tag('br') .
                 html_writer::tag('div',
-                    html_writer::link($url, $this->pix_icon('i/reload', '', '', array('class' => 'icon icon-pre')) .
+                    html_writer::link($url, $this->pix_icon('i/reload', '', '', ['class' => 'icon']) .
                             get_string('reload'), array('title' => get_string('reload'))),
                 array('class' => 'continuebutton')) . html_writer::empty_tag('br');
     }
@@ -1241,7 +1258,7 @@ class core_admin_renderer extends plugin_renderer_base {
                 new moodle_url($this->page->url, array('installupdatex' => 1)),
                 get_string('updateavailableinstallall', 'core_admin', count($installableupdates)),
                 'post',
-                array('class' => 'singlebutton updateavailableinstallall mr-1')
+                array('class' => 'singlebutton updateavailableinstallall me-1')
             );
         }
 
@@ -1250,7 +1267,7 @@ class core_admin_renderer extends plugin_renderer_base {
                 new moodle_url($this->page->url, array('abortinstallx' => 1, 'confirmplugincheck' => 0)),
                 get_string('cancelinstallall', 'core_plugin', count($installabortable)),
                 'post',
-                array('class' => 'singlebutton cancelinstallall mr-1')
+                array('class' => 'singlebutton cancelinstallall me-1')
             );
         }
 
@@ -1259,17 +1276,17 @@ class core_admin_renderer extends plugin_renderer_base {
                 new moodle_url($this->page->url, array('abortupgradex' => 1)),
                 get_string('cancelupgradeall', 'core_plugin', count($upgradeabortable)),
                 'post',
-                array('class' => 'singlebutton cancelupgradeall mr-1')
+                array('class' => 'singlebutton cancelupgradeall me-1')
             );
         }
 
         $out .= html_writer::div(html_writer::link(new moodle_url($this->page->url, array('showallplugins' => 0)),
             get_string('plugincheckattention', 'core_plugin')).' '.html_writer::span($sumattention, 'badge bg-light text-dark'),
-            'btn btn-link mr-1');
+            'btn btn-link me-1');
 
         $out .= html_writer::div(html_writer::link(new moodle_url($this->page->url, array('showallplugins' => 1)),
             get_string('plugincheckall', 'core_plugin')).' '.html_writer::span($sumtotal, 'badge bg-light text-dark'),
-            'btn btn-link mr-1');
+            'btn btn-link me-1');
 
         $out .= $this->output->container_end(); // End of .actions container.
         $out .= $this->output->container_end(); // End of #plugins-check-info container.
@@ -1288,7 +1305,7 @@ class core_admin_renderer extends plugin_renderer_base {
      * @param null|moodle_url $cancel URL for the cancel link, defaults to the current page
      * @return string HTML
      */
-    public function plugins_management_confirm_buttons(moodle_url $continue=null, moodle_url $cancel=null) {
+    public function plugins_management_confirm_buttons(?moodle_url $continue=null, ?moodle_url $cancel=null) {
 
         $out = html_writer::start_div('plugins-management-confirm-buttons');
 
@@ -1376,13 +1393,13 @@ class core_admin_renderer extends plugin_renderer_base {
                     new moodle_url($this->page->url, array('installdepx' => 1)),
                     get_string('dependencyinstallmissing', 'core_plugin', count($installable)),
                     'post',
-                    array('class' => 'singlebutton dependencyinstallmissing d-inline-block mr-1')
+                    array('class' => 'singlebutton dependencyinstallmissing d-inline-block me-1')
                 );
             }
 
             $out .= html_writer::div(html_writer::link(new moodle_url('/admin/tool/installaddon/'),
                 get_string('dependencyuploadmissing', 'core_plugin'), array('class' => 'btn btn-link')),
-                'dependencyuploadmissing d-inline-block mr-1');
+                'dependencyuploadmissing d-inline-block me-1');
 
             $out .= $this->output->container_end(); // End of .plugins-check-dependencies-actions container.
 
@@ -1448,29 +1465,29 @@ class core_admin_renderer extends plugin_renderer_base {
             $info .= html_writer::div(
                 html_writer::link('https://moodle.org/plugins/view.php?plugin='.$plugin->component,
                     get_string('misdepinfoplugin', 'core_plugin')),
-                'misdepinfoplugin d-inline-block mr-3 mb-1'
+                'misdepinfoplugin d-inline-block me-3 mb-1'
             );
 
             $info .= html_writer::div(
                 html_writer::link('https://moodle.org/plugins/pluginversion.php?id='.$plugin->version->id,
                     get_string('misdepinfoversion', 'core_plugin')),
-                'misdepinfoversion d-inline-block mr-3 mb-1'
+                'misdepinfoversion d-inline-block me-3 mb-1'
             );
 
             $info .= html_writer::div(html_writer::link($plugin->version->downloadurl, get_string('download')),
-                'misdepdownload d-inline-block mr-3 mb-1');
+                'misdepdownload d-inline-block me-3 mb-1');
 
             if ($pluginman->is_remote_plugin_installable($plugin->component, $plugin->version->version, $reason)) {
                 $info .= $this->output->single_button(
                     new moodle_url($this->page->url, array('installdep' => $plugin->component)),
                     get_string('dependencyinstall', 'core_plugin'),
                     'post',
-                    array('class' => 'singlebutton dependencyinstall mr-3 mb-1')
+                    array('class' => 'singlebutton dependencyinstall me-3 mb-1')
                 );
             } else {
                 $reasonhelp = $this->info_remote_plugin_not_installable($reason);
                 if ($reasonhelp) {
-                    $info .= html_writer::div($reasonhelp, 'reasonhelp dependencyinstall d-inline-block mr-3 mb-1');
+                    $info .= html_writer::div($reasonhelp, 'reasonhelp dependencyinstall d-inline-block me-3 mb-1');
                 }
             }
 
@@ -1656,8 +1673,9 @@ class core_admin_renderer extends plugin_renderer_base {
     public function plugins_overview_panel(core_plugin_manager $pluginman, array $options = array()) {
 
         $plugininfo = $pluginman->get_plugins();
+        $this->page->requires->js_call_amd('core_admin/plugins_overview', 'init');
 
-        $numtotal = $numextension = $numupdatable = $numinstallable = 0;
+        $numtotal = $numextension = $numupdatable = $numinstallable = $nummissing = $numnew = 0;
 
         foreach ($plugininfo as $type => $plugins) {
             foreach ($plugins as $name => $plugin) {
@@ -1671,8 +1689,12 @@ class core_admin_renderer extends plugin_renderer_base {
                     }
                 }
                 if ($plugin->get_status() === core_plugin_manager::PLUGIN_STATUS_MISSING) {
+                    $nummissing++;
                     continue;
                 }
+                if ($plugin->get_status() === core_plugin_manager::PLUGIN_STATUS_NEW) {
+                    $numnew++;
+                }
                 $numtotal++;
                 if (!$plugin->is_standard()) {
                     $numextension++;
@@ -1681,36 +1703,50 @@ class core_admin_renderer extends plugin_renderer_base {
         }
 
         $infoall = html_writer::link(
-            new moodle_url($this->page->url, array('contribonly' => 0, 'updatesonly' => 0)),
+            $this->page->url,
             get_string('overviewall', 'core_plugin'),
-            array('title' => get_string('filterall', 'core_plugin'))
+            ['title' => get_string('filterall', 'core_plugin'), 'data-filterby' => 'all', 'class' => 'active']
         ).' '.html_writer::span($numtotal, 'badge number number-all');
 
         $infoext = html_writer::link(
-            new moodle_url($this->page->url, array('contribonly' => 1, 'updatesonly' => 0)),
+            new moodle_url($this->page->url, [], 'additional'),
             get_string('overviewext', 'core_plugin'),
-            array('title' => get_string('filtercontribonly', 'core_plugin'))
+            ['title' => get_string('filtercontribonly', 'core_plugin'), 'data-filterby' => 'additional']
         ).' '.html_writer::span($numextension, 'badge number number-additional');
 
         if ($numupdatable) {
             $infoupdatable = html_writer::link(
-                new moodle_url($this->page->url, array('contribonly' => 0, 'updatesonly' => 1)),
+                new moodle_url($this->page->url, [], 'updatable'),
                 get_string('overviewupdatable', 'core_plugin'),
-                array('title' => get_string('filterupdatesonly', 'core_plugin'))
+                ['title' => get_string('filterupdatesonly', 'core_plugin'), 'data-filterby' => 'updatable']
             ).' '.html_writer::span($numupdatable, 'badge bg-info text-white number number-updatable');
         } else {
             // No updates, or the notifications disabled.
             $infoupdatable = '';
         }
 
-        $out = html_writer::start_div('', array('id' => 'plugins-overview-panel'));
-
-        if (!empty($options['updatesonly'])) {
-            $out .= $this->output->heading(get_string('overviewupdatable', 'core_plugin'), 3);
-        } else if (!empty($options['contribonly'])) {
-            $out .= $this->output->heading(get_string('overviewext', 'core_plugin'), 3);
+        if ($numnew) {
+            $infonew = html_writer::link(
+                new moodle_url($this->page->url, [], 'newplugin'),
+                get_string('status_new', 'plugin'),
+                ['title' => get_string('filternewpluginsonly', 'core_plugin'), 'data-filterby' => 'newplugin']
+            ).' '.html_writer::span($numnew, 'badge bg-success text-white number number-newplugin');
+        } else {
+            $infonew = '';
         }
 
+        if ($nummissing) {
+            $infomissing = html_writer::link(
+                new moodle_url($this->page->url, [], 'missing'),
+                get_string('status_missing', 'plugin'),
+                ['title' => get_string('filtermissingonly', 'core_plugin'), 'data-filterby' => 'missing']
+            ).' '.html_writer::span($nummissing, 'badge bg-danger text-white number number-missing');
+        } else {
+            $infomissing = '';
+        }
+
+        $out = html_writer::start_div('', ['id' => 'plugins-overview-panel']);
+
         if ($numinstallable) {
             $out .= $this->output->single_button(
                 new moodle_url($this->page->url, array('installupdatex' => 1)),
@@ -1721,8 +1757,10 @@ class core_admin_renderer extends plugin_renderer_base {
         }
 
         $out .= html_writer::div($infoall, 'info info-all').
-            html_writer::div($infoext, 'info info-ext').
-            html_writer::div($infoupdatable, 'info info-updatable');
+            html_writer::div($infoext, 'info info-additional').
+            html_writer::div($infoupdatable, 'info info-updatable').
+            html_writer::div($infonew, 'info info-newplugin').
+            html_writer::div($infomissing, 'info info-missing');
 
         $out .= html_writer::end_div(); // End of #plugins-overview-panel block.
 
@@ -1742,38 +1780,6 @@ class core_admin_renderer extends plugin_renderer_base {
 
         $plugininfo = $pluginman->get_plugins();
 
-        // Filter the list of plugins according the options.
-        if (!empty($options['updatesonly'])) {
-            $updateable = array();
-            foreach ($plugininfo as $plugintype => $pluginnames) {
-                foreach ($pluginnames as $pluginname => $pluginfo) {
-                    $pluginavailableupdates = $pluginfo->available_updates();
-                    if (!empty($pluginavailableupdates)) {
-                        foreach ($pluginavailableupdates as $pluginavailableupdate) {
-                            $updateable[$plugintype][$pluginname] = $pluginfo;
-                        }
-                    }
-                }
-            }
-            $plugininfo = $updateable;
-        }
-
-        if (!empty($options['contribonly'])) {
-            $contribs = array();
-            foreach ($plugininfo as $plugintype => $pluginnames) {
-                foreach ($pluginnames as $pluginname => $pluginfo) {
-                    if (!$pluginfo->is_standard()) {
-                        $contribs[$plugintype][$pluginname] = $pluginfo;
-                    }
-                }
-            }
-            $plugininfo = $contribs;
-        }
-
-        if (empty($plugininfo)) {
-            return '';
-        }
-
         $table = new html_table();
         $table->id = 'plugins-control-panel';
         $table->head = array(
@@ -1871,13 +1877,15 @@ class core_admin_renderer extends plugin_renderer_base {
                     $row->attributes['class'] .= ' standard';
                     $source = '';
                 } else {
-                    $row->attributes['class'] .= ' extension';
-                    $source = html_writer::div(get_string('sourceext', 'core_plugin'), 'source badge bg-info text-white');
+                    $row->attributes['class'] .= ' additional';
+                    $source = html_writer::div(get_string('sourceext', 'core_plugin'), 'source badge mr-1 bg-info text-white');
                 }
 
                 if ($status === core_plugin_manager::PLUGIN_STATUS_MISSING) {
+                    $row->attributes['class'] .= ' missing';
                     $msg = html_writer::div(get_string('status_missing', 'core_plugin'), 'statusmsg badge bg-danger text-white');
                 } else if ($status === core_plugin_manager::PLUGIN_STATUS_NEW) {
+                    $row->attributes['class'] .= ' newplugin';
                     $msg = html_writer::div(get_string('status_new', 'core_plugin'), 'statusmsg badge bg-success text-white');
                 } else {
                     $msg = '';
@@ -1893,6 +1901,7 @@ class core_admin_renderer extends plugin_renderer_base {
 
                 $updateinfo = '';
                 if (is_array($plugin->available_updates())) {
+                    $row->attributes['class'] .= ' updatable';
                     foreach ($plugin->available_updates() as $availableupdate) {
                         $updateinfo .= $this->plugin_available_update_info($pluginman, $availableupdate);
                     }
@@ -2206,14 +2215,10 @@ class core_admin_renderer extends plugin_renderer_base {
      * @return string
      */
     public function moodleorg_registration_message() {
-
-        $out = format_text(get_string('registerwithmoodleorginfo', 'core_hub'), FORMAT_MARKDOWN);
-
-        $out .= html_writer::link(
-            MOODLE_PRODUCTURL.'/solutions/moodle-app/',
-            $this->output->pix_icon('i/info', '').' '.get_string('registerwithmoodleorginfoapp', 'core_hub'),
-            ['class' => 'btn btn-link', 'role' => 'opener', 'target' => '_href']
-        );
+        $a = new stdClass();
+        $a->moreinformation = '#id_sitestats'; // More information anchor.
+        $a->moodleapp = HUB_MOODLEORGHUBURL . '/solutions/moodle-app/';
+        $out = format_text(get_string('registerwithmoodleorginfo', 'core_hub', $a), FORMAT_MARKDOWN);
 
         $out .= html_writer::link(
             HUB_MOODLEORGHUBURL,

admin/roles/UPGRADING.md

@@ -0,0 +1,22 @@
+# core_role (subsystem) Upgrade notes
+
+## 4.5
+
+### Added
+
+- All session management has been moved to the `\core\session\manager` class.
+  This removes the dependancy to use the `sessions` table.
+
+  Session management plugins (like Redis) should now inherit
+  the base `\core\session\handler` class, which implements
+  `SessionHandlerInterface`, and override methods as required.
+
+  The following methods in `\core\session\manager` have been deprecated:
+  | Old method name                  | New method name           |
+  | ---                              | ---                       |
+  | `kill_all_sessions`              | `destroy_all`             |
+  | `kill_session`                   | `destroy`                 |
+  | `kill_sessions_for_auth_plugin`  | `destroy_by_auth_plugin`  |
+  | `kill_user_sessions`             | `destroy_user_sessions`   |
+
+  For more information see [MDL-66151](https://tracker.moodle.org/browse/MDL-66151)

admin/roles/classes/define_role_table_advanced.php

@@ -655,7 +655,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
             echo "</label>\n";
         }
         if ($helpicon) {
-            echo '<span class="float-sm-right text-nowrap">'.$helpicon.'</span>';
+            echo '<span class="float-sm-end text-nowrap">'.$helpicon.'</span>';
         }
         echo '</div>';
         if (isset($this->errors[$name])) {

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

@@ -18,13 +18,12 @@ declare(strict_types=1);
 
 namespace core_role\reportbuilder\local\entities;
 
-use context;
-use context_helper;
-use lang_string;
-use stdClass;
+use core\{context, context_helper};
+use core\lang_string;
 use core_reportbuilder\local\entities\base;
 use core_reportbuilder\local\filters\select;
 use core_reportbuilder\local\report\{column, filter};
+use stdClass;
 
 /**
  * Role entity
@@ -96,7 +95,6 @@ class role extends base {
             $this->get_entity_name()
         ))
             ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_TEXT)
             ->add_fields("{$rolealias}.name, {$rolealias}.shortname, {$rolealias}.id, {$contextalias}.id AS contextid")
             ->add_fields(context_helper::get_preload_record_columns_sql($contextalias))
             // The sorting is on name, unless empty (determined by single space - thanks Oracle) then we use shortname.
@@ -106,7 +104,7 @@ class role extends base {
                       ELSE {$rolealias}.name
                  END",
             ])
-            ->set_callback(static function($name, stdClass $role): string {
+            ->add_callback(static function(?string $name, stdClass $role): string {
                 if ($name === null) {
                     return '';
                 }
@@ -124,7 +122,6 @@ class role extends base {
             $this->get_entity_name()
         ))
             ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_TEXT)
             ->add_fields("{$rolealias}.name, {$rolealias}.shortname")
             // The sorting is on name, unless empty (determined by single space - thanks Oracle) then we use shortname.
             ->set_is_sortable(true, [
@@ -133,12 +130,9 @@ class role extends base {
                       ELSE {$rolealias}.name
                  END",
             ])
-            ->set_callback(static function($name, stdClass $role): string {
-                if ($name === null) {
-                    return '';
-                }
-
-                return role_get_name($role, null, ROLENAME_ORIGINAL);
+            ->add_callback(fn(?string $name, stdClass $role) => match ($name) {
+                null => '',
+                default => role_get_name($role, null, ROLENAME_ORIGINAL),
             });
 
         // Short name column.
@@ -148,8 +142,22 @@ class role extends base {
             $this->get_entity_name()
         ))
             ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_TEXT)
-            ->add_fields("{$rolealias}.shortname")
+            ->add_field("{$rolealias}.shortname")
+            ->set_is_sortable(true);
+
+        // Archetype column.
+        $columns[] = (new column(
+            'archetype',
+            new lang_string('archetype', 'core_role'),
+            $this->get_entity_name(),
+        ))
+            ->add_joins($this->get_joins())
+            ->add_field("{$rolealias}.archetype")
+            ->add_callback(fn(?string $archetype) => match ($archetype) {
+                null => '',
+                '' => get_string('none'),
+                default => get_string("archetype{$archetype}", 'core_role'),
+            })
             ->set_is_sortable(true);
 
         // Description column.
@@ -166,12 +174,9 @@ class role extends base {
             ->set_type(column::TYPE_LONGTEXT)
             ->add_field($descriptionfieldsql, 'description')
             ->add_field("{$rolealias}.shortname")
-            ->set_callback(static function($description, stdClass $role): string {
-                if ($description === null) {
-                    return '';
-                }
-
-                return role_get_description($role);
+            ->add_callback(fn(?string $description, stdClass $role) => match ($description) {
+                null => '',
+                default => role_get_description($role),
             });
 
         return $columns;
@@ -198,6 +203,22 @@ class role extends base {
                 return role_get_names(null, ROLENAME_ORIGINAL, true);
             });
 
+        // Archetype filter.
+        $filters[] = (new filter(
+            select::class,
+            'archetype',
+            new lang_string('archetype', 'core_role'),
+            $this->get_entity_name(),
+            "{$rolealias}.archetype",
+        ))
+            ->add_joins($this->get_joins())
+            ->set_options_callback(static function(): array {
+                return array_map(
+                    fn(string $archetype) => get_string("archetype{$archetype}", 'core_role'),
+                    get_role_archetypes(),
+                );
+            });
+
         return $filters;
     }
 }

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

@@ -102,7 +102,6 @@ class role_assignment extends base {
             $this->get_entity_name()
         ))
             ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_TEXT)
             ->add_field("{$raalias}.component")
             ->set_is_sortable(true);
 
@@ -113,7 +112,6 @@ class role_assignment extends base {
             $this->get_entity_name()
         ))
             ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_INTEGER)
             ->add_field("{$raalias}.itemid")
             ->set_is_sortable(true);
 

admin/roles/override.php

@@ -165,7 +165,7 @@ if (!empty($capabilities)) {
     $attrs = array('type'=>'submit', 'name'=>'savechanges', 'value'=>get_string('savechanges'), 'class'=>'btn btn-primary');
     echo html_writer::empty_tag('input', $attrs);
     $attrs = array('type' => 'submit', 'name' => 'cancel', 'value' => get_string('cancel'),
-        'class' => 'btn btn-secondary ml-1');
+        'class' => 'btn btn-secondary ms-1');
     echo html_writer::empty_tag('input', $attrs);
     echo html_writer::end_tag('div');
     echo html_writer::end_tag('div');

admin/roles/tests/preset_test.php

@@ -27,7 +27,7 @@ use core_role_preset;
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class preset_test extends \advanced_testcase {
-    public function test_xml() {
+    public function test_xml(): void {
         global $DB;
 
         $roles = $DB->get_records('role');
@@ -81,7 +81,7 @@ class preset_test extends \advanced_testcase {
      * Tests covered method.
      * @covers \core_role_preset::parse_preset
      */
-    public function test_mixed_levels() {
+    public function test_mixed_levels(): void {
         // The problem here is that we cannot guarantee plugin contexts
         // have unique short names, so we have to also support level numbers.
         $xml = file_get_contents(__DIR__ . '/fixtures/mixed_levels.xml');

admin/roles/tests/privacy/provider_test.php

@@ -45,7 +45,7 @@ class provider_test extends provider_testcase {
      * Test to check export_user_preferences.
      * returns user preferences data.
      */
-    public function test_export_user_preferences() {
+    public function test_export_user_preferences(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
         $user = $this->getDataGenerator()->create_user();
@@ -64,7 +64,7 @@ class provider_test extends provider_testcase {
     /**
      * Check all contexts are returned if there is any user data for this user.
      */
-    public function test_get_contexts_for_userid() {
+    public function test_get_contexts_for_userid(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -114,7 +114,7 @@ class provider_test extends provider_testcase {
     /**
      * Test that user data is exported correctly.
      */
-    public function test_export_user_data() {
+    public function test_export_user_data(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -243,7 +243,7 @@ class provider_test extends provider_testcase {
     /**
      * Test for provider::delete_data_for_all_users_in_context().
      */
-    public function test_delete_data_for_all_users_in_context() {
+    public function test_delete_data_for_all_users_in_context(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -329,7 +329,7 @@ class provider_test extends provider_testcase {
     /**
      * Test for provider::delete_data_for_user().
      */
-    public function test_delete_data_for_user() {
+    public function test_delete_data_for_user(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -387,7 +387,7 @@ class provider_test extends provider_testcase {
     /**
      * Export for a user with a key against a script where no instance is specified.
      */
-    public function test_export_user_role_to_cohort() {
+    public function test_export_user_role_to_cohort(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -443,7 +443,7 @@ class provider_test extends provider_testcase {
     /**
      * Test for provider::delete_user_role_to_cohort().
      */
-    public function test_delete_user_role_to_cohort() {
+    public function test_delete_user_role_to_cohort(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -478,7 +478,7 @@ class provider_test extends provider_testcase {
     /**
      * Test that only users within a course context are fetched.
      */
-    public function test_get_users_in_context() {
+    public function test_get_users_in_context(): void {
         global $DB;
 
         $this->resetAfterTest();
@@ -599,7 +599,7 @@ class provider_test extends provider_testcase {
     /**
      * Test that data for users in approved userlist is deleted.
      */
-    public function test_delete_data_for_users() {
+    public function test_delete_data_for_users(): void {
         global $DB;
 
         $this->resetAfterTest();

admin/roles/tests/reportbuilder/datasource/roles_test.php

@@ -32,7 +32,7 @@ require_once("{$CFG->dirroot}/reportbuilder/tests/helpers.php");
  * Unit tests for roles datasource
  *
  * @package     core_role
- * @covers      \core_role\reportbuilder\datasource\roles;
+ * @covers      \core_role\reportbuilder\datasource\roles
  * @copyright   2024 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -104,6 +104,7 @@ final class roles_test extends core_reportbuilder_testcase {
         // Role.
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'role:name']);
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'role:shortname']);
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'role:archetype']);
         $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'role:description']);
 
         // Role assignment.
@@ -114,11 +115,20 @@ final class roles_test extends core_reportbuilder_testcase {
         $content = $this->get_custom_report_content($report->get('id'));
         $this->assertCount(1, $content);
 
-        [$rolename, $roleshortname, $roledescription, $timemodified, $component, $itemid] = array_values($content[0]);
+        [
+            $rolename,
+            $roleshortname,
+            $rolearchetype,
+            $roledescription,
+            $timemodified,
+            $component,
+            $itemid,
+        ] = array_values($content[0]);
 
         // Role.
         $this->assertEquals('Moocher (Manager)', $rolename);
         $this->assertEquals('manager', $roleshortname);
+        $this->assertEquals('ARCHETYPE: Manager', $rolearchetype);
         $this->assertEquals('Managers can access courses and modify them, but usually do not participate in them.',
             $roledescription);
 
@@ -146,6 +156,14 @@ final class roles_test extends core_reportbuilder_testcase {
                 'role:name_operator' => select::EQUAL_TO,
                 'role:name_value' => -1,
             ], false],
+            'Filter role archetype' => ['role:archetype', [
+                'role:archetype_operator' => select::EQUAL_TO,
+                'role:archetype_value' => 'student',
+            ], true],
+            'Filter role archetype (no match)' => ['role:archetype', [
+                'role:archetype_operator' => select::EQUAL_TO,
+                'role:archetype_value' => 'teacher',
+            ], false],
 
             // Role assignment.
             'Filter role assignment time modified' => ['role_assignment:timemodified', [

admin/settings/ai.php

@@ -0,0 +1,69 @@
+<?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/>.
+
+/**
+ * Adds settings links to admin tree.
+ *
+ * AI gets top billing in general because it's the future.
+ *
+ * @package   core_admin
+ * @copyright 2024 Matt Porritt <matt.porritt@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+if ($hassiteconfig) {
+    // Add settings page for AI provider settings.
+    $providers = new admin_settingpage('aiprovider', new lang_string('aiproviders', 'ai'));
+    $providers->add(new admin_setting_heading('availableproviders',
+            get_string('availableproviders', 'core_ai'),
+            get_string('availableproviders_desc', 'core_ai')));
+    $providers->add(new \core_admin\admin\admin_setting_plugin_manager(
+            'aiprovider',
+            \core_ai\table\aiprovider_management_table::class,
+            'manageaiproviders',
+            new lang_string('manageaiproviders', 'core_ai'),
+    ));
+    $ADMIN->add('ai', $providers);
+
+    // Load settings for all AI providers.
+    $plugins = core_plugin_manager::instance()->get_plugins_of_type('aiprovider');
+    foreach ($plugins as $plugin) {
+        /** @var \core\plugininfo\aiprovider $plugin */
+        $plugin->load_settings($ADMIN, 'ai', $hassiteconfig);
+    }
+
+    // Add settings page for AI placement settings.
+    $placements = new admin_settingpage('aiplacement', new lang_string('aiplacements', 'ai'));
+    $placements->add(new admin_setting_heading('availableplacements',
+            get_string('availableplacements', 'core_ai'),
+            get_string('availableplacements_desc', 'core_ai')));
+    $placements->add(new \core_admin\admin\admin_setting_plugin_manager(
+            'aiplacement',
+            \core_ai\table\aiplacement_management_table::class,
+            'manageaiplacements',
+            new lang_string('manageaiplacements', 'core_ai'),
+    ));
+    $ADMIN->add('ai', $placements);
+
+    // Load settings for all placements.
+    $plugins = core_plugin_manager::instance()->get_plugins_of_type('aiplacement');
+    foreach ($plugins as $plugin) {
+        /** @var \core\plugininfo\aiprovider $plugin */
+        $plugin->load_settings($ADMIN, 'ai', $hassiteconfig);
+    }
+}

admin/settings/appearance.php

@@ -152,6 +152,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) { // sp
     }
     $choices[HOMEPAGE_MYCOURSES] = new lang_string('mycourses', 'admin');
     $choices[HOMEPAGE_USER] = new lang_string('userpreference', 'admin');
+
+    // Allow hook callbacks to extend options.
+    $hook = new \core_user\hook\extend_default_homepage();
+    \core\di::get(\core\hook\manager::class)->dispatch($hook);
+    $choices += $hook->get_options();
+
     $temp->add(new admin_setting_configselect('defaulthomepage', new lang_string('defaulthomepage', 'admin'),
             new lang_string('configdefaulthomepage', 'admin'), get_default_home_page(), $choices));
     if (!isset($CFG->enabledashboard) || $CFG->enabledashboard) {

admin/settings/badges.php

@@ -87,7 +87,7 @@ if (($hassiteconfig || has_any_capability(array(
     $ADMIN->add('badges',
         new admin_externalpage('newbadge',
             new lang_string('newbadge', 'badges'),
-            new moodle_url('/badges/newbadge.php', array('type' => BADGE_TYPE_SITE)),
+            new moodle_url('/badges/edit.php', ['action' => 'new']),
             array('moodle/badges:createbadge'), empty($CFG->enablebadges)
         )
     );

admin/settings/development.php

@@ -109,7 +109,16 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     // Add the 'profiling' page to admin block.
     $ADMIN->add('development', $temp);
 
-     // Web service test clients DO NOT COMMIT : THE EXTERNAL WEB PAGE IS NOT AN ADMIN PAGE !!!!!
+    $ADMIN->add(
+        parentname: 'development',
+        something: new admin_externalpage(
+            name: 'swaggerui',
+            visiblename: new lang_string('swaggerui', 'admin'),
+            url: "$CFG->wwwroot/admin/swaggerui.php",
+        ),
+    );
+
+    // Web service test clients DO NOT COMMIT : THE EXTERNAL WEB PAGE IS NOT AN ADMIN PAGE !!!!!
     $ADMIN->add('development', new admin_externalpage('testclient', new lang_string('testclient', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/testclient.php"));
 
 

admin/settings/fileredact.php

@@ -0,0 +1,44 @@
+<?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/>.
+
+/**
+ * Configure the settings for file redaction service.
+ *
+ * @package   core_admin
+ * @copyright Meirza <meirza.arson@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+if ($hassiteconfig) {
+    if (!$ADMIN->locate('file_redactor')) {
+        $ADMIN->add('server', new admin_category('file_redactor', get_string('redactor', 'core_files')));
+    }
+
+    $manager = \core\di::get(\core_files\redactor\manager::class);
+
+    // Get settings from each service.
+    foreach ($manager->get_service_classnames() as $servicename => $service) {
+        $servicesettings = new admin_settingpage(
+            $servicename,
+            new lang_string("redactor:{$servicename}", 'core_files'),
+        );
+        $service::add_settings($servicesettings);
+
+        $ADMIN->add('file_redactor', $servicesettings);
+    }
+}

admin/settings/location.php

@@ -39,18 +39,37 @@ if ($hassiteconfig) {
         $temp->add(new admin_setting_configtext('defaultcity', new lang_string('defaultcity', 'core_admin'),
             new lang_string('defaultcity_help', 'core_admin'), ''));
 
+        $temp->add(new admin_setting_countrycodes('allcountrycodes', new lang_string('allcountrycodes', 'core_admin'),
+            new lang_string('configallcountrycodes', 'core_admin')));
+
         $temp->add(new admin_setting_heading('iplookup', new lang_string('iplookup', 'core_admin'),
             new lang_string('iplookupinfo', 'core_admin')));
 
         $temp->add(new admin_setting_configfile('geoip2file', new lang_string('geoipfile', 'core_admin'),
             new lang_string('configgeoipfile', 'core_admin', $CFG->dataroot . '/geoip/'),
-            $CFG->dataroot . '/geoip/GeoLite2-City.mmdb'));
+            $CFG->dataroot . '/geoip/GeoIP-City.mmdb'));
+
+        $temp->add(new admin_setting_configselect('geoipdbedition',
+            new lang_string('geoipdbedition', 'core_admin'),
+            new lang_string('geoipdbedition_desc', 'core_admin'), 'GeoLite2-City',
+            ['GeoLite2-City' => 'GeoLite2-City', 'GeoIP2-City' => 'GeoIP2-City']));
+
+        $temp->add(new admin_setting_configtext('geoipmaxmindaccid',
+            new lang_string('geoipmaxmindaccid', 'core_admin'),
+            new lang_string('geoipmaxmindaccid_desc', 'core_admin'),
+            '',
+            PARAM_TEXT,
+        ));
+
+        $temp->add(new admin_setting_configtext('geoipmaxmindlicensekey',
+            new lang_string('geoipmaxmindlicensekey', 'core_admin'),
+            new lang_string('geoipmaxmindlicensekey_desc', 'core_admin'),
+            '',
+            PARAM_TEXT,
+        ));
 
         $temp->add(new admin_setting_configtext('googlemapkey3', new lang_string('googlemapkey3', 'core_admin'),
             new lang_string('googlemapkey3_help', 'core_admin'), '', PARAM_RAW, 60));
-
-        $temp->add(new admin_setting_countrycodes('allcountrycodes', new lang_string('allcountrycodes', 'core_admin'),
-            new lang_string('configallcountrycodes', 'core_admin')));
     }
 
     $ADMIN->add('location', $temp);

admin/settings/plugins.php

@@ -102,6 +102,8 @@ if ($hassiteconfig) {
         new lang_string('limitconcurrentlogins_desc', 'core_auth'), 0, $options));
     $temp->add(new admin_setting_configtext('alternateloginurl', new lang_string('alternateloginurl', 'auth'),
                                             new lang_string('alternatelogin', 'auth', htmlspecialchars(get_login_url(), ENT_COMPAT)), ''));
+    $temp->add(new admin_setting_configcheckbox('showloginform', new lang_string('showloginform', 'core_auth'),
+                                                new lang_string('showloginform_desc', 'core_auth'), 1));
     $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'),
@@ -285,7 +287,7 @@ if ($hassiteconfig) {
         $items[] = new admin_setting_configcheckbox('filtermatchonepertext', new lang_string('filtermatchonepertext', 'admin'), new lang_string('configfiltermatchonepertext', 'admin'), 0);
         $items[] = new admin_setting_configcheckbox('filternavigationwithsystemcontext',
                 new lang_string('filternavigationwithsystemcontext', 'admin'),
-                new lang_string('configfilternavigationwithsystemcontext', 'admin'), 0);
+                new lang_string('configfilternavigationwithsystemcontext', 'admin'), 1);
         foreach ($items as $item) {
             $item->set_updatedcallback('reset_text_filters_cache');
             $temp->add($item);
@@ -542,6 +544,18 @@ if ($hassiteconfig || has_capability('moodle/question:config', $systemcontext))
     $settings->add(new admin_setting_configselect('question_preview/history',
             get_string('responsehistory', 'question'), '', 0, $hiddenofvisible));
 
+    // Question editing settings.
+    $settings = new admin_settingpage('qediting',
+            get_string('questionediting', 'question'),
+            'moodle/question:config');
+    $ADMIN->add('qtypesettings', $settings);
+
+    $settings->add(new admin_setting_heading('qediting_options',
+            '', get_string('questionediting_desc', 'question')));
+
+    $settings->add(new admin_setting_configcheckbox('questiondefaultssave',
+            get_string('questiondefaultssave', 'question'), get_string('questiondefaultssave_desc', 'question'), 1));
+
     // Settings for particular question types.
     $plugins = core_plugin_manager::instance()->get_plugins_of_type('qtype');
     core_collator::asort_objects_by_property($plugins, 'displayname');
@@ -822,12 +836,49 @@ if ($hassiteconfig && core_communication\api::is_available()) {
     }
 }
 
+// SMS plugins.
+if ($hassiteconfig) {
+    $ADMIN->add(
+        'modules',
+        new admin_category(
+            'sms',
+            new lang_string('sms', 'core_sms'),
+        ),
+    );
+    $ADMIN->add(
+        'sms',
+        new admin_externalpage(
+            'smsgateway',
+            new lang_string('manage_sms_gateways', 'core_sms'),
+            $CFG->wwwroot . '/sms/sms_gateways.php',
+        ),
+    );
+    foreach (core_component::get_plugin_list('smsgateway') as $plugin => $path) {
+        $settingspath = $path . '/settings.php';
+        if (file_exists($settingspath)) {
+            $settings = new admin_settingpage(
+                'smsgateway_' . $plugin . '_settings',
+                new lang_string('pluginname', 'smsgateway_' . $plugin),
+                'moodle/site:config',
+            );
+            include($settingspath);
+            $ADMIN->add('smsgateway', $settings);
+        }
+    }
+}
+
 // Content bank content types.
 if ($hassiteconfig) {
     $ADMIN->add('modules', new admin_category('contentbanksettings', new lang_string('contentbank')));
     $temp = new admin_settingpage('managecontentbanktypes', new lang_string('managecontentbanktypes'));
     $temp->add(new admin_setting_managecontentbankcontenttypes());
     $ADMIN->add('contentbanksettings', $temp);
+    $ADMIN->add('contentbanksettings',
+        new admin_externalpage('contentbank', new lang_string('contentbankcustomfields', 'contentbank'),
+            $CFG->wwwroot . '/contentbank/customfield.php',
+            'moodle/contentbank:configurecustomfields'
+        )
+    );
     $plugins = core_plugin_manager::instance()->get_plugins_of_type('contenttype');
     foreach ($plugins as $plugin) {
         /** @var \core\plugininfo\contentbank $plugin */

admin/settings/security.php

@@ -126,7 +126,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add($adminsetting);
     $temp->add(new admin_setting_configcheckbox('passwordchangelogout',
         new lang_string('passwordchangelogout', 'admin'),
-        new lang_string('passwordchangelogout_desc', 'admin'), 0));
+        new lang_string('passwordchangelogout_desc', 'admin'), 1));
 
     $temp->add(new admin_setting_configcheckbox('passwordchangetokendeletion',
         new lang_string('passwordchangetokendeletion', 'admin'),
@@ -152,7 +152,9 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $sensiblesettingsdefault .= 'server_password@@search_solr, ssl_keypassword@@search_solr, ';
     $sensiblesettingsdefault .= 'alternateserver_password@@search_solr, alternatessl_keypassword@@search_solr, ';
     $sensiblesettingsdefault .= 'test_password@@cachestore_redis, password@@mlbackend_python, ';
-    $sensiblesettingsdefault .= 'badges_badgesalt@@none, calendar_exportsalt@@none';
+    $sensiblesettingsdefault .= 'badges_badgesalt@@none, calendar_exportsalt@@none, ';
+    $sensiblesettingsdefault .= 'bigbluebuttonbn_shared_secret@@none, apikey@@tiny_premium, ';
+    $sensiblesettingsdefault .= 'matrixaccesstoken@@communication_matrix, api_secret@@factor_sms';
     $temp->add(new admin_setting_configtextarea('adminpresets/sensiblesettings',
             get_string('sensiblesettings', 'core_adminpresets'),
             get_string('sensiblesettingstext', 'core_adminpresets'),

admin/settings/top.php

@@ -25,6 +25,7 @@ if ($hassiteconfig) {
 $ADMIN->add('root', new admin_category('users', new lang_string('users','admin')));
 $ADMIN->add('root', new admin_category('courses', new lang_string('courses','admin')));
 $ADMIN->add('root', new admin_category('grades', new lang_string('grades')));
+$ADMIN->add('root', new admin_category('ai', new lang_string('ai', 'ai')));
 $ADMIN->add('root', new admin_category('analytics', new lang_string('analytics', 'analytics')));
 $ADMIN->add('root', new admin_category('competencies', new lang_string('competencies', 'core_competency')));
 $ADMIN->add('root', new admin_category('badges', new lang_string('badges'), empty($CFG->enablebadges)));

admin/swaggerui.php

@@ -0,0 +1,87 @@
+<?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/>.
+
+/**
+ * Swagger UI for Moodle
+ *
+ * @package   core_admin
+ * @copyright Andrew Lyons <andrew@nicols.co.uk>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require('../config.php');
+require_once($CFG->libdir . '/adminlib.php');
+
+$swaggerversion = '5.17.14';
+
+$PAGE->set_url('/admin/swaggerui.php');
+
+admin_externalpage_setup('swaggerui');
+
+$PAGE->requires->css(new moodle_url("https://unpkg.com/swagger-ui-dist@{$swaggerversion}/swagger-ui.css"));
+
+echo $OUTPUT->header();
+
+// These have to be manually added for now because they must be made cross-origin. The `js` method does not yet support this.
+echo html_writer::tag(
+    tagname: 'script',
+    contents: '',
+    attributes: [
+        'src' => new moodle_url("https://unpkg.com/swagger-ui-dist@{$swaggerversion}/swagger-ui-bundle.js"),
+        'crossorigin' => 'crossorigin',
+    ],
+);
+echo html_writer::tag(
+    tagname: 'script',
+    contents: '',
+    attributes: [
+        'src' => new moodle_url("https://unpkg.com/swagger-ui-plugin-hierarchical-tags"),
+        'crossorigin' => 'crossorigin',
+    ],
+);
+
+$openapipath = moodle_url::routed_path('/api/rest/v2/openapi.json')->out();
+$swaggerinit = <<<JS
+    window.ui = SwaggerUIBundle({
+        url: "{$openapipath}",
+        dom_id: '#swagger-ui',
+
+        // Enable the "Try it out" button by default.
+        tryItOutEnabled: true,
+
+        // Show snippets different OS options.
+        requestSnippetsEnabled: true,
+
+        deepLinking: true,
+
+        plugins: [
+            HierarchicalTagsPlugin,
+        ],
+
+        hierarchicalTagSeparator: /[_]/
+    });
+JS;
+
+$PAGE->requires->js_init_code(
+    jscode: $swaggerinit,
+    ondomready: true,
+);
+
+echo html_writer::div('', '', [
+    'id' => 'swagger-ui',
+]);
+
+echo $OUTPUT->footer();

admin/tasklogs.php

@@ -24,6 +24,7 @@
 
 require_once(__DIR__ . '/../config.php');
 require_once("{$CFG->libdir}/adminlib.php");
+require_once("tool/task/lib.php");
 
 use core_admin\reportbuilder\local\systemreports\task_logs;
 use core_reportbuilder\system_report_factory;
@@ -49,9 +50,41 @@ if (null !== $logid) {
     if ($download) {
         $filename = str_replace('\\', '_', $log->classname) . "-{$log->id}.log";
         header("Content-Disposition: attachment; filename=\"{$filename}\"");
+        readstring_accel($log->output, 'text/plain');
+        exit;
     }
 
-    readstring_accel($log->output, 'text/plain');
+    try {
+        $class = new $log->classname;
+        $title = $class->get_name();
+    } catch (Exception $e) {
+        $title = $log->classname;
+    }
+    $title .= " ($log->id)";
+
+    $PAGE->navbar->add($title, '');
+    echo $OUTPUT->header();
+    echo html_writer::start_tag('pre', ['class' => 'task-output', 'style' => 'min-height: 24lh']);
+
+    echo tool_task_mtrace_wrapper($log->output);
+    echo html_writer::end_tag('pre');
+    echo $OUTPUT->action_link(
+        new moodle_url('/admin/tasklogs.php'),
+        $strheading,
+        null,
+        null,
+        new pix_icon('i/log', ''),
+    );
+    echo ' ';
+    echo $OUTPUT->action_link(
+        new moodle_url('/admin/tasklogs.php', ['logid' => $log->id, 'download' => true]),
+        new lang_string('download'),
+        null,
+        null,
+        new pix_icon('t/download', ''),
+    );
+
+    echo $OUTPUT->footer();
     exit;
 }
 

admin/templates/setting.mustache

@@ -48,7 +48,7 @@
     Setting.
 }}
 <div class="form-item row" id="{{id}}">
-    <div class="form-label col-sm-3 text-sm-right">
+    <div class="form-label col-sm-3 text-sm-end">
         {{#customcontrol}}
             <p {{#labelfor}}id="{{labelfor}}_label"{{/labelfor}}>
                 {{{title}}}

admin/templates/setting_configcheckbox.mustache

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

admin/templates/setting_configmulticheckbox.mustache

@@ -35,7 +35,7 @@
     }
 }}
 <div class="form-multicheckbox">
-    <input type="hidden" name="{{name}}[xxxxx]" value="1">
+    {{^readonly}}<input type="hidden" name="{{name}}[xxxxx]" value="1">{{/readonly}}
     {{#hasoptions}}
         <ul>
             {{#options}}

admin/templates/setting_configmultiselect.mustache

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

admin/templates/setting_configmultiselect_optgroup.mustache

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

admin/templates/setting_configtoggle.mustache

@@ -0,0 +1,59 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template core_admin/setting_configtoggle
+
+    Template for toggle element in admin settings.
+
+    Context variables required for this template:
+    * id - element id
+    * checked - bool, true if the toggle is enabled
+    * name - form element name
+    * value - form for name field
+    * action - action to be performed when the toggle is clicked
+    * plugin - plugin name
+    * state - state of the toggle
+    * title - title of the toggle tooltip
+    * label - label of the toggle
+    * labelclasses - classes for the label (sr-only for screen readers)
+
+    Example context (json):
+    {
+        "id": "reality-toggle-3",
+        "checked": true,
+        "dataattributes": [{
+            "name": "id",
+            "value": "toggle-reality",
+            "action": "togglestate",
+            "plugin": "tool_reality",
+            "state": 1
+        }],
+        "title": "Title example",
+        "label": "Enable/disable reality",
+        "labelclasses": "sr-only"
+    }
+}}
+<div id="container-{{id}}"
+     data-toggle-method="{{dataattributes.toggle-method}}"
+     data-action="{{dataattributes.action}}"
+     data-plugin="{{dataattributes.plugin}}"
+     data-state="{{dataattributes.state}}"
+     data-value="{{dataattributes.value}}"
+     >
+  {{> core/toggle }}
+</div>
+

admin/templates/setting_description.mustache

@@ -35,7 +35,7 @@
     Setting description.
 }}
 <div class="form-item row">
-    <div class="form-label col-sm-3 text-sm-right">
+    <div class="form-label col-sm-3 text-sm-end">
         <label>
             {{{title}}}
         </label>

admin/templates/setting_savebutton.mustache

@@ -0,0 +1,33 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template core_admin/setting_savebutton
+
+    Admin save button settings template.
+
+    Example context (json):
+    {
+    }
+}}
+{{!
+    Settings.
+}}
+<div class="row">
+    <div class="offset-sm-3 col-sm-3">
+        <button type="submit" class="btn btn-primary">{{#str}}savechanges, admin{{/str}}</button>
+    </div>
+</div>

admin/templates/table/namedesc.mustache

@@ -0,0 +1,39 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template core_admin/table/namedesc
+
+    Admin setting template to display an name and description
+    in a single table cell.
+
+    Context variables required for this template:
+    * name - Name of the table setting
+    * description - Description of the setting
+
+    Example context (json):
+    {
+        "name": "Fancy Setting",
+        "description": "Text that describes this setting well"
+    }
+}}
+{{!
+    Name and description.
+}}
+<div>
+    <div><strong>{{name}}</strong></div>
+    <div>{{description}}</div>
+</div>

admin/templates/themeselector/theme_card.mustache

@@ -58,7 +58,7 @@
                     <a
                         href="{{reporturl}}"
                         id="theme-usage-report-{{choose}}"
-                        class="btn btn-link p-0 ml-2"
+                        class="btn btn-link p-0 ms-2"
                         title="{{#str}}themeusagereportname, admin, {{name}}{{/str}}">
                         <i class="icon fa fa-area-chart m-0" aria-hidden="true"></i>
                         <span class="sr-only">{{#str}}themeusagereportname, admin, {{name}}{{/str}}</span>
@@ -68,7 +68,7 @@
                     <a
                         href="{{settingsurl}}"
                         id="theme-settings-{{choose}}"
-                        class="btn btn-link p-0 ml-2"
+                        class="btn btn-link p-0 ms-2"
                         title="{{#str}}themeeditsettingsname, admin, {{name}}{{/str}}">
                         <i class="icon fa fa-cog m-0" aria-hidden="true"></i>
                         <span class="sr-only">{{#str}}themeeditsettingsname, admin, {{name}}{{/str}}</span>

admin/templates/webservice_token_new.mustache

@@ -36,7 +36,7 @@
         <div class="lead">{{tokenname}}</div>
         <div class="d-flex justify-content-start align-middle">
             <div class="lead text-break pt-1" id="copytoclipboardtoken">{{token}}</div>
-            <button class="btn btn-primary ml-2" data-action="copytoclipboard" data-clipboard-target="#copytoclipboardtoken" data-clipboard-success-message="{{#str}}tokencopied, webservice{{/str}}">
+            <button class="btn btn-primary ms-2" data-action="copytoclipboard" data-clipboard-target="#copytoclipboardtoken" data-clipboard-success-message="{{#str}}tokencopied, webservice{{/str}}">
             {{#pix}}t/copy, core {{/pix}}{{#str}}copytoclipboard{{/str}}</button>
         </div>
     </div>

admin/tests/behat/behat_admin.php

@@ -90,6 +90,8 @@ class behat_admin extends behat_base {
      * @Given /^the following config values are set as admin:$/
      * @param TableNode $table
      */
+    #[\core\attribute\example('And the following config values are set as admin:
+        | sendcoursewelcomemessage | 0 | enrol_manual |')]
     public function the_following_config_values_are_set_as_admin(TableNode $table) {
 
         if (!$data = $table->getRowsHash()) {

admin/tests/behat/browse_users.feature

@@ -18,7 +18,7 @@ Feature: An administrator can browse user accounts
     When I navigate to "Users > Accounts > Browse list of users" in site administration
     # Name field always present, email field is default for showidentity.
     Then the following should exist in the "reportbuilder-table" table:
-      | First name / Last name | Email address   |
+      | First 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 "reportbuilder-table" table:
-      | First name - phonetic / Last name | Email address   |
+      | First name - phonetic           | 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 "reportbuilder-table" table:
-      | First name / Last name | Favourite frog  | Department |
+      | First name           | Favourite frog  | Department |
       | User One             | Kermit          | Attack     |
       | User Two             | Tree            | Defence    |
     And I should not see "Email address" in the "table" "css_element"
@@ -103,7 +103,7 @@ Feature: An administrator can browse user accounts
       | user3    | User      | Three    | three@example.com | Glass              |
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | First name / Last name | Email address     |
+      | First name             | Email address     |
       | User One               | one@example.com   |
       | User Two               | two@example.com   |
       | User Three             | three@example.com |
@@ -137,7 +137,7 @@ Feature: An administrator can browse user accounts
       | user2 | C1     | student |
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | First name / Last name | Email address     |
+      | First name             | Email address     |
       | User One               | one@example.com   |
       | User Two               | two@example.com   |
     And I click on "Filters" "button"
@@ -166,7 +166,7 @@ Feature: An administrator can browse user accounts
       | user1 | coursecreator | system       |           |
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | First name / Last name | Email address     |
+      | First name             | Email address     |
       | User One               | one@example.com   |
       | User Two               | two@example.com   |
       | User Three             | three@example.com |

admin/tests/behat/filter_users.feature

@@ -159,3 +159,24 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
     And I should not see "User One" in the "reportbuilder-table" "table"
     And I should not see "User Three" in the "reportbuilder-table" "table"
     And I should not see "User Four" in the "reportbuilder-table" "table"
+
+  @javascript
+  Scenario: Filter users by full name
+    When I click on "Filters" "button"
+    And I set the following fields in the "Full name" "core_reportbuilder > Filter" to these values:
+      | Full name operator | Is equal to |
+      | Full name value    | User One    |
+    And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
+    Then I should see "User One" in the "reportbuilder-table" "table"
+    And I should not see "User Two" in the "reportbuilder-table" "table"
+    And I should not see "User Three" in the "reportbuilder-table" "table"
+    And I should not see "User Four" in the "reportbuilder-table" "table"
+    And I click on "Reset all" "button" in the "[data-region='report-filters']" "css_element"
+    And I set the following fields in the "Full name" "core_reportbuilder > Filter" to these values:
+      | Full name operator | Is equal to |
+      | Full name value    | User Two    |
+    And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
+    And I should see "User Two" in the "reportbuilder-table" "table"
+    And I should not see "User One" in the "reportbuilder-table" "table"
+    And I should not see "User Three" in the "reportbuilder-table" "table"
+    And I should not see "User Four" in the "reportbuilder-table" "table"

admin/tests/behat/manage_blocks.feature

@@ -8,26 +8,14 @@ Feature: An administrator can manage Block plugins
   Scenario: An administrator can control the enabled state of block plugins using JavaScript
     Given I am logged in as "admin"
     And I navigate to "Plugins > Blocks > Manage blocks" in site administration
-    When I click on "Disable Latest badges" "link"
-    Then I should see "Latest badges disabled."
-    And "Disable Latest badges" "link" should not exist
-    But "Enable Latest badges" "link" should exist
-    When I click on "Enable Latest badges" "link"
-    Then I should see "Latest badges enabled."
-    And "Enable Latest badges" "link" should not exist
-    But "Disable Latest badges" "link" should exist
-
-  Scenario: An administrator can control the enabled state of block plugins without JavaScript
-    Given I am logged in as "admin"
-    And I navigate to "Plugins > Blocks > Manage blocks" in site administration
-    When I click on "Disable Latest badges" "link"
-    Then I should see "Latest badges disabled."
-    And "Disable Latest badges" "link" should not exist
-    But "Enable Latest badges" "link" should exist
-    When I click on "Enable Latest badges" "link"
-    Then I should see "Latest badges enabled."
-    And "Enable Latest badges" "link" should not exist
-    But "Disable Latest badges" "link" should exist
+    When I toggle the "Disable Latest badges" admin switch "off"
+    And I should see "Latest badges disabled."
+    And I reload the page
+    Then I should see "Enable Latest badges"
+    And I toggle the "Enable Latest badges" admin switch "on"
+    And I should see "Latest badges enabled."
+    And I reload the page
+    Then I should see "Disable Latest badges"
 
   @javascript
   Scenario: An administrator can control the protected state of block plugins using JavaScript

admin/tests/behat/manage_media.feature

@@ -6,25 +6,14 @@ Feature: An administrator can manage Media plugins
 
   @javascript
   Scenario: An administrator can control the enabled state of media plugins using JavaScript
+    The state change should be reflected in the UI and persist across page reloads
     Given I am logged in as "admin"
     And I navigate to "Plugins > Media players > Manage media players" in site administration
-    When I click on "Disable YouTube" "link"
-    Then I should see "YouTube disabled."
-    And "Disable YouTube" "link" should not exist
-    But "Enable YouTube" "link" should exist
-    When I click on "Enable YouTube" "link"
-    Then I should see "YouTube enabled."
-    And "Enable YouTube" "link" should not exist
-    But "Disable YouTube" "link" should exist
-
-  Scenario: An administrator can control the enabled state of media plugins without JavaScript
-    Given I am logged in as "admin"
-    And I navigate to "Plugins > Media players > Manage media players" in site administration
-    When I click on "Disable YouTube" "link"
-    Then I should see "YouTube disabled."
-    And "Disable YouTube" "link" should not exist
-    But "Enable YouTube" "link" should exist
-    When I click on "Enable YouTube" "link"
-    Then I should see "YouTube enabled."
-    And "Enable YouTube" "link" should not exist
-    But "Disable YouTube" "link" should exist
+    When I toggle the "Disable YouTube" admin switch "off"
+    And I should see "YouTube disabled."
+    And I reload the page
+    Then I should see "Enable YouTube"
+    And I toggle the "Enable YouTube" admin switch "on"
+    And I should see "YouTube enabled."
+    And I reload the page
+    Then I should see "Disable YouTube"

admin/tests/behat/manage_tokens.feature

@@ -1,103 +0,0 @@
-@core @core_admin
-Feature: Manage external services tokens
-  In order to manage external service usage
-  As an admin
-  I need to be able to create, filter and delete tokens
-
-  Background:
-    Given the following "users" exist:
-      | username  | password  | firstname     | lastname    |
-      | user1     | user1     | Firstname1    | Lastname1   |
-      | user2     | user2     | Firstname2    | Lastname2   |
-      | user3     | user3     | Firstname3    | Lastname3   |
-      | user4     | user4     | Firstname4    | Lastname4   |
-    And I change window size to "small"
-
-  @javascript
-  Scenario: Add a token to user identified by name and then delete that token
-    Given I log in as "admin"
-    And I am on site homepage
-    And I navigate to "Server > Web services > Manage tokens" in site administration
-    And I press "Create token"
-    And I set the field "Name" to "Webservice1"
-    And I set the field "User" to "Firstname1 Lastname1"
-    And I set the field "Service" to "Moodle mobile web service"
-    And I set the field "IP restriction" to "127.0.0.1"
-    When I press "Save changes"
-    Then the following should exist in the "generaltable" table:
-      | Name        | First name           | Service                   | IP restriction | Last access |
-      | Webservice1 | Firstname1 Lastname1 | Moodle mobile web service | 127.0.0.1      | Never       |
-
-    # Verify the message and the "Copy to clipboard" button.
-    And I should see "Copy the token now. It won't be shown again once you leave this page."
-    And "Copy to clipboard" "button" should exist
-
-    # New token can only read once.
-    And I reload the page
-    And I should not see "Copy the token now. It won't be shown again once you leave this page."
-    And "Copy to clipboard" "button" should not exist
-
-    # Delete token.
-    And I click on "Delete" "link" in the "Webservice1" "table_row"
-    And I should see "Do you really want to delete this web service token for Firstname1 Lastname1 on the service Moodle mobile web service?"
-    And I press "Delete"
-    And "Webservice1" "table_row" should not exist
-
-  @javascript @skip_chrome_zerosize
-  Scenario: Tokens can be filtered by name (case-insensitive), by user and by service
-    Given the following "core_webservice > Service" exists:
-      | name      | Site information              |
-      | shortname | siteinfo                      |
-      | enabled   | 1                             |
-    And the following "core_webservice > Service function" exists:
-      | service   | siteinfo                      |
-      | functions | core_webservice_get_site_info |
-    And the following "core_webservice > Tokens" exist:
-      | user      | service                       | name           |
-      | user2     | siteinfo                      | WEBservice1    |
-      | user3     | moodle_mobile_app             | webservicE3     |
-      | user4     | siteinfo                      | New service2   |
-    When I log in as "admin"
-    And I navigate to "Server > Web services > Manage tokens" in site administration
-
-    # All created tokens are shown by default.
-    And "Firstname1 Lastname1" "table_row" should not exist
-    And I should see "Site information" in the "Firstname2 Lastname2" "table_row"
-    And I should see "Moodle mobile web service" in the "Firstname3 Lastname3" "table_row"
-    And I should see "Site information" in the "Firstname4 Lastname4" "table_row"
-
-    # Filter tokens by by name (case-insensitive).
-    And I click on "Tokens filter" "link"
-    And I set the field "Name" to "webservice"
-    And I press "Show only matching tokens"
-    And I should see "Site information" in the "Firstname2 Lastname2" "table_row"
-    And I should see "Moodle mobile web service" in the "Firstname3 Lastname3" "table_row"
-    And "Firstname4 Lastname4" "table_row" should not exist
-
-    # Reset the filter.
-    And I press "Show all tokens"
-    And I should see "Site information" in the "Firstname2 Lastname2" "table_row"
-    And I should see "Moodle mobile web service" in the "Firstname3 Lastname3" "table_row"
-    And I should see "Site information" in the "Firstname4 Lastname4" "table_row"
-
-    # Filter tokens by user (note we can select the user by the identity field here).
-    When I click on "Tokens filter" "link"
-    And I set the field "User" to "user2@example.com"
-    And I press "Show only matching tokens"
-    Then "Firstname3 Lastname3" "table_row" should not exist
-    And "Firstname4 Lastname4" "table_row" should not exist
-    And I should see "Site information" in the "Firstname2 Lastname2" "table_row"
-
-    # Reset the filter.
-    And I press "Show all tokens"
-    And I should see "Site information" in the "Firstname2 Lastname2" "table_row"
-    And I should see "Moodle mobile web service" in the "Firstname3 Lastname3" "table_row"
-    And I should see "Site information" in the "Firstname4 Lastname4" "table_row"
-
-    # Filter tokens by service.
-    And I click on "Tokens filter" "link"
-    And I set the field "Service" to "Site information"
-    And I press "Show only matching tokens"
-    And I should see "Site information" in the "Firstname2 Lastname2" "table_row"
-    And I should see "Site information" in the "Firstname4 Lastname4" "table_row"
-    And "Firstname3 Lastname3" "table_row" should not exist

admin/tests/behat/task_logs.feature

@@ -48,25 +48,3 @@ Feature: View task logs report and use its filters
       | operator     | shouldornotsee |
       | Less than    | should not see |
       | Greater than | should see     |
-
-  @javascript
-  Scenario: Reset task log filters
-    Given I log in as "admin"
-    And I change window size to "large"
-    And I navigate to "Server > Tasks > Task logs" in site administration
-    When I click on "Filters" "button"
-    And I set the following fields in the "Result" "core_reportbuilder > Filter" to these values:
-      | Result operator | Is equal to |
-      | Result value    | Fail        |
-    And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
-    Then I should see "Filters applied"
-    And I should see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
-    And I should see "Nothing to display"
-    And I click on "Reset all" "button" in the "[data-region='report-filters']" "css_element"
-    And I should see "Filters reset"
-    And I should not see "Filters (1)" in the "#dropdownFiltersButton" "css_element"
-    And I should see "Filters" in the "#dropdownFiltersButton" "css_element"
-    And "[data-region='report-filters']" "css_element" should be visible
-    And the following fields in the "Result" "core_reportbuilder > Filter" match these values:
-      | Result operator | Is any value |
-    And I should not see "Nothing to display"

admin/tool/UPGRADING.md

@@ -0,0 +1,9 @@
+# tool (plugin type) Upgrade notes
+
+## 4.5
+
+### Removed
+
+- The Convert to InnoDB plugin (`tool_innodb`) has been completely removed.
+
+  For more information see [MDL-78776](https://tracker.moodle.org/browse/MDL-78776)

admin/tool/admin_presets/amd/build/admin_presets_list.min.js

@@ -0,0 +1,3 @@
+define("tool_admin_presets/admin_presets_list",["exports","core/event_dispatcher","core/notification","core/prefetch","core/str","core/pending","core_reportbuilder/local/events","core_reportbuilder/local/selectors","core/toast","tool_admin_presets/repository"],(function(_exports,_event_dispatcher,_notification,_prefetch,_str,_pending,reportEvents,reportSelectors,_toast,_repository){function _getRequireWildcardCache(nodeInterop){if("function"!=typeof WeakMap)return null;var cacheBabelInterop=new WeakMap,cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}function _interopRequireWildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule)return obj;if(null===obj||"object"!=typeof obj&&"function"!=typeof obj)return{default:obj};var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj))return cache.get(obj);var newObj={},hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj)if("default"!==key&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;desc&&(desc.get||desc.set)?Object.defineProperty(newObj,key,desc):newObj[key]=obj[key]}return newObj.default=obj,cache&&cache.set(obj,newObj),newObj}function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,_notification=_interopRequireDefault(_notification),_pending=_interopRequireDefault(_pending),reportEvents=_interopRequireWildcard(reportEvents),reportSelectors=_interopRequireWildcard(reportSelectors);_exports.init=()=>{(0,_prefetch.prefetchStrings)("core",["delete"]),(0,_prefetch.prefetchStrings)("tool_admin_presets",["deleteshow","deletepreset","eventpresetdeleted","deletepreviouslyapplied"]),document.addEventListener("click",(event=>{const presetDelete=event.target.closest('[data-action="admin-preset-delete"]');if(presetDelete){event.preventDefault();const triggerElement=presetDelete.closest(".dropdown").querySelector(".dropdown-toggle"),stringid=presetDelete.dataset.presetRollback?"deletepreviouslyapplied":"deletepreset";_notification.default.saveCancelPromise((0,_str.getString)("deleteshow","tool_admin_presets"),(0,_str.getString)(stringid,"tool_admin_presets",presetDelete.dataset.presetName),(0,_str.getString)("delete","core"),{triggerElement:triggerElement}).then((()=>{const pendingPromise=new _pending.default("tool/admin_presets:deletepreset"),reportElement=event.target.closest(reportSelectors.regions.report);return(0,_repository.deletePreset)(presetDelete.dataset.presetId).then((()=>(0,_toast.add)((0,_str.getString)("eventpresetdeleted","tool_admin_presets")))).then((()=>((0,_event_dispatcher.dispatchEvent)(reportEvents.tableReload,{preservePagination:!0},reportElement),pendingPromise.resolve()))).catch(_notification.default.exception)})).catch((()=>{}))}}))}}));
+
+//# sourceMappingURL=admin_presets_list.min.js.map

admin/tool/admin_presets/amd/build/admin_presets_list.min.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"admin_presets_list.min.js","sources":["../src/admin_presets_list.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\n/**\n * Admin presets list management\n *\n * @module     tool_admin_presets/admin_presets_list\n * @copyright  2024 David Carrillo <davidmc@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\n\"use strict\";\n\nimport {dispatchEvent} from 'core/event_dispatcher';\nimport Notification from 'core/notification';\nimport {prefetchStrings} from 'core/prefetch';\nimport {getString} from 'core/str';\nimport Pending from 'core/pending';\nimport * as reportEvents from 'core_reportbuilder/local/events';\nimport * as reportSelectors from 'core_reportbuilder/local/selectors';\nimport {add as addToast} from 'core/toast';\nimport {deletePreset} from 'tool_admin_presets/repository';\n\n/**\n * Initialise module\n */\nexport const init = () => {\n    prefetchStrings('core', [\n        'delete',\n    ]);\n\n    prefetchStrings('tool_admin_presets', [\n        'deleteshow',\n        'deletepreset',\n        'eventpresetdeleted',\n        'deletepreviouslyapplied'\n    ]);\n\n    document.addEventListener('click', event => {\n        const presetDelete = event.target.closest('[data-action=\"admin-preset-delete\"]');\n        if (presetDelete) {\n            event.preventDefault();\n\n            // Use triggerElement to return focus to the action menu toggle.\n            const triggerElement = presetDelete.closest('.dropdown').querySelector('.dropdown-toggle');\n            const stringid = presetDelete.dataset.presetRollback ? 'deletepreviouslyapplied' : 'deletepreset';\n\n            /* eslint-disable promise/no-nesting */\n            Notification.saveCancelPromise(\n                getString('deleteshow', 'tool_admin_presets'),\n                getString(stringid, 'tool_admin_presets', presetDelete.dataset.presetName),\n                getString('delete', 'core'),\n                {triggerElement}\n            ).then(() => {\n                const pendingPromise = new Pending('tool/admin_presets:deletepreset');\n                const reportElement = event.target.closest(reportSelectors.regions.report);\n\n                return deletePreset(presetDelete.dataset.presetId)\n                    .then(() => addToast(getString('eventpresetdeleted', 'tool_admin_presets')))\n                    .then(() => {\n                        dispatchEvent(reportEvents.tableReload, {preservePagination: true}, reportElement);\n                        return pendingPromise.resolve();\n                    })\n                    .catch(Notification.exception);\n            }).catch(() => {\n                return;\n            });\n        }\n    });\n};\n"],"names":["document","addEventListener","event","presetDelete","target","closest","preventDefault","triggerElement","querySelector","stringid","dataset","presetRollback","saveCancelPromise","presetName","then","pendingPromise","Pending","reportElement","reportSelectors","regions","report","presetId","reportEvents","tableReload","preservePagination","resolve","catch","Notification","exception"],"mappings":"+qDAsCoB,mCACA,OAAQ,CACpB,yCAGY,qBAAsB,CAClC,aACA,eACA,qBACA,4BAGJA,SAASC,iBAAiB,SAASC,cACzBC,aAAeD,MAAME,OAAOC,QAAQ,0CACtCF,aAAc,CACdD,MAAMI,uBAGAC,eAAiBJ,aAAaE,QAAQ,aAAaG,cAAc,oBACjEC,SAAWN,aAAaO,QAAQC,eAAiB,0BAA4B,qCAGtEC,mBACT,kBAAU,aAAc,uBACxB,kBAAUH,SAAU,qBAAsBN,aAAaO,QAAQG,aAC/D,kBAAU,SAAU,QACpB,CAACN,eAAAA,iBACHO,MAAK,WACGC,eAAiB,IAAIC,iBAAQ,mCAC7BC,cAAgBf,MAAME,OAAOC,QAAQa,gBAAgBC,QAAQC,eAE5D,4BAAajB,aAAaO,QAAQW,UACpCP,MAAK,KAAM,eAAS,kBAAU,qBAAsB,yBACpDA,MAAK,yCACYQ,aAAaC,YAAa,CAACC,oBAAoB,GAAOP,eAC7DF,eAAeU,aAEzBC,MAAMC,sBAAaC,cACzBF,OAAM"}

admin/tool/admin_presets/amd/build/repository.min.js

@@ -0,0 +1,10 @@
+define("tool_admin_presets/repository",["exports","core/ajax"],(function(_exports,_ajax){var obj;
+/**
+   * Module to handle presets AJAX requests
+   *
+   * @module     tool_admin_presets/repository
+   * @copyright  2024 David Carrillo <davidmc@moodle.com>
+   * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.deletePreset=void 0,_ajax=(obj=_ajax)&&obj.__esModule?obj:{default:obj};_exports.deletePreset=presetId=>{const request={methodname:"tool_admin_presets_delete_preset",args:{id:presetId}};return _ajax.default.call([request])[0]}}));
+
+//# sourceMappingURL=repository.min.js.map

admin/tool/admin_presets/amd/build/repository.min.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"repository.min.js","sources":["../src/repository.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\n/**\n * Module to handle presets AJAX requests\n *\n * @module     tool_admin_presets/repository\n * @copyright  2024 David Carrillo <davidmc@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport Ajax from 'core/ajax';\n\n/**\n * Delete given preset\n *\n * @param {Number} presetId\n * @return {Promise}\n */\nexport const deletePreset = presetId => {\n    const request = {\n        methodname: 'tool_admin_presets_delete_preset',\n        args: {id: presetId}\n    };\n\n    return Ajax.call([request])[0];\n};\n"],"names":["presetId","request","methodname","args","id","Ajax","call"],"mappings":";;;;;;;oKA+B4BA,iBAClBC,QAAU,CACZC,WAAY,mCACZC,KAAM,CAACC,GAAIJ,kBAGRK,cAAKC,KAAK,CAACL,UAAU"}

admin/tool/admin_presets/amd/src/admin_presets_list.js

@@ -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/>.
+
+/**
+ * Admin presets list management
+ *
+ * @module     tool_admin_presets/admin_presets_list
+ * @copyright  2024 David Carrillo <davidmc@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+"use strict";
+
+import {dispatchEvent} from 'core/event_dispatcher';
+import Notification from 'core/notification';
+import {prefetchStrings} from 'core/prefetch';
+import {getString} from 'core/str';
+import Pending from 'core/pending';
+import * as reportEvents from 'core_reportbuilder/local/events';
+import * as reportSelectors from 'core_reportbuilder/local/selectors';
+import {add as addToast} from 'core/toast';
+import {deletePreset} from 'tool_admin_presets/repository';
+
+/**
+ * Initialise module
+ */
+export const init = () => {
+    prefetchStrings('core', [
+        'delete',
+    ]);
+
+    prefetchStrings('tool_admin_presets', [
+        'deleteshow',
+        'deletepreset',
+        'eventpresetdeleted',
+        'deletepreviouslyapplied'
+    ]);
+
+    document.addEventListener('click', event => {
+        const presetDelete = event.target.closest('[data-action="admin-preset-delete"]');
+        if (presetDelete) {
+            event.preventDefault();
+
+            // Use triggerElement to return focus to the action menu toggle.
+            const triggerElement = presetDelete.closest('.dropdown').querySelector('.dropdown-toggle');
+            const stringid = presetDelete.dataset.presetRollback ? 'deletepreviouslyapplied' : 'deletepreset';
+
+            /* eslint-disable promise/no-nesting */
+            Notification.saveCancelPromise(
+                getString('deleteshow', 'tool_admin_presets'),
+                getString(stringid, 'tool_admin_presets', presetDelete.dataset.presetName),
+                getString('delete', 'core'),
+                {triggerElement}
+            ).then(() => {
+                const pendingPromise = new Pending('tool/admin_presets:deletepreset');
+                const reportElement = event.target.closest(reportSelectors.regions.report);
+
+                return deletePreset(presetDelete.dataset.presetId)
+                    .then(() => addToast(getString('eventpresetdeleted', 'tool_admin_presets')))
+                    .then(() => {
+                        dispatchEvent(reportEvents.tableReload, {preservePagination: true}, reportElement);
+                        return pendingPromise.resolve();
+                    })
+                    .catch(Notification.exception);
+            }).catch(() => {
+                return;
+            });
+        }
+    });
+};

admin/tool/admin_presets/amd/src/repository.js

@@ -0,0 +1,39 @@
+// 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/>.
+
+/**
+ * Module to handle presets AJAX requests
+ *
+ * @module     tool_admin_presets/repository
+ * @copyright  2024 David Carrillo <davidmc@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+import Ajax from 'core/ajax';
+
+/**
+ * Delete given preset
+ *
+ * @param {Number} presetId
+ * @return {Promise}
+ */
+export const deletePreset = presetId => {
+    const request = {
+        methodname: 'tool_admin_presets_delete_preset',
+        args: {id: presetId}
+    };
+
+    return Ajax.call([request])[0];
+};

admin/tool/admin_presets/classes/external/delete_preset.php

@@ -0,0 +1,71 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace tool_admin_presets\external;
+
+use core_adminpresets\manager;
+use core_external\external_api;
+use core_external\external_function_parameters;
+use core_external\external_value;
+
+/**
+ * External function tool_admin_presets_delete_preset
+ *
+ * @package    tool_admin_presets
+ * @copyright  2024 David Carrillo <davidmc@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class delete_preset extends external_api {
+
+    /**
+     * Describes the parameters.
+     *
+     * @return external_function_parameters
+     */
+    public static function execute_parameters(): external_function_parameters {
+        return new external_function_parameters([
+            'id' => new external_value(PARAM_INT),
+        ]);
+    }
+
+    /**
+     * External function to delete custom presets.
+     *
+     * @param int $id
+     */
+    public static function execute(int $id): void {
+        // Parameter validation.
+        [
+            'id' => $id,
+        ] = self::validate_parameters(self::execute_parameters(), [
+            'id' => $id,
+        ]);
+
+        // Validate context.
+        $context = \context_system::instance();
+        self::validate_context($context);
+
+        require_capability('moodle/site:config', $context);
+
+        (new manager())->delete_preset($id);
+    }
+
+    /**
+     * Describes the data returned from the external function.
+     */
+    public static function execute_returns(): void {
+    }
+}

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

@@ -17,9 +17,7 @@
 namespace tool_admin_presets\local\action;
 
 use context_system;
-use moodle_url;
 use core_adminpresets\manager;
-use tool_admin_presets\output\presets_list;
 use tool_admin_presets\output\export_import;
 
 /**
@@ -41,7 +39,7 @@ class base {
         'preview' => 'preset_previewed',
         'load' => 'preset_loaded',
         'rollback' => 'preset_reverted',
-        'download_xml' => 'preset_downloaded'
+        'download_xml' => 'preset_downloaded',
     ];
 
     /** @var string The main action (delete, export, import, load...). **/
@@ -79,14 +77,19 @@ class base {
      * actions (preview, load, download, delete and rollback)
      */
     public function show(): void {
-        global $DB, $OUTPUT;
+        global $DB, $OUTPUT, $PAGE;
 
+        $this->outputs = $OUTPUT->container_start('d-flex flex-wrap justify-content-end');
         $options = new export_import();
-        $this->outputs = $OUTPUT->render($options);
+        $this->outputs .= $OUTPUT->render($options);
+        $this->outputs .= $OUTPUT->container_end();
 
-        $presets = $DB->get_records('adminpresets');
-        $list = new presets_list($presets, true);
-        $this->outputs .= $OUTPUT->render($list);
+        $PAGE->requires->js_call_amd('tool_admin_presets/admin_presets_list', 'init');
+
+        $report = \core_reportbuilder\system_report_factory::create(
+            \tool_admin_presets\reportbuilder\local\systemreports\admin_presets::class,
+            $PAGE->context, '', '', 0, []);
+        $this->outputs .= $report->output();
     }
 
     /**

admin/tool/admin_presets/classes/output/export_import.php

@@ -43,11 +43,13 @@ class export_import implements renderable, templatable {
     public function export_for_template(renderer_base $output): stdClass {
         $context = new stdClass();
         $exportlink = new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'export']);
-        $exportbutton = new \single_button($exportlink, get_string('actionexport', 'tool_admin_presets'), 'get');
+        $exportbutton = new \single_button($exportlink, get_string('actionexport', 'tool_admin_presets'), 'get',
+            \single_button::BUTTON_PRIMARY);
         $context->export = $exportbutton->export_for_template($output);
 
         $importlink = new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'import']);
-        $importbutton = new \single_button($importlink, get_string('actionimport', 'tool_admin_presets'), 'get');
+        $importbutton = new \single_button($importlink, get_string('actionimport', 'tool_admin_presets'), 'get',
+            \single_button::BUTTON_PRIMARY);
         $context->import = $importbutton->export_for_template($output);
         return $context;
     }

admin/tool/admin_presets/classes/reportbuilder/local/entities/admin_preset.php

@@ -0,0 +1,149 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace tool_admin_presets\reportbuilder\local\entities;
+
+use lang_string;
+use core\output\inplace_editable;
+use core_reportbuilder\local\entities\base;
+use core_reportbuilder\local\filters\text;
+use core_reportbuilder\local\report\{column, filter};
+
+/**
+ * Admin preset entity
+ *
+ * @package     tool_admin_presets
+ * @copyright   2024 David Carrillo <davidmc@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class admin_preset extends base {
+
+    /**
+     * Database tables that this entity uses
+     *
+     * @return string[]
+     */
+    protected function get_default_tables(): array {
+        return [
+            'adminpresets',
+        ];
+    }
+
+    /**
+     * The default title for this entity
+     *
+     * @return lang_string
+     */
+    protected function get_default_entity_title(): lang_string {
+        return new lang_string('pluginname', 'tool_admin_presets');
+    }
+
+    /**
+     * Initialise the entity
+     *
+     * @return base
+     */
+    public function initialise(): base {
+        $columns = $this->get_all_columns();
+        foreach ($columns as $column) {
+            $this->add_column($column);
+        }
+
+        // All the filters defined by the entity can also be used as conditions.
+        $filters = $this->get_all_filters();
+        foreach ($filters as $filter) {
+            $this
+                ->add_filter($filter)
+                ->add_condition($filter);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns list of all available columns
+     *
+     * @return column[]
+     */
+    protected function get_all_columns(): array {
+        global $DB;
+        $apalias = $this->get_table_alias('adminpresets');
+
+        // Name.
+        $columns[] = (new column(
+            'name',
+            new lang_string('name'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_TEXT)
+            ->add_fields("{$apalias}.id, {$apalias}.name, {$apalias}.iscore")
+            ->set_is_sortable(true)
+            ->set_callback(static function(?string $value, \stdClass $row): string {
+                global $OUTPUT;
+                $edithint = get_string('editadminpresetname', 'tool_admin_presets');
+                $displayvalue = format_string($row->name, true, ['context' => \context_system::instance(), 'escape' => false]);
+                $editlabel = get_string('newvaluefor', 'form', $displayvalue);
+                $canedit = (int)$row->iscore === \core_adminpresets\manager::NONCORE_PRESET;
+                $inlineeditable = new inplace_editable('tool_admin_presets', 'presetname', $row->id, $canedit,
+                    $displayvalue, $row->name, $edithint, $editlabel);
+                return $OUTPUT->render($inlineeditable);
+            });
+
+        // Description.
+        $descriptionfieldsql = "{$apalias}.comments";
+        if ($DB->get_dbfamily() === 'oracle') {
+            $descriptionfieldsql = $DB->sql_order_by_text($descriptionfieldsql, 1024);
+        }
+        $columns[] = (new column(
+            'description',
+            new lang_string('description'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_LONGTEXT)
+            ->add_field($descriptionfieldsql, 'description')
+            ->set_is_sortable(true)
+            ->set_callback(static function(?string $description, \stdClass $row): string {
+                return format_text($description, FORMAT_HTML, ['context' => \context_system::instance()]);
+            });
+
+        return $columns;
+    }
+
+    /**
+     * Return list of all available filters
+     *
+     * @return filter[]
+     */
+    protected function get_all_filters(): array {
+        $apalias = $this->get_table_alias('adminpresets');
+
+        // Name.
+        $filters[] = (new filter(
+            text::class,
+            'name',
+            new lang_string('name'),
+            $this->get_entity_name(),
+            "{$apalias}.name"
+        ))
+            ->add_joins($this->get_joins());
+
+        return $filters;
+    }
+}

admin/tool/admin_presets/classes/reportbuilder/local/systemreports/admin_presets.php

@@ -0,0 +1,152 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace tool_admin_presets\reportbuilder\local\systemreports;
+
+use tool_admin_presets\reportbuilder\local\entities\admin_preset;
+use core_reportbuilder\local\helpers\database;
+use core_reportbuilder\local\report\action;
+use core_reportbuilder\system_report;
+
+/**
+ * Admin presets system report class implementation
+ *
+ * @package    tool_admin_presets
+ * @copyright  2024 David Carrillo <davidmc@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class admin_presets extends system_report {
+
+    /**
+     * Initialise report, we need to set the main table, load our entities and set columns/filters
+     */
+    protected function initialise(): void {
+        // Our main entity, it contains all of the column definitions that we need.
+        $apentity = new admin_preset();
+        $entityalias = $apentity->get_table_alias('adminpresets');
+
+        $this->set_main_table('adminpresets', $entityalias);
+        $this->add_entity($apentity);
+
+        $apappalias = database::generate_alias();
+
+        // We need to join the adminpresets_app table to check if the preset rollback has ben used.
+        $this->add_join("LEFT JOIN {adminpresets_app} {$apappalias} ON {$entityalias}.id = {$apappalias}.adminpresetid");
+
+        // Any columns required by actions should be defined here to ensure they're always available.
+        $this->add_base_fields("{$entityalias}.id, {$entityalias}.name, {$entityalias}.iscore, {$apappalias}.id as appid");
+
+        // Now we can call our helper methods to add the content we want to include in the report.
+        $this->add_columns();
+        $this->add_filters();
+        $this->add_actions();
+
+        // Set if report can be downloaded.
+        $this->set_downloadable(false);
+    }
+
+    /**
+     * Validates access to view this report
+     *
+     * @return bool
+     */
+    protected function can_view(): bool {
+        return has_capability('moodle/site:config', \context_system::instance());
+    }
+
+    /**
+     * Adds the columns we want to display in the report
+     *
+     * They are provided by the entities we previously added in the {@see initialise} method, referencing each by their
+     * unique identifier. If custom columns are needed just for this report, they can be defined here.
+     */
+    public function add_columns(): void {
+        $columns = [
+            'admin_preset:name',
+            'admin_preset:description',
+        ];
+        $this->add_columns_from_entities($columns);
+    }
+
+    /**
+     * Adds the filters we want to display in the report
+     *
+     * They are all provided by the entities we previously added in the {@see initialise} method, referencing each by their
+     * unique identifier
+     */
+    protected function add_filters(): void {
+        $filters = [
+            'admin_preset:name',
+        ];
+        $this->add_filters_from_entities($filters);
+    }
+
+    /**
+     * Add the system report actions. An extra column will be appended to each row, containing all actions added here
+     *
+     * Note the use of ":id" placeholder which will be substituted according to actual values in the row
+     */
+    protected function add_actions(): void {
+
+        // Review settings and apply.
+        $this->add_action((new action(
+            new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'load', 'id' => ':id']),
+            new \pix_icon('t/play', '', 'core'),
+            [],
+            false,
+            new \lang_string('applyaction', 'tool_admin_presets')
+        )));
+
+        // Download.
+        $this->add_action((new action(
+            new \moodle_url('/admin/tool/admin_presets/index.php',
+                ['action' => 'export', 'mode' => 'download_xml', 'sesskey' => sesskey(), 'id' => ':id']),
+            new \pix_icon('t/download', '', 'core'),
+            [],
+            false,
+            new \lang_string('download', 'core')
+        )));
+
+        // Delete button won't be displayed for the pre-installed core "Starter" and "Full" presets.
+        $this->add_action((new action(
+            new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'delete', 'id' => ':id']),
+            new \pix_icon('i/delete', '', 'core'),
+            [
+                'data-action' => 'admin-preset-delete',
+                'data-preset-name' => ':name',
+                'data-preset-id' => ':id',
+                'data-preset-rollback' => ':appid',
+            ],
+            false,
+            new \lang_string('delete', 'core')
+        ))->add_callback(function(\stdClass $row): bool {
+            return (int)$row->iscore === \core_adminpresets\manager::NONCORE_PRESET;
+        }));
+
+        // Look for preset applications.
+        $this->add_action((new action(
+            new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'rollback', 'id' => ':id']),
+            new \pix_icon('i/reload', '', 'core'),
+            [],
+            false,
+            new \lang_string('showhistory', 'tool_admin_presets')
+        ))->add_callback(function(\stdClass $row): bool {
+            return (bool) $row->appid;
+        }));
+    }
+}

admin/tool/admin_presets/db/services.php

@@ -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/>.
+
+/**
+ * External functions and service declaration for Site admin presets
+ *
+ * Documentation: {@link https://moodledev.io/docs/apis/subsystems/external/description}
+ *
+ * @package    tool_admin_presets
+ * @category   webservice
+ * @copyright  2024 David Carrillo <davidmc@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$functions = [
+    'tool_admin_presets_delete_preset' => [
+        'classname' => tool_admin_presets\external\delete_preset::class,
+        'description' => 'Delete a custom preset',
+        'type' => 'write',
+        'ajax' => true,
+    ],
+];

admin/tool/admin_presets/lang/en/tool_admin_presets.php

@@ -34,9 +34,10 @@ $string['basedescription'] = 'Presets allow you to easily switch between differe
 $string['created'] = 'Created';
 $string['currentvalue'] = 'Current value';
 $string['deletepreset'] = 'Are you sure you want to delete the site admin preset {$a}?';
-$string['deletepreviouslyapplied'] = 'This preset has been previously applied. Deleting a preset removes it from your site completely. You will not be able to revert your settings to how they were before applying this preset.';
+$string['deletepreviouslyapplied'] = 'Are you sure you want to delete the site admin preset {$a}?<br><br>This preset has been previously applied. Deleting a preset removes it from your site completely. You will not be able to revert your settings to how they were before applying this preset.';
 $string['deletepresettitle'] = 'Delete {$a} preset?';
 $string['deleteshow'] = 'Delete site admin preset';
+$string['editadminpresetname'] = 'Edit admin preset name';
 $string['eventpresetdeleted'] = 'Preset deleted';
 $string['eventpresetdownloaded'] = 'Preset downloaded';
 $string['eventpresetexported'] = 'Preset created';

admin/tool/admin_presets/lib.php

@@ -0,0 +1,63 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Admin presets callbacks
+ *
+ * @package     tool_admin_presets
+ * @copyright   2024 David Carrillo <davidmc@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+declare(strict_types=1);
+
+use core\output\inplace_editable;
+
+/**
+ * Inplace editable functionality
+ *
+ * @param string $itemtype
+ * @param int $itemid
+ * @param string $newvalue
+ * @return inplace_editable
+ */
+function tool_admin_presets_inplace_editable(string $itemtype, int $itemid, string $newvalue): inplace_editable {
+    global $DB;
+    $context = \context_system::instance();
+    \core_external\external_api::validate_context($context);
+
+    require_capability('moodle/site:config', $context);
+
+    switch ($itemtype) {
+        case 'presetname':
+            $newvalue = clean_param($newvalue, PARAM_TEXT);
+            $edithint = get_string('editadminpresetname', 'tool_admin_presets');
+            $displayvalue = format_string($newvalue, true, ['context' => \context_system::instance(), 'escape' => false]);
+            $editlabel = get_string('newvaluefor', 'form', $displayvalue);
+
+            // Update value in database.
+            $DB->set_field('adminpresets', 'name', $newvalue, [
+                'id' => $itemid,
+                'iscore' => \core_adminpresets\manager::NONCORE_PRESET,
+            ]);
+
+            break;
+        default:
+            throw new \coding_exception('Unexpected admin preset inplace editable item type');
+    }
+
+    return new inplace_editable('tool_admin_presets', $itemtype, $itemid, true, $displayvalue, $newvalue, $edithint, $editlabel);
+}

admin/tool/admin_presets/templates/export_import.mustache

@@ -40,7 +40,7 @@
     }
 }}
 
-<div class="mt-2 mb-1 float-right">
+<div class="mt-2 mb-1 float-end">
     {{#export}}{{> core/single_button}}{{/export}}
     {{#import}}{{> core/single_button}}{{/import}}
 </div>

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

@@ -6,19 +6,17 @@ Feature: I can apply presets
 
   Scenario: Default settings are equal to Full preset
     Given I navigate to "Site admin presets" in site administration
-    And I should see "Full"
-    And I open the action menu in "Full" "table_row"
-    When I choose "Review settings and apply" in the open action menu
+    When I press "Review settings and apply" action in the "Full" report row
     Then I should not see "Setting changes"
 
   Scenario: Applying Starter Moodle preset changes status and settings
 #   Checking the settings before applying Full Moodle preset (we're only testing one of each type).
     Given I navigate to "Plugins > Activity modules > Manage activities" in site administration
-    And "Disable Database" "icon" should exist in the "Database" "table_row"
+    And I should see "Disable Database"
     And I navigate to "Plugins > Availability restrictions > Manage restrictions" in site administration
-    And "Hide" "icon" should exist in the "Restriction by grouping" "table_row"
+    And I should see "Disable Restriction by grouping"
     And I navigate to "Plugins > Blocks > Manage blocks" in site administration
-    And "Disable Logged in user" "icon" should exist in the "Logged in user" "table_row"
+    And I should see "Disable Logged in user"
     And I navigate to "Plugins > Course formats > Manage course formats" in site administration
     And "Disable" "icon" should exist in the "Social" "table_row"
     And I navigate to "Plugins > Question behaviours > Manage question behaviours" in site administration
@@ -26,9 +24,7 @@ Feature: I can apply presets
     And I navigate to "Plugins > Question types > Manage question types" in site administration
     And "Enabled" "icon" should exist in the "Calculated multichoice" "table_row"
     When I navigate to "Site admin presets" in site administration
-    And I should see "Starter"
-    And I open the action menu in "Starter" "table_row"
-    And I choose "Review settings and apply" in the open action menu
+    And I press "Review settings and apply" action in the "Starter" report row
     And I should see "Setting changes"
 #   Checking all the settings to be applied for the Starter (if will help to identify possible regressions).
     And I should see "Activities" in the "Setting changes" "table"
@@ -109,11 +105,11 @@ Feature: I can apply presets
     And the field "Enable badges" matches value "0"
     And the field "Enable competencies" matches value "0"
     And I navigate to "Plugins > Activity modules > Manage activities" in site administration
-    And "Disable Database" "icon" should not exist in the "Database" "table_row"
+    And I should see "Enable Database"
     And I navigate to "Plugins > Availability restrictions > Manage restrictions" in site administration
-    And "Hide" "icon" should not exist in the "Restriction by grouping" "table_row"
+    And I should see "Enable Restriction by grouping"
     And I navigate to "Plugins > Blocks > Manage blocks" in site administration
-    And "Disable Logged in user" "icon" should not exist in the "Logged in user" "table_row"
+    And I should see "Enable Logged in user"
     And I navigate to "Plugins > Course formats > Manage course formats" in site administration
     And "Disable" "icon" should not exist in the "Social" "table_row"
     And I navigate to "Plugins > Question behaviours > Manage question behaviours" in site administration
@@ -124,13 +120,11 @@ Feature: I can apply presets
   Scenario: Re-applying Starter Moodle preset does not display setting changes
 #   Apply Starter preset.
     Given I navigate to "Site admin presets" in site administration
-    And I open the action menu in "Starter" "table_row"
-    And I choose "Review settings and apply" in the open action menu
+    When I press "Review settings and apply" action in the "Starter" report row
     And I click on "Apply" "button"
     And I click on "Continue" "button"
 #   When the Starter preset it's applied again, no changes should be displayed.
-    When I open the action menu in "Starter" "table_row"
-    And I choose "Review settings and apply" in the open action menu
+    And I press "Review settings and apply" action in the "Starter" report row
     Then I should not see "Setting changes"
 
   Scenario: Applied exported settings
@@ -139,14 +133,12 @@ Feature: I can apply presets
     And I set the field "Name" to "Current"
     And I click on "Create preset" "button"
     And I should see "Current"
-    And I open the action menu in "Current" "table_row"
-    When I choose "Review settings and apply" in the open action menu
+    When I press "Review settings and apply" action in the "Current" report row
     And I should not see "Setting changes"
     And I click on "Continue" "button"
     And the following config values are set as admin:
       | enabled | 0 | core_competency |
-    And I open the action menu in "Current" "table_row"
-    And I choose "Review settings and apply" in the open action menu
+    And I press "Review settings and apply" action in the "Current" report row
     Then I should see "Setting changes"
     And I should see "Enable competencies" in the "core_competency" "table_row"
     And I click on "Apply" "button"