Moodle release 5.0.6

Instead of introducing a new optional parameter,
we will make all the changes in the Admin Renderer

.github/workflows/onebyone.yml

@@ -51,7 +51,7 @@ jobs:
                   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")
+          done < <(find . -name "*_test.php" -not -path "*/fixtures/*")
           # 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"

.grunt/tasks/ignorefiles.js

@@ -58,6 +58,31 @@ module.exports = grunt => {
         }) + "\n");
     };
 
+    /**
+     * Extracts ignore entries from a local ignore file.
+     *
+     * @param {string} componentPath the file path to the component, relative to the code base directory
+     * @param {string} ignoreFilePath the path to the ignore file
+     * @return {array} array of ignore paths to be included in the global ignore files
+     */
+    const getEntriesFromLocalIgnoreFile = (componentPath, ignoreFilePath) => {
+        const ignorePaths = [];
+        if (grunt.file.exists(ignoreFilePath)) {
+            const ignoreFile = grunt.file.read(ignoreFilePath);
+            const entries = ignoreFile.split('\n');
+            entries.forEach(entry => {
+                entry = entry.trim();
+                if (entry.length > 0 && !entry.startsWith('#') && !entry.startsWith('!')) {
+                    while (entry.startsWith('/')) {
+                        entry = entry.substring(1);
+                    }
+                    ignorePaths.push(componentPath + '/' + entry);
+                }
+            });
+        }
+        return ignorePaths;
+    };
+
     /**
      * Generate ignore files (utilising thirdpartylibs.xml data)
      */
@@ -67,6 +92,20 @@ module.exports = grunt => {
 
         // An array of paths to third party directories.
         const thirdPartyPaths = ComponentList.getThirdPartyPaths();
+        const localStylelintIgnorePaths = [];
+        const localEslintIgnorePaths = [];
+        ComponentList.getComponentPaths(process.cwd() + '/').forEach(componentPath => {
+            const localEslintIgnorePath = process.cwd() + '/' + componentPath + '/.eslintignore';
+            const localEslintIgnoreEntries = getEntriesFromLocalIgnoreFile(componentPath, localEslintIgnorePath);
+            if (localEslintIgnoreEntries.length > 0) {
+                localEslintIgnorePaths.push(...localEslintIgnoreEntries);
+            }
+            const localStylelintIgnorePath = process.cwd() + '/' + componentPath + '/.stylelintignore';
+            const localStylelintIgnoreEntries = getEntriesFromLocalIgnoreFile(componentPath, localStylelintIgnorePath);
+            if (localStylelintIgnoreEntries.length > 0) {
+                localStylelintIgnorePaths.push(...localStylelintIgnoreEntries);
+            }
+        });
 
         // Generate .eslintignore.
         const eslintIgnores = [
@@ -77,7 +116,7 @@ module.exports = grunt => {
             // Ignore all yui/src meta directories and build directories.
             '*/**/yui/src/*/meta/',
             '*/**/build/',
-        ].concat(thirdPartyPaths);
+        ].concat(thirdPartyPaths).concat(localEslintIgnorePaths);
         grunt.file.write('.eslintignore', eslintIgnores.join('\n') + '\n');
 
         // Generate .stylelintignore.
@@ -88,7 +127,7 @@ module.exports = grunt => {
             'theme/classic/style/moodle.css',
             'jsdoc/styles/*.css',
             'admin/tool/componentlibrary/hugo/dist/css/docs.css',
-        ].concat(thirdPartyPaths);
+        ].concat(thirdPartyPaths).concat(localStylelintIgnorePaths);
         grunt.file.write('.stylelintignore', stylelintIgnores.join('\n') + '\n');
 
         phpcsIgnore(thirdPartyPaths);

MDL-87443-2025121117305654.yml

@@ -0,0 +1,7 @@
+issueNumber: MDL-87443
+notes:
+  core:
+    - message: >-
+        There is a new Behat `toast_message` named selector to more easily
+        assert the presence of Toast messages on the page
+      type: improved

UPGRADING.md

@@ -6,6 +6,86 @@ More detailed information on key changes can be found in the [Developer update n
 
 The format of this change log follows the advice given at [Keep a CHANGELOG](https://keepachangelog.com).
 
+## 5.0.5
+
+### core
+
+#### Changed
+
+- `\core\output\core_renderer::confirm()`'s `$displayoptions` parameter now also accepts a `headinglevel` option that developers can use to specify the heading level of the confirmation's heading. If not specified, the confirmation heading will be rendered in an `h4` tag.
+
+  For more information see [MDL-87694](https://tracker.moodle.org/browse/MDL-87694)
+
+### core_question
+
+#### Fixed
+
+- In order to prevent re-use of question version numbers after a version is deleted, the `nextversion` column was added to `question_bank_entries`. This serves as a counter incremented each time a version is created.
+  Do not query this field directly. Instead use `core_question\versions::get_next_version()` to read the value, which will initialise it based on the existing versions if it is not set yet. By default, it will increment the version number automatically, unless you pass `increment: false`. Because of this, it is advisable to call it inside a transaction, that is only committed after the version number is used in a `question_versions` record.
+
+  For more information see [MDL-86798](https://tracker.moodle.org/browse/MDL-86798)
+
+## 5.0.4
+
+### core
+
+#### Added
+
+- Added clean_string() that prevents double escaping in Mustache templates
+
+  For more information see [MDL-87066](https://tracker.moodle.org/browse/MDL-87066)
+
+#### Changed
+
+- The Hook Manager now uses localcache instead of caching via MUC.
+
+  For more information see [MDL-87107](https://tracker.moodle.org/browse/MDL-87107)
+
+#### Fixed
+
+- `restore_qtype_plugin::unset_excluded_fields` now returns the modified questiondata structure,
+  in order to support structures that contain arrays.
+  If your qtype plugin overrides `restore_qtype_plugin::remove_excluded_question_data` without
+  calling the parent method, you may need to modify your overridden method to use the returned
+  value.
+
+  For more information see [MDL-85975](https://tracker.moodle.org/browse/MDL-85975)
+- When responding to pcntl signals, call existing signal handlers.
+
+  For more information see [MDL-87079](https://tracker.moodle.org/browse/MDL-87079)
+
+### core_completion
+
+#### Changed
+
+- The `completion_info::clear_criteria` method takes an optional `$removetypecriteria` to determine whether to remove course type criteria from other courses that refer to the current course
+
+  For more information see [MDL-86332](https://tracker.moodle.org/browse/MDL-86332)
+
+### core_course
+
+#### Added
+
+- The external function `core_course_get_course_contents` now includes the `candisplay` property for each returned module. If this is false, the module should not be displayed on the course page (for example, for question banks).
+
+  For more information see [MDL-85405](https://tracker.moodle.org/browse/MDL-85405)
+
+### core_group
+
+#### Added
+
+- `groups_print_activity_menu()` and `groups_get_activity_group()` now include an additional `$participationonly` parameter, which is true by default. This can be set false when we want the user to be able to select a non-participation group within an activity, for example if a teacher wants to filter assignment submissions by non-participation groups. It should never be used when the menu is displayed to students, as this may allow them to participate using non-participation groups. Non-participation groups are labeled as such.
+
+  For more information see [MDL-81514](https://tracker.moodle.org/browse/MDL-81514)
+
+### mod_glossary
+
+#### Added
+
+- Function mod_glossary_rating_can_see_item_ratings is now implemented for checking permissions to view ratings.
+
+  For more information see [MDL-86960](https://tracker.moodle.org/browse/MDL-86960)
+
 ## 5.0.3
 
 ### core

admin/category.php

@@ -119,8 +119,8 @@ foreach ($settingspage->children as $childpage) {
                 $outputhtml .= html_writer::tag('div', '<!-- -->', array('class' => 'clearer'));
                 $outputhtml .= $setting->output_html($data);
                 if ($childpage->has_dependencies()) {
-                    $opts = ['dependencies' => $childpage->get_dependencies_for_javascript()];
-                    $PAGE->requires->js_call_amd('core/showhidesettings', 'init', [$opts]);
+                    $context = ['dependencies' => json_encode($childpage->get_dependencies_for_javascript())];
+                    echo $OUTPUT->render_from_template('core_admin/settings_showhide', $context);
                 }
             }
             $outputhtml .= html_writer::end_tag('fieldset');

admin/classes/admin/admin_setting_notification.php

@@ -0,0 +1,74 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_admin\admin;
+
+use admin_setting;
+
+/**
+ * Render a notification as part of other admin settings.
+ *
+ * @package    core_admin
+ * @subpackage admin
+ * @copyright  2025 Matt Porritt <matt.porritt@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class admin_setting_notification extends admin_setting {
+    /**
+     * Constructor.
+     *
+     * @param string $name The name of the setting.
+     * @param string $notification The notification to display.
+     * @param string $type The type of notification.
+     * @param bool $cancelable Whether the notification can be canceled.
+     */
+    public function __construct(
+        string $name,
+        /** @var string The notification to display. */
+        protected string $notification,
+        /** @var string The type of notification. */
+        protected string $type = 'info',
+        /** @var bool Whether the notification can be canceled. */
+        protected bool $cancelable = false
+    ) {
+        $this->nosave = true;
+
+        parent::__construct($name, '', '', '');
+    }
+
+    #[\Override]
+    public function get_setting(): bool {
+        return true;
+    }
+
+    #[\Override]
+    public function get_defaultsetting(): bool {
+        return true;
+    }
+
+    #[\Override]
+    public function write_setting($data): string {
+        // Do not write any setting.
+        return '';
+    }
+
+    #[\Override]
+    public function output_html($data, $query = ''): string {
+        global $OUTPUT;
+
+        return $OUTPUT->notification($this->notification, $this->type, $this->cancelable);
+    }
+}

admin/cli/scheduled_task.php

@@ -125,11 +125,6 @@ if ($options['list']) {
     exit(0);
 }
 
-if (moodle_needs_upgrading()) {
-    mtrace("Moodle upgrade pending, cannot manage tasks.");
-    exit(1);
-}
-
 if ($disable = $options['disable']) {
     if (!$task = \core\task\manager::get_scheduled_task($disable)) {
         mtrace("Task '$disable' not found");
@@ -157,6 +152,11 @@ if ($disable = $options['disable']) {
         exit(1);
     }
 } else if ($execute = $options['execute']) {
+    if (moodle_needs_upgrading()) {
+        mtrace("Moodle upgrade pending, cannot execute tasks.");
+        exit(1);
+    }
+
     if (!$task = \core\task\manager::get_scheduled_task($execute)) {
         mtrace("Task '$execute' not found");
         exit(1);

admin/environment.xml

@@ -3835,6 +3835,7 @@
       <PHP_EXTENSION name="fileinfo" level="required"/>
       <PHP_EXTENSION name="sodium" level="optional"/>
       <PHP_EXTENSION name="exif" level="optional"/>
+      <PHP_EXTENSION name="filter" level="required"/>
     </PHP_EXTENSIONS>
     <PHP_SETTINGS>
       <PHP_SETTING name="memory_limit" value="96M" level="required">
@@ -4411,6 +4412,7 @@
       <PHP_EXTENSION name="fileinfo" level="required"/>
       <PHP_EXTENSION name="sodium" level="required"/>
       <PHP_EXTENSION name="exif" level="optional"/>
+      <PHP_EXTENSION name="filter" level="required"/>
     </PHP_EXTENSIONS>
     <PHP_SETTINGS>
       <PHP_SETTING name="memory_limit" value="96M" level="required">
@@ -4607,6 +4609,7 @@
       <PHP_EXTENSION name="fileinfo" level="required"/>
       <PHP_EXTENSION name="sodium" level="required"/>
       <PHP_EXTENSION name="exif" level="optional"/>
+      <PHP_EXTENSION name="filter" level="required"/>
     </PHP_EXTENSIONS>
     <PHP_SETTINGS>
       <PHP_SETTING name="memory_limit" value="96M" level="required">
@@ -4802,6 +4805,7 @@
       <PHP_EXTENSION name="fileinfo" level="required"/>
       <PHP_EXTENSION name="sodium" level="required"/>
       <PHP_EXTENSION name="exif" level="optional"/>
+      <PHP_EXTENSION name="filter" level="required"/>
     </PHP_EXTENSIONS>
     <PHP_SETTINGS>
       <PHP_SETTING name="memory_limit" value="96M" level="required">
@@ -4997,6 +5001,7 @@
       <PHP_EXTENSION name="fileinfo" level="required"/>
       <PHP_EXTENSION name="sodium" level="required"/>
       <PHP_EXTENSION name="exif" level="optional"/>
+      <PHP_EXTENSION name="filter" level="required"/>
     </PHP_EXTENSIONS>
     <PHP_SETTINGS>
       <PHP_SETTING name="memory_limit" value="96M" level="required">
@@ -5100,4 +5105,208 @@
       </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
+  <MOODLE version="5.2" requires="4.4">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.11.0" />
+      <VENDOR name="mysql" version="8.4" />
+      <VENDOR name="postgres" version="16" />
+      <VENDOR name="mssql" version="15.0" />
+      <VENDOR name="auroramysql" version="8.0" />
+    </DATABASE>
+    <PHP version="8.3.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_EXTENSION name="filter" level="required"/>
+    </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_SETTING name="zend.exception_ignore_args" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingzendexceptionignoreargs" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK function="\core\environment::check_composer_dependencies_installed" level="optional" />
+      <CUSTOM_CHECK function="\core\environment::check_composer_developer_dependencies_not_installed" level="optional" />
+      <CUSTOM_CHECK function="\core\environment::check_composer_dependencies_optimised" level="optional" />
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="sixtyfourbitsrequired" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iscustomadminwarnings" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_db_prefix_length" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_async_backup" level="recommended">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_aurora_version" level="optional">
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/filters.php

@@ -121,7 +121,7 @@ $table = new html_table();
 $table->head  = [get_string('filter'), get_string('isactive', 'filters'),
         get_string('order'), get_string('applyto', 'filters'), get_string('settings'), get_string('uninstallplugin', 'core_admin')];
 $table->colclasses = array ('leftalign', 'leftalign', 'centeralign', 'leftalign', 'leftalign', 'leftalign');
-$table->attributes['class'] = 'admintable generaltable';
+$table->attributes['class'] = 'admintable generaltable table table-hover';
 $table->id = 'filterssetting';
 $table->data  = [];
 

admin/index.php

@@ -916,8 +916,14 @@ if (empty($CFG->disabledevlibdirscheck) && (is_dir($CFG->dirroot.'/vendor') || i
 // Check if the site is being foced onto ssl.
 $overridetossl = !empty($CFG->overridetossl);
 
-// Check if moodle campaign content setting is enabled or not.
-$showcampaigncontent = !isset($CFG->showcampaigncontent) || $CFG->showcampaigncontent;
+if (defined('BEHAT_SITE_RUNNING') && BEHAT_SITE_RUNNING) {
+    // We need to add this in order to be able to verify the showcampaigncontent setting behaviour during behat tests.
+    $showcampaigncontent = get_config('core', 'showcampaigncontent');
+    $showcampaigncontent = $showcampaigncontent === 'true';
+} else {
+    // Check if moodle campaign content setting is enabled or not.
+    $showcampaigncontent = !isset($CFG->showcampaigncontent) || $CFG->showcampaigncontent;
+}
 
 // Encourage admins to enable the user feedback feature if it is not enabled already.
 $showfeedbackencouragement = empty($CFG->enableuserfeedback);
@@ -935,9 +941,27 @@ admin_externalpage_setup('adminnotifications');
 
 $output = $PAGE->get_renderer('core', 'admin');
 
-echo $output->admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed, $cronoverdue, $dbproblems,
-                                       $maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb,
-                                       $registered, $cachewarnings, $eventshandlers, $themedesignermode, $devlibdir,
-                                       $mobileconfigured, $overridetossl, $invalidforgottenpasswordurl, $croninfrequent,
-                                       $showcampaigncontent, $showfeedbackencouragement, $servicesandsupportcontent,
-                                       $xmlrpcwarning);
+echo $output->admin_notifications_page(
+    $maturity,
+    $insecuredataroot,
+    $errorsdisplayed,
+    $cronoverdue,
+    $dbproblems,
+    $maintenancemode,
+    $availableupdates,
+    $availableupdatesfetch,
+    $buggyiconvnomb,
+    $registered,
+    $cachewarnings,
+    $eventshandlers,
+    $themedesignermode,
+    $devlibdir,
+    $mobileconfigured,
+    $overridetossl,
+    $invalidforgottenpasswordurl,
+    $croninfrequent,
+    $showcampaigncontent,
+    $showfeedbackencouragement,
+    $servicesandsupportcontent,
+    $xmlrpcwarning
+);

admin/mnet/index.php

@@ -98,7 +98,7 @@
     echo $OUTPUT->header();
 ?>
 <form method="post" action="index.php">
-    <table align="center" width="635" class="generaltable" border="0" cellpadding="5" cellspacing="0">
+    <table align="center" width="635" class="generaltable table table-hover" border="0" cellpadding="5" cellspacing="0">
         <tr>
             <td  class="generalboxcontent">
             <table cellpadding="9" cellspacing="0" class="table-reboot">
@@ -119,7 +119,7 @@
     </table>
 </form>
 <form method="post" action="index.php">
-    <table align="center" width="635" class="generaltable" border="0" cellpadding="5" cellspacing="0">
+    <table align="center" width="635" class="generaltable table table-hover" border="0" cellpadding="5" cellspacing="0">
         <tr>
             <td  class="generalboxcontent">
             <table cellpadding="9" cellspacing="0" class="table-reboot">

admin/plagiarism.php

@@ -54,7 +54,7 @@ $table = new html_table();
 $table->head  = array($txt->name, $txt->version, $txt->uninstall, $txt->settings);
 $table->colclasses = array('mdl-left', 'mdl-align', 'mdl-align', 'mdl-align');
 $table->data  = array();
-$table->attributes['class'] = 'manageplagiarismtable generaltable';
+$table->attributes['class'] = 'manageplagiarismtable generaltable table table-hover';
 
 // Iterate through auth plugins and add to the display table.
 $authcount = count($plagiarismplugins);

admin/renderer.php

@@ -282,13 +282,30 @@ class core_admin_renderer extends plugin_renderer_base {
      *
      * @return string HTML to output.
      */
-    public function admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed,
-            $cronoverdue, $dbproblems, $maintenancemode, $availableupdates, $availableupdatesfetch,
-            $buggyiconvnomb, $registered, array $cachewarnings = array(), $eventshandlers = 0,
-            $themedesignermode = false, $devlibdir = false, $mobileconfigured = false,
-            $overridetossl = false, $invalidforgottenpasswordurl = false, $croninfrequent = false,
-            $showcampaigncontent = false, bool $showfeedbackencouragement = false, bool $showservicesandsupport = false,
-            $xmlrpcwarning = '') {
+    public function admin_notifications_page(
+        $maturity,
+        $insecuredataroot,
+        $errorsdisplayed,
+        $cronoverdue,
+        $dbproblems,
+        $maintenancemode,
+        $availableupdates,
+        $availableupdatesfetch,
+        $buggyiconvnomb,
+        $registered,
+        array $cachewarnings = [],
+        $eventshandlers = 0,
+        $themedesignermode = false,
+        $devlibdir = false,
+        $mobileconfigured = false,
+        $overridetossl = false,
+        $invalidforgottenpasswordurl = false,
+        $croninfrequent = false,
+        $showcampaigncontent = false,
+        bool $showfeedbackencouragement = false,
+        bool $showservicesandsupport = false,
+        $xmlrpcwarning = ''
+    ) {
 
         global $CFG;
         $output = '';
@@ -313,6 +330,7 @@ class core_admin_renderer extends plugin_renderer_base {
         $output .= $this->mobile_configuration_warning($mobileconfigured);
         $output .= $this->forgotten_password_url_warning($invalidforgottenpasswordurl);
         $output .= $this->mnet_deprecation_warning($xmlrpcwarning);
+        $output .= $this->moodlenet_removal_warning();
         $output .= $this->userfeedback_encouragement($showfeedbackencouragement);
         $output .= $this->services_and_support_content($showservicesandsupport);
         $output .= $this->campaign_content($showcampaigncontent);
@@ -1809,6 +1827,7 @@ class core_admin_renderer extends plugin_renderer_base {
 
         $table = new html_table();
         $table->id = 'plugins-control-panel';
+        $table->attributes['class'] = 'generaltable table table-striped table-hover';
         $table->head = array(
             get_string('displayname', 'core_plugin'),
             get_string('version', 'core_plugin'),
@@ -2063,7 +2082,7 @@ class core_admin_renderer extends plugin_renderer_base {
             get_string('status'),
         );
         $servertable->colclasses = array('centeralign name', 'centeralign info', 'leftalign report', 'leftalign plugin', 'centeralign status');
-        $servertable->attributes['class'] = 'table table-striped admintable environmenttable generaltable table-sm';
+        $servertable->attributes['class'] = 'table table-striped admintable environmenttable generaltable table-sm table-hover';
         $servertable->id = 'serverstatus';
 
         $serverdata = array('ok'=>array(), 'warn'=>array(), 'error'=>array());
@@ -2076,7 +2095,7 @@ class core_admin_renderer extends plugin_renderer_base {
             get_string('status'),
         );
         $othertable->colclasses = array('aligncenter info', 'alignleft report', 'alignleft plugin', 'aligncenter status');
-        $othertable->attributes['class'] = 'table table-striped admintable environmenttable generaltable table-sm';
+        $othertable->attributes['class'] = 'table table-striped admintable environmenttable generaltable table-sm table-hover';
         $othertable->id = 'otherserverstatus';
 
         $otherdata = array('ok'=>array(), 'warn'=>array(), 'error'=>array());
@@ -2325,6 +2344,21 @@ class core_admin_renderer extends plugin_renderer_base {
         return $this->warning($xmlrpcwarning);
     }
 
+    /**
+     * Display a warning about the removal of MoodleNet integration.
+     *
+     * @return string HTML to output.
+     */
+    protected function moodlenet_removal_warning(): string {
+        $moodlenetenabled = get_config('tool_moodlenet', 'enablemoodlenet');
+        if (!empty($moodlenetenabled)) {
+            $moodlenetwarning = get_string('moodlenetremovalwarning', 'admin');
+            return $this->warning($moodlenetwarning);
+        }
+
+        return '';
+    }
+
     /**
      * Renders the theme selector list.
      *

admin/repository.php

@@ -263,7 +263,7 @@ if (($action == 'edit') || ($action == 'new')) {
     $table->colclasses = array('leftalign', 'centeralign', 'centeralign', 'centeralign', 'centeralign', 'centeralign');
     $table->id = 'repositoriessetting';
     $table->data = array();
-    $table->attributes['class'] = 'admintable generaltable';
+    $table->attributes['class'] = 'admintable generaltable table table-hover';
 
     // Get list of used plug-ins
     $repositorytypes = repository::get_types();

admin/roles/admins.php

@@ -179,7 +179,7 @@ echo $OUTPUT->header();
     <div>
     <input type="hidden" name="sesskey" value="<?php p(sesskey()); ?>" />
 
-    <table class="generaltable generalbox groupmanagementtable boxaligncenter" summary="">
+    <table class="generaltable generalbox groupmanagementtable boxaligncenter table table-hover" summary="">
     <tr>
       <td id='existingcell'>
           <p>

admin/roles/assign.php

@@ -228,7 +228,7 @@ if ($roleid) {
 <form id="assignform" method="post" action="<?php echo $assignurl ?>"><div>
   <input type="hidden" name="sesskey" value="<?php echo sesskey() ?>" />
 
-  <table id="assigningrole" summary="" class="admintable roleassigntable generaltable" cellspacing="0">
+  <table id="assigningrole" summary="" class="admintable roleassigntable generaltable table table-hover" cellspacing="0">
     <tr>
       <td id="existingcell">
           <p><label for="removeselect"><?php print_string('extusers', 'core_role'); ?></label></p>
@@ -322,7 +322,7 @@ if ($roleid) {
     $table->id = 'assignrole';
     $table->head = array(get_string('role'), get_string('description'), get_string('userswiththisrole', 'core_role'));
     $table->colclasses = array('leftalign role', 'leftalign', 'centeralign userrole');
-    $table->attributes['class'] = 'admintable generaltable';
+    $table->attributes['class'] = 'admintable generaltable table table-hover';
     if ($showroleholders) {
         $table->headspan = array(1, 1, 2);
         $table->colclasses[] = 'leftalign roleholder';

admin/roles/manage.php

@@ -153,7 +153,7 @@ require('managetabs.php');
 $table = new html_table();
 $table->colclasses = array('leftalign', 'leftalign', 'leftalign', 'leftalign');
 $table->id = 'roles';
-$table->attributes['class'] = 'admintable generaltable';
+$table->attributes['class'] = 'admintable generaltable table table-hover';
 $table->head = array(
     get_string('role') . ' ' . $OUTPUT->help_icon('roles', 'core_role'),
     get_string('description'),

admin/settings.php

@@ -165,10 +165,8 @@ if (empty($SITE->fullname)) {
 $PAGE->requires->js_call_amd('core_form/changechecker', 'watchFormById', ['adminsettings']);
 
 if ($settingspage->has_dependencies()) {
-    $opts = [
-        'dependencies' => $settingspage->get_dependencies_for_javascript()
-    ];
-    $PAGE->requires->js_call_amd('core/showhidesettings', 'init', [$opts]);
+    $context = ['dependencies' => json_encode($settingspage->get_dependencies_for_javascript())];
+    echo $OUTPUT->render_from_template('core_admin/settings_showhide', $context);
 }
 
 echo $OUTPUT->footer();

admin/settings/ai.php

@@ -32,19 +32,29 @@ if ($hassiteconfig) {
     $providers->add(new admin_setting_heading('availableproviders',
         get_string('availableproviders', 'core_ai'),
         get_string('availableproviders_desc', 'core_ai')));
-    // Add call to action to add a new provider.
-    $providers->add(new \core_admin\admin\admin_setting_template_render(
-        name: 'addnewprovider',
-        templatename: 'core_ai/admin_add_provider',
-        context: ['addnewproviderurl' => new moodle_url('/ai/configure.php')]
-    ));
 
-    $providers->add(new \core_ai\admin\admin_setting_provider_manager(
+    if (!empty(core_plugin_manager::instance()->get_plugins_of_type("aiprovider"))) {
+        // Add call to action to add a new provider.
+        $providers->add(new \core_admin\admin\admin_setting_template_render(
+            name: 'addnewprovider',
+            templatename: 'core_ai/admin_add_provider',
+            context: ['addnewproviderurl' => new moodle_url('/ai/configure.php')]
+        ));
+
+        $providers->add(new \core_ai\admin\admin_setting_provider_manager(
             'aiprovider',
             \core_ai\table\aiprovider_management_table::class,
             'manageaiproviders',
             new lang_string('manageaiproviders', 'core_ai'),
-    ));
+        ));
+    } else {
+        $providers->add(new \core_admin\admin\admin_setting_notification(
+            name:'noproviderplugins',
+            notification: get_string('noproviderplugins', 'core_ai'),
+            type: 'danger'
+        ));
+    }
+
     $ADMIN->add('ai', $providers);
 
     // Add settings page for AI placement settings.

admin/templates/settings_showhide.mustache

@@ -0,0 +1,51 @@
+{{!
+    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/settings_showhide
+
+    Passes the necessary data to show/hide dependant settings.
+
+    Context variables required for this template:
+    * dependencies - JSON-serialized data structure describing the dependencies between settings
+
+    Example context (json):
+    {
+        "dependencies": {
+            "s__setting1":{
+                "eq":[
+                    [
+                        "s__setting0"
+                    ]
+                ]
+            },
+            "s__setting2":{
+                "eq":[
+                    [
+                        "s__setting1"
+                    ]
+                ]
+            }
+        }
+    }
+}}
+<span id="settings-showhide-{{uniqid}}" data-dependencies="{{dependencies}}"></span>
+
+{{#js}}
+    require(['core/showhidesettings'], function(ShowHideSettings) {
+        ShowHideSettings.init("settings-showhide-{{uniqid}}");
+    });
+{{/js}}

admin/tests/behat/browse_users.feature

@@ -90,6 +90,7 @@ Feature: An administrator can browse user accounts
       | username | firstname | lastname | email             | confirmed |
       | user3    | User      | Three    | three@example.com | 0         |
     And I navigate to "Users > Accounts > Browse list of users" in site administration
+    And I change window size to "large"
     Then I should see "Confirmation pending" in the "User Three" "table_row"
     And I press "Resend confirmation email" action in the "User Three" report row
     And I should see "Confirmation email sent successfully"

admin/tests/behat/toggle_campaign_display.feature

@@ -0,0 +1,17 @@
+@core @core_admin
+Feature: Toggle campaign banner visibility
+  In order to control the visibility of the campaign banner content
+  As an admin
+  I need to be able to disable the campaign banner display
+
+  Scenario Outline: Admin can disable the campaign banner display
+    Given the following config values are set as admin:
+      | showcampaigncontent | <showcampaigncontent> |
+    And I log in as "admin"
+    When I navigate to "Notifications" in site administration
+    Then "//iframe[@id='campaign-content']" "xpath_element" <display> exist
+
+    Examples:
+      | showcampaigncontent | display    |
+      | true                | should     |
+      | false               | should not |

admin/thirdpartylibs.php

@@ -47,7 +47,7 @@ $table->head = array(
     get_string('thirdpartylibrarylocation', 'core_admin'), get_string('license'));
 $table->align = array('left', 'left', 'left', 'left');
 $table->id = 'thirdpartylibs';
-$table->attributes['class'] = 'admintable generaltable';
+$table->attributes['class'] = 'admintable generaltable table table-hover';
 $table->data  = array();
 
 foreach ($files as $component => $xmlpath) {

admin/tool/capability/index.php

@@ -140,7 +140,7 @@ function print_report_tree($contextid, $contexts, $allroles) {
     // If there are any role overrides here, print them.
     if (!empty($contexts[$contextid]->rolecapabilities)) {
         $rowcounter = 0;
-        echo '<table class="generaltable table-striped"><tbody>';
+        echo '<table class="generaltable table-striped table table-hover"><tbody>';
         foreach ($allroles as $role) {
             if (isset($contexts[$contextid]->rolecapabilities[$role->id])) {
                 $permission = $contexts[$contextid]->rolecapabilities[$role->id];

admin/tool/cohortroles/classes/privacy/provider.php

@@ -166,10 +166,12 @@ class provider implements
 
         // Retrieve the tool_cohortroles records created for the user.
         $sql = "SELECT cr.id as cohortroleid,
+                       cr.cohortid,
                        c.name as cohortname,
                        c.idnumber as cohortidnumber,
-                       c.description as cohortdescription,
-                       c.contextid as contextid,
+                       c.description,
+                       c.descriptionformat,
+                       c.contextid,
                        r.shortname as roleshortname,
                        cr.userid as userid,
                        cr.timecreated as timecreated,
@@ -185,27 +187,39 @@ class provider implements
         $cohortroles = $DB->get_records_sql($sql, $params);
 
         foreach ($cohortroles as $cohortrole) {
+            $context = \context::instance_by_id($cohortrole->contextid);
+
             // The tool_cohortroles data export is organised in:
             // {User Context}/Cohort roles management/{cohort name}/{role shortname}/data.json.
             $subcontext = [
                 get_string('pluginname', 'tool_cohortroles'),
-                $cohortrole->cohortname,
+                format_string($cohortrole->cohortname, options: ['context' => $context]),
                 $cohortrole->roleshortname
             ];
 
             $data = (object) [
-                'cohortname' => $cohortrole->cohortname,
+                'cohortname' => format_string($cohortrole->cohortname, options: ['context' => $context]),
                 'cohortidnumber' => $cohortrole->cohortidnumber,
-                'cohortdescription' => $cohortrole->cohortdescription,
+                'cohortdescription' => format_text(
+                    writer::with_context($context)->rewrite_pluginfile_urls(
+                        $subcontext,
+                        'cohort',
+                        'description',
+                        $cohortrole->cohortid,
+                        $cohortrole->description,
+                    ),
+                    $cohortrole->descriptionformat,
+                    ['context' => $context],
+                ),
                 'roleshortname' => $cohortrole->roleshortname,
                 'userid' => transform::user($cohortrole->userid),
                 'timecreated' => transform::datetime($cohortrole->timecreated),
                 'timemodified' => transform::datetime($cohortrole->timemodified)
             ];
 
-            $context = \context::instance_by_id($cohortrole->contextid);
-
-            writer::with_context($context)->export_data($subcontext, $data);
+            writer::with_context($context)
+                ->export_area_files($subcontext, 'cohort', 'description', $cohortrole->cohortid)
+                ->export_data($subcontext, $data);
         }
     }
 

admin/tool/dataprivacy/classes/output/data_requests_table.php

@@ -162,7 +162,7 @@ class data_requests_table extends table_sql {
      */
     public function col_userid($data) {
         $user = $data->foruser;
-        return html_writer::link($user->profileurl, $user->fullname, ['title' => get_string('viewprofile')]);
+        return html_writer::link($user->profileurl, $user->fullname);
     }
 
     /**
@@ -183,7 +183,7 @@ class data_requests_table extends table_sql {
      */
     public function col_requestedby($data) {
         $user = $data->requestedbyuser;
-        return html_writer::link($user->profileurl, $user->fullname, ['title' => get_string('viewprofile')]);
+        return html_writer::link($user->profileurl, $user->fullname);
     }
 
     /**

admin/tool/dataprivacy/templates/my_data_requests.mustache

@@ -138,7 +138,7 @@
               }}>
                 <td>{{typename}}</td>
                 <td>{{#userdate}} {{timecreated}}, {{#str}} strftimedatetime, core_langconfig {{/str}} {{/userdate}}</td>
-                <td><a href="{{requestedbyuser.profileurl}}" title="{{#str}}viewprofile{{/str}}">{{requestedbyuser.fullname}}</a></td>
+                <td><a href="{{requestedbyuser.profileurl}}">{{requestedbyuser.fullname}}</a></td>
                 <td>
                     <span class="badge {{statuslabelclass}}" title="{{statuslabeltitle}}">{{statuslabel}}</span>
                 </td>

admin/tool/dataprivacy/templates/request_details.mustache

@@ -62,7 +62,7 @@
         </div>
         <div class="flex-grow-1 ms-3">
             <h4 class="mt-0 mb-1">
-                <a href="{{foruser.profileurl}}" title="{{#str}}viewprofile{{/str}}">{{foruser.fullname}}</a>
+                <a href="{{foruser.profileurl}}">{{foruser.fullname}}</a>
             </h4>
             <a href="mailto:{{foruser.email}}">{{foruser.email}}</a>
             <div class="clearfix mt-1 mb-1">
@@ -76,7 +76,7 @@
             </span>
             <span class="float-start me-1">
                 <strong>{{#str}}requestbydetail, tool_dataprivacy{{/str}}</strong>
-                <span><a href="{{requestedbyuser.profileurl}}" title="{{#str}}viewprofile{{/str}}">{{requestedbyuser.fullname}}</a></span>
+                <span><a href="{{requestedbyuser.profileurl}}">{{requestedbyuser.fullname}}</a></span>
             </span>
             </div>
             {{#canreview}}

admin/tool/dataprivacy/tests/behat/user_data_request.feature

@@ -0,0 +1,100 @@
+@tool @tool_dataprivacy
+Feature: Authorized users can request others personal data
+  In order to export or access another users data
+  As a designated role
+  I need the correct permissions
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email                |
+      | user1    | User1     | One      | user1@example.com    |
+      | user2    | User2     | Two      | user2@example.com    |
+      | officer1 | Officer1  | One      | officer1@example.com |
+    # Create Privacy Officer Role.
+    And the following "role" exists:
+      | shortname                                    | privacyofficer  |
+      | name                                         | Privacy Officer |
+      | context_system                               | 1               |
+      | tool/dataprivacy:managedataregistry          | allow           |
+      | tool/dataprivacy:managedatarequests          | allow           |
+      | tool/dataprivacy:makedatarequestsforchildren | allow           |
+      | moodle/site:configview                       | allow           |
+      | moodle/category:viewhiddencategories         | allow           |
+      | moodle/course:viewhiddencourses              | allow           |
+      | moodle/course:viewhiddenactivities           | allow           |
+      | moodle/course:view                           | allow           |
+    # Create Parent Role.
+    And the following "role" exists:
+      | shortname                                    | parentrole  |
+      | name                                         | Parent Role |
+      | context_user                                 | 1           |
+      | moodle/user:viewdetails                      | allow       |
+      | moodle/user:viewalldetails                   | allow       |
+      | moodle/user:readuserblogs                    | allow       |
+      | moodle/user:readuserposts                    | allow       |
+      | moodle/user:viewuseractivitiesreport         | allow       |
+      | moodle/user:editprofile                      | allow       |
+      | tool/policy:acceptbehalf                     | allow       |
+      | tool/dataprivacy:makedatarequestsforchildren | allow       |
+    # Add permission to allow parent to make requests on behalf of child user.
+    And the following config values are set as admin:
+      | contactdataprotectionofficer | 1 | tool_dataprivacy |
+    And I log in as "admin"
+
+  @javascript
+  Scenario: Privacy officer can request for other user's personal data
+    Given I navigate to "Users > Permissions > Assign system roles" in site administration
+    # Assign Privacy Officer role to officer1.
+    And I follow "Privacy Officer"
+    And I set the field "addselect_searchtext" to "Officer1"
+    And I set the field "addselect" to "Officer1 One (officer1@example.com)"
+    And I press "Add"
+    # Navigate to home in order to navigate properly to Privacy settings.
+    And I am on site homepage
+    # Select Privacy officer in the Orivacy officer role mapping setting.
+    And I navigate to "Users > Privacy and policies > Privacy settings" in site administration
+    And I click on "Privacy Officer" "checkbox"
+    And I press "Save changes"
+    And I log in as "officer1"
+    And I navigate to "Users > Privacy and policies > Data requests" in site administration
+    # Create a new request as the designated privacy officer.
+    When I follow "New request"
+    And I set the field "User" to "User1 One"
+    And I set the field "Comment" to "User One data"
+    And I press "Save changes"
+    # Confirm that the new data request is successfully created for selected user with status "Awaiting approval".
+    Then the following should exist in the "generaltable" table:
+      | Type   | User      | Requested by | Status            | Message       |
+      | Export | User1 One | Officer1 One | Awaiting approval | User One data |
+
+  @javascript
+  Scenario: Parent user can request data on behalf of child user
+    Given I navigate to "Users > Accounts > Browse list of users" in site administration
+    And I follow "User1 One"
+    And I click on "Preferences" "link" in the ".profile_tree" "css_element"
+    # Assign user2 as parent for user1.
+    And I follow "Assign roles relative to this user"
+    And I follow "Parent"
+    And I set the field "Potential users" to "User2 Two (user2@example.com)"
+    And I click on "Add" "button" in the "#page-content" "css_element"
+    And I log in as "user2"
+    And I follow "Profile" in the user menu
+    And I follow "Data requests"
+    # As parent, create a data request for a child user.
+    And I follow "New request"
+    And I click on "User" "field"
+    When I type "User1 One"
+    # Confirm that only the parent's child users can be searched and selected.
+    Then I should see "User1 One"
+    And I type "User2 Two"
+    And I should see "No suggestions"
+    And I type "Officer1 One"
+    And I should see "No suggestions"
+    And I set the field "Search" to "User1"
+    And I set the field "Comment" to "This is a comment"
+    And I press "Save changes"
+    # Confirm that data request was successfully made by parent on behalf of child user.
+    And I should see "Your request has been submitted to the privacy officer"
+    And the following should exist in the "generaltable" table:
+      | Type                                       | Requested by | Status            | Message           |
+      | Export all of my personal data (User1 One) | User2 Two    | Awaiting approval | This is a comment |

admin/tool/licensemanager/classes/output/table.php

@@ -80,7 +80,7 @@ class table implements \renderable {
             'text-center',
         ];
         $table->id = 'manage-licenses';
-        $table->attributes['class'] = 'admintable generaltable';
+        $table->attributes['class'] = 'admintable generaltable table table-hover';
         $table->data  = [];
 
         $rownumber = 0;

admin/tool/log/classes/setting_managestores.php

@@ -137,7 +137,7 @@ class tool_log_setting_managestores extends admin_setting {
         $table->colclasses = array('leftalign', 'centeralign', 'centeralign', 'centeralign', 'centeralign', 'centeralign',
                 'centeralign');
         $table->id = 'logstoreplugins';
-        $table->attributes['class'] = 'admintable generaltable';
+        $table->attributes['class'] = 'admintable generaltable table table-hover';
         $table->data = array();
 
         // Iterate through store plugins and add to the display table.

admin/tool/lp/templates/user_summary.mustache

@@ -49,7 +49,7 @@
     }
 }}
 <span>
-    <a href="{{profileurl}}" title="{{#str}}viewprofile{{/str}}">
+    <a href="{{profileurl}}">
     <img height="18" src="{{profileimageurlsmall}}" alt="">
     <span>{{fullname}}</span>
     {{#hasidentity}}

admin/tool/lp/tests/behat/competency_crud.feature

@@ -0,0 +1,77 @@
+@tool @tool_lp @tool_lp_framework
+Feature: Manage CRUD operations for competencies
+  In order to perform CRUD operations on competencies
+  As a manager
+  I need to be able to create, read, update and delete competencies
+
+  Background:
+    Given the following "core_competency > frameworks" exist:
+      | shortname | idnumber |
+      | CF1       | CF1      |
+    And the following "core_competency > competencies" exist:
+      | shortname | competencyframework | idnumber | description    |
+      | C1        | CF1                 | C1ID     | C1 description |
+    And I log in as "admin"
+    And I navigate to "Competencies > Competency frameworks" in site administration
+    And I click on "CF1 (CF1)" "link"
+
+  @javascript
+  Scenario: Create a new competency
+    # Targets the `CF1` element to make `Add competency` button visible and accessible to avoid ambiguity with the other 'CF1' element on the screen.
+    Given I click on "//span[text()='CF1']" "xpath_element"
+    When I press "Add competency"
+    And I set the field "Name" to "C2"
+    And I set the field "Description" to "C2 description"
+    And I set the field "ID number" to "C2ID"
+    And I press "Save changes"
+    # Access the newly created competencies to ensure that correct information was registered.
+    Then "Competency created" "text" should exist
+    And "C2" "text" should appear after "C1" "text"
+    And I select "C2" of the competency tree
+    And "C2ID" "text" should exist
+    And "C2 description" "text" should exist
+
+  @javascript
+  Scenario: Read a competency
+    When I select "C1" of the competency tree
+    # Confirm that selected competency info displayed matches registered info.
+    Then "C1ID" "text" should exist
+    And "C1 description" "text" should exist
+    # Targets the unique 'Edit' link needed to open the menu, avoiding ambiguity with the other 'Edit' link.
+    And I click on "//a[@href='#' and text()='Edit']" "xpath_element"
+    # Similar to the previous step, to avoid ambiguity with the competency framework "Edit", target css element with data-action=edit.
+    And I click on "[data-action=edit]" "css_element"
+    # Confirm that the details displayed when accessing edit screen values match registered data.
+    And the field "Name" matches value "C1"
+    And the field "Description" matches value "C1 description"
+    And the field "ID number" matches value "C1ID"
+
+  @javascript
+  Scenario: Update a competency
+    Given I select "C1" of the competency tree
+    # Targets the unique 'Edit' link needed to open the menu, avoiding ambiguity with the other 'Edit' link.
+    And I click on "//a[@href='#' and text()='Edit']" "xpath_element"
+    # Similar to the previous step, to avoid ambiguity with the competency framework "Edit", target css element with data-action=edit.
+    When I click on "[data-action=edit]" "css_element"
+    And I set the field "Name" to "C2"
+    And I set the field "Description" to "C2 description"
+    And I set the field "ID number" to "C2ID"
+    And I press "Save changes"
+    Then "Competency updated" "text" should exist
+    And "C1" "text" should not exist
+    And "C2" "text" should exist
+    And I select "C2" of the competency tree
+    And "C2ID" "text" should exist
+    And "C1ID" "text" should not exist
+    And "C2 description" "text" should exist
+    And "C1 description" "text" should not exist
+
+  @javascript
+  Scenario: Delete a competency
+    Given I select "C1" of the competency tree
+    # Targets the unique 'Edit' link needed to open the menu, avoiding ambiguity with the other 'Edit' link.
+    And I click on "//a[@href='#' and text()='Edit']" "xpath_element"
+    When I click on "Delete" "link"
+    And I click on "Delete" "button" in the "Confirm" "dialogue"
+    # Confirm that "C1" competency was successfully deleted.
+    Then "C1" "text" should not exist

admin/tool/lp/tests/behat/competency_management.feature

@@ -0,0 +1,63 @@
+@tool @tool_lp @tool_lp_framework
+Feature: Move and cross-reference competencies
+  In order to move and cross-reference competencies
+  As a manager
+  I need to be open the competency's menu items.
+
+  Background:
+    Given the following "core_competency > frameworks" exist:
+      | shortname | idnumber |
+      | CF1       | CF1      |
+    And the following "core_competency > competencies" exist:
+      | shortname | competencyframework |
+      | C1        | CF1                 |
+      | C2        | CF1                 |
+      | C3        | CF1                 |
+      | C4        | CF1                 |
+    And I log in as "admin"
+    And I navigate to "Competencies > Competency frameworks" in site administration
+    And I click on "CF1 (CF1)" "link"
+
+  @javascript
+  Scenario: Move a competency using Move up/Move down menu items
+    Given I select "C1" of the competency tree
+    # Targets the unique 'Edit' link needed to open the menu, avoiding ambiguity with the other 'Edit' link.
+    And I click on "//a[@href='#' and text()='Edit']" "xpath_element"
+    When I click on "Move down" "link"
+    Then "C1" "text" should appear after "C2" "text"
+    # Targets the unique 'Edit' link needed to open the menu, avoiding ambiguity with the other 'Edit' link.
+    And I click on "//a[@href='#' and text()='Edit']" "xpath_element"
+    And I click on "Move up" "link"
+    And "C1" "text" should appear before "C2" "text"
+
+  @javascript
+  Scenario: Move a competency using Relocate menu item
+    Given I select "C3" of the competency tree
+    # Targets the unique 'Edit' link needed to open the menu, avoiding ambiguity with the other 'Edit' link.
+    And I click on "//a[@href='#' and text()='Edit']" "xpath_element"
+    When I click on "Relocate" "link"
+    And I click on "C1" "text" in the "Move competency" "dialogue"
+    And I click on "Move" "button" in the "Move competency" "dialogue"
+    Then "C1" "text" should appear before "C3" "text"
+    And "C3" "text" should appear before "C2" "text"
+    And I select "C3" of the competency tree
+    # Targets the unique 'Edit' link needed to open the menu, avoiding ambiguity with the other 'Edit' link.
+    And I click on "//a[@href='#' and text()='Edit']" "xpath_element"
+    # Similar to the previous step, to avoid ambiguity with the competency framework "Edit", target css element with data-action=edit.
+    And I click on "[data-action=edit]" "css_element"
+    And "C1" "text" should exist
+    And "No parent (top-level competency)" "text" should not exist
+    And I press "Cancel"
+    And "C1" "text" should appear before "C3" "text"
+    And "C3" "text" should appear before "C2" "text"
+
+  @javascript
+  Scenario: Cross-reference a competency
+    Given I select "C1" of the competency tree
+    # Targets the unique 'Edit' link needed to open the menu, avoiding ambiguity with the other 'Edit' link.
+    And I click on "//a[@href='#' and text()='Edit']" "xpath_element"
+    When I click on "Add cross-referenced competency" "link"
+    And I click on "C2" "text" in the "Competency picker" "dialogue"
+    And I click on "Add" "button" in the "Competency picker" "dialogue"
+    Then "Cross-referenced competencies:" "text" should exist
+    And I should see "C2 cmp2"

admin/tool/lp/tests/behat/plan_workflow.feature

@@ -16,16 +16,10 @@ Feature: Manage plan workflow
       | usermanageownplan | User manage own plan role | user |
       | manageplan | Manager all plans role | manager |
     And the following "role capabilities" exist:
-      | role                   | moodle/competency:planmanageowndraft | moodle/competency:planmanageown |
-      | usermanageowndraftplan | allow                                |                                 |
-      | usermanageownplan      | allow                                | allow                           |
-      | manageplan             | allow                                | allow                           |
-    And the following "role capability" exists:
-      | role                                | manageplan |
-      | moodle/competency:planmanage        | allow      |
-      | moodle/competency:planview          | allow      |
-      | moodle/competency:planreview        | allow      |
-      | moodle/competency:planrequestreview | allow      |
+      | role                   | moodle/competency:planmanageowndraft | moodle/competency:planmanageown | moodle/competency:planmanage | moodle/competency:planview | moodle/competency:planreview | moodle/competency:planrequestreview |
+      | usermanageowndraftplan | allow                                |                                 |                              |                            |                              |                                     |
+      | usermanageownplan      | allow                                | allow                           |                              |                            |                              |                                     |
+      | manageplan             | allow                                | allow                           | allow                        | allow                      | allow                        | allow                               |
     And the following "role assigns" exist:
       | user  | role | contextlevel | reference |
       | user1 | usermanageowndraftplan | System |  |
@@ -53,8 +47,7 @@ Feature: Manage plan workflow
       | lp                      | System       | 1         | my-index        | content       |
 
   Scenario: User can manages his own plan draft
-    Given I log in as "user1"
-    And I follow "Profile" in the user menu
+    Given I am on the "user1" "user > profile" page logged in as user1
     When I follow "Learning plans"
     Then I should see "List of learning plans"
     And I should see "Test-Plan1"
@@ -63,11 +56,9 @@ Feature: Manage plan workflow
     And I should see "Waiting for review"
     And I click on "Cancel review" of edit menu in the "Test-Plan1" row
     And I should see "Draft"
-    And I log out
 
   Scenario: User can manages his own plan
-    Given I log in as "user2"
-    And I follow "Profile" in the user menu
+    Given I am on the "user2" "user > profile" page logged in as user2
     When I follow "Learning plans"
     Then I should see "List of learning plans"
     And I should see "Test-Plan2"
@@ -82,11 +73,11 @@ Feature: Manage plan workflow
     And I should see "Active"
     And I click on "Complete this learning plan" of edit menu in the "Test-Plan2" row
     And I click on "Complete this learning plan" "button" in the "Confirm" "dialogue"
+    And I wait until the page is ready
     And I should see "Complete"
     And I click on "Reopen this learning plan" of edit menu in the "Test-Plan2" row
     And I click on "Reopen this learning plan" "button" in the "Confirm" "dialogue"
     And I should see "Active"
-    And I log out
 
   Scenario: Manager can see learning plan with status waiting for review
     Given the following "core_competency > plans" exist:
@@ -96,7 +87,6 @@ Feature: Manage plan workflow
     When I log in as "manager1"
     Then I should see "Test-Plan3"
     And I should not see "Test-Plan4"
-    And I log out
 
   Scenario: Manager can start review of learning plan with status waiting for review
     Given the following "core_competency > plans" exist:
@@ -108,7 +98,6 @@ Feature: Manage plan workflow
     And I should see "Test-Plan3"
     When I follow "Start review"
     Then I should see "In review"
-    And I log out
 
   Scenario: Manager can reject a learning plan with status in review
     Given the following "core_competency > plans" exist:
@@ -121,7 +110,6 @@ Feature: Manage plan workflow
     And I should see "In review"
     When I follow "Finish review"
     Then I should see "Draft"
-    And I log out
 
   Scenario: Manager can accept a learning plan with status in review
     Given the following "core_competency > plans" exist:
@@ -134,7 +122,6 @@ Feature: Manage plan workflow
     And I should see "In review"
     When I follow "Make active"
     Then I should see "Active"
-    And I log out
 
   Scenario: Manager send back to draft an active learning plan
     Given the following "core_competency > plans" exist:
@@ -150,7 +137,6 @@ Feature: Manage plan workflow
     And I follow "Learning plans"
     Then I should see "Draft"
     And I should not see "Active"
-    And I log out
 
   Scenario: Manager change an active learning plan to completed
     Given the following "core_competency > plans" exist:
@@ -169,7 +155,6 @@ Feature: Manage plan workflow
     And I follow "Learning plans"
     Then I should see "Complete"
     And I should not see "Active"
-    And I log out
 
   Scenario: Manager reopen a complete learning plan
     Given the following "core_competency > plans" exist:
@@ -187,4 +172,67 @@ Feature: Manage plan workflow
     And I follow "Learning plans"
     Then I should see "Active"
     And I should not see "Complete"
-    And I log out
+
+  Scenario: Student learning plan derived from templates can be completed
+    Given the following "core_competency > templates" exist:
+      | shortname |
+      | LPT1      |
+    And the following "core_competency > template_competencies" exist:
+      | template | competency |
+      | LPT1     | Test-Comp1 |
+    And I log in as "admin"
+    And I navigate to "Competencies > Learning plan templates" in site administration
+    # Select 1 user to assign to create learning plans for using template.
+    And I click on ".template-userplans" "css_element" in the "LPT1" "table_row"
+    And I set the field "Select users" to "user1"
+    And I press "Create learning plans"
+    And I click on "LPT1" "link" in the "LPT1" "table_row"
+    When I click on "Complete this learning plan" "link"
+    And I click on "Complete this learning plan" "button" in the "Confirm" "dialogue"
+    # Add a short wait to ensure the page has loaded before checking that "Complete" "text" exists.
+    And I wait until the page is ready
+    # Confirm that student's learning plan template is marked as Completed.
+    Then "Complete" "text" should exist
+    And "Reopen this learning plan" "link" should exist
+
+  Scenario: Learning plan template updates are not reflected on plans already completed
+    Given the following "core_competency > templates" exist:
+      | shortname |
+      | LPT1      |
+    And the following "core_competency > template_competencies" exist:
+      | template | competency |
+      | LPT1     | Test-Comp1 |
+    And I log in as "admin"
+    And I navigate to "Competencies > Learning plan templates" in site administration
+    # Select 2 users to assign to create learning plans for using template.
+    And I click on ".template-userplans" "css_element" in the "LPT1" "table_row"
+    And I set the field "Select users" to "user1"
+    And I press "Create learning plans"
+    And I set the field "Select users" to "user2"
+    And I press "Create learning plans"
+    # Complete the learning plan for User 1.
+    And I click on "LPT1" "link" in the "User 1" "table_row"
+    And I click on "Complete this learning plan" "link"
+    And I click on "Complete this learning plan" "button" in the "Confirm" "dialogue"
+    # Add another competency to the learning plan template.
+    And the following "core_competency > template_competencies" exist:
+      | template | competency |
+      | LPT1     | Test-Comp2 |
+    # Navigate back to the list of Learning plan templates in order to access User 1's learning plan.
+    And I navigate to "Competencies > Learning plan templates" in site administration
+    And I click on ".template-userplans" "css_element" in the "LPT1" "table_row"
+    # Confirm that only the first competency is reflected on User 1's learning plan since it's already completed.
+    When I click on "LPT1" "link" in the "User 1" "table_row"
+    Then "Test-Comp2" "link" should not exist
+    And "Test-Comp2" "text" should not exist
+    And "Test-Comp1" "link" should exist
+    And "Test-Comp1" "text" should exist
+    # Navigate back to list of Learning plan templates in order to access User 2's learning plan.
+    And I navigate to "Competencies > Learning plan templates" in site administration
+    And I click on ".template-userplans" "css_element" in the "LPT1" "table_row"
+    # Confirm that both competencies are reflected on User 2's learning plan since it's not yet completed.
+    And I click on "LPT1" "link" in the "User 2" "table_row"
+    And "Test-Comp2" "link" should exist
+    And "Test-Comp2" "text" should exist
+    And "Test-Comp1" "link" should exist
+    And "Test-Comp1" "text" should exist

admin/tool/lp/tests/behat/synchronize_cohorts_lp.feature

@@ -0,0 +1,60 @@
+@tool @tool_lp @core_cohort
+Feature: Cohorts can be synchronized with learning plans
+  In order to create learning plans for cohort members
+  As an admin
+  I need to be able to synchronise cohorts with learning plans
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email             |
+      | user1    | User      | One      | user1@example.com |
+      | user2    | User      | Two      | user2@example.com |
+    And the following "cohorts" exist:
+      | name     | idnumber |
+      | Cohort 1 | CH1      |
+    And the following "cohort members" exist:
+      | user  | cohort |
+      | user1 | CH1    |
+      | user2 | CH1    |
+    And the following "core_competency > frameworks" exist:
+      | shortname | idnumber |
+      | CF1       | CF1      |
+    And the following "core_competency > competencies" exist:
+      | shortname | competencyframework | idnumber |
+      | C1        | CF1                 | C1       |
+    And the following "core_competency > templates" exist:
+      | shortname |
+      | LPT1      |
+    And the following "core_competency > template_competencies" exist:
+      | template | competency |
+      | LPT1     | C1         |
+
+  @javascript
+  Scenario: Cohorts can be synchronised with learning plans
+    Given I log in as "admin"
+    # Navigate to the list of learning plan templates in order to add cohorts.
+    And I navigate to "Competencies > Learning plan templates" in site administration
+    When I click on "Add cohorts to sync" of edit menu in the "LPT1" row
+    And I set the field "Select cohorts to sync" to "Cohort 1"
+    And I press "Add cohorts"
+    And I wait until the page is ready
+    # Confirm that 2 learning plans were created for members of the cohort.
+    Then "2 learning plans were created" "text" should exist
+    # Confirm current screen is still "Cohorts synced to this learning plan template screen"
+    And "Cohorts synced to this learning plan template" "text" should exist
+    # Confirm that the cohort is now added to the learning plan template.
+    And the following should exist in the "generaltable" table:
+      | Name     | Cohort ID |
+      | Cohort 1 | CH1       |
+    # Navigate back to the list of learning plan templates to view updated list.
+    And I navigate to "Competencies > Learning plan templates" in site administration
+    # Confirm that the added cohort and learning plans are now reflected on the list of Learning plan templates.
+    And the following should exist in the "generaltable" table:
+      | Name | Category | Cohorts | Learning plans |
+      | LPT1 | System   | 1       | 2              |
+    And I click on ".template-userplans" "css_element" in the "LPT1" "table_row"
+    # Confirm that learning plans were created for all cohort members.
+    And the following should exist in the "generaltable" table:
+      | Name | First name / Last name | Email address     |
+      | LPT1 | User One               | user1@example.com |
+      | LPT1 | User Two               | user2@example.com |

admin/tool/lp/tests/externallib_test.php

@@ -17,6 +17,7 @@
 namespace tool_lp;
 
 use core_competency\api;
+use core_competency\competency;
 use core_external\external_api;
 use externallib_advanced_testcase;
 
@@ -432,6 +433,80 @@ final class externallib_test extends externallib_advanced_testcase {
         $this->assertEquals('A', $summary->usercompetencysummary->evidence[1]->gradename);
     }
 
+    /**
+     * Evidence stored against a course module competency is deleted if the CM is deleted.
+     * @covers \tool_lp\external::data_for_user_competency_summary_in_plan
+     */
+    public function test_data_for_user_competency_summary_in_plan_deleted_cm(): void {
+        $this->setUser($this->creator);
+
+        $dg = $this->getDataGenerator();
+        $lpg = $dg->get_plugin_generator('core_competency');
+
+        $f1 = $lpg->create_framework();
+
+        $c1 = $lpg->create_competency(['competencyframeworkid' => $f1->get('id')]);
+        $c2 = $lpg->create_competency(['competencyframeworkid' => $f1->get('id')]);
+
+        $tpl = $lpg->create_template();
+        $lpg->create_template_competency(['templateid' => $tpl->get('id'), 'competencyid' => $c1->get('id')]);
+        $lpg->create_template_competency(['templateid' => $tpl->get('id'), 'competencyid' => $c2->get('id')]);
+
+        $plan = $lpg->create_plan(['userid' => $this->user->id, 'templateid' => $tpl->get('id'), 'name' => 'Evil']);
+
+        $course = $dg->create_course();
+
+        $assign1 = $dg->create_module('assign', ['course' => $course->id]);
+        $assign2 = $dg->create_module('assign', ['course' => $course->id]);
+        $lpg->create_course_module_competency(['competencyid' => $c1->get('id'), 'cmid' => $assign1->cmid]);
+        $lpg->create_course_module_competency(['competencyid' => $c2->get('id'), 'cmid' => $assign1->cmid]);
+
+        api::add_evidence(
+            $this->user->id,
+            $c1->get('id'),
+            \core\context\module::instance($assign1->cmid),
+            competency::OUTCOME_COMPLETE,
+            'evidence_competencyrule',
+            'core_competency',
+        );
+        api::add_evidence(
+            $this->user->id,
+            $c2->get('id'),
+            \core\context\module::instance($assign2->cmid),
+            competency::OUTCOME_COMPLETE,
+            'evidence_competencyrule',
+            'core_competency',
+        );
+
+        // Confirm we have evidence for 2 course module competencies.
+        $summary1 = external::data_for_user_competency_summary_in_plan($c1->get('id'), $plan->get('id'));
+        $this->assertEquals('Evil', $summary1->plan->name);
+        $this->assertEquals(
+            get_string('evidence_competencyrule', 'core_competency'),
+            $summary1->usercompetencysummary->evidence[0]->description
+        );
+        $summary2 = external::data_for_user_competency_summary_in_plan($c2->get('id'), $plan->get('id'));
+        $this->assertEquals('Evil', $summary2->plan->name);
+        $this->assertEquals(
+            get_string('evidence_competencyrule', 'core_competency'),
+            $summary2->usercompetencysummary->evidence[0]->description
+        );
+
+        // Delete one course module.
+        course_delete_module($assign1->cmid);
+
+        // The evidence for the deleted course module should have been deleted. Other evidence should remain.
+        $summary1 = external::data_for_user_competency_summary_in_plan($c1->get('id'), $plan->get('id'));
+        $this->assertEquals('Evil', $summary1->plan->name);
+        $this->assertFalse(array_key_exists(0, $summary1->usercompetencysummary->evidence));
+        $summary2 = external::data_for_user_competency_summary_in_plan($c2->get('id'), $plan->get('id'));
+        $this->assertEquals('Evil', $summary2->plan->name);
+        $this->assertEquals(
+            get_string('evidence_competencyrule', 'core_competency'),
+            $summary2->usercompetencysummary->evidence[0]->description
+        );
+    }
+
     public function test_data_for_user_competency_summary(): void {
         $this->setUser($this->creator);
 

admin/tool/messageinbound/renderer.php

@@ -56,7 +56,7 @@ class tool_messageinbound_renderer extends plugin_renderer_base {
                 $enabled,
                 $edit,
             );
-        $table->attributes['class'] = 'admintable generaltable messageinboundhandlers';
+        $table->attributes['class'] = 'admintable generaltable messageinboundhandlers table table-hover';
 
         $yes = get_string('yes');
         $no = get_string('no');

admin/tool/mfa/classes/manager.php

@@ -74,7 +74,7 @@ class manager {
             get_string('achievedweight', 'tool_mfa'),
             get_string('status'),
         ];
-        $table->attributes['class'] = 'admintable generaltable table table-bordered';
+        $table->attributes['class'] = 'admintable generaltable table table-bordered table-hover';
         $table->colclasses = [
             'text-end',
             '',

admin/tool/mfa/classes/output/renderer.php

@@ -174,7 +174,7 @@ class renderer extends \plugin_renderer_base {
 
         $table = new \html_table();
         $table->id = 'active_factors';
-        $table->attributes['class'] = 'generaltable table table-bordered';
+        $table->attributes['class'] = 'generaltable table table-bordered table-hover';
         $table->head  = [
             $headers->devicename,
             $headers->added,
@@ -348,7 +348,7 @@ class renderer extends \plugin_renderer_base {
         $table = new \html_table();
         $table->head = $displaynames;
         $table->align = $colclasses;
-        $table->attributes['class'] = 'generaltable table table-bordered w-auto';
+        $table->attributes['class'] = 'generaltable table table-bordered w-auto table-hover';
         $table->attributes['style'] = 'width: auto; min-width: 50%; margin-bottom: 0;';
 
         // Manually handle Total users and MFA users.
@@ -461,7 +461,7 @@ class renderer extends \plugin_renderer_base {
 
         $table = new \html_table();
 
-        $table->attributes['class'] = 'generaltable table table-bordered w-auto';
+        $table->attributes['class'] = 'generaltable table table-bordered w-auto table-hover';
         $table->attributes['style'] = 'width: auto; min-width: 50%';
 
         $table->head = [
@@ -513,7 +513,7 @@ class renderer extends \plugin_renderer_base {
         global $DB;
 
         $table = new \html_table();
-        $table->attributes['class'] = 'generaltable table table-bordered w-auto';
+        $table->attributes['class'] = 'generaltable table table-bordered w-auto table-hover';
         $table->attributes['style'] = 'width: auto; min-width: 50%';
         $table->head = [
             'userid' => get_string('userid', 'grades'),

admin/tool/mfa/classes/table/admin_setting_managemfa.php

@@ -131,7 +131,7 @@ class admin_setting_managemfa extends \core_admin\table\plugin_management_table
         $txt = get_strings(['combination', 'totalweight'], 'tool_mfa');
         $table = new \html_table();
         $table->id = 'mfacombinations';
-        $table->attributes['class'] = 'admintable generaltable table table-bordered';
+        $table->attributes['class'] = 'admintable generaltable table table-bordered table-hover';
         $table->head  = [$txt->combination, $txt->totalweight];
         $table->data  = [];
 

admin/tool/mfa/factor/auth/lang/en/factor_auth.php

@@ -28,6 +28,6 @@ $string['pluginname'] = 'Authentication type';
 $string['privacy:metadata'] = 'The Authentication type factor plugin does not store any personal data.';
 $string['settings:description'] = 'Automatically verify users based on their authentication type.';
 $string['settings:goodauth'] = 'Factor authentication types';
-$string['settings:goodauth_help'] = 'Select all authentication types to use as a factor for MFA. Any types not selected will not be treated as a FAIL in MFA.';
+$string['settings:goodauth_help'] = 'Select all authentication types that will gain the points from this factor. Other authentication types will not be treated as a fail in MFA, but will not gain this factor\'s weight points.';
 $string['settings:shortdescription'] = 'Allow users to bypass extra authentication steps based on their authentication type.';
 $string['summarycondition'] = 'has an authentication type of {$a}';

admin/tool/mfa/factor/totp/classes/factor.php

@@ -195,7 +195,7 @@ class factor extends object_factor_base {
 
         $manualtable = new \html_table();
         $manualtable->id = 'manualattributes';
-        $manualtable->attributes['class'] = 'generaltable table table-bordered table-sm w-auto';
+        $manualtable->attributes['class'] = 'generaltable table table-bordered table-sm w-auto table-hover';
         $manualtable->attributes['style'] = 'width: auto;';
         $manualtable->data = [
             [get_string('setupfactor:key', 'factor_totp'), $secret],

admin/tool/mobile/classes/api.php

@@ -817,7 +817,7 @@ class api {
             $credentials[] = ['type' => 'airnotifieraccesskey', 'value' => $CFG->airnotifieraccesskey];
         }
         if (\core\hub\registration::is_registered()) {
-            $credentials[] = ['type' => 'siteid', 'value' => $CFG->siteidentifier];
+            $credentials[] = ['type' => 'siteid', 'value' => \core\hub\registration::get_secret()];
         }
         // Generate a hash key for validating that the request is coming from this site via WS.
         $key = complex_random_string(32);

admin/tool/mobile/classes/hook_callbacks.php

@@ -16,7 +16,10 @@
 
 namespace tool_mobile;
 
+use core\hook\output\extend_url;
 use html_writer;
+use moodle_url;
+use tool_mobile\local\hooks\before_extend_ios_app_banner;
 
 /**
  * Allows plugins to add any elements to the footer.
@@ -35,22 +38,39 @@ class hook_callbacks {
         \core\hook\output\before_standard_head_html_generation $hook,
     ): void {
         global $CFG, $PAGE;
-        // Smart App Banners meta tag is only displayed if mobile services are enabled and configured.
-        if (!empty($CFG->enablemobilewebservice)) {
-            $mobilesettings = get_config('tool_mobile');
-            if (!empty($mobilesettings->enablesmartappbanners)) {
-                if (!empty($mobilesettings->iosappid)) {
-                    $hook->add_html(
-                        '<meta name="apple-itunes-app" content="app-id=' . s($mobilesettings->iosappid) . ', ' .
-                            'app-argument=' . $PAGE->url->out() . '"/>'
-                    );
-                }
+        // Only emit mobile app metadata when mobile services are enabled + configured.
+        if (empty($CFG->enablemobilewebservice)) {
+            return;
+        }
+        $mobilesettings = get_config('tool_mobile');
+        if (empty($mobilesettings->enablesmartappbanners)) {
+            return;
+        }
+        // IOS with hook-based app id and argument augmentation.
+        if (!empty($mobilesettings->iosappid)) {
+            $appid = (string)$mobilesettings->iosappid;
+            $appargument = $PAGE->url->out();
+            // Hook to allow modification of ios smart app banner fields.
+            $ioshook = new before_extend_ios_app_banner($appid, $appargument);
+            \core\di::get(\core\hook\manager::class)->dispatch($ioshook);
+            $appid = $ioshook->get_appid();
+            $appargument = $ioshook->get_appargument();
+            // Add the meta tag.
+            $hook->add_html(
+                '<meta name="apple-itunes-app" content="app-id=' . s($appid) .
+                ', app-argument=' . s($appargument) . '"/>'
+            );
+        }
 
-                if (!empty($mobilesettings->androidappid)) {
-                    $mobilemanifesturl = "$CFG->wwwroot/$CFG->admin/tool/mobile/mobile.webmanifest.php";
-                    $hook->add_html('<link rel="manifest" href="' . $mobilemanifesturl . '" />');
-                }
-            }
+        // Android with hook-based URL augmentation.
+        if (!empty($mobilesettings->androidappid)) {
+            $url = new moodle_url('/admin/tool/mobile/mobile.webmanifest.php');
+            $urlhook = new extend_url($url);
+            \core\di::get(\core\hook\manager::class)->dispatch($urlhook);
+            $url = $urlhook->get_url();
+
+            // Add the link tag.
+            $hook->add_html('<link rel="manifest" href="' . $url->out(false) . '" />');
         }
     }
 

admin/tool/mobile/classes/local/hooks/before_extend_ios_app_banner.php

@@ -0,0 +1,78 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace tool_mobile\local\hooks;
+
+/**
+ * Allow adjustment of ios smart app banner fields.
+ *
+ * @package    tool_mobile
+ * @copyright  2025 Safat Shahin <safat.shahin@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+#[\core\attribute\label('Allow adjustment of ios smart app banner fields')]
+#[\core\attribute\tags('mobile')]
+final class before_extend_ios_app_banner {
+    /**
+     * Create a new instance of the hook.
+     *
+     * @param string $appid The app id for the ios smart banner
+     * @param string $appargument The app argument for the ios smart banner
+     */
+    public function __construct(
+        /** @var string $appid The app id for the ios smart banner */
+        private string $appid,
+        /** @var string $appargument The app argument for the ios smart banner */
+        private string $appargument,
+    ) {
+    }
+
+    /**
+     * Get the appid.
+     *
+     * @return string
+     */
+    public function get_appid(): string {
+        return $this->appid;
+    }
+
+    /**
+     * Set the appid.
+     *
+     * @param string $appid
+     */
+    public function set_appid(string $appid): void {
+        $this->appid = $appid;
+    }
+
+    /**
+     * Get the appargument.
+     *
+     * @return string
+     */
+    public function get_appargument(): string {
+        return $this->appargument;
+    }
+
+    /**
+     * Set the appargument.
+     *
+     * @param string $appargument
+     */
+    public function set_appargument(string $appargument): void {
+        $this->appargument = $appargument;
+    }
+}

admin/tool/mobile/mobile.webmanifest.php

@@ -28,10 +28,13 @@
  */
 
 define('NO_DEBUG_DISPLAY', true);
+define('NO_MOODLE_COOKIES', true);
 
 require_once(__DIR__ . '/../../../config.php');
 
 header('Content-Type: application/json; charset: utf-8');
+header('Cache-Control: public, max-age=' .  HOURSECS . ', no-transform');
+header('Expires: ' . gmdate('D, d M Y H:i:s', time() + HOURSECS) . ' GMT');
 
 $mobilesettings = get_config('tool_mobile');
 // Display manifest contents only if all the required conditions are met.

admin/tool/moodlenet/classes/local/import_backup_helper.php

@@ -86,7 +86,7 @@ class import_backup_helper {
         }
 
         [$filepath, $filename] = $this->remoteresource->download_to_requestdir();
-        \core\antivirus\manager::scan_file($filepath, $filename, true);
+        \core\antivirus\manager::scan_file($filepath . DIRECTORY_SEPARATOR . $filename, $filename, true);
 
         // Check the final size of file against the user upload limits.
         $localsize = filesize(sprintf('%s/%s', $filepath, $filename));

admin/tool/moodlenet/classes/local/import_strategy_file.php

@@ -78,7 +78,7 @@ class import_strategy_file implements import_strategy {
 
         // Download the file into a request directory and scan it.
         [$filepath, $filename] = $resource->download_to_requestdir();
-        avmanager::scan_file($filepath, $filename, true);
+        avmanager::scan_file($filepath . DIRECTORY_SEPARATOR . $filename, $filename, true);
 
         // Check the final size of file against the user upload limits.
         $localsize = filesize(sprintf('%s/%s', $filepath, $filename));

admin/tool/moodlenet/lang/en/tool_moodlenet.php

@@ -38,6 +38,9 @@ $string['defaultmoodlenet_desc'] = 'The URL of the MoodleNet instance available
 $string['defaultmoodlenetname'] = "MoodleNet instance name";
 $string['defaultmoodlenetnamevalue'] = 'MoodleNet Central';
 $string['defaultmoodlenetname_desc'] = 'The name of the MoodleNet instance available via the activity chooser.';
+$string['removalwarning_feature'] = 'If you need to continue using MoodleNet, contact your site administrator about setting up a self-hosted MoodleNet instance.';
+$string['removalwarning_service'] = 'After the date, you will no longer be able to browse or add content from MoodleNet Central.';
+$string['removalwarning_title'] = 'The MoodleNet service will be shut down on 20 April 2026.';
 $string['enablemoodlenet'] = 'Enable MoodleNet integration (inbound)';
 $string['enablemoodlenet_desc'] = 'If enabled, a user with the capability to create and manage activities can browse MoodleNet via the activity chooser and import MoodleNet resources into their course. In addition, a user with the capability to restore backups can select a backup file on MoodleNet and restore it into Moodle.';
 $string['errorduringdownload'] = 'An error occurred while downloading the file: {$a}';

admin/tool/moodlenet/templates/chooser_moodlenet.mustache

@@ -27,8 +27,16 @@
     <div class="content text-start mb-5 px-5 py-4" data-region="chooser-option-summary-content-container">
         <div data-region="moodle-net">
             <div class="overlay-icon-container z-index-1 d-none" data-region="spinner"></div>
-            <img class="w-25 mb-4" aria-hidden="true" src="{{{img}}}">
+            <img class="w-25 mb-4" alt="" aria-hidden="true" src="{{{img}}}">
             <p>{{#str}} instancedescription, tool_moodlenet {{/str}}</p>
+
+            {{! Removal warning - always visible when MoodleNet integration is enabled }}
+            <div class="alert alert-warning w-75 mx-auto mb-3" role="alert">
+                <strong>{{#str}}removalwarning_title, tool_moodlenet{{/str}}</strong>
+                <p class="mb-1">{{#str}}removalwarning_service, tool_moodlenet{{/str}}</p>
+                <p class="mb-0">{{#str}}removalwarning_feature, tool_moodlenet{{/str}}</p>
+            </div>
+
             <p class="w-75 mx-auto mb-1 mt-5">{{#str}} connectandbrowse, tool_moodlenet {{/str}}</p>
             <a class="btn btn-secondary d-block w-75 mx-auto mb-4"
                data-action="browse"

admin/tool/oauth2/classes/output/renderer.php

@@ -60,7 +60,7 @@ class renderer extends plugin_renderer_base {
             get_string('systemauthstatus', 'tool_oauth2') . ' ' . $this->help_icon('systemaccountconnected', 'tool_oauth2'),
             get_string('edit'),
         ];
-        $table->attributes['class'] = 'admintable generaltable';
+        $table->attributes['class'] = 'admintable generaltable table table-hover';
         $data = [];
 
         $index = 0;
@@ -231,7 +231,7 @@ class renderer extends plugin_renderer_base {
             get_string('url'),
             get_string('edit'),
         ];
-        $table->attributes['class'] = 'admintable generaltable';
+        $table->attributes['class'] = 'admintable generaltable table table-hover';
         $data = [];
 
         $index = 0;
@@ -290,7 +290,7 @@ class renderer extends plugin_renderer_base {
             get_string('userfieldinternalfield', 'tool_oauth2'),
             get_string('edit'),
         ];
-        $table->attributes['class'] = 'admintable generaltable';
+        $table->attributes['class'] = 'admintable generaltable table table-hover';
         $data = [];
 
         $index = 0;

admin/tool/oauth2/tests/behat/basic_settings.feature

@@ -61,7 +61,8 @@ Feature: Basic OAuth2 functionality
     And I should see "device_authorization_endpoint"
     And I navigate to "Server > OAuth 2 services" in site administration
     And I click on "Configure user field mappings" "link" in the "Testing service" "table_row"
-    And I should see "firstname" in the "givenname" "table_row"
+    And I should see "firstname" in the "given_name" "table_row"
+    And I should see "lastname" in the "family_name" "table_row"
     And I should see "idnumber" in the "sub" "table_row"
     And I should see "email" in the "email" "table_row"
     And I should see "lang" in the "locale" "table_row"

admin/tool/policy/classes/api.php

@@ -14,15 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Provides {@link tool_policy\output\renderer} class.
- *
- * @package     tool_policy
- * @category    output
- * @copyright   2018 David Mudrák <david@moodle.com>
- * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace tool_policy;
 
 use coding_exception;
@@ -33,13 +24,12 @@ use core\session\manager;
 use stdClass;
 use tool_policy\event\acceptance_created;
 use tool_policy\event\acceptance_updated;
-use user_picture;
-
-defined('MOODLE_INTERNAL') || die();
 
 /**
  * Provides the API of the policies plugin.
  *
+ * @package   tool_policy
+ * @category  output
  * @copyright 2018 David Mudrak <david@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -1038,9 +1028,12 @@ class api {
 
         // MDL-80973: At this point, the policyagreed value in DB could be 0 but $user->policyagreed could be 1 (as it was copied from $USER).
         // So we need to ensure that the value in DB is set true if all policies were responded.
-        if ($user->policyagreed != $allresponded || $allresponded) {
+        $userpolicyagreed = (bool) ($user->policyagreed ?? false);
+        if ($userpolicyagreed !== $allresponded || $allresponded) {
             $user->policyagreed = $allresponded;
-            $DB->set_field('user', 'policyagreed', $allresponded, ['id' => $user->id]);
+            if (!isguestuser($user)) {
+                $DB->set_field('user', 'policyagreed', $user->policyagreed, ['id' => $user->id]);
+            }
         }
     }
 

admin/tool/recyclebin/classes/course_bin.php

@@ -145,6 +145,12 @@ class course_bin extends base_bin {
             return;
         }
 
+        // We never need badge information here.
+        if ($plan->setting_exists('badges')) {
+            $badges = $plan->get_setting('badges');
+            $badges->set_value(false);
+        }
+
         $controller->execute_plan();
 
         // We don't need the forced setting anymore, hence restore previous settings.

admin/tool/recyclebin/tests/behat/basic_functionality.feature

@@ -39,11 +39,19 @@ Feature: Basic recycle bin functionality
       | student2 | G1 |
       | student2 | G2 |
     And the following config values are set as admin:
-      | coursebinenable | 1 | tool_recyclebin |
-      | categorybinenable | 1 | tool_recyclebin |
-      | coursebinexpiry | 604800 | tool_recyclebin |
+      | coursebinenable   | 1       | tool_recyclebin |
+      | categorybinenable | 1       | tool_recyclebin |
+      | coursebinexpiry   | 604800  | tool_recyclebin |
       | categorybinexpiry | 1209600 | tool_recyclebin |
-      | autohide | 0 | tool_recyclebin |
+      | autohide          | 0       | tool_recyclebin |
+    And the following "core_badges > Badges" exist:
+      | name              | course | description       | image                        | status | type |
+      | My course 1 badge | C1     | Badge description | badges/tests/behat/badge.png | active | 2    |
+      | My course 2 badge | C2     | Badge description | badges/tests/behat/badge.png | active | 2    |
+    And the following "core_badges > Criterias" exist:
+      | badge             | role           |
+      | My course 1 badge | editingteacher |
+      | My course 2 badge | editingteacher |
 
   Scenario: Restore a deleted assignment
     Given I log in as "teacher1"
@@ -58,6 +66,14 @@ Feature: Basic recycle bin functionality
     And I wait to be redirected
     And I am on "Course 1" course homepage
     And I should see "Test assign 1" in the "Section 1" "section"
+    # Check badges were not duplicated.
+    And I navigate to "Badges" in current page administration
+    And the following should exist in the "reportbuilder-table" table:
+      | Name              | Badge status |
+      | My course 1 badge | Available    |
+    And the following should not exist in the "reportbuilder-table" table:
+      | Name              | Badge status  |
+      | My course 1 badge | Not available |
 
   @javascript
   Scenario: Restore a deleted course
@@ -83,6 +99,11 @@ Feature: Basic recycle bin functionality
     And "Student 1" "text" should exist in the "Group A" "table_row"
     And "Student 2" "text" should exist in the "Group A" "table_row"
     And "Student 2" "text" should exist in the "Group B" "table_row"
+    # Check badges are restored.
+    And I navigate to "Badges" in current page administration
+    And the following should exist in the "reportbuilder-table" table:
+      | Name              | Badge status  |
+      | My course 2 badge | Not available |
 
   @javascript
   Scenario: Deleting a single item from the recycle bin

admin/tool/task/renderer.php

@@ -58,7 +58,7 @@ class tool_task_renderer extends plugin_renderer_base {
             get_string('nextruntime', 'tool_task'),
         ];
 
-        $table->attributes['class'] = 'admintable generaltable';
+        $table->attributes['class'] = 'admintable generaltable table table-hover';
         $table->colclasses = [];
 
         // For each task entry (row) show action buttons/logs link depending on the user permissions.
@@ -200,8 +200,9 @@ class tool_task_renderer extends plugin_renderer_base {
             });
         }
 
-        return html_writer::table($table)
-            . html_writer::div(
+        $output = html_writer::table($table);
+        if ($canruntasks) {
+            $output .= html_writer::div(
                 html_writer::link(
                     new moodle_url(
                         $adhocrunurl,
@@ -210,7 +211,10 @@ class tool_task_renderer extends plugin_renderer_base {
                     get_string('runclassname', 'tool_task')
                 ),
                 'task-runnow'
-            )
+            );
+        }
+
+        return $output
             . html_writer::div(
                 html_writer::link(
                     new moodle_url(
@@ -259,7 +263,7 @@ class tool_task_renderer extends plugin_renderer_base {
             get_string('actions','tool_task'),
         ];
 
-        $table->attributes['class'] = 'generaltable';
+        $table->attributes['class'] = 'generaltable table table-hover';
         $table->colclasses = [];
 
         // For each task entry (row) show action buttons/logs link depending on the user permissions.
@@ -384,7 +388,7 @@ class tool_task_renderer extends plugin_renderer_base {
             get_string('default', 'tool_task'),
         ];
 
-        $table->attributes['class'] = 'admintable generaltable';
+        $table->attributes['class'] = 'admintable generaltable table table-hover';
         $table->colclasses = [];
 
         if (!$showloglink) {

admin/tool/uploaduser/classes/preview.php

@@ -64,7 +64,7 @@ class preview extends \html_table {
         $this->previewrows = $previewrows;
 
         $this->id = "uupreview";
-        $this->attributes['class'] = 'generaltable';
+        $this->attributes['class'] = 'generaltable table table-hover';
         $this->tablealign = 'center';
         $this->summary = get_string('uploaduserspreview', 'tool_uploaduser');
         $this->head = array();

admin/tool/uploaduser/locallib.php

@@ -94,7 +94,8 @@ class uu_progress_tracker {
      */
     public function start() {
         $ci = 0;
-        echo '<table id="uuresults" class="generaltable boxaligncenter flexible-wrap" summary="'.get_string('uploadusersresult', 'tool_uploaduser').'">';
+        echo '<table id="uuresults" class="generaltable boxaligncenter flexible-wrap table table-hover" ' .
+            'summary="' . get_string('uploadusersresult', 'tool_uploaduser') . '">';
         echo '<tr class="heading r0">';
         foreach ($this->headers as $key => $header) {
             echo '<th class="header c'.$ci++.'" scope="col">'.$header.'</th>';

admin/tool/uploaduser/tests/behat/suspend_user_enrolment.feature

@@ -0,0 +1,41 @@
+@tool @tool_uploaduser @_file_upload
+Feature: Admin can suspend user course enrolment via CSV upload
+  In order to manage enrolments in bulk
+  As an administrator
+  I need to be able to enrol and suspend users using CSV upload
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+      | Course 2 | C2        |
+      | Course 3 | C3        |
+
+  @javascript
+  Scenario: Admin uploads enrol and suspend CSVs and verifies enrolment status
+    Given I log in as "admin"
+    And I navigate to "Users > Accounts > Upload users" in site administration
+    When I upload "lib/tests/fixtures/QA_user_enrol.txt" file to "File" filemanager
+    And I press "Upload users"
+    And I press "Upload users"
+    And I press "Continue"
+    And I upload "lib/tests/fixtures/QA_user_suspend.txt" file to "File" filemanager
+    And I press "Upload users"
+    And I set the field "Upload type" to "Update existing users only"
+    And I press "Upload users"
+    And I press "Continue"
+    And I am on the "Course 1" "enrolled users" page
+    Then the following should exist in the "participants" table:
+      | First name  | Status |
+      | Learner One | Active |
+      | Learner Two | Active |
+    And I am on the "Course 2" "enrolled users" page
+    And the following should exist in the "participants" table:
+      | First name  | Status    |
+      | Learner One | Active    |
+      | Learner Two | Suspended |
+    And I am on the "Course 3" "enrolled users" page
+    And the following should exist in the "participants" table:
+      | First name  | Status    |
+      | Learner One | Suspended |
+      | Learner Two | Active    |

admin/tool/usertours/amd/src/tour.js

@@ -808,9 +808,6 @@ const Tour = class {
 
             targetNode.data('flexitour', 'target');
 
-            // Add the backdrop.
-            this.positionBackdrop(stepConfig);
-
             $(document.body).append(currentStepNode);
             this.currentStepNode = currentStepNode;
 
@@ -826,6 +823,7 @@ const Tour = class {
                 .animate({
                     scrollTop: this.calculateScrollTop(stepConfig),
                 }).promise().then(function() {
+                        this.positionBackdrop(stepConfig);
                         this.positionStep(stepConfig);
                         this.revealStep(stepConfig);
                         pendingPromise.resolve();

admin/tool/xmldb/actions/XMLDBCheckAction.class.php

@@ -90,7 +90,7 @@ abstract class XMLDBCheckAction extends XMLDBAction {
 
         // If  not confirmed, show confirmation box
         if (!$confirmed) {
-            $o = '<table class="generaltable" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o = '<table class="generaltable table table-hover" border="0" cellpadding="5" cellspacing="0" id="notice">';
             $o.= '  <tr><td class="generalboxcontent">';
             $o.= '    <p class="centerpara">' . $this->str[$this->introstr] . '</p>';
             $o .= '    <table class="table-reboot w-100" cellpadding="20"><tr><td class="text-end">';

admin/tool/xmldb/actions/check_bigints/check_bigints.class.php

@@ -99,7 +99,8 @@ class check_bigints extends XMLDBCheckAction {
         $dbman = $DB->get_manager();
 
         $s = '';
-        $r = '<table class="generaltable boxaligncenter boxwidthwide" border="0" cellpadding="5" cellspacing="0" id="results">';
+        $r = '<table class="generaltable boxaligncenter boxwidthwide table table-hover" ' .
+            'border="0" cellpadding="5" cellspacing="0" id="results">';
         $r.= '  <tr><td class="generalboxcontent">';
         $r.= '    <h2 class="main">' . $this->str['searchresults'] . '</h2>';
         $r.= '    <p class="centerpara">' . $this->str['wrongints'] . ': ' . count($wrong_fields) . '</p>';

admin/tool/xmldb/actions/check_defaults/check_defaults.class.php

@@ -147,7 +147,8 @@ class check_defaults extends XMLDBCheckAction {
         $dbman = $DB->get_manager();
 
         $s = '';
-        $r = '<table class="generaltable boxaligncenter boxwidthwide" border="0" cellpadding="5" cellspacing="0" id="results">';
+        $r = '<table class="generaltable boxaligncenter boxwidthwide table table-hover" ' .
+            'border="0" cellpadding="5" cellspacing="0" id="results">';
         $r .= '  <tr><td class="generalboxcontent">';
         $r .= '    <h2 class="main">' . $this->str['searchresults'] . '</h2>';
         $r .= '    <p class="centerpara">' . $this->str['wrongdefaults'] . ': ' . count($wrongfields) . '</p>';

admin/tool/xmldb/actions/check_foreign_keys/check_foreign_keys.class.php

@@ -159,7 +159,8 @@ class check_foreign_keys extends XMLDBCheckAction {
     }
 
     protected function display_results(array $violatedkeys) {
-        $r = '<table class="generaltable boxaligncenter boxwidthwide" border="0" cellpadding="5" cellspacing="0" id="results">';
+        $r = '<table class="generaltable boxaligncenter boxwidthwide table table-hover" ' .
+            'border="0" cellpadding="5" cellspacing="0" id="results">';
         $r.= '  <tr><td class="generalboxcontent">';
         $r.= '    <h2 class="main">' . $this->str['searchresults'] . '</h2>';
         $r.= '    <p class="centerpara">' . $this->str['violatedforeignkeys'] . ': ' . count($violatedkeys) . '</p>';

admin/tool/xmldb/actions/check_indexes/check_indexes.class.php

@@ -154,7 +154,8 @@ class check_indexes extends XMLDBCheckAction {
         }
 
         $s = '';
-        $r = '<table class="generaltable boxaligncenter boxwidthwide" border="0" cellpadding="5" cellspacing="0" id="results">';
+        $r = '<table class="generaltable boxaligncenter boxwidthwide table table-hover" ' .
+            'border="0" cellpadding="5" cellspacing="0" id="results">';
         $r.= '  <tr><td class="generalboxcontent">';
         $r.= '    <h2 class="main">' . $this->str['searchresults'] . '</h2>';
         $r .= '    <p class="centerpara">' . $this->str['missingindexes'] . ': ' . count($missingindexes) . '</p>';

admin/tool/xmldb/actions/delete_field/delete_field.class.php

@@ -73,7 +73,7 @@ class delete_field extends XMLDBAction {
 
         // If  not confirmed, show confirmation box
         if (!$confirmed) {
-            $o = '<table width="60" class="generaltable" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o = '<table width="60" class="generaltable table table-hover" border="0" cellpadding="5" cellspacing="0" id="notice">';
             $o.= '  <tr><td class="generalboxcontent">';
             $o.= '    <p class="centerpara">' . $this->str['confirmdeletefield'] . '<br /><br />' . $fieldparam . '</p>';
             $o .= '    <table class="table-reboot w-100" cellpadding="20"><tr><td class="text-end">';

admin/tool/xmldb/actions/delete_index/delete_index.class.php

@@ -73,7 +73,7 @@ class delete_index extends XMLDBAction {
 
         // If  not confirmed, show confirmation box
         if (!$confirmed) {
-            $o = '<table width="60" class="generaltable" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o = '<table width="60" class="generaltable table table-hover" border="0" cellpadding="5" cellspacing="0" id="notice">';
             $o.= '  <tr><td class="generalboxcontent">';
             $o.= '    <p class="centerpara">' . $this->str['confirmdeleteindex'] . '<br /><br />' . $indexparam . '</p>';
             $o .= '    <table class="table-reboot w-100" cellpadding="20"><tr><td class="text-end">';

admin/tool/xmldb/actions/delete_key/delete_key.class.php

@@ -73,7 +73,7 @@ class delete_key extends XMLDBAction {
 
         // If  not confirmed, show confirmation box
         if (!$confirmed) {
-            $o = '<table width="60" class="generaltable" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o = '<table width="60" class="generaltable table table-hover" border="0" cellpadding="5" cellspacing="0" id="notice">';
             $o.= '  <tr><td class="generalboxcontent">';
             $o.= '    <p class="centerpara">' . $this->str['confirmdeletekey'] . '<br /><br />' . $keyparam . '</p>';
             $o .= '    <table class="table-reboot w-100" cellpadding="20"><tr><td class="text-end">';

admin/tool/xmldb/actions/delete_table/delete_table.class.php

@@ -72,7 +72,7 @@ class delete_table extends XMLDBAction {
 
         // If  not confirmed, show confirmation box
         if (!$confirmed) {
-            $o = '<table width="60" class="generaltable" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o = '<table width="60" class="generaltable table table-hover" border="0" cellpadding="5" cellspacing="0" id="notice">';
             $o.= '  <tr><td class="generalboxcontent">';
             $o.= '    <p class="centerpara">' . $this->str['confirmdeletetable'] . '<br /><br />' . $tableparam . '</p>';
             $o .= '    <table class="table-reboot w-100" cellpadding="20"><tr><td class="text-end">';

admin/tool/xmldb/actions/delete_xml_file/delete_xml_file.class.php

@@ -71,7 +71,7 @@ class delete_xml_file extends XMLDBAction {
 
         // If  not confirmed, show confirmation box
         if (!$confirmed) {
-            $o = '<table width="60" class="generaltable" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o = '<table width="60" class="generaltable table table-hover" border="0" cellpadding="5" cellspacing="0" id="notice">';
             $o.= '  <tr><td class="generalboxcontent">';
             $o.= '    <p class="centerpara">' . $this->str['confirmdeletexmlfile'] . '<br /><br />' . $dirpath . '/install.php</p>';
             $o .= '    <table class="table-reboot w-100" cellpadding="20"><tr><td class="text-end">';

admin/tool/xmldb/actions/main_view/main_view.class.php

@@ -119,7 +119,7 @@ class main_view extends XMLDBAction {
         // Display list of DB directories if everything is ok
         if ($result && !empty($XMLDB->dbdirs)) {
             $o .= '<table id="listdirectories" border="0" cellpadding="5" cellspacing="1"' .
-                ' class="table-striped table-sm admintable generaltable">';
+                ' class="table-striped table-sm admintable generaltable table table-hover">';
             $row = 0;
             foreach ($XMLDB->dbdirs as $key => $dbdir) {
                 // Detect if this is the lastused dir

admin/tool/xmldb/actions/reconcile_files/reconcile_files.class.php

@@ -90,8 +90,15 @@ class reconcile_files extends XMLDBAction {
 
                 // Generate the XML contents from the loaded structure.
                 $xmlcontents = $xmldb->getStructure()->xmlOutput();
+                $correctdom = new \DOMDocument();
+                $correctdom->loadXML($xmlcontents);
+                $correct = $correctdom->saveXML();
 
-                if ($rawcontents != $xmlcontents) {
+                $currentdom = new \DOMDocument();
+                $currentdom->loadXML($rawcontents);
+                $current = $currentdom->saveXML();
+
+                if ($current !== $correct) {
                     $relpath = str_replace($CFG->dirroot . '/', '', $key) . '/install.xml';
                     $needfix[] = $relpath;
                     // Left here on purpose, as a quick way to fix problems. To be

admin/tool/xmldb/actions/revert_changes/revert_changes.class.php

@@ -71,7 +71,8 @@ class revert_changes extends XMLDBAction {
 
         // If  not confirmed, show confirmation box
         if (!$confirmed) {
-            $o = '<table width="60" class="generaltable boxaligncenter" border="0" cellpadding="5" cellspacing="0" id="notice">';
+            $o = '<table width="60" class="generaltable boxaligncenter table table-hover" ' .
+                'border="0" cellpadding="5" cellspacing="0" id="notice">';
             $o.= '  <tr><td class="generalboxcontent">';
             $o.= '    <p class="centerpara">' . $this->str['confirmrevertchanges'] . '<br /><br />' . $dirpath . '</p>';
             $o .= '   <table class="table-reboot w-100" cellpadding="20"><tr><td class="text-end">';

admin/tool/xmldb/index.php

@@ -50,6 +50,7 @@ if (!isset($SESSION->xmldb)) {
 // Some previous checks
 $site = get_site();
 
+$PAGE->set_primary_active_tab('siteadminnode');
 
 // Body of the script, based on action, we delegate the work
 $action = optional_param ('action', 'main_view', PARAM_ALPHAEXT);

ai/configure.php

@@ -72,6 +72,12 @@ $PAGE->set_pagelayout('admin');
 $PAGE->set_title($title);
 $PAGE->set_heading($title);
 
+// Explode if there are no provider plugins installed.
+$plugins = core_plugin_manager::instance()->get_plugins_of_type('aiprovider');
+if (empty($plugins)) {
+    throw new moodle_exception('noproviderplugins', 'core_ai');
+}
+
 // Provider instance form processing.
 $mform = new \core_ai\form\ai_provider_form(customdata: $data);
 if ($mform->is_cancelled()) {

ai/placement/courseassist/classes/external/explain_text.php

@@ -92,10 +92,11 @@ class explain_text extends external_api {
         // Send the action to the AI manager.
         $manager = \core\di::get(\core_ai\manager::class);
         $response = $manager->process_action($action);
+        $generatedcontent = $response->get_response_data()['generatedcontent'] ?? '';
         // Return the response.
         return [
             'success' => $response->get_success(),
-            'generatedcontent' => $response->get_response_data()['generatedcontent'] ?? '',
+            'generatedcontent' => \core_external\util::format_text($generatedcontent, FORMAT_PLAIN, $contextid)[0],
             'finishreason' => $response->get_response_data()['finishreason'] ?? '',
             'errorcode' => $response->get_errorcode(),
             'error' => $response->get_errormessage(),

ai/placement/courseassist/classes/external/summarise_text.php

@@ -92,10 +92,11 @@ class summarise_text extends external_api {
         // Send the action to the AI manager.
         $manager = \core\di::get(\core_ai\manager::class);
         $response = $manager->process_action($action);
+        $generatedcontent = $response->get_response_data()['generatedcontent'] ?? '';
         // Return the response.
         return [
             'success' => $response->get_success(),
-            'generatedcontent' => $response->get_response_data()['generatedcontent'] ?? '',
+            'generatedcontent' => \core_external\util::format_text($generatedcontent, FORMAT_PLAIN, $contextid)[0],
             'finishreason' => $response->get_response_data()['finishreason'] ?? '',
             'errorcode' => $response->get_errorcode(),
             'error' => $response->get_errormessage(),

ai/tests/behat/admin.feature

@@ -40,15 +40,23 @@ Feature: An administrator can manage AI subsystem settings
     And I navigate to "AI > AI providers" in site administration
     And I should see "OpenAI API test"
     And I should see "Azure AI API test"
+    And I hover "Enable OpenAI API test" "field"
+    And "Enable OpenAI API test" "text" should be visible
     And I toggle the "Enable OpenAI API test" admin switch "on"
     And I should see "OpenAI API test enabled."
+    And I hover "Enable Azure AI API test" "field"
+    And "Enable Azure AI API test" "text" should be visible
     And I toggle the "Enable Azure AI API test" admin switch "on"
     And I should see "Azure AI API test enabled."
     And I reload the page
     And I should see "Disable OpenAI API test"
     And I should see "Disable Azure AI API test"
+    And I hover "Disable OpenAI API test" "field"
+    And "Disable OpenAI API test" "text" should be visible
     And I toggle the "Disable OpenAI API test" admin switch "off"
     And I should see "OpenAI API test disabled."
+    And I hover "Disable Azure AI API test" "field"
+    And "Disable Azure AI API test" "text" should be visible
     And I toggle the "Disable Azure AI API test" admin switch "off"
     Then I should see "Azure AI API test disabled."
 

analytics/classes/local/analyser/by_course.php

@@ -53,6 +53,7 @@ abstract class by_course extends base {
 
         if (!$recordset->valid()) {
             $this->add_log(get_string('nocourses', 'analytics'));
+            $recordset->close();
             return new \ArrayIterator([]);
         }
 

analytics/tests/model_test.php

@@ -54,7 +54,7 @@ final class model_test extends \advanced_testcase {
 
     public function setUp(): void {
         parent::setUp();
-
+        $this->resetAfterTest();
         $this->setAdminUser();
 
         $target = \core_analytics\manager::get_target('test_target_shortname');
@@ -68,8 +68,6 @@ final class model_test extends \advanced_testcase {
     }
 
     public function test_enable(): void {
-        $this->resetAfterTest(true);
-
         $this->assertEquals(0, $this->model->get_model_obj()->enabled);
         $this->assertEquals(0, $this->model->get_model_obj()->trained);
         $this->assertEquals('', $this->model->get_model_obj()->timesplitting);
@@ -81,8 +79,6 @@ final class model_test extends \advanced_testcase {
     }
 
     public function test_create(): void {
-        $this->resetAfterTest(true);
-
         $target = \core_analytics\manager::get_target('\core_course\analytics\target\course_dropout');
         $indicators = array(
             \core_analytics\manager::get_indicator('\core\analytics\indicator\any_write_action'),
@@ -194,7 +190,6 @@ final class model_test extends \advanced_testcase {
      */
     public function test_clear_static(): void {
         global $DB;
-        $this->resetAfterTest();
 
         $statictarget = new \test_static_target_shortname();
         $indicators['test_indicator_max'] = \core_analytics\manager::get_indicator('test_indicator_max');
@@ -211,8 +206,6 @@ final class model_test extends \advanced_testcase {
     }
 
     public function test_model_manager(): void {
-        $this->resetAfterTest(true);
-
         $this->assertCount(3, $this->model->get_indicators());
         $this->assertInstanceOf('\core_analytics\local\target\binary', $this->model->get_target());
 
@@ -225,8 +218,6 @@ final class model_test extends \advanced_testcase {
     }
 
     public function test_output_dir(): void {
-        $this->resetAfterTest(true);
-
         $dir = make_request_directory();
         set_config('modeloutputdir', $dir, 'analytics');
 
@@ -237,9 +228,6 @@ final class model_test extends \advanced_testcase {
 
     public function test_unique_id(): void {
         global $DB;
-
-        $this->resetAfterTest(true);
-
         $originaluniqueid = $this->model->get_unique_id();
 
         // Same id across instances.
@@ -283,8 +271,6 @@ final class model_test extends \advanced_testcase {
      * @return void
      */
     public function test_exists(): void {
-        $this->resetAfterTest(true);
-
         $target = \core_analytics\manager::get_target('\core_course\analytics\target\no_teaching');
         $this->assertTrue(\core_analytics\model::exists($target));
 
@@ -302,9 +288,6 @@ final class model_test extends \advanced_testcase {
      */
     public function test_model_timelimit(): void {
         global $DB;
-
-        $this->resetAfterTest(true);
-
         set_config('modeltimelimit', 2, 'analytics');
 
         $courses = array();
@@ -365,8 +348,6 @@ final class model_test extends \advanced_testcase {
      * Test model_config::get_class_component.
      */
     public function test_model_config_get_class_component(): void {
-        $this->resetAfterTest(true);
-
         $this->assertEquals('core',
             \core_analytics\model_config::get_class_component('\\core\\analytics\\indicator\\read_actions'));
         $this->assertEquals('core',
@@ -387,8 +368,6 @@ final class model_test extends \advanced_testcase {
             $this->markTestSkipped('mlbackend_python is not configured.');
         }
 
-        $this->resetAfterTest(true);
-
         $this->model->enable('\\core\\analytics\\time_splitting\\quarters');
         $zipfilepath = $this->model->export_model('yeah-config.zip');
 
@@ -408,8 +387,6 @@ final class model_test extends \advanced_testcase {
      * Test can export configuration
      */
     public function test_can_export_configuration(): void {
-        $this->resetAfterTest(true);
-
         // No time splitting method.
         $this->assertFalse($this->model->can_export_configuration());
 
@@ -433,8 +410,6 @@ final class model_test extends \advanced_testcase {
             $this->markTestSkipped('mlbackend_python is not configured.');
         }
 
-        $this->resetAfterTest(true);
-
         $this->model->enable('\\core\\analytics\\time_splitting\\quarters');
 
         $modelconfig = new \core_analytics\model_config($this->model);
@@ -463,8 +438,6 @@ final class model_test extends \advanced_testcase {
     public function test_inplace_editable_name(): void {
         global $PAGE;
 
-        $this->resetAfterTest();
-
         $output = new \core_renderer($PAGE, RENDERER_TARGET_GENERAL);
 
         // Check as a user with permission to edit the name.
@@ -489,8 +462,6 @@ final class model_test extends \advanced_testcase {
     public function test_get_name_and_rename(): void {
         global $PAGE;
 
-        $this->resetAfterTest();
-
         $output = new \core_renderer($PAGE, RENDERER_TARGET_GENERAL);
 
         // By default, the model exported for template uses its target's name in the name inplace editable element.
@@ -518,8 +489,6 @@ final class model_test extends \advanced_testcase {
      * Tests model::get_potential_timesplittings()
      */
     public function test_potential_timesplittings(): void {
-        $this->resetAfterTest();
-
         $this->assertArrayNotHasKey('\core\analytics\time_splitting\no_splitting', $this->model->get_potential_timesplittings());
         $this->assertArrayHasKey('\core\analytics\time_splitting\single_range', $this->model->get_potential_timesplittings());
         $this->assertArrayHasKey('\core\analytics\time_splitting\quarters', $this->model->get_potential_timesplittings());
@@ -531,8 +500,6 @@ final class model_test extends \advanced_testcase {
      * @return null
      */
     public function test_get_samples(): void {
-        $this->resetAfterTest();
-
         if (!PHPUNIT_LONGTEST) {
             $this->markTestSkipped('PHPUNIT_LONGTEST is not defined');
         }

analytics/tests/stats_test.php

@@ -39,7 +39,7 @@ final class stats_test extends \advanced_testcase {
      */
     public function setUp(): void {
         parent::setUp();
-
+        $this->resetAfterTest();
         $this->setAdminUser();
     }
 
@@ -47,9 +47,6 @@ final class stats_test extends \advanced_testcase {
      * Test the {@link \core_analytics\stats::enabled_models()} implementation.
      */
     public function test_enabled_models(): void {
-
-        $this->resetAfterTest(true);
-
         // By default, sites have {@link \core_course\analytics\target\no_teaching} and
         // {@link \core_user\analytics\target\upcoming_activities_due} enabled.
         $this->assertEquals(4, \core_analytics\stats::enabled_models());
@@ -77,8 +74,6 @@ final class stats_test extends \advanced_testcase {
             $this->markTestSkipped('mlbackend_python is not configured.');
         }
 
-        $this->resetAfterTest(true);
-
         $model = \core_analytics\model::create(
             \core_analytics\manager::get_target('test_target_shortname'),
             [
@@ -127,8 +122,6 @@ final class stats_test extends \advanced_testcase {
             $this->markTestSkipped('mlbackend_python is not configured.');
         }
 
-        $this->resetAfterTest(true);
-
         $model = \core_analytics\model::create(
             \core_analytics\manager::get_target('test_target_shortname'),
             [

auth/classes/external.php

@@ -370,7 +370,7 @@ class core_auth_external extends external_api {
      * @throws moodle_exception
      */
     public static function resend_confirmation_email($username, $password, $redirect = '') {
-        global $PAGE;
+        global $PAGE, $CFG;
 
         $warnings = array();
         $params = self::validate_parameters(
@@ -387,20 +387,27 @@ class core_auth_external extends external_api {
         $username = trim(core_text::strtolower($params['username']));
         $password = $params['password'];
 
+        $user = core_user::get_user_by_username($username);
+
+        if (!empty($user) && $user->confirmed) {
+            if (!empty($CFG->protectusernames)) {
+                throw new moodle_exception('invalidlogin');
+            }
+            throw new moodle_exception('alreadyconfirmed');
+        }
+
         if (is_restored_user($username)) {
+            if (!empty($CFG->protectusernames)) {
+                throw new moodle_exception('invalidlogin');
+            }
             throw new moodle_exception('restoredaccountresetpassword', 'webservice');
         }
 
         $user = authenticate_user_login($username, $password);
-
         if (empty($user)) {
             throw new moodle_exception('invalidlogin');
         }
 
-        if ($user->confirmed) {
-            throw new moodle_exception('alreadyconfirmed');
-        }
-
         // Check if we should redirect the user once the user is confirmed.
         $confirmationurl = null;
         if (!empty($params['redirect'])) {

auth/db/classes/task/sync_users.php

@@ -14,18 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Sync users task
- * @package   auth_db
- * @author    Guy Thomas <gthomas@moodlerooms.com>
- * @copyright Copyright (c) 2017 Blackboard Inc.
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace auth_db\task;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Sync users task class
  * @package   auth_db
@@ -49,7 +39,7 @@ class sync_users extends \core\task\scheduled_task {
      */
     public function execute() {
         if (!is_enabled_auth('db')) {
-            mtrace('auth_db plugin is disabled, synchronisation stopped', 2);
+            mtrace('auth_db plugin is disabled, synchronisation stopped');
             return;
         }
 

auth/lti/auth.php

@@ -104,6 +104,7 @@ class auth_plugin_lti extends \auth_plugin_base {
      * @param int $provisioningmode the desired account provisioning mode, which controls the auth flow for unbound users.
      * @param array $legacyconsumersecrets an array of secrets used by the legacy consumer if a migration claim exists.
      * @throws coding_exception if the specified provisioning mode is invalid.
+     * @throws \core\exception\moodle_exception if user authentication fails.
      */
     public function complete_login(array $launchdata, moodle_url $returnurl, int $provisioningmode,
             array $legacyconsumersecrets = []): void {
@@ -112,6 +113,19 @@ class auth_plugin_lti extends \auth_plugin_base {
         if ($this->get_user_binding($launchdata['iss'], $launchdata['sub'])) {
             $user = $this->find_or_create_user_from_launch($launchdata);
 
+            if ($user->suspended) {
+                $failurereason = AUTH_LOGIN_SUSPENDED;
+                $event = \core\event\user_login_failed::create([
+                    'userid' => $user->id,
+                    'other' => [
+                        'username' => $user->username,
+                        'reason' => $failurereason
+                    ]
+                ]);
+                $event->trigger();
+                throw new \core\exception\moodle_exception('invalidlogin', 'core');
+            }
+
             if (isloggedin()) {
                 // If a different user is currently logged in, authenticate the linked user instead.
                 global $USER;

auth/oauth2/classes/api.php

@@ -197,9 +197,7 @@ class api {
 
         $data->link = $confirmationurl->out(false);
         $message = get_string('confirmlinkedloginemail', 'auth_oauth2', $data);
-
-        $data->link = $confirmationurl->out();
-        $messagehtml = text_to_html(get_string('confirmlinkedloginemail', 'auth_oauth2', $data), false, false, true);
+        $messagehtml = text_to_html(get_string('confirmlinkedloginemail', 'auth_oauth2', $data), false, false);
 
         $user->mailformat = 1;  // Always send HTML version as well.
 
@@ -339,9 +337,7 @@ class api {
 
         $data->link = $confirmationurl->out(false);
         $message = get_string('confirmaccountemail', 'auth_oauth2', $data);
-
-        $data->link = $confirmationurl->out();
-        $messagehtml = text_to_html(get_string('confirmaccountemail', 'auth_oauth2', $data), false, false, true);
+        $messagehtml = text_to_html(get_string('confirmaccountemail', 'auth_oauth2', $data), false, false);
 
         $user->mailformat = 1;  // Always send HTML version as well.
 

auth/oauth2/classes/auth.php

@@ -34,9 +34,11 @@ use stdClass;
 use core\oauth2\issuer;
 use core\oauth2\client;
 
+global $CFG;
 require_once($CFG->libdir.'/authlib.php');
 require_once($CFG->dirroot.'/user/lib.php');
 require_once($CFG->dirroot.'/user/profile/lib.php');
+require_once($CFG->dirroot.'/login/lib.php');
 
 /**
  * Plugin for oauth2 authentication.
@@ -175,12 +177,12 @@ class auth extends \auth_plugin_base {
     public function loginpage_idp_list($wantsurl) {
         $providers = \core\oauth2\api::get_all_issuers(true);
         $result = [];
-        if (empty($wantsurl)) {
-            $wantsurl = '/';
-        }
         foreach ($providers as $idp) {
             if ($idp->is_available_for_login()) {
-                $params = ['id' => $idp->get('id'), 'wantsurl' => $wantsurl, 'sesskey' => sesskey()];
+                $params = ['id' => $idp->get('id'), 'sesskey' => sesskey()];
+                if (!empty($wantsurl)) {
+                    $params['wantsurl'] = $wantsurl;
+                }
                 $url = new moodle_url('/auth/oauth2/login.php', $params);
                 $icon = $idp->get('image');
                 $result[] = ['url' => $url, 'iconurl' => $icon, 'name' => $idp->get_display_name()];
@@ -465,18 +467,31 @@ class auth extends \auth_plugin_base {
             $mappeduser = get_complete_user_data('id', $linkedlogin->get('userid'));
 
             if ($mappeduser && $mappeduser->suspended) {
-                $failurereason = AUTH_LOGIN_SUSPENDED;
-                $event = \core\event\user_login_failed::create([
-                    'userid' => $mappeduser->id,
-                    'other' => [
-                        'username' => $userinfo['username'],
-                        'reason' => $failurereason
-                    ]
-                ]);
-                $event->trigger();
-                $SESSION->loginerrormsg = get_string('invalidlogin');
-                $client->log_out();
-                redirect(new moodle_url('/login/index.php'));
+                // Check if there's another user with the same email that is not suspended.
+                $moodleuser = \core_user::get_user_by_email($userinfo['email'], '*', null, IGNORE_MULTIPLE);
+                if ($moodleuser->id == $mappeduser->id) {
+                    $failurereason = AUTH_LOGIN_SUSPENDED;
+                    $event = \core\event\user_login_failed::create([
+                        'userid' => $mappeduser->id,
+                        'other' => [
+                            'username' => $userinfo['username'],
+                            'reason' => $failurereason,
+                        ],
+                    ]);
+                    $event->trigger();
+                    $SESSION->loginerrormsg = get_string('invalidlogin');
+                    $client->log_out();
+                    redirect(new moodle_url('/login/index.php'));
+                } else if ($moodleuser && !$moodleuser->suspended) {
+                    // Update the OAuth2 linked login to point to the active user account.
+                    $linkedlogin->set('userid', $moodleuser->id);
+                    $linkedlogin->set('timemodified', time());
+                    $linkedlogin->update();
+
+                    // Update user fields and continue with login.
+                    $userinfo = $this->update_user($userinfo, $moodleuser);
+                    $userwasmapped = true;
+                }
             } else if ($mappeduser && ($mappeduser->confirmed || !$issuer->get('requireconfirmation'))) {
                 // Update user fields.
                 $userinfo = $this->update_user($userinfo, $mappeduser);
@@ -506,7 +521,6 @@ class auth extends \auth_plugin_base {
             redirect(new moodle_url('/login/index.php'));
         }
 
-
         if (!$issuer->is_valid_login_domain($oauthemail)) {
             // Trigger login failed event.
             $failurereason = AUTH_LOGIN_UNAUTHORISED;
@@ -522,8 +536,24 @@ class auth extends \auth_plugin_base {
 
         if (!$userwasmapped) {
             // No defined mapping - we need to see if there is an existing account with the same email.
+            $moodleuser = \core_user::get_user_by_email($userinfo['email'], '*', null, IGNORE_MULTIPLE);
+
+            // Ensure we don't link a login for a suspended user.
+            if (!empty($moodleuser) && $moodleuser->suspended) {
+                $failurereason = AUTH_LOGIN_SUSPENDED;
+                $event = \core\event\user_login_failed::create([
+                    'userid' => $moodleuser->id,
+                    'other' => [
+                        'username' => $userinfo['email'],
+                        'reason' => $failurereason,
+                    ],
+                ]);
+                $event->trigger();
+                $SESSION->loginerrormsg = get_string('invalidlogin');
+                $client->log_out();
+                redirect(new moodle_url('/login/index.php'));
+            }
 
-            $moodleuser = \core_user::get_user_by_email($userinfo['email']);
             if (!empty($moodleuser)) {
                 if ($issuer->get('requireconfirmation')) {
                     $PAGE->set_url('/auth/oauth2/confirm-link-login.php');
@@ -620,7 +650,11 @@ class auth extends \auth_plugin_base {
 
         complete_user_login($user, $this->get_extrauserinfo());
         $this->update_picture($user);
-        redirect($redirecturl);
+
+        if (empty($redirecturl)) {
+            $redirecturl = core_login_get_return_url();
+        }
+        redirect(new moodle_url($redirecturl));
     }
 
     /**

auth/oauth2/classes/output/renderer.php

@@ -55,7 +55,7 @@ class renderer extends plugin_renderer_base {
             get_string('info', 'auth_oauth2'),
             get_string('edit'),
         ];
-        $table->attributes['class'] = 'admintable generaltable';
+        $table->attributes['class'] = 'admintable generaltable table table-hover';
         $data = [];
 
         $index = 0;

auth/oauth2/lang/en/auth_oauth2.php

@@ -27,19 +27,14 @@ $string['auth_oauth2description'] = 'OAuth 2 standards based authentication';
 $string['auth_oauth2settings'] = 'OAuth 2 authentication settings.';
 $string['confirmaccountemail'] = 'Hi {$a->firstname},
 
-A new account has been requested at \'{$a->sitename}\'
-using your email address.
+A new account has been requested at \'{$a->sitename}\' using your email address.
 
-To confirm your new account, please go to this web address:
+To confirm your new account, please click the link below:
 
-{$a->link}
+<a href="{$a->link}">Confirm your account</a>
 
-In most mail programs, this should appear as a blue link
-which you can just click on.  If that doesn\'t work,
-then cut and paste the address into the address
-line at the top of your web browser window.
 
-If you need help, please contact the site administrator,
+If you need help, please contact the site administrator.
 {$a->admin}
 
 If you did not do this, someone else could be trying to compromise your account.
@@ -53,16 +48,12 @@ A request has been made to link the {$a->issuername} login
 {$a->linkedemail} to your account at \'{$a->sitename}\'
 using your email address.
 
-To confirm this request and link these logins, please go to this web address:
+To confirm this request and link these logins, please click the link below:
 
-{$a->link}
+<a href="{$a->link}">Link your accounts</a>
 
-In most mail programs, this should appear as a blue link
-which you can just click on.  If that doesn\'t work,
-then cut and paste the address into the address
-line at the top of your web browser window.
 
-If you need help, please contact the site administrator,
+If you need help, please contact the site administrator.
 {$a->admin}
 
 If you did not do this, someone else could be trying to compromise your account.

auth/oauth2/login.php

@@ -25,7 +25,7 @@
 require_once('../../config.php');
 
 $issuerid = required_param('id', PARAM_INT);
-$wantsurl = new moodle_url(optional_param('wantsurl', '', PARAM_URL));
+$wantsurl = optional_param('wantsurl', '', PARAM_LOCALURL);
 
 $PAGE->set_context(context_system::instance());
 $PAGE->set_url(new moodle_url('/auth/oauth2/login.php', ['id' => $issuerid]));

auth/tests/behat/loginform.feature

@@ -96,13 +96,15 @@ Feature: Test if the login form provides the correct feedback
     And I follow "Log in"
     Then the focused element is "Password" "field"
 
+  @accessibility
   Scenario: Test the login page focus after error feature
     Given I follow "Log in"
     And I set the field "Username" to "admin"
     And I set the field "Password" to "wrongpassword"
     And I press "Log in"
-    And I press the tab key
+    And I wait until the page is ready
     Then the focused element is "Username" "field"
+    And the page should meet accessibility standards with "best-practice" extra tests
 
   Scenario: Display the password visibility toggle icon
     Given the following config values are set as admin:

auth/tests/external/external_test.php

@@ -182,6 +182,7 @@ final class external_test extends externallib_advanced_testcase {
         $this->assertTrue($result['success']);
         $this->assertEmpty($result['warnings']);
 
+        set_config('protectusernames', 0);
         $_SERVER['HTTP_USER_AGENT'] = 'no browser'; // Hack around missing user agent in CLI scripts.
         $this->expectException('\moodle_exception');
         $this->expectExceptionMessage('error/invalidlogin');
@@ -205,6 +206,7 @@ final class external_test extends externallib_advanced_testcase {
         $this->assertTrue($result['success']);
         $this->assertEmpty($result['warnings']);
 
+        set_config('protectusernames', 0);
         $_SERVER['HTTP_USER_AGENT'] = 'no browser'; // Hack around missing user agent in CLI scripts.
         $this->expectException('\moodle_exception');
         $this->expectExceptionMessage('error/invalidlogin');
@@ -235,6 +237,13 @@ final class external_test extends externallib_advanced_testcase {
         $result = external_api::clean_returnvalue(core_auth_external::confirm_user_returns(), $result);
         $this->assertTrue($result['success']);
 
+        // Keep protectusernames enabled so the call returns invalidlogin exception.
+        $this->expectException('\moodle_exception');
+        $this->expectExceptionMessage('error/invalidlogin');
+        core_auth_external::resend_confirmation_email($username, $password);
+
+        // Now disable protectusernames and expect an exception.
+        set_config('protectusernames', 0);
         $this->expectException('\moodle_exception');
         $this->expectExceptionMessage('error/alreadyconfirmed');
         core_auth_external::resend_confirmation_email($username, $password);

availability/classes/info.php

@@ -746,7 +746,11 @@ abstract class info {
                     $modulename = format_string($cm->get_name(), true, ['context' => $context]);
                     // We make sure that we add a data attribute to the name so we can change it later if the
                     // original module name changes.
-                    if ($cm->has_view() && $cm->get_user_visible()) {
+                    if (
+                        \course_modinfo::is_mod_type_visible_on_course($cm->modname)
+                        && $cm->has_view()
+                        && $cm->get_user_visible()
+                    ) {
                         // Help student by providing a link to the module which is preventing availability.
                         return \html_writer::link($cm->get_url(), $modulename, ['data-cm-name-for' => $cm->id]);
                     } else {

availability/condition/completion/tests/behat/availability_completion_previous.feature

@@ -32,7 +32,7 @@ Feature: Confirm that availability_completion works with previous activity setti
     And I expand all fieldsets
     And I click on "Add restriction..." "button"
     And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
+    And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link"
     And I set the field "Activity or resource" to "Previous activity with completion"
     And I press "Save and return to course"
     Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region"
@@ -58,7 +58,7 @@ Feature: Confirm that availability_completion works with previous activity setti
     And I expand all fieldsets
     And I click on "Add restriction..." "button"
     And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
+    And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link"
     And I set the field "Activity or resource" to "Previous activity with completion"
     And I press "Save and return to course"
     Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region"
@@ -83,7 +83,7 @@ Feature: Confirm that availability_completion works with previous activity setti
     And I expand all fieldsets
     And I click on "Add restriction..." "button"
     And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
+    And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link"
     And I set the field "Activity or resource" to "Previous activity with completion"
     And I press "Save and return to course"
     Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region"
@@ -112,7 +112,7 @@ Feature: Confirm that availability_completion works with previous activity setti
     And I expand all fieldsets
     And I click on "Add restriction..." "button"
     And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
+    And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link"
     And I set the field "Activity or resource" to "Previous activity with completion"
     And I press "Save changes"
     Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region"
@@ -138,7 +138,7 @@ Feature: Confirm that availability_completion works with previous activity setti
     And I expand all fieldsets
     And I click on "Add restriction..." "button"
     And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
+    And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link"
     Then the "Activity or resource" select box should not contain "Previous activity with completion"
 
     # Set Page2 restriction to Previous Activity with completion and delete Page1.
@@ -148,7 +148,7 @@ Feature: Confirm that availability_completion works with previous activity setti
     And I expand all fieldsets
     And I click on "Add restriction..." "button"
     And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
+    And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link"
     And I set the field "Activity or resource" to "Previous activity with completion"
     And I press "Save and return to course"
     Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region"
@@ -170,7 +170,7 @@ Feature: Confirm that availability_completion works with previous activity setti
     And I expand all fieldsets
     And I click on "Add restriction..." "button"
     And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
+    And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link"
     And I set the field "Activity or resource" to "Previous activity with completion"
     And I press "Save changes"
     Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region"
@@ -184,7 +184,7 @@ Feature: Confirm that availability_completion works with previous activity setti
     And I expand all fieldsets
     And I click on "Add restriction..." "button"
     And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
+    And I click on "Item name displayed with access restriction information if student doesn't meet this condition • Click to hide" "link"
     And I set the field "Activity or resource" to "Previous activity with completion"
     And I press "Save changes"
     And I should see "Not available unless: The previous activity with completion" in the "region-main" "region"

availability/tests/behat/display_availability.feature

@@ -180,4 +180,4 @@ Feature: Display availability for activities and sections
     And I should not see "Date" in the "Restrict access" "fieldset"
     And I press "Add restriction..."
     And I click on "Grade" "button" in the "Add restriction..." "dialogue"
-    And the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Displayed if student"
+    And the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Item name displayed"

availability/tests/behat/edit_availability.feature

@@ -89,13 +89,13 @@ Feature: edit_availability
     And I should see "Date" in the "Restrict access" "fieldset"
     And ".availability-item .availability-eye img" "css_element" should be visible
     And ".availability-item .availability-delete img" "css_element" should be visible
-    And the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Displayed if student"
+    And the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Item name displayed"
 
     # Toggle the eye icon.
     When I click on ".availability-item .availability-eye img" "css_element"
     Then the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Hidden entirely"
     When I click on ".availability-item .availability-eye img" "css_element"
-    Then the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Displayed if student"
+    Then the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Item name displayed"
 
     # Click the delete button.
     When I click on ".availability-item .availability-delete img" "css_element"

backup/moodle2/backup_stepslib.php

@@ -310,7 +310,10 @@ trait backup_question_set_reference_trait {
         foreach ($setreferenceconditions as $setreferencecondition) {
             $conditions = json_decode($setreferencecondition, true);
             $conditions = question_reference_manager::convert_legacy_set_reference_filter_condition($conditions);
-            $setreferencequestionids += array_keys($randomloader->get_filtered_questions($conditions['filter'], 0));
+            $setreferencequestionids = array_merge(
+                $setreferencequestionids,
+                array_keys($randomloader->get_filtered_questions($conditions['filter'], 0)),
+            );
         }
         if (empty($setreferencequestionids)) {
             return;
@@ -2642,6 +2645,7 @@ class backup_questions_structure_step extends backup_structure_step {
                 'questioncategoryid',
                 'idnumber',
                 'ownerid',
+                'nextversion',
             ]);
 
         $questionversions = new backup_nested_element('question_version');
@@ -2718,7 +2722,7 @@ class backup_questions_structure_step extends backup_structure_step {
              WHERE bi.backupid = ?
                AND bi.itemname = 'question_categoryfinal'", [backup::VAR_BACKUPID]);
 
-        // Add all question bank entries from "complete" categories, plus annotated question bank entires
+        // Add all question bank entries from "complete" categories, plus annotated question bank entires and their children
         // from "partial" categories.
         $questionbankentry->set_source_sql(
             "
@@ -2730,8 +2734,11 @@ class backup_questions_structure_step extends backup_structure_step {
                 UNION
                 SELECT qbe.*
                  FROM {question_bank_entries} qbe
+                 JOIN {question_versions} qv ON qv.questionbankentryid = qbe.id
+                 JOIN {question} q ON q.id = qv.questionid
+                 LEFT JOIN {question_versions} parentqv ON parentqv.questionid = q.parent
                  JOIN {question_category_partial_temp} qcp ON qcp.itemid = qbe.questioncategoryid
-                 JOIN {backup_ids_temp} biq ON biq.itemid = qbe.id
+                 JOIN {backup_ids_temp} biq ON biq.itemid = qbe.id OR biq.itemid = parentqv.questionbankentryid
                 WHERE qcp.itemid = ?
                       AND qcp.backupid = ?
                       AND biq.backupid = ?

backup/moodle2/restore_qtype_plugin.class.php

@@ -568,8 +568,7 @@ abstract class restore_qtype_plugin extends restore_plugin {
 
         foreach ($excludefields as $excludefield) {
             $pathparts = explode('/', ltrim($excludefield, '/'));
-            $data = $questiondata;
-            self::unset_excluded_fields($data, $pathparts);
+            $questiondata = self::unset_excluded_fields($questiondata, $pathparts);
         }
 
         return $questiondata;
@@ -581,25 +580,60 @@ abstract class restore_qtype_plugin extends restore_plugin {
      * If any of the elements in the path is an array, this is called recursively on each element in the array to unset fields
      * in each child of the array.
      *
-     * @param stdClass|array $data The questiondata object, or a subsection of it.
+     * @param stdClass|array $data The questiondata structure, or a subsection of it.
      * @param array $pathparts The remaining elements in the path to the excluded field.
-     * @return void
+     * @return stdClass|array The $data structure with excluded fields removed.
      */
-    private static function unset_excluded_fields(stdClass|array $data, array $pathparts): void {
+    private static function unset_excluded_fields(stdClass|array $data, array $pathparts): stdClass|array {
         $element = array_shift($pathparts);
-        if (!isset($data->{$element})) {
-            // This element is not present in the data structure, nothing to unset.
-            return;
+        $unset = false;
+        // Get the current element from the data structure.
+        if (is_object($data)) {
+            if (!property_exists($data, $element)) {
+                // This element is not present in the data structure, nothing to unset.
+                return $data;
+            }
+            $dataelement = $data->{$element};
+        } else { // It's an array.
+            if (!array_key_exists($element, $data)) {
+                return $data;
+            }
+            $dataelement = $data[$element];
         }
-        if (is_object($data->{$element})) {
-            self::unset_excluded_fields($data->{$element}, $pathparts);
-        } else if (is_array($data->{$element})) {
-            foreach ($data->{$element} as $item) {
-                self::unset_excluded_fields($item, $pathparts);
+        // Check if we need to recur, or unset this element.
+        if (is_object($dataelement)) {
+            $dataelement = self::unset_excluded_fields($dataelement, $pathparts);
+        } else if (is_array($dataelement)) {
+            foreach ($dataelement as $key => $item) {
+                if (is_object($item) || is_array($item)) {
+                    // This is an array of objects or arrays, recur.
+                    $dataelement[$key] = self::unset_excluded_fields($item, $pathparts);
+                } else {
+                    // This is an associative array of values, check if they should be removed.
+                    $subelement = reset($pathparts);
+                    if ($key == $subelement) {
+                        unset($dataelement[$key]);
+                    }
+                }
             }
         } else if (empty($pathparts)) {
             // This is the last element of the path and it's a scalar value, unset it.
-            unset($data->{$element});
+            $unset = true;
         }
+        // Write the modified element back to the data structure, or unset it.
+        if (is_object($data)) {
+            if ($unset) {
+                unset($data->{$element});
+            } else {
+                $data->{$element} = $dataelement;
+            }
+        } else {
+            if ($unset) {
+                unset($data[$element]);
+            } else {
+                $data[$element] = $dataelement;
+            }
+        }
+        return $data;
     }
 }