Moodle release 4.5.6

NOBUG: Add upgrade notes
weekly release 4.5.5+
2025-08-08 10:48:30 +08:00 · 2025-08-08 10:48:29 +08:00 · 2025-08-07 16:45:16 +02:00 · 2025-08-07 16:45:16 +02:00 · 2025-08-07 16:45:10 +02:00 · 2025-08-07 16:45:07 +02:00
1223 changed files with 12215 additions and 4406 deletions
@@ -19,7 +19,7 @@ env:

 jobs:
  Grunt:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04

    steps:
      - name: Checking out code
@@ -61,12 +61,12 @@ jobs:
      matrix:
        include:
          # MySQL builds always run with the lowest PHP supported version.
-          - os: ubuntu-22.04
+          - os: ubuntu-24.04
            php: 8.1
            extensions:
            db: mysqli
          # PostgreSQL builds always run with the highest PHP supported version.
-          - os: ubuntu-22.04
+          - os: ubuntu-24.04
            php: 8.3
            db: pgsql

@@ -6,6 +6,72 @@ 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).

+## 4.5.6
+
+### core
+
+#### Added
+
+- Add a new method has_valid_group in \core\report_helper that will return true or false depending if the user has a valid group. This is mainly false in case the user is not in any group in SEPARATEGROUPS. Used in report_log and report_loglive
+
+  For more information see [MDL-84464](https://tracker.moodle.org/browse/MDL-84464)
+
+#### Changed
+
+- The `\core\attribute\deprecated` attribute constructor `$replacement` parameter now defaults to null, and can be omitted
+
+  For more information see [MDL-84531](https://tracker.moodle.org/browse/MDL-84531)
+- Added a new `\core\deprecation::emit_deprecation()` method which should be used in places where a deprecation is known to occur. This method will throw debugging if no deprecation notice was found, for example:
+  ```php
+  public function deprecated_method(): void {
+      \core\deprecation::emit_deprecation([self::class, __FUNCTION__]);
+  }
+  ```
+
+  For more information see [MDL-85897](https://tracker.moodle.org/browse/MDL-85897)
+
+### core_message
+
+#### Added
+
+- The web service `core_message_get_member_info` additionally returns `cancreatecontact` which is a boolean value for a user's permission to add a contact.
+
+  For more information see [MDL-72123](https://tracker.moodle.org/browse/MDL-72123)
+
+## 4.5.5
+
+### core
+
+#### Added
+
+- - Added is_site_registered_in_hub method in lib/classes/hub/api.php to
+    check if the site is registered or not.
+  - Added get_secret method in lib/classes/hub/registration.php to get site's secret.
+
+  For more information see [MDL-83448](https://tracker.moodle.org/browse/MDL-83448)
+- Added a new optional param to adhoc_task_failed and scheduled_task_failed to allow skipping log finalisation when called from a separate task.
+
+  For more information see [MDL-84442](https://tracker.moodle.org/browse/MDL-84442)
+- There is a new `core/page_title` Javascript module for manipulating the current page title
+
+  For more information see [MDL-84804](https://tracker.moodle.org/browse/MDL-84804)
+
+### core_auth
+
+#### Added
+
+- A new method called `get_additional_upgrade_token_parameters` has been added to `oauth2_client` class. This will allow custom clients to override this one and add their extra parameters for upgrade token request.
+
+  For more information see [MDL-80380](https://tracker.moodle.org/browse/MDL-80380)
+
+### core_user
+
+#### Added
+
+- New method `\core_user::get_dummy_fullname(...)` for returning dummy user fullname comprised of configured name fields only
+
+  For more information see [MDL-82132](https://tracker.moodle.org/browse/MDL-82132)
+
 ## 4.5.4

 ### core
@@ -118,6 +118,10 @@ 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]);
+                }
            }
            $outputhtml .= html_writer::end_tag('fieldset');
        }
@@ -24,6 +24,7 @@
 */

 define('CLI_SCRIPT', true);
+define('IGNORE_COMPONENT_CACHE', true);

 require(__DIR__.'/../../config.php');
 require_once($CFG->libdir.'/clilib.php');
@@ -4716,6 +4716,7 @@
      <VENDOR name="mysql" version="8.4" />
      <VENDOR name="postgres" version="14" />
      <VENDOR name="mssql" version="14.0" />
+      <VENDOR name="auroramysql" version="8.0" />
    </DATABASE>
    <PHP version="8.2.0" level="required">
    </PHP>
@@ -4895,6 +4896,208 @@
      </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>
+  <MOODLE version="5.1" requires="4.2.3">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.11.0" />
+      <VENDOR name="mysql" version="8.4" />
+      <VENDOR name="postgres" version="15" />
+      <VENDOR name="mssql" version="14.0" />
+      <VENDOR name="auroramysql" version="8.0" />
+    </DATABASE>
+    <PHP version="8.2.0" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="mbstringrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+      <PHP_EXTENSION name="sodium" level="required"/>
+      <PHP_EXTENSION name="exif" level="optional"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="zend.exception_ignore_args" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingzendexceptionignoreargs" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="sixtyfourbitsrequired" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iscustomadminwarnings" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_db_prefix_length" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_async_backup" level="recommended">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_aurora_version" level="optional">
+      </CUSTOM_CHECK>
    </CUSTOM_CHECKS>
  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -23,6 +23,8 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

+define('IGNORE_COMPONENT_CACHE', true);
+
 require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');

@@ -34,8 +34,10 @@ admin_externalpage_setup('registrationmoodleorg');

 $unregistration = optional_param('unregistration', false, PARAM_BOOL);
 $confirm = optional_param('confirm', false, PARAM_BOOL);
+// Consider the site 'registered' if records exist locally and at the hub.
+$siteisregistered = \core\hub\registration::is_registered() && core\hub\api::is_site_registered_in_hub();

-if ($unregistration && \core\hub\registration::is_registered()) {
+if ($unregistration && $siteisregistered) {
    if ($confirm) {
        require_sesskey();
        \core\hub\registration::unregister(false, false);
@@ -60,7 +62,7 @@ if (!$returnurl = optional_param('returnurl', null, PARAM_LOCALURL)) {
    $returnurl = $isinitialregistration ? '/admin/index.php' : '/admin/registration/index.php';
 }

-$siteregistrationform = new \core\hub\site_registration_form();
+$siteregistrationform = new \core\hub\site_registration_form(null, ['registered' => $siteisregistered]);
 $siteregistrationform->set_data(['returnurl' => $returnurl]);
 if ($fromform = $siteregistrationform->get_data()) {

@@ -86,7 +88,7 @@ echo $OUTPUT->header();
 // Current status of registration.

 $notificationtype = \core\output\notification::NOTIFY_ERROR;
-if (\core\hub\registration::is_registered()) {
+if ($siteisregistered) {
    $lastupdated = \core\hub\registration::get_last_updated();
    if ($lastupdated == 0) {
        $registrationmessage = get_string('pleaserefreshregistrationunknown', 'admin');
@@ -104,7 +106,7 @@ if (\core\hub\registration::is_registered()) {
 }

 // Heading.
-if (\core\hub\registration::is_registered()) {
+if ($siteisregistered) {
    echo $OUTPUT->heading(get_string('registerwithmoodleorgupdate', 'core_hub'));
 } else if ($isinitialregistration) {
    echo $OUTPUT->heading(get_string('registerwithmoodleorgcomplete', 'core_hub'));
@@ -117,7 +119,7 @@ echo $renderer->moodleorg_registration_message();

 $siteregistrationform->display();

-if (\core\hub\registration::is_registered()) {
+if ($siteisregistered) {
    // Unregister link.
    $unregisterhuburl = new moodle_url("/admin/registration/index.php", ['unregistration' => 1]);
    echo html_writer::div(html_writer::link($unregisterhuburl, get_string('unregister', 'hub')), 'unregister mt-2');
@@ -36,6 +36,10 @@ if (function_exists('opcache_reset')) {
 define('CLI_SCRIPT', true);
 define('CACHE_DISABLE_ALL', true);

+// It makes no sense to use BEHAT_CLI for this script (the Behat launch scripts expect to start
+// from the normal environment), so in case user has set tne environment variable, disable it.
+putenv('BEHAT_CLI=0');
+
 // Basic functions.
 require_once(__DIR__ . '/../../../../lib/clilib.php');
 require_once(__DIR__ . '/../../../../lib/behat/lib.php');
@@ -31,6 +31,10 @@ define('ABORT_AFTER_CONFIG', true);
 define('CACHE_DISABLE_ALL', true);
 define('NO_OUTPUT_BUFFERING', true);

+// It makes no sense to use BEHAT_CLI for this script (the Behat launch scripts expect to start
+// from the normal environment), so in case user has set tne environment variable, disable it.
+putenv('BEHAT_CLI=0');
+
 require_once(__DIR__ .'/../../../../config.php');
 require_once(__DIR__.'/../../../../lib/clilib.php');
 require_once(__DIR__.'/../../../../lib/behat/lib.php');
@@ -39,6 +39,10 @@ define('NO_OUTPUT_BUFFERING', true);
 define('IGNORE_COMPONENT_CACHE', true);
 define('ABORT_AFTER_CONFIG', true);

+// It makes no sense to use BEHAT_CLI for this script (the Behat launch scripts expect to start
+// from the normal environment), so in case user has set tne environment variable, disable it.
+putenv('BEHAT_CLI=0');
+
 require_once(__DIR__ . '/../../../../lib/clilib.php');

 // CLI options.
@@ -33,6 +33,10 @@ if (isset($_SERVER['REMOTE_ADDR'])) {
    die(); // No access from web!.
 }

+// It makes no sense to use BEHAT_CLI for this script (the Behat launch scripts expect to start
+// from the normal environment), so in case user has set tne environment variable, disable it.
+putenv('BEHAT_CLI=0');
+
 // Basic functions.
 require_once(__DIR__ . '/../../../../lib/clilib.php');
 require_once(__DIR__ . '/../../../../lib/behat/lib.php');
@@ -24,5 +24,14 @@

 defined('MOODLE_INTERNAL') || die;

-// Remove the 'enableaccessibilitytools' configuration setting in case of reinstall.
-unset_config('enableaccessibilitytools');
+/**
+ * Plugin uninstall code.
+ *
+ * @return true
+ */
+function xmldb_tool_brickfield_uninstall(): bool {
+    // Remove the 'enableaccessibilitytools' configuration setting in case of reinstall.
+    unset_config('enableaccessibilitytools');
+
+    return true;
+}
@@ -0,0 +1,70 @@
+<?php
+// This file is part of Moodle - https://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <https://www.gnu.org/licenses/>.
+
+namespace tool_capability;
+
+// phpcs:disable moodle.PHPUnit.TestCaseProvider.dataProviderSyntaxMethodNotFound
+
+/**
+ * Detect common problems in capability definitions of plugins.
+ *
+ * @group     plugin_checks
+ * @package   tool_capability
+ * @copyright 2025 Petr Skoda
+ * @license   https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+final class plugin_checks_test extends \core\tests\plugin_checks_testcase {
+    /**
+     * Verify contents of plugin db/access.php file.
+     *
+     * @dataProvider all_plugins_provider
+     * @coversNothing
+     *
+     * @param string $component
+     * @param string $plugintype
+     * @param string $pluginname
+     * @param string $dir
+     */
+    public function test_db_access_file(string $component, string $plugintype, string $pluginname, string $dir): void {
+        global $CFG;
+
+        $stringmanager = get_string_manager();
+        $corerolefile = "$CFG->dirroot/lang/en/role.php";
+        $langfile = "$dir/lang/en/$component.php";
+
+        $file = "$dir/db/access.php";
+        $capabilities = $this->fetch_array_from_file($file, 'capabilities');
+        if (!$capabilities) {
+            $this->expectNotToPerformAssertions();
+            return;
+        }
+
+        foreach ($capabilities as $capname => $capability) {
+            if ($plugintype === 'qbank' && str_starts_with($capname, 'moodle/question:')) {
+                // Question bank capabilities are irregular.
+                $strname = explode('/', $capname, 2)[1];
+                $this->assertTrue($stringmanager->string_exists($strname, 'core_role'),
+                    "Missing capability name string '$strname' in $corerolefile");
+                continue;
+            }
+            $this->assertMatchesRegularExpression("|^$plugintype/$pluginname:[a-z0-9_]+$|", $capname);
+            $strname = substr($capname, strlen($plugintype) + 1);
+            $this->assertTrue($stringmanager->string_exists($strname, $component),
+                "Missing capability name string '$strname' in $langfile");
+            $this->assertSame($capname, clean_param($capname, PARAM_CAPABILITY));
+        }
+    }
+}
@@ -46,11 +46,11 @@ Feature: See the competencies for an activity on the course competencies page.
    When I follow "Competencies"
    Then I should see "Test-Comp1"
    And I should see "Test-Comp2"
-    And I set the field "Filter competencies by resource or activity" to "PageName1"
+    And I set the competency filter "Filter competencies by resource or activity" to "PageName1"
    And I press the enter key
    And I should see "Test-Comp1"
    And I should not see "Test-Comp2"
-    And I set the field "Filter competencies by resource or activity" to "PageName2"
+    And I set the competency filter "Filter competencies by resource or activity" to "PageName2"
    And I press the enter key
    And I should not see "Test-Comp1"
    And I should not see "Test-Comp2"
@@ -169,6 +169,17 @@ switch ($action) {
        echo $OUTPUT->heading(get_string('managefactor', 'factor_' . $factorobject->name));
        echo $OUTPUT->active_factors($factor);
        echo $OUTPUT->single_button($returnurl, get_string('back'));
+
+        // Displays a setup additional button in case it is needed.
+        if ($factorobject->show_additional_setup_button()) {
+            echo $OUTPUT->single_button(
+                url: new \moodle_url('action.php', ['action' => 'setup', 'factor' => $factor]),
+                label:  $factorobject->get_additional_setup_string(),
+                method: 'post',
+                options: ['type' => 'primary'],
+            );
+        }
+
        // JS for modal confirming replace and revoke actions.
        $PAGE->requires->js_call_amd('tool_mfa/confirmation_modal', 'init', [$context->id]);

@@ -421,6 +421,18 @@ abstract class object_factor_base implements object_factor {
        return $this->has_setup();
    }

+    /**
+     * Returns true if a button should be shown to add factors of the same kind on the preferences page.
+     * For example, give user's the ability to set up multiple security keys.
+     *
+     * Override in child class if necessary.
+     *
+     * @return bool
+     */
+    public function show_additional_setup_button(): bool {
+        return false;
+    }
+
    /**
     * Returns true if a factor requires input from the user to verify.
     *
@@ -578,6 +590,18 @@ abstract class object_factor_base implements object_factor {
        return get_string('setupfactor', 'tool_mfa');
    }

+    /**
+     * Gets the string for additional setup button on preferences page.
+     * If the user has the ability to set up multiple security keys.
+     *
+     * Override in child class if necessary.
+     *
+     * @return string
+     */
+    public function get_additional_setup_string(): string {
+        return get_string('setupfactorbuttonadditional', 'tool_mfa');
+    }
+
    /**
     * Gets the string for manage button on preferences page.
     *
@@ -530,6 +530,13 @@ class manager {
            }
        }

+        // Site policies from tool_policy.
+        $policyviewurl = new \moodle_url('/admin/tool/policy/view.php');
+        $policyindexurl = new \moodle_url('/admin/tool/policy/index.php');
+        if ($policyviewurl->compare($url, URL_MATCH_BASE) || $policyindexurl->compare($url, URL_MATCH_BASE)) {
+            return self::NO_REDIRECT;
+        }
+
        // WS/AJAX check.
        if (WS_SERVER || AJAX_SCRIPT) {
            if (isset($SESSION->mfa_pending) && !empty($SESSION->mfa_pending)) {
@@ -379,7 +379,7 @@ class renderer extends \plugin_renderer_base {
                        WHERE deleted = 0
                        AND suspended = 0
                    GROUP BY auth";
-        $allusersinfo = $DB->get_records_sql($alluserssql, []);
+        $allusersinfo = $DB->get_records_sql_menu($alluserssql);

        $noncompletesql = "SELECT u.auth, COUNT(u.id)
                             FROM {user} u
@@ -388,7 +388,7 @@ class renderer extends \plugin_renderer_base {
                              AND (mfaa.lastverified < ?
                               OR mfaa.lastverified IS NULL)
                         GROUP BY u.auth";
-        $noncompleteinfo = $DB->get_records_sql($noncompletesql, [$lookback, $lookback]);
+        $noncompleteinfo = $DB->get_records_sql_menu($noncompletesql, [$lookback, $lookback]);

        $nologinsql = "SELECT auth, COUNT(id)
                         FROM {user}
@@ -396,7 +396,7 @@ class renderer extends \plugin_renderer_base {
                          AND suspended = 0
                          AND lastlogin < ?
                     GROUP BY auth";
-        $nologininfo = $DB->get_records_sql($nologinsql, [$lookback]);
+        $nologininfo = $DB->get_records_sql_menu($nologinsql, [$lookback]);

        $mfauserssql = "SELECT auth,
                            COUNT(DISTINCT tm.userid)
@@ -406,7 +406,7 @@ class renderer extends \plugin_renderer_base {
                        AND u.deleted = 0
                        AND u.suspended = 0
                    GROUP BY u.auth";
-        $mfausersinfo = $DB->get_records_sql($mfauserssql, [$lookback]);
+        $mfausersinfo = $DB->get_records_sql_menu($mfauserssql, [$lookback]);

        $factorsusedsql = "SELECT CONCAT(u.auth, '_', tm.factor) as id,
                                COUNT(*)
@@ -417,7 +417,7 @@ class renderer extends \plugin_renderer_base {
                            AND u.suspended = 0
                            AND (tm.revoked = 0 OR (tm.revoked = 1 AND tm.timemodified > ?))
                        GROUP BY CONCAT(u.auth, '_', tm.factor)";
-        $factorsusedinfo = $DB->get_records_sql($factorsusedsql, [$lookback, $lookback]);
+        $factorsusedinfo = $DB->get_records_sql_menu($factorsusedsql, [$lookback, $lookback]);

        // Auth rows.
        $authtypes = get_enabled_auth_plugins(true);
@@ -426,10 +426,10 @@ class renderer extends \plugin_renderer_base {
            $row[] = \html_writer::tag('b', $authtype);

            // Setup the overall totals columns.
-            $row[] = $allusersinfo[$authtype]->count ?? '-';
-            $row[] = $mfausersinfo[$authtype]->count ?? '-';
-            $row[] = $noncompleteinfo[$authtype]->count ?? '-';
-            $row[] = $nologininfo[$authtype]->count ?? '-';
+            $row[] = $allusersinfo[$authtype] ?? '-';
+            $row[] = $mfausersinfo[$authtype] ?? '-';
+            $row[] = $noncompleteinfo[$authtype] ?? '-';
+            $row[] = $nologininfo[$authtype] ?? '-';

            // Create a running counter for the total.
            $authtotal = 0;
@@ -439,7 +439,7 @@ class renderer extends \plugin_renderer_base {
                if (!empty($column)) {
                    // Get the information from the data key.
                    $key = $authtype . '_' . $column;
-                    $count = $factorsusedinfo[$key]->count ?? 0;
+                    $count = $factorsusedinfo[$key] ?? 0;
                    $authtotal += $count;

                    $row[] = $count ? format_float($count, 0) : '-';
@@ -71,7 +71,7 @@ $string['setupfactor:instructionsverification'] = '3. Enter the verification cod
 $string['setupfactor:intro'] = 'To set up this method, you need to have a device with an authenticator app. If you don\'t have an app, you can download one. For example, <a href="https://2fas.com/" target="_blank">2FAS Auth</a>, <a href="https://freeotp.github.io/" target="_blank">FreeOTP</a>, Google Authenticator, Microsoft Authenticator or Twilio Authy.';
 $string['setupfactor:key'] = 'Secret key: ';
 $string['setupfactor:link'] = 'Or enter details manually.';
-$string['setupfactor:link_help'] = 'If you are on a mobile device and already have an authenticator app installed this link may work. Note that using TOTP on the same device as you login on can weaken the benefits of MFA.';
+$string['setupfactor:link_help'] = 'If you are on a mobile device and already have an authenticator app installed this link may work. Note that using TOTP on the same device as you log in on can weaken the benefits of MFA.';
 $string['setupfactor:linklabel'] = 'Open app already installed on this device';
 $string['setupfactor:mode'] = 'Mode:';
 $string['setupfactor:mode:timebased'] = 'Time-based';
@@ -115,6 +115,15 @@ class factor extends object_factor_base {
        return true;
    }

+    /**
+     * Returns true if an additional setup button should be shown on the preferences page.
+     *
+     * @return bool
+     */
+    public function show_additional_setup_button(): bool {
+        return true;
+    }
+
    /**
     * WebAuthn factor implementation.
     *
@@ -155,6 +164,15 @@ class factor extends object_factor_base {
        return get_string('setupfactorbutton', 'factor_webauthn');
    }

+    /**
+     * Gets the string for additional setup button on preferences page.
+     *
+     * @return string
+     */
+    public function get_additional_setup_string(): string {
+        return get_string('setupfactorbuttonadditional', 'factor_webauthn');
+    }
+
    /**
     * Gets the string for manage button on preferences page.
     *
@@ -51,6 +51,7 @@ $string['settings:userverification'] = 'User verification';
 $string['settings:userverification_help'] = 'Serves to ensure the person authenticating is in fact who they say they are. User verification can take various forms, such as password, PIN, fingerprint, etc.';
 $string['setupfactor'] = 'Set up security key';
 $string['setupfactorbutton'] = 'Set up';
+$string['setupfactorbuttonadditional'] = 'Add security key';
 $string['setupfactor:instructionsregistersecuritykey'] = '2. Register a security key.';
 $string['setupfactor:instructionssecuritykeyname'] = '1. Give your key a name.';
 $string['setupfactor:intro'] = 'A security key is a physical device that you can use to authenticate yourself. Security keys can be USB tokens, Bluetooth devices, or event built-in fingerprint scanners on your phone or computer.';
@@ -151,6 +151,7 @@ $string['settings:redir_exclusions_help'] = 'Each new line is a relative URL fro
 $string['settings:weight'] = 'Factor weight';
 $string['settings:weight_help'] = 'The weight of this factor if passed. A user needs at least 100 points to log in.';
 $string['setupfactor'] = 'Set up factor';
+$string['setupfactorbuttonadditional'] = 'Add additional factor';
 $string['setuprequired'] = 'User setup';
 $string['state:fail'] = 'Fail';
 $string['state:locked'] = 'Locked';
@@ -32,6 +32,7 @@ Feature: Set up and manage user factors
    And I click on "Cancel" "button"
    And I click on "Manage security key" "button"
    And I should see "Manage security key"
+    And I should see "Add security key"

  @javascript
  Scenario: I can revoke a factor only when there is more than one active factor
@@ -76,3 +77,15 @@ Feature: Set up and manage user factors
    And I click on "Replace" "button" in the "MacBook" "table_row"
    When I click on "Yes, replace" "button" in the "Replace 'MacBook' security key?" "dialogue"
    Then I should see "Replace security key"
+
+  Scenario: I can add a new factor instance on the manage factor page
+    Given the following config values are set as admin:
+      | enabled | 1 | factor_webauthn |
+    And the following "tool_mfa > User factors" exist:
+      | username | factor   | label    |
+      | admin    | webauthn | MacBook  |
+    And I follow "Preferences" in the user menu
+    And I click on "Multi-factor authentication preferences" "link"
+    And I click on "Manage security key" "button"
+    When I click on "Add security key" "button"
+    Then I should see "Set up security key"
@@ -129,6 +129,7 @@ class issuer extends persistent {
            \core\oauth2\issuer::EVERYWHERE => get_string('issueruseineverywhere', 'tool_oauth2'),
            \core\oauth2\issuer::LOGINONLY => get_string('issueruseinloginonly', 'tool_oauth2'),
            \core\oauth2\issuer::SERVICEONLY => get_string('issueruseininternalonly', 'tool_oauth2'),
+            \core\oauth2\issuer::SMTPWITHXOAUTH2 => get_string('issueruseinsmtpwithoauth', 'tool_oauth2'),
        ];
        $mform->addElement('select', 'showonloginpage', get_string('issuerusein', 'tool_oauth2'), $options);
        $mform->addHelpButton('showonloginpage', 'issuerusein', 'tool_oauth2');
@@ -138,6 +139,13 @@ class issuer extends persistent {
        $mform->addRule('loginpagename', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
        $mform->addHelpButton('loginpagename', 'issuerloginpagename', 'tool_oauth2');
        $mform->hideIf('loginpagename', 'showonloginpage', 'eq', \core\oauth2\issuer::SERVICEONLY);
+        $mform->hideIf('loginpagename', 'showonloginpage', 'eq', \core\oauth2\issuer::SMTPWITHXOAUTH2);
+
+        // Connected email for XOAUTH2.
+        $mform->addElement('text', 'systememail', get_string('issuersmtpsystememail', 'tool_oauth2'));
+        $mform->setType('systememail', PARAM_EMAIL);
+        $mform->addHelpButton('systememail', 'issuersmtpsystememail', 'tool_oauth2');
+        $mform->hideIf('systememail', 'showonloginpage', 'ne', \core\oauth2\issuer::SMTPWITHXOAUTH2);

        // Login scopes.
        $mform->addElement('text', 'loginscopes', get_string('issuerloginscopes', 'tool_oauth2'));
@@ -86,7 +86,8 @@ class renderer extends plugin_renderer_base {
            $namecell->header = true;

            // Login issuer.
-            if ((int)$issuer->get('showonloginpage') == issuer::SERVICEONLY) {
+            if ((int)$issuer->get('showonloginpage') == issuer::SERVICEONLY ||
+                    (int)$issuer->get('showonloginpage') == issuer::SMTPWITHXOAUTH2) {
                $loginissuer = $this->pix_icon('no', get_string('notloginissuer', 'tool_oauth2'), 'tool_oauth2');
                $logindisplayas = '';
            } else {
@@ -89,13 +89,16 @@ $string['issuershowonloginpage'] = 'Show on login page';
 $string['issuerrequireconfirmation_help'] = 'Require that all users verify their email address before they can log in with OAuth. This applies to newly created accounts as part of the login process, or when an existing Moodle account is connected to an OAuth login via matching email addresses.';
 $string['issuerrequireconfirmation'] = 'Require email verification';
 $string['issuers'] = 'Issuers';
+$string['issuersmtpsystememail'] = 'SMTP email';
+$string['issuersmtpsystememail_help'] = 'If specified, this email will be used to connect a system account for sending email via SMTP. This is required for some OAuth 2 services (e.g. Microsoft). Please check the documentation for your OAuth 2 service to see if this is required.';
 $string['issuersservicesallow'] = 'Allow services';
 $string['issuersservicesnotallow'] = 'Do not allow services';
 $string['issuerusein'] = 'This service will be used';
-$string['issuerusein_help'] = 'OAuth 2 services can be used for internal services, on the login page, or both, if required.';
+$string['issuerusein_help'] = 'OAuth 2 services can be used for internal services, on the login page, SMTP with XOAUTH2, or both login page and internal services, if required.';
 $string['issueruseineverywhere'] = 'Login page and internal services';
 $string['issueruseininternalonly'] = 'Internal services only';
 $string['issueruseinloginonly'] = 'Login page only';
+$string['issueruseinsmtpwithoauth'] = 'SMTP with XOAUTH2 only';
 $string['issuerusedforlogin'] = 'Login';
 $string['issuerusedforinternal'] = 'Internal services';
 $string['linkedin_service'] = 'LinkedIn';
@@ -54,13 +54,17 @@ Feature: Basic OAuth2 functionality
    And I should see "Testing service"
    And "Allow login" "icon" should exist in the "Testing service" "table_row"
    And "Allow services" "icon" should exist in the "Testing service" "table_row"
-    And I should see "-" in the "Testing service" "table_row"
+    And "Service discovery successful" "icon" should exist in the "Testing service" "table_row"
    And I click on "Configure endpoints" "link" in the "Testing service" "table_row"
    And I should see "authorization_endpoint"
-    And I should not see "discovery_endpoint"
+    And I should see "discovery_endpoint"
+    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 "givenname" "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"
    And I navigate to "Server > OAuth 2 services" in site administration
    And I click on "Edit" "link" in the "Testing service" "table_row"
    And I set the following fields to these values:
@@ -34,6 +34,10 @@ if (function_exists('opcache_reset')) {

 define('IGNORE_COMPONENT_CACHE', true);

+// It makes no sense to use BEHAT_CLI for this script (you cannot initialise PHPunit starting from
+// the Behat environment), so in case user has set tne environment variable, disable it.
+putenv('BEHAT_CLI=0');
+
 require_once(__DIR__.'/../../../../lib/clilib.php');
 require_once(__DIR__.'/../../../../lib/phpunit/bootstraplib.php');
 require_once(__DIR__.'/../../../../lib/testing/lib.php');
@@ -30,6 +30,10 @@ if (isset($_SERVER['REMOTE_ADDR'])) {

 define('IGNORE_COMPONENT_CACHE', true);

+// It makes no sense to use BEHAT_CLI for this script (you cannot initialise PHPunit starting from
+// the Behat environment), so in case user has set tne environment variable, disable it.
+putenv('BEHAT_CLI=0');
+
 require_once(__DIR__.'/../../../../lib/clilib.php');
 require_once(__DIR__.'/../../../../lib/phpunit/bootstraplib.php');
 require_once(__DIR__.'/../../../../lib/testing/lib.php');
@@ -590,6 +590,7 @@ class api {
            'subdirs' => false,
            'maxfiles' => -1,
            'context' => context_system::instance(),
+            'noclean' => true,
        ];
    }

@@ -606,6 +607,7 @@ class api {
            'subdirs' => false,
            'maxfiles' => -1,
            'context' => context_system::instance(),
+            'noclean' => true,
        ];
    }

@@ -58,7 +58,7 @@ $agreedocs = array_values(array_unique($agreedocs));
 $declinedocs = array_values(array_unique($declinedocs));

 $PAGE->set_context(context_system::instance());
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('secure');
 $PAGE->set_url('/admin/tool/policy/index.php');
 $PAGE->set_popup_notification_allowed(false);

@@ -304,3 +304,14 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
    And I log out
    When I log in as "user1"
    Then I should see "Calendar"
+
+  Scenario: Policy acceptance is prioritised when MFA is enabled
+    Given the following config values are set as admin:
+      | enabled | 1 | tool_mfa |
+    And the following config values are set as admin:
+      | enabled | 1 | factor_email |
+    And I log in as "user1"
+    And I press "Next"
+    And I set the field "I agree to the This site policy" to "1"
+    When I press "Next"
+    Then I should see "2-step verification"
@@ -290,9 +290,6 @@ Feature: User must accept policy managed by this plugin when logging in and sign
    And I set the field "I agree to the This privacy policy." to "0"
    Then I should see "Please agree to the following policies:"
    And I should see "Before continuing you need to acknowledge all these policies."
-    # Confirm that user can not browse the site (edit their profile).
-    When I follow "Profile" in the user menu
-    Then I should see "Please agree to the following policies:"

  Scenario: Accept policy on login, accept all policies
    Given the following config values are set as admin:
@@ -47,7 +47,7 @@ $numpolicy = optional_param('numpolicy', null, PARAM_INT);
 $totalpolicies = optional_param('totalpolicies', null, PARAM_INT);

 $PAGE->set_context(context_system::instance());
-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('secure');

 $viewpage = new page_viewdoc($policyid, $versionid, $returnurl, $behalfid, $manage, $numpolicy, $totalpolicies);

@@ -254,7 +254,7 @@ class course_bin extends base_bin {
        // This hack will be removed once recycle bin switches to use its own backup mode, with
        // own preferences and 100% separate from MOODLE_AUTOMATED.
        // TODO: Remove this as part of MDL-65228.
-        $forcedrestoresettings = $CFG->forced_plugin_settings['restore'] ?? null;
+        $forcedrestoresettings = $CFG->forced_plugin_settings['restore'] ?? [];
        $CFG->forced_plugin_settings['restore']['restore_general_users'] = 1;
        $CFG->forced_plugin_settings['restore']['restore_general_groups'] = 1;

@@ -274,7 +274,7 @@ class tool_task_renderer extends plugin_renderer_base {
                $nextruntime = $task->get_next_run_time();
                $due = $nextruntime < $now;
                if ($task->get_attempts_available() > 0) {
-                    $nextrun = $due ? userdate($nextruntime) : get_string('asap', 'tool_task');
+                    $nextrun = $due ? get_string('asap', 'tool_task') : userdate($nextruntime);
                } else {
                    $nextrun = get_string('never', 'admin');
                }
@@ -0,0 +1,23 @@
+@tool @tool_task @javascript
+Feature: Manage adhoc task
+  In order to manage adhoc tasks
+  As an admin
+  I need to be able to view adhoc tasks
+
+  Scenario Outline: View adhoc tasks next run time
+    Given the following "tool_task > adhoc tasks" exist:
+      | classname                            | seconds | hostname     | pid  | nextruntime   |
+      | \core\task\asynchronous_backup_task  | 0       | c69335460f7f | 1915 | <nextruntime> |
+    When I log in as "admin"
+    And I navigate to "Server > Tasks > Ad hoc tasks" in site administration
+    Then the following should exist in the "Ad hoc tasks" table:
+      | Component / Class name   | Next run         |
+      | asynchronous_backup_task | <nextruntimestr> |
+    And I click on "asynchronous_backup_task" "link" in the "Ad hoc tasks" "table"
+    And the following should exist in the "\core\task\asynchronous_backup_task Ad hoc tasks" table:
+      | Next run         |
+      | <nextruntimestr> |
+    Examples:
+      | nextruntime       | nextruntimestr                         |
+      | ##yesterday##     | ASAP                                   |
+      | ##tomorrow noon## | ##tomorrow noon##%A, %d %B %Y, %I:%M## |
@@ -43,7 +43,7 @@ class tool_task_generator extends testing_module_generator {
        global $DB;
        $conditions = ['classname' => $data['classname']];
        $record = $DB->get_record('task_scheduled', $conditions, '*', MUST_EXIST);
-        $record->timestarted = time() - $data['seconds'];
+        $record->timestarted = $data['seconds'] > 0 ? time() - $data['seconds'] : 0;
        $record->hostname = $data['hostname'];
        $record->pid = $data['pid'];
        $DB->update_record('task_scheduled', $record);
@@ -59,8 +59,8 @@ class tool_task_generator extends testing_module_generator {
        global $DB;
        $adhoctask = (object)[
            'classname' => $data['classname'],
-            'nextruntime' => 0,
-            'timestarted' => time() - $data['seconds'],
+            'nextruntime' => $data['nextruntime'] ?? 0,
+            'timestarted' => $data['seconds'] > 0 ? time() - $data['seconds'] : 0,
            'hostname' => $data['hostname'],
            'pid' => $data['pid'],
        ];
@@ -1146,7 +1146,7 @@ class tool_uploadcourse_course {

                    // Now update values.
                    // Sort out plugin specific fields.
-                    $modifiedinstance = $plugin->update_enrol_plugin_data($course->id, $method, $instance);
+                    $modifiedinstance = $plugin->update_enrol_plugin_data($course->id, $method, clone $instance);
                    $plugin->update_instance($instance, $modifiedinstance);
                } else {
                    foreach ($errors as $key => $message) {
@@ -177,12 +177,7 @@ class tool_uploadcourse_helper {
     * @return enrol_plugin[]
     */
    public static function get_enrolment_plugins() {
-        $cache = cache::make('tool_uploadcourse', 'helper');
-        if (($enrol = $cache->get('enrol')) === false) {
-            $enrol = enrol_get_plugins(false);
-            $cache->set('enrol', $enrol);
-        }
-        return $enrol;
+        return enrol_get_plugins(false);
    }

    /**
@@ -126,3 +126,19 @@ Feature: An admin can create courses with cohort enrolments using a CSV file
    And I press "Cancel"
    And I click on "Edit" "link" in the "Cohort 4" "table_row"
    And the field "Assign role" matches value "Non-editing teacher"
+
+  @javascript
+  Scenario: Uploading a cohort enrolment method with a non-default role applies only the specified role
+    Given the following "users" exist:
+      | username | firstname | lastname | email          |
+      | t1       | Teacher   | 1        | s1@example.com |
+    And the following "cohort members" exist:
+      | user | cohort |
+      | t1   | CV4    |
+    And I upload "admin/tool/uploadcourse/tests/fixtures/enrolment_cohort_multiple.csv" file to "File" filemanager
+    And I click on "Preview" "button"
+    And I click on "Upload courses" "button"
+    When I am on the "Course 1" "course" page
+    And I navigate to course participants
+    Then I should see "Non-editing teacher" in the "Teacher 1" "table_row"
+    And I should not see "Student" in the "Teacher 1" "table_row"
@@ -1,12 +0,0 @@
-@tool @tool_xmldb
-Feature: The Reconcile XMLDB files report works and all the files are ok
-  In order to ensure that all the XMLDB Editor xml files are generated properly
-  As a developer
-  I need to be able to run the Reconcile XMLDB files report and verify that everything is ok
-
-  Scenario: The Reconcile XMLDB files reports that all files are ok
-    Given I log in as "admin"
-    And I navigate to "Development > XMLDB editor" in site administration
-    When I follow "[Reconcile XMLDB files]"
-    Then I should see "Look for XMLDB files needing reconciling"
-    And I should see "All files are OK. No reconciling is needed."
@@ -1,3 +1,3 @@
-define("aiplacement_courseassist/selectors",["exports"],(function(_exports){Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0;return _exports.default={ELEMENTS:{AIDRAWER:"#ai-drawer",AIDRAWER_BODY:"#ai-drawer .ai-drawer-body",PAGE:"#page",MAIN_REGION:'[role="main"]'},ACTIONS:{SUMMARY:'[data-action="course-summarise"]',RETRY:'[data-action="course-summarise-retry"]',DECLINE:'.ai-policy-block [data-action="decline"]',ACCEPT:'.ai-policy-block [data-action="accept"]',REGENERATE:'[data-action="course-summarise-regenerate"]',CANCEL:'[data-action="course-summarise-cancel"]'}},_exports.default}));
+define("aiplacement_courseassist/selectors",["exports"],(function(_exports){Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0;return _exports.default={ELEMENTS:{AIDRAWER:"#ai-drawer",AIDRAWER_BODY:"#ai-drawer .ai-drawer-body",PAGE:"#page",MAIN_REGION:'[role="main"]',JUMPTO:'.ai-course-summarise-controls [data-region="jumpto"]',AIDRAWER_CLOSE:"#ai-drawer-close"},ACTIONS:{SUMMARY:'[data-action="course-summarise"]',RETRY:'[data-action="course-summarise-retry"]',DECLINE:'.ai-policy-block [data-action="decline"]',ACCEPT:'.ai-policy-block [data-action="accept"]',REGENERATE:'[data-action="course-summarise-regenerate"]',CANCEL:'[data-action="course-summarise-cancel"]'}},_exports.default}));

 //# sourceMappingURL=selectors.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"selectors.min.js","sources":["../src/selectors.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Define all of the selectors we will be using on the AI Course assistant.\n *\n * @module     aiplacement_courseassist/selectors\n * @copyright  2024 Huong Nguyen <huongnv13@gmail.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\nexport default {\n    ELEMENTS: {\n        AIDRAWER: '#ai-drawer',\n        AIDRAWER_BODY: '#ai-drawer .ai-drawer-body',\n        PAGE: '#page',\n        MAIN_REGION: '[role=\"main\"]',\n    },\n    ACTIONS: {\n        SUMMARY: '[data-action=\"course-summarise\"]',\n        RETRY: '[data-action=\"course-summarise-retry\"]',\n        DECLINE: '.ai-policy-block [data-action=\"decline\"]',\n        ACCEPT: '.ai-policy-block [data-action=\"accept\"]',\n        REGENERATE: '[data-action=\"course-summarise-regenerate\"]',\n        CANCEL: '[data-action=\"course-summarise-cancel\"]',\n    }\n};\n"],"names":["ELEMENTS","AIDRAWER","AIDRAWER_BODY","PAGE","MAIN_REGION","ACTIONS","SUMMARY","RETRY","DECLINE","ACCEPT","REGENERATE","CANCEL"],"mappings":"oLAsBe,CACXA,SAAU,CACNC,SAAU,aACVC,cAAe,6BACfC,KAAM,QACNC,YAAa,iBAEjBC,QAAS,CACLC,QAAS,mCACTC,MAAO,yCACPC,QAAS,2CACTC,OAAQ,0CACRC,WAAY,8CACZC,OAAQ"}
+{"version":3,"file":"selectors.min.js","sources":["../src/selectors.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Define all of the selectors we will be using on the AI Course assistant.\n *\n * @module     aiplacement_courseassist/selectors\n * @copyright  2024 Huong Nguyen <huongnv13@gmail.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\nexport default {\n    ELEMENTS: {\n        AIDRAWER: '#ai-drawer',\n        AIDRAWER_BODY: '#ai-drawer .ai-drawer-body',\n        PAGE: '#page',\n        MAIN_REGION: '[role=\"main\"]',\n        JUMPTO: '.ai-course-summarise-controls [data-region=\"jumpto\"]',\n        AIDRAWER_CLOSE: '#ai-drawer-close',\n    },\n    ACTIONS: {\n        SUMMARY: '[data-action=\"course-summarise\"]',\n        RETRY: '[data-action=\"course-summarise-retry\"]',\n        DECLINE: '.ai-policy-block [data-action=\"decline\"]',\n        ACCEPT: '.ai-policy-block [data-action=\"accept\"]',\n        REGENERATE: '[data-action=\"course-summarise-regenerate\"]',\n        CANCEL: '[data-action=\"course-summarise-cancel\"]',\n    }\n};\n"],"names":["ELEMENTS","AIDRAWER","AIDRAWER_BODY","PAGE","MAIN_REGION","JUMPTO","AIDRAWER_CLOSE","ACTIONS","SUMMARY","RETRY","DECLINE","ACCEPT","REGENERATE","CANCEL"],"mappings":"oLAsBe,CACXA,SAAU,CACNC,SAAU,aACVC,cAAe,6BACfC,KAAM,QACNC,YAAa,gBACbC,OAAQ,uDACRC,eAAgB,oBAEpBC,QAAS,CACLC,QAAS,mCACTC,MAAO,yCACPC,QAAS,2CACTC,OAAQ,0CACRC,WAAY,8CACZC,OAAQ"}
@@ -31,6 +31,8 @@ import AIHelper from 'core_ai/helper';
 import DrawerEvents from 'core/drawer_events';
 import {subscribe} from 'core/pubsub';
 import * as MessageDrawerHelper from 'core_message/message_drawer_helper';
+import * as FocusLock from 'core/local/aria/focuslock';
+import {isSmall} from "core/pagehelpers";

 const AICourseAssist = class {

@@ -57,6 +59,10 @@ const AICourseAssist = class {
        this.aiDrawerElement = document.querySelector(Selectors.ELEMENTS.AIDRAWER);
        this.aiDrawerBodyElement = document.querySelector(Selectors.ELEMENTS.AIDRAWER_BODY);
        this.pageElement = document.querySelector(Selectors.ELEMENTS.PAGE);
+        this.jumpToElement = document.querySelector(Selectors.ELEMENTS.JUMPTO);
+        this.summaryActionElement = document.querySelector(Selectors.ACTIONS.SUMMARY);
+        this.aiDrawerCloseElement = this.aiDrawerElement.querySelector(Selectors.ELEMENTS.AIDRAWER_CLOSE);
+        this.isDrawerFocusLocked = false;

        this.registerEventListeners();
    }
@@ -70,6 +76,7 @@ const AICourseAssist = class {
            if (summariseAction) {
                e.preventDefault();
                this.toggleAIDrawer();
+                this.summaryActionElement.focus();
                const isPolicyAccepted = await this.isPolicyAccepted();
                if (!isPolicyAccepted) {
                    // Display policy.
@@ -81,12 +88,28 @@ const AICourseAssist = class {
            }
        });

+        document.addEventListener('keydown', e => {
+            if (this.isAIDrawerOpen() && e.key === 'Escape') {
+                this.closeAIDrawer();
+            }
+        });
+
        // Close AI drawer if message drawer is shown.
        subscribe(DrawerEvents.DRAWER_SHOWN, () => {
            if (this.isAIDrawerOpen()) {
                this.closeAIDrawer();
            }
        });
+
+        // Focus on the AI drawer's close button when the jump-to element is focused.
+        this.jumpToElement.addEventListener('focus', () => {
+            this.aiDrawerCloseElement.focus();
+        });
+
+        // Focus on the summary action element when the AI drawer is focused.
+        this.aiDrawerElement.addEventListener('focus', () => {
+            this.summaryActionElement.focus();
+        });
    }

    /**
@@ -177,25 +200,42 @@ const AICourseAssist = class {
        // Close message drawer if it is shown.
        MessageDrawerHelper.hide();
        this.aiDrawerElement.classList.add('show');
+        this.aiDrawerElement.setAttribute('tabindex', '0');
        this.aiDrawerBodyElement.setAttribute('aria-live', 'polite');
        if (!this.pageElement.classList.contains('show-drawer-right')) {
            this.addPadding();
        }
-        // Disable the summary button.
-        this.disableSummaryButton();
+        this.jumpToElement.setAttribute('tabindex', 0);
+        this.jumpToElement.focus();
+
+        // If the AI drawer is opened on a small screen, we need to trap the focus tab within the AI drawer.
+        if (isSmall()) {
+            FocusLock.trapFocus(this.aiDrawerElement);
+            this.aiDrawerElement.setAttribute('aria-modal', 'true');
+            this.aiDrawerElement.setAttribute('role', 'dialog');
+            this.isDrawerFocusLocked = true;
+        }
    }

    /**
     * Close the AI drawer.
     */
    closeAIDrawer() {
+        // Untrap focus if it was locked.
+        if (this.isDrawerFocusLocked) {
+            FocusLock.untrapFocus();
+            this.aiDrawerElement.removeAttribute('aria-modal');
+            this.aiDrawerElement.setAttribute('role', 'region');
+        }
+
        this.aiDrawerElement.classList.remove('show');
+        this.aiDrawerElement.setAttribute('tabindex', '-1');
        this.aiDrawerBodyElement.removeAttribute('aria-live');
        if (this.pageElement.classList.contains('show-drawer-right') && this.aiDrawerBodyElement.dataset.removepadding === '1') {
            this.removePadding();
        }
-        // Enable the summary button.
-        this.enableSummaryButton();
+        this.jumpToElement.setAttribute('tabindex', -1);
+        this.summaryActionElement.focus();
    }

    /**
@@ -225,27 +265,6 @@ const AICourseAssist = class {
        this.aiDrawerBodyElement.dataset.removepadding = '0';
    }

-    /**
-     * Disable the summary button.
-     */
-    disableSummaryButton() {
-        const summaryButton = document.querySelector(Selectors.ACTIONS.SUMMARY);
-        if (summaryButton) {
-            summaryButton.setAttribute('disabled', 1);
-        }
-    }
-
-    /**
-     * Enable the summary button and focus on it.
-     */
-    enableSummaryButton() {
-        const summaryButton = document.querySelector(Selectors.ACTIONS.SUMMARY);
-        if (summaryButton) {
-            summaryButton.removeAttribute('disabled');
-            summaryButton.focus();
-        }
-    }
-
    /**
     * Check if the policy is accepted.
     * @return {bool} True if the policy is accepted, false otherwise.
@@ -26,6 +26,8 @@ export default {
        AIDRAWER_BODY: '#ai-drawer .ai-drawer-body',
        PAGE: '#page',
        MAIN_REGION: '[role="main"]',
+        JUMPTO: '.ai-course-summarise-controls [data-region="jumpto"]',
+        AIDRAWER_CLOSE: '#ai-drawer-close',
    },
    ACTIONS: {
        SUMMARY: '[data-action="course-summarise"]',
@@ -22,6 +22,7 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

+$string['aidrawerlabel'] = 'AI-generated content drawer';
 $string['aisummary'] = 'AI summary';
 $string['courseassist:summarise_text'] = 'Summarise text';
 $string['copy'] = 'Copy';
@@ -31,7 +31,7 @@
        "content": "<p>Content to display</p>"
    }
 }}
-<div class="ai-drawer" id="ai-drawer">
+<div class="ai-drawer" id="ai-drawer" aria-label={{#quote}}{{#str}} aidrawerlabel, aiplacement_courseassist {{/str}}{{/quote}} tabindex="-1" role="region">
    <div class="ai-drawer-header">
        <button id="ai-drawer-close" class="btn ai-drawer-button" type="button" data-action="course-summarise">
            {{#pix}} e/cancel, core {{/pix}}
@@ -33,6 +33,7 @@
            data-action="course-summarise"
            data-toggle="tooltip"
            data-html="true"
+            data-delay="200"
            title="{{#str}} summarise_tooltips, aiplacement_courseassist {{/str}}"
    >
        <span class="ai-course-summarise-sparkles-icon">
@@ -43,4 +44,5 @@
        </span>
        {{#str}} summarise, aiplacement_courseassist {{/str}}
    </button>
+    {{> core_message/message_jumpto }}
 </div>
@@ -1925,6 +1925,7 @@ class model {
                $uniqueid = $this->get_time_splitting()->append_rangeindex($dbprediction->sampleid, $dbprediction->rangeindex);
                $predictionrecords[$uniqueid]->id = $dbprediction->id;
            }
+            $dbpredictions->close();
        }

        return $predictionrecords;
@@ -0,0 +1,9 @@
+# core_auth (subsystem / plugintype) Upgrade notes
+
+## 4.5.5
+
+### Added
+
+- A new method called `get_additional_upgrade_token_parameters` has been added to `oauth2_client` class. This will allow custom clients to override this one and add their extra parameters for upgrade token request.
+
+  For more information see [MDL-80380](https://tracker.moodle.org/browse/MDL-80380)
@@ -87,7 +87,7 @@ Please log in as before, using the link on the login page.
 $string['emailpasswordchangeinfosubject'] = '{$a}: Change password information';
 $string['info'] = 'External account';
 $string['issuer'] = 'OAuth 2 service';
-$string['issuernologin'] = 'This issuer can not be used to login';
+$string['issuernologin'] = 'This issuer can not be used to log in.';
 $string['key'] = 'Key';
 $string['linkedlogins'] = 'Linked logins';
 $string['linkedloginshelp'] = 'Help with linked logins';
@@ -31,7 +31,7 @@ $string['auth_shib_contact_administrator'] = 'In case you are not associated wit
 $string['auth_shibbolethdescription'] = 'Using this method users are created and authenticated using Shibboleth. For set-up details, see the <a href="{$a}">Shibboleth README</a>.';
 $string['auth_shibboleth_errormsg'] = 'Please select the organization you are member of!';
 $string['auth_shibboleth_login'] = 'Shibboleth login';
-$string['auth_shibboleth_login_long'] = 'Login to Moodle via Shibboleth';
+$string['auth_shibboleth_login_long'] = 'Log in via Shibboleth';
 $string['auth_shibboleth_manual_login'] = 'Manual login';
 $string['auth_shibboleth_select_member'] = 'I\'m a member of ...';
 $string['auth_shibboleth_select_organization'] = 'For authentication via Shibboleth, please select your organisation from the drop-down menu:';
@@ -117,6 +117,11 @@ abstract class frontend {
        foreach ($enabled as $plugin => $info) {
            // Create plugin front-end object.
            $class = '\availability_' . $plugin . '\frontend';
+            if (!class_exists($class)) {
+                continue;
+            }
+
+            /** @var \core_availability\frontend $frontend */
            $frontend = new $class();

            // Add to array of required YUI modules.
@@ -792,11 +792,10 @@ abstract class info {
        // plugin could also rely on the completion plugin.
        $pluginmanager = \core_plugin_manager::instance();
        $enabled = $pluginmanager->get_enabled_plugins('availability');
-        $componentparams = new \stdClass();
        foreach ($enabled as $plugin => $info) {
-            // Use the static method.
+            /** @var \core_availability\condition $class */
            $class = '\availability_' . $plugin . '\condition';
-            if ($class::completion_value_used($course, $cmid)) {
+            if (class_exists($class) && $class::completion_value_used($course, $cmid)) {
                return true;
            }
        }
@@ -220,9 +220,9 @@ class tree extends tree_node {

            // First see if it's a condition. These have a defined type.
            if (isset($child->type)) {
-                // Look for a plugin of this type.
+                /** @var \core_availability\condition $classname */
                $classname = '\availability_' . $child->type . '\condition';
-                if (!array_key_exists($child->type, $enabled)) {
+                if (!array_key_exists($child->type, $enabled) || !class_exists($classname)) {
                    if ($lax) {
                        // On load of existing settings, ignore if class
                        // doesn't exist.
@@ -31,6 +31,6 @@ class core_availability_renderer extends plugin_renderer_base {
     */
    #[\core\attribute\deprecated(availability_info::class, since: '4.0', mdl: 'MDL-71691', final: true)]
    public function render_core_availability_multiple_messages(): void {
-        \core\deprecation::emit_deprecation_if_present([self::class, __FUNCTION__]);
+        \core\deprecation::emit_deprecation([self::class, __FUNCTION__]);
    }
 }
@@ -764,7 +764,7 @@ M.core_availability.List.prototype.clickAdd = function() {
    dialogRef.dialog = new M.core.dialogue(config);
    dialogRef.dialog.show();
    cancel.on('click', function() {
-        dialogRef.dialog.destroy();
+        dialogRef.dialog.hide();
        // Focus the button they clicked originally.
        this.inner.one('> .availability-button').one('button').focus();
    }, this);
@@ -801,7 +801,7 @@ M.core_availability.List.prototype.getAddHandler = function(type, dialogRef) {
        M.core_availability.form.rootList.renumber();
        this.updateHtml();
        // Hide dialog.
-        dialogRef.dialog.destroy();
+        dialogRef.dialog.hide();
        newItem.focusAfterAdd();
    };
 };
@@ -764,7 +764,7 @@ M.core_availability.List.prototype.clickAdd = function() {
    dialogRef.dialog = new M.core.dialogue(config);
    dialogRef.dialog.show();
    cancel.on('click', function() {
-        dialogRef.dialog.destroy();
+        dialogRef.dialog.hide();
        // Focus the button they clicked originally.
        this.inner.one('> .availability-button').one('button').focus();
    }, this);
@@ -801,7 +801,7 @@ M.core_availability.List.prototype.getAddHandler = function(type, dialogRef) {
        M.core_availability.form.rootList.renumber();
        this.updateHtml();
        // Hide dialog.
-        dialogRef.dialog.destroy();
+        dialogRef.dialog.hide();
        newItem.focusAfterAdd();
    };
 };
@@ -762,7 +762,7 @@ M.core_availability.List.prototype.clickAdd = function() {
    dialogRef.dialog = new M.core.dialogue(config);
    dialogRef.dialog.show();
    cancel.on('click', function() {
-        dialogRef.dialog.destroy();
+        dialogRef.dialog.hide();
        // Focus the button they clicked originally.
        this.inner.one('> .availability-button').one('button').focus();
    }, this);
@@ -799,7 +799,7 @@ M.core_availability.List.prototype.getAddHandler = function(type, dialogRef) {
        M.core_availability.form.rootList.renumber();
        this.updateHtml();
        // Hide dialog.
-        dialogRef.dialog.destroy();
+        dialogRef.dialog.hide();
        newItem.focusAfterAdd();
    };
 };
@@ -111,7 +111,7 @@ abstract class base_controller extends backup implements loggable {
     */
    #[\core\attribute\deprecated(since: '4.1', mdl: 'MDL-74548', final: true)]
    public function set_copy(): void {
-        \core\deprecation::emit_deprecation_if_present([self::class, __FUNCTION__]);
+        \core\deprecation::emit_deprecation([self::class, __FUNCTION__]);
    }

    /**
@@ -119,6 +119,6 @@ abstract class base_controller extends backup implements loggable {
     */
    #[\core\attribute\deprecated('restore_controller::get_copy()', since: '4.1', mdl: 'MDL-74548', final: true)]
    public function get_copy() {
-        \core\deprecation::emit_deprecation_if_present([self::class, __FUNCTION__]);
+        \core\deprecation::emit_deprecation([self::class, __FUNCTION__]);
    }
 }
@@ -1093,8 +1093,9 @@ class core_backup_renderer extends plugin_renderer_base {
            $sourceurl = new \moodle_url('/course/view.php', array('id' => $copy->sourceid));

            $tablerow = array(
-                html_writer::link($sourceurl, $copy->source),
-                $copy->destination,
+                html_writer::link($sourceurl, format_string($copy->source, true,
+                    ['context' => context_course::instance($copy->sourceid)])),
+                format_string($copy->destination, true, ['context' => context_course::instance($copy->sourceid)]),
                userdate($copy->timecreated),
                get_string($copy->operation),
                $this->get_status_display($copy->status, $copy->backupid, $copy->restoreid, $copy->operation)
@@ -37,6 +37,7 @@ if (empty($CFG->enablebadges)) {
 }
 $badge = new badge($badgeid);
 $context = $badge->get_context();
+$title = [get_string('alignment', 'badges'), $badge->name];
 $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));
 require_capability('moodle/badges:configuredetails', $context);

@@ -47,6 +48,7 @@ if ($badge->type == BADGE_TYPE_COURSE) {
    require_login($badge->courseid);
    $course = get_course($badge->courseid);
    $heading = format_string($course->fullname, true, ['context' => $context]);
+    $title[] = $heading;
    $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
    $PAGE->set_pagelayout('standard');
    navigation_node::override_active_url($navurl);
@@ -60,7 +62,7 @@ $currenturl = new moodle_url('/badges/alignment.php', array('id' => $badge->id))
 $PAGE->set_context($context);
 $PAGE->set_url($currenturl);
 $PAGE->set_heading($heading);
-$PAGE->set_title($badge->name);
+$PAGE->set_title(implode(\moodle_page::TITLE_SEPARATOR, $title));
 $PAGE->navbar->add($badge->name);

 $output = $PAGE->get_renderer('core', 'badges');
@@ -60,6 +60,7 @@ if (!empty($issuedbadge->recipient->id)) {
    $assertionid = $assertion->get_assertion_hash();
    $assertionentityid = $assertiondata['id'];
    $badgeadded = false;
+    $issuerexists = false;
    if (badges_open_badges_backpack_api() == OPEN_BADGES_V2) {
        $sitebackpack = badges_get_site_primary_backpack();
        $api = new \core_badges\backpack_api($sitebackpack);
@@ -71,62 +72,75 @@ if (!empty($issuedbadge->recipient->id)) {
            $issuer = $assertion->get_issuer();
            if (!($issuerentityid = badges_external_get_mapping($sitebackpack->id, OPEN_BADGES_V2_TYPE_ISSUER, $issuer['email']))) {
                $response = $api->put_issuer($issuer);
-                if (!$response) {
-                    throw new moodle_exception('invalidrequest', 'error');
+                if ($response) {
+                    $issuerexists = true;
+                    $issuerentityid = $response->id;
+                    badges_external_create_mapping(
+                        $sitebackpack->id,
+                        OPEN_BADGES_V2_TYPE_ISSUER,
+                        $issuer['email'],
+                        $issuerentityid,
+                    );
                }
-                $issuerentityid = $response->id;
-                badges_external_create_mapping($sitebackpack->id, OPEN_BADGES_V2_TYPE_ISSUER, $issuer['email'],
-                    $issuerentityid);
            }
-            // Create badge.
-            $badge = $assertion->get_badge_class(false);
-            $badgeid = $assertion->get_badge_id();
-            if (!($badgeentityid = badges_external_get_mapping($sitebackpack->id, OPEN_BADGES_V2_TYPE_BADGE, $badgeid))) {
-                $response = $api->put_badgeclass($issuerentityid, $badge);
-                if (!$response) {
-                    throw new moodle_exception('invalidrequest', 'error');
+            if ($issuerexists) {
+                // Create badge.
+                $badge = $assertion->get_badge_class(false);
+                $badgeid = $assertion->get_badge_id();
+                if (!($badgeentityid = badges_external_get_mapping($sitebackpack->id, OPEN_BADGES_V2_TYPE_BADGE, $badgeid))) {
+                    $response = $api->put_badgeclass($issuerentityid, $badge);
+                    if ($response) {
+                        $badgeentityid = $response->id;
+                        badges_external_create_mapping(
+                            $sitebackpack->id,
+                            OPEN_BADGES_V2_TYPE_BADGE,
+                            $badgeid,
+                            $badgeentityid,
+                        );
+                    }
                }
-                $badgeentityid = $response->id;
-                badges_external_create_mapping($sitebackpack->id, OPEN_BADGES_V2_TYPE_BADGE, $badgeid,
-                    $badgeentityid);
-            }

-            // Create assertion (Award the badge!).
-            $assertionentityid = badges_external_get_mapping(
-                $sitebackpack->id,
-                OPEN_BADGES_V2_TYPE_ASSERTION,
-                $assertionid
-            );
-
-            if ($assertionentityid && strpos($sitebackpack->backpackapiurl, 'badgr')) {
-                $assertionentityid = badges_generate_badgr_open_url(
-                    $sitebackpack,
-                    OPEN_BADGES_V2_TYPE_ASSERTION,
-                    $assertionentityid
-                );
-            }
-
-            // Create an assertion for the recipient in the issuer's account.
-            if (!$assertionentityid) {
-                $response = $api->put_badgeclass_assertion($badgeentityid, $assertiondata);
-                if (!$response) {
-                    throw new moodle_exception('invalidrequest', 'error');
-                }
-                $assertionentityid = badges_generate_badgr_open_url($sitebackpack, OPEN_BADGES_V2_TYPE_ASSERTION, $response->id);
-                $badgeadded = true;
-                badges_external_create_mapping($sitebackpack->id, OPEN_BADGES_V2_TYPE_ASSERTION, $assertionid,
-                    $response->id);
-            } else {
-                // An assertion already exists. Make sure it's up to date.
-                $internalid = badges_external_get_mapping(
+                // Create assertion (Award the badge!).
+                $assertionentityid = badges_external_get_mapping(
                    $sitebackpack->id,
                    OPEN_BADGES_V2_TYPE_ASSERTION,
-                    $assertionid,
-                    'externalid'
+                    $assertionid
                );
-                $response = $api->update_assertion($internalid, $assertiondata);
-                if (!$response) {
-                    throw new moodle_exception('invalidrequest', 'error');
+
+                if ($assertionentityid && strpos($sitebackpack->backpackapiurl, 'badgr')) {
+                    $assertionentityid = badges_generate_badgr_open_url(
+                        $sitebackpack,
+                        OPEN_BADGES_V2_TYPE_ASSERTION,
+                        $assertionentityid
+                    );
+                }
+
+                // Create an assertion for the recipient in the issuer's account.
+                if (!$assertionentityid) {
+                    $response = $api->put_badgeclass_assertion($badgeentityid, $assertiondata);
+                    if ($response) {
+                        $assertionentityid = badges_generate_badgr_open_url(
+                            $sitebackpack,
+                            OPEN_BADGES_V2_TYPE_ASSERTION,
+                            $response->id,
+                        );
+                        $badgeadded = true;
+                        badges_external_create_mapping(
+                            $sitebackpack->id,
+                            OPEN_BADGES_V2_TYPE_ASSERTION,
+                            $assertionid,
+                            $response->id,
+                        );
+                    }
+                } else {
+                    // An assertion already exists. Make sure it's up to date.
+                    $internalid = badges_external_get_mapping(
+                        $sitebackpack->id,
+                        OPEN_BADGES_V2_TYPE_ASSERTION,
+                        $assertionid,
+                        'externalid'
+                    );
+                    $response = $api->update_assertion($internalid, $assertiondata);
                }
            }
        }
@@ -136,21 +150,61 @@ if (!empty($issuedbadge->recipient->id)) {
    // - If a user and site backpack have the same provider we can skip this as Badgr automatically maps recipients
    // based on email address.
    // - This is only needed when the backpacks are from different regions.
-    if ($assertionentityid && !badges_external_get_mapping($userbackpack->id, OPEN_BADGES_V2_TYPE_ASSERTION, $assertionid)) {
+    if (
+        $assertionentityid
+        && (!$issuerexists || !badges_external_get_mapping($userbackpack->id, OPEN_BADGES_V2_TYPE_ASSERTION, $assertionid))
+    ) {
        $userapi = new \core_badges\backpack_api($userbackpack, $backpack);
        $userapi->authenticate();
        $response = $userapi->import_badge_assertion($assertionentityid);
-        if (!$response) {
-            throw new moodle_exception('invalidrequest', 'error');
+        if ($response) {
+            $assertionentityid = $response->id;
+            $badgeadded = true;
+            badges_external_create_mapping(
+                $userbackpack->id,
+                OPEN_BADGES_V2_TYPE_ASSERTION,
+                $assertionid,
+                $assertionentityid,
+            );
        }
-        $assertionentityid = $response->id;
-        $badgeadded = true;
-        badges_external_create_mapping($userbackpack->id, OPEN_BADGES_V2_TYPE_ASSERTION, $assertionid,
-            $assertionentityid);
    }

-    $response = $badgeadded ? ['success' => 'addedtobackpack'] : ['warning' => 'existsinbackpack'];
-    redirect(new moodle_url('/badges/mybadges.php', $response));
+    if ($badgeadded) {
+        $message = get_string('addedtobackpack', 'badges');
+        $messagetype = \core\output\notification::NOTIFY_SUCCESS;
+    } else {
+        if (isset($userapi) && !empty($userapi->get_errors())) {
+            // If the api used to import the badge to the backpack has errors, show them to inform the user.
+            if (array_filter($userapi->get_errors(), fn($element) => str_contains($element, "DUPLICATE_BADGE"))) {
+                // Duplicated badges are displayed as a warning.
+                $message = get_string('existsinbackpack', 'badges');
+                $messagetype = \core\output\notification::NOTIFY_WARNING;
+            } else {
+                // If the userapi has any other errors, we will use those to inform the user.
+                $message = get_string(
+                    'error:cannotsendtobackpack',
+                    'badges',
+                    implode($userapi->get_errors()),
+                );
+                $messagetype = \core\output\notification::NOTIFY_ERROR;
+            }
+        } else if (isset($api) && !empty($api->get_errors())) {
+            // If the api used to create/update the issuer has errors, show them to inform the user.
+            $errors = $api->get_errors() ?? [get_string('invalidrequest', 'error')];
+            $message = get_string(
+                'error:cannotsendtobackpack',
+                'badges',
+                implode($errors),
+            );
+            $messagetype = \core\output\notification::NOTIFY_ERROR;
+        }
+    }
+
+    redirect(
+        url: new \core\url('/badges/mybadges.php'),
+        message: $message,
+        messagetype: $messagetype,
+    );
 } else {
-    redirect(new moodle_url('/badges/mybadges.php'));
+    redirect(new \core\url('/badges/mybadges.php'));
 }
@@ -56,7 +56,7 @@ if ($action == 'delete' && $confirm && confirm_sesskey()) {
    } else {
        $msg = get_string('sitebackpacknotdeleted', 'badges');
    }
-} else if ($action == 'moveup' || $action == 'movedown') {
+} else if (($action == 'moveup' || $action == 'movedown') && confirm_sesskey()) {
    // If no backpack has been selected, there isn't anything to move.
    if (empty($id)) {
        redirect($url);
@@ -512,6 +512,20 @@ class backpack_api {
        return backpack_api_mapping::get_authentication_error();
    }

+    /**
+     * List all errors occurred during the requests to the backpack.
+     *
+     * @return array The list of errors.
+     */
+    public function get_errors(): array {
+        $errors = [];
+        foreach ($this->mappings as $mapping) {
+            $errors = array_merge($errors, $mapping->get_errors());
+        }
+
+        return $errors;
+    }
+
    /**
     * Get the list of badges in a collection.
     *
@@ -81,6 +81,9 @@ class backpack_api_mapping {
    /** @var int OpenBadges version. */
    protected $backpackapiversion;

+    /** @var array Errors encountered during the request. */
+    protected $errors = [];
+
    /**
     * Create a mapping.
     *
@@ -146,6 +149,26 @@ class backpack_api_mapping {
        return self::$authenticationerror;
    }

+    /**
+     * Get the errors encountered during the request.
+     *
+     * @return array The list of errors.
+     */
+    public function get_errors() {
+        return $this->errors;
+    }
+
+    /**
+     * Add an error to the list of errors.
+     *
+     * @param string $error The error message.
+     * @return self This instance for method chaining.
+     */
+    public function add_error(string $error): self {
+        $this->errors[] = $error;
+        return $this;
+    }
+
    /**
     * Does the action match this mapping?
     *
@@ -342,6 +365,23 @@ class backpack_api_mapping {
            $response = $curl->put($url, $post, $options);
        }
        $response = json_decode($response);
+        if ($response === null) {
+            $this->add_error(get_string('invalidrequest', 'error'));
+            return null;
+        }
+        if (isset($response->status) && isset($response->status->success) && $response->status->success != true) {
+            // If the response wasn't successful, store the errors and return null.
+            if (isset($response->validationErrors)) {
+                $error = implode(', ', $response->validationErrors);
+            } else if (isset($response->status->description)) {
+                $error = $response->status->description;
+            } else {
+                $error = get_string('invalidrequest', 'error');
+            }
+            $this->add_error($error);
+            return null;
+        }
+
        if (isset($response->result)) {
            $response = $response->result;
        }
@@ -130,6 +130,38 @@ class badge extends base {
                return html_writer::link($url, $row->name);
            });

+        // Name with image and link.
+        $columns[] = (new column(
+            'namewithimagelink',
+            new lang_string('namewithimagelink', 'core_badges'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->add_join("LEFT JOIN {context} {$contextalias}
+                    ON {$contextalias}.contextlevel = " . CONTEXT_COURSE . "
+                   AND {$contextalias}.instanceid = {$badgealias}.courseid")
+            ->add_fields(
+                "{$badgealias}.name, {$badgealias}.id, {$badgealias}.type, {$badgealias}.courseid"
+            )
+            ->add_field($DB->sql_cast_to_char("{$badgealias}.imagecaption"), 'imagecaption')
+            ->add_fields(context_helper::get_preload_record_columns_sql($contextalias))
+            ->set_is_sortable(true)
+            ->add_callback(static function ($value, stdClass $badge): string {
+                if ($badge->id === null) {
+                    return '';
+                }
+                if ($badge->type == BADGE_TYPE_SITE) {
+                    $context = context_system::instance();
+                } else {
+                    context_helper::preload_from_record($badge);
+                    $context = context_course::instance($badge->courseid);
+                }
+
+                $badgeimage = moodle_url::make_pluginfile_url($context->id, 'badges', 'badgeimage', $badge->id, '/', 'f2');
+                $url = new moodle_url('/badges/overview.php', ['id' => $badge->id]);
+                return html_writer::img($badgeimage, $badge->imagecaption) . ' ' . html_writer::link($url, $badge->name);
+            });
+
        // Description (note, this column contains plaintext so requires no post-processing).
        $descriptionfieldsql = "{$badgealias}.description";
        if ($DB->get_dbfamily() === 'oracle') {
@@ -94,8 +94,6 @@ class badges extends system_report {
        $this->add_filters();
        $this->add_actions();

-        // Set initial sorting by name.
-        $this->set_initial_sort_column('badge:namewithlink', SORT_ASC);
        $this->set_default_no_results_notice(new lang_string('nomatchingbadges', 'core_badges'));

        // Set if report can be downloaded.
@@ -129,8 +127,7 @@ class badges extends system_report {
     */
    public function add_columns(string $badgeissuedalias): void {
        $columns = [
-            'badge:image',
-            'badge:namewithlink',
+            'badge:namewithimagelink',
            'badge:status',
            'badge:criteria',
        ];
@@ -138,15 +135,12 @@ class badges extends system_report {
        $canviewdraftbadges = $this->can_view_draft_badges();
        if (!$canviewdraftbadges) {
            // Remove status and recipients column.
-            unset($columns[2]);
+            unset($columns[1]);
        }
        $this->add_columns_from_entities($columns);

-        // Remove title from image column.
-        $this->get_column('badge:image')->set_title(null);
-
-        // Change title from namewithlink column.
-        $this->get_column('badge:namewithlink')->set_title(new lang_string('name'));
+        // Change title of the `namewithimagelink` column to 'Name'.
+        $this->get_column('badge:namewithimagelink')->set_title(new lang_string('name'));

        // Recipients column.
        if ($canviewdraftbadges) {
@@ -193,7 +187,7 @@ class badges extends system_report {
                return $OUTPUT->action_icon($badgeurl, $icon, null, null, true);
            });

-        $this->set_initial_sort_column('badge:namewithlink', SORT_ASC);
+        $this->set_initial_sort_column('badge:namewithimagelink', SORT_ASC);
    }

    /**
@@ -51,7 +51,7 @@ class course_badges extends system_report {
     */
    #[\core\attribute\deprecated('course_badges::initialise', since: '4.5', mdl: 'MDL-82503')]
    protected function initialise(): void {
-        \core\deprecation::emit_deprecation_if_present([$this, __FUNCTION__]);
+        \core\deprecation::emit_deprecation([$this, __FUNCTION__]);
        global $USER;
        // Our main entity, it contains all of the column definitions that we need.
        $badgeentity = new badge();
@@ -103,7 +103,7 @@ class course_badges extends system_report {
     */
    #[\core\attribute\deprecated('course_badges::can_view', since: '4.5', mdl: 'MDL-82503')]
    protected function can_view(): bool {
-        \core\deprecation::emit_deprecation_if_present([$this, __FUNCTION__]);
+        \core\deprecation::emit_deprecation([$this, __FUNCTION__]);
        return has_capability('moodle/badges:viewbadges', $this->get_context());
    }

@@ -118,7 +118,7 @@ class course_badges extends system_report {
     */
    #[\core\attribute\deprecated('course_badges::add_columns', since: '4.5', mdl: 'MDL-82503')]
    protected function add_columns(): void {
-        \core\deprecation::emit_deprecation_if_present([$this, __FUNCTION__]);
+        \core\deprecation::emit_deprecation([$this, __FUNCTION__]);
        $badgeissuedalias = $this->get_entity('badge_issued')->get_table_alias('badge_issued');

        $this->add_columns_from_entities([
@@ -156,7 +156,7 @@ class course_badges extends system_report {
     */
    #[\core\attribute\deprecated('course_badges::add_filters', since: '4.5', mdl: 'MDL-82503')]
    protected function add_filters(): void {
-        \core\deprecation::emit_deprecation_if_present([$this, __FUNCTION__]);
+        \core\deprecation::emit_deprecation([$this, __FUNCTION__]);
        $this->add_filters_from_entities([
            'badge:name',
            'badge_issued:issued',
@@ -38,6 +38,7 @@ if (empty($CFG->enablebadges)) {

 $badge = new badge($badgeid);
 $context = $badge->get_context();
+$title = [get_string('bcriteria', 'badges'), $badge->name];
 $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));

 require_capability('moodle/badges:configurecriteria', $context);
@@ -49,6 +50,7 @@ if ($badge->type == BADGE_TYPE_COURSE) {
    require_login($badge->courseid);
    $course = get_course($badge->courseid);
    $heading = format_string($course->fullname, true, ['context' => $context]);
+    $title[] = $heading;
    $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
    $PAGE->set_pagelayout('standard');
    navigation_node::override_active_url($navurl);
@@ -63,7 +65,7 @@ $currenturl = new moodle_url('/badges/criteria.php', array('id' => $badge->id));
 $PAGE->set_context($context);
 $PAGE->set_url($currenturl);
 $PAGE->set_heading($heading);
-$PAGE->set_title($badge->name);
+$PAGE->set_title(implode(\moodle_page::TITLE_SEPARATOR, $title));
 $PAGE->navbar->add($badge->name, $currenturl);

 $output = $PAGE->get_renderer('core', 'badges');
@@ -41,6 +41,7 @@ require_login();

 $return = new moodle_url('/badges/criteria.php', array('id' => $badgeid));
 $badge = new badge($badgeid);
+$title = [get_string('addcriterion', 'badges'), $badge->name];
 $context = $badge->get_context();
 $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));

@@ -65,6 +66,7 @@ if ($badge->type == BADGE_TYPE_COURSE) {
    require_login($badge->courseid);
    $course = get_course($badge->courseid);
    $heading = format_string($course->fullname, true, ['context' => $context]);
+    $title[] = $heading;
    $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
    $PAGE->set_pagelayout('standard');
    navigation_node::override_active_url($navurl);
@@ -78,7 +80,7 @@ $urlparams = array('badgeid' => $badgeid, 'edit' => $edit, 'type' => $type, 'cri
 $PAGE->set_context($context);
 $PAGE->set_url('/badges/criteria_settings.php', $urlparams);
 $PAGE->set_heading($heading);
-$PAGE->set_title($badge->name);
+$PAGE->set_title(implode(\moodle_page::TITLE_SEPARATOR, $title));
 $PAGE->navbar->add($badge->name, new moodle_url('overview.php', array('id' => $badge->id)))
    ->add(get_string('bcriteria', 'badges'), new moodle_url('criteria.php', ['id' => $badge->id]))
    ->add(get_string('criteria_' . $type, 'badges'));
@@ -119,4 +121,4 @@ if (!empty($addcourse)) {

 echo $OUTPUT->header();
 $mform->display();
-echo $OUTPUT->footer();
+echo $OUTPUT->footer();
@@ -56,8 +56,10 @@ if (!empty($badgeid)) {
    // Check capabilities.
    $context = $badge->get_context();
    if ($action == 'message') {
+        $title = [get_string('configuremessage', 'badges'), $badge->name];
        require_capability('moodle/badges:configuremessages', $context);
    } else {
+        $title = [get_string('badgedetails', 'badges'), $badge->name];
        require_capability('moodle/badges:configuredetails', $context);
    }

@@ -78,6 +80,7 @@ if (!empty($badgeid)) {

    $params = ['courseid' => $courseid];
    $badgename = get_string('create', 'badges');
+    $title = [$badgename];

    // Check capabilities.
    require_capability('moodle/badges:createbadge', $context);
@@ -94,6 +97,7 @@ $navurl = new moodle_url('/badges/index.php', ['type' => $badge->type]);
 if ($badge->type == BADGE_TYPE_COURSE) {
    require_login($badge->courseid);
    $heading = format_string($course->fullname, true, ['context' => $context]);
+    $title[] = $heading;
    $navurl = new moodle_url('/badges/index.php', ['type' => $badge->type, 'id' => $badge->courseid]);
    $PAGE->set_pagelayout('incourse');
    navigation_node::override_active_url($navurl);
@@ -108,7 +112,7 @@ $currenturl = new moodle_url('/badges/edit.php', $params);
 $PAGE->set_context($context);
 $PAGE->set_url($currenturl);
 $PAGE->set_heading($heading);
-$PAGE->set_title($badgename);
+$PAGE->set_title(implode(\moodle_page::TITLE_SEPARATOR, $title));
 $PAGE->add_body_class('limitedwidth');
 $PAGE->navbar->add($badgename);

@@ -36,6 +36,7 @@ if (empty($CFG->enablebadges)) {

 $badge = new badge($badgeid);
 $context = $badge->get_context();
+$title = [get_string('bendorsement', 'badges'), $badge->name];
 $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));
 require_capability('moodle/badges:configuredetails', $context);

@@ -46,6 +47,7 @@ if ($badge->type == BADGE_TYPE_COURSE) {
    require_login($badge->courseid);
    $course = get_course($badge->courseid);
    $heading = format_string($course->fullname, true, ['context' => $context]);
+    $title[] = $heading;
    $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
    $PAGE->set_pagelayout('standard');
    navigation_node::override_active_url($navurl);
@@ -59,7 +61,7 @@ $currenturl = new moodle_url('/badges/endorsement.php', array('id' => $badgeid))
 $PAGE->set_context($context);
 $PAGE->set_url($currenturl);
 $PAGE->set_heading($heading);
-$PAGE->set_title($badge->name);
+$PAGE->set_title(implode(\moodle_page::TITLE_SEPARATOR, $title));
 $PAGE->navbar->add($badge->name);

 $output = $PAGE->get_renderer('core', 'badges');
@@ -39,6 +39,7 @@ if (empty($CFG->enablebadges)) {
 $badge = new badge($badgeid);
 $context = $badge->get_context();
 $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));
+$title = [$badge->name];

 if ($badge->type == BADGE_TYPE_COURSE) {
    if (empty($CFG->badges_allowcoursebadges)) {
@@ -47,6 +48,7 @@ if ($badge->type == BADGE_TYPE_COURSE) {
    require_login($badge->courseid);
    $course = get_course($badge->courseid);
    $heading = format_string($course->fullname, true, ['context' => $context]);
+    $title[] = $heading;

    $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
    $PAGE->set_pagelayout('standard');
@@ -62,7 +64,7 @@ $currenturl = new moodle_url('/badges/overview.php', array('id' => $badge->id));
 $PAGE->set_context($context);
 $PAGE->set_url($currenturl);
 $PAGE->set_heading($heading);
-$PAGE->set_title($badge->name);
+$PAGE->set_title(implode(\moodle_page::TITLE_SEPARATOR, $title));
 $PAGE->navbar->add($badge->name);

 require_capability('moodle/badges:viewbadges', $context);
@@ -40,6 +40,7 @@ if (empty($CFG->enablebadges)) {

 $badge = new badge($badgeid);
 $context = $badge->get_context();
+$title = [get_string('awards', 'badges'), $badge->name];
 $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));

 require_capability('moodle/badges:viewawarded', $context);
@@ -51,6 +52,7 @@ if ($badge->type == BADGE_TYPE_COURSE) {
    require_login($badge->courseid);
    $course = get_course($badge->courseid);
    $heading = format_string($course->fullname, true, ['context' => $context]);
+    $title[] = $heading;
    $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
    $PAGE->set_pagelayout('standard');
    navigation_node::override_active_url($navurl);
@@ -63,7 +65,7 @@ if ($badge->type == BADGE_TYPE_COURSE) {
 $PAGE->set_context($context);
 $PAGE->set_url('/badges/recipients.php', ['id' => $badgeid]);
 $PAGE->set_heading($heading);
-$PAGE->set_title($badge->name);
+$PAGE->set_title(implode(\moodle_page::TITLE_SEPARATOR, $title));
 $PAGE->navbar->add($badge->name);

 /** @var core_badges_renderer $output */
@@ -40,6 +40,7 @@ if (empty($CFG->enablebadges)) {

 $badge = new badge($badgeid);
 $context = $badge->get_context();
+$title = [get_string('relatedbages', 'badges'), $badge->name];
 $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));
 require_capability('moodle/badges:configuredetails', $context);

@@ -50,6 +51,7 @@ if ($badge->type == BADGE_TYPE_COURSE) {
    require_login($badge->courseid);
    $course = get_course($badge->courseid);
    $heading = format_string($course->fullname, true, ['context' => $context]);
+    $title[] = $heading;

    $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type, 'id' => $badge->courseid));
    $PAGE->set_pagelayout('standard');
@@ -64,7 +66,7 @@ $currenturl = new moodle_url('/badges/related.php', array('id' => $badge->id));
 $PAGE->set_context($context);
 $PAGE->set_url($currenturl);
 $PAGE->set_heading($heading);
-$PAGE->set_title($badge->name);
+$PAGE->set_title(implode(\moodle_page::TITLE_SEPARATOR, $title));
 $PAGE->navbar->add($badge->name);
 $output = $PAGE->get_renderer('core', 'badges');
 $msg = optional_param('msg', '', PARAM_TEXT);
@@ -56,13 +56,13 @@
            <td> {{{backpackweburl}}} </td>
            <td>
                {{#canmoveup}}
-                    <a href="{{baseurl}}?id={{id}}&action=moveup">{{#pix}}t/up, core,{{#str}}moveup{{/str}}{{/pix}}</a>
+                    <a href="{{baseurl}}?id={{id}}&sesskey={{sesskey}}&action=moveup">{{#pix}}t/up, core,{{#str}}moveup{{/str}}{{/pix}}</a>
                {{/canmoveup}}
                {{^canmoveup}}
                    {{#pix}}spacer, moodle{{/pix}}
                {{/canmoveup}}
                {{#canmovedown}}
-                    <a href="{{baseurl}}?id={{id}}&action=movedown">{{#pix}}t/down, core,{{#str}}movedown{{/str}}{{/pix}}</a>
+                    <a href="{{baseurl}}?id={{id}}&sesskey={{sesskey}}&action=movedown">{{#pix}}t/down, core,{{#str}}movedown{{/str}}{{/pix}}</a>
                {{/canmovedown}}
                {{^canmovedown}}
                    {{#pix}}spacer, moodle{{/pix}}
@@ -118,6 +118,7 @@ Feature: Manage badges
      | Admin User |
      | User One   |

+  @accessibility
  Scenario: View list of badges with recipients
    Given the following "users" exist:
      | username | firstname | lastname |
@@ -139,6 +140,7 @@ Feature: Manage badges
      | Badge #1 | Not available | 2          |
      | Badge #2 | Available     | 1          |
      | Badge #3 | Available     | 0          |
+    And the "Badges" "table" should meet accessibility standards with "best-practice" extra tests

  @_file_upload
  Scenario: Badge names are not unique anymore
@@ -125,6 +125,7 @@ final class badges_test extends core_reportbuilder_testcase {
        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'user:fullname', 'sortenabled' => 1]);

        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'badge:namewithlink']);
+        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'badge:namewithimagelink']);
        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'badge:criteria']);
        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'badge:image']);
        $generator->create_column(['reportid' => $report->get('id'), 'uniqueidentifier' => 'badge:language']);
@@ -146,11 +147,12 @@ final class badges_test extends core_reportbuilder_testcase {
            ['id' => $badgeone->id]), ($badgeone->name));

        // First badge, issued to user one.
-        [$badgename, $fullname, $namewithlink, $criteria, $image, $language, $version, $status, $expiry, $tag, $expires,
-            $visible, $coursename] = array_values($content[0]);
+        [$badgename, $fullname, $namewithlink, $namewithimagelink, $criteria, $image, $language, $version, $status, $expiry, $tag,
+            $expires, $visible, $coursename] = array_values($content[0]);
        $this->assertEquals($badgeone->name, $badgename);
        $this->assertEquals(fullname($user1), $fullname);
        $this->assertEquals($expectedbadgeonelink, $namewithlink);
+        $this->assertEquals($image . ' ' . $expectedbadgeonelink, $namewithimagelink);
        $this->assertStringContainsString('Awarded by: Manager', $criteria);
        $this->assertStringContainsString('Image caption', $image);
        $this->assertEquals('German', $language);
@@ -163,11 +165,12 @@ final class badges_test extends core_reportbuilder_testcase {
        $this->assertEquals('PHPUnit test site', $coursename);

        // First badge, issued to user two.
-        [$badgename, $fullname, $namewithlink, $criteria, $image, $language, $version, $status, $expiry, $tag, $expires,
-            $visible, $coursename] = array_values($content[1]);
+        [$badgename, $fullname, $namewithlink, $namewithimagelink, $criteria, $image, $language, $version, $status, $expiry, $tag,
+            $expires, $visible, $coursename] = array_values($content[1]);
        $this->assertEquals($badgeone->name, $badgename);
        $this->assertEquals(fullname($user2), $fullname);
        $this->assertEquals($expectedbadgeonelink, $namewithlink);
+        $this->assertEquals($image . ' ' . $expectedbadgeonelink, $namewithimagelink);
        $this->assertStringContainsString('Awarded by: Manager', $criteria);
        $this->assertStringContainsString('Image caption', $image);
        $this->assertEquals('German', $language);
@@ -183,11 +186,12 @@ final class badges_test extends core_reportbuilder_testcase {
            ['id' => $badgetwo->id]), ($badgetwo->name));

        // Course badge, not issues to any users.
-        [$badgename, $fullname, $namewithlink, $criteria, $image, $language, $version, $status, $expiry, $tag, $expires,
-            $visible, $coursename] = array_values($content[2]);
+        [$badgename, $fullname, $namewithlink, $namewithimagelink, $criteria, $image, $language, $version, $status, $expiry, $tag,
+            $expires, $visible, $coursename] = array_values($content[2]);
        $this->assertEquals($badgetwo->name, $badgename);
        $this->assertEmpty($fullname);
        $this->assertEquals($expectedbadgetwolink, $namewithlink);
+        $this->assertEquals($image . ' ' . $expectedbadgetwolink, $namewithimagelink);
        $this->assertEquals('Criteria for this badge have not been set up yet.', $criteria);
        $this->assertStringContainsString('Image caption', $image);
        $this->assertEquals('English', $language);
@@ -95,7 +95,7 @@ class fetch_addable_blocks extends external_api {
        }

        // Firstly, we need to load all currently existing page blocks to later determine which blocks are addable.
-        $page->blocks->load_blocks(false);
+        $page->blocks->load_blocks(true);
        $page->blocks->create_all_block_instances();

        $addableblocks = $page->blocks->get_addable_blocks();
@@ -441,6 +441,11 @@ class block_edit_form extends \core_form\dynamic_form {
            $blockregion = $this->optional_param('blockregion', null, PARAM_TEXT);
            $newblock = $this->page->blocks->add_block_at_end_of_default_region($this->block->name(),
                empty($blockregion) ? null : $blockregion);
+
+            if (empty($newblock)) {
+                return;
+            }
+
            $this->page->blocks->load_blocks();
            $newblock = $this->page->blocks->find_instance($newblock->instance->id);
            $newdata = $this->prepare_defaults($newblock->instance);
@@ -32,7 +32,9 @@
 * @todo MDL-36050 improve capability check on stick blocks, so we can check user capability before sending images.
 */
 function block_html_pluginfile($course, $birecord_or_cm, $context, $filearea, $args, $forcedownload, array $options=array()) {
-    global $DB, $CFG, $USER;
+    global $CFG;
+
+    require_once("{$CFG->dirroot}/user/lib.php");

    if ($context->contextlevel != CONTEXT_BLOCK) {
        send_file_not_found();
@@ -51,9 +53,12 @@ function block_html_pluginfile($course, $birecord_or_cm, $context, $filearea, $a
            if (!core_course_category::get($parentcontext->instanceid, IGNORE_MISSING)) {
                send_file_not_found();
            }
-        } else if ($parentcontext->contextlevel === CONTEXT_USER && $parentcontext->instanceid != $USER->id) {
-            // The block is in the context of a user, it is only visible to the user who it belongs to.
-            send_file_not_found();
+        } else if ($parentcontext->contextlevel === CONTEXT_USER) {
+            $user = core_user::get_user($parentcontext->instanceid, '*', MUST_EXIST);
+            $extracaps = block_method_result('html', 'get_extra_capabilities');
+            if (!user_can_view_profile($user, null, $parentcontext) || !has_any_capability($extracaps, $context)) {
+                send_file_not_found();
+            }
        }
        // At this point there is no way to check SYSTEM context, so ignoring it.
    }
@@ -297,6 +297,7 @@ final class provider_test extends \core_privacy\tests\provider_testcase {
        $user = $this->getDataGenerator()->create_user();
        $course = $this->getDataGenerator()->create_course();
        $this->setUser($user);
+        $this->getDataGenerator()->enrol_user($user->id, $course->id, 'editingteacher');

        $block = $this->create_course_block($course, $title, $content, $format);
        $context = \context_block::instance($block->instance->id);
@@ -324,6 +325,7 @@ final class provider_test extends \core_privacy\tests\provider_testcase {
        $user = $this->getDataGenerator()->create_user();
        $course = $this->getDataGenerator()->create_course();
        $this->setUser($user);
+        $this->getDataGenerator()->enrol_user($user->id, $course->id, 'editingteacher');

        $block = $this->create_course_block($course, $title, $content, $format);
        $context = \context_block::instance($block->instance->id);
@@ -369,6 +371,7 @@ final class provider_test extends \core_privacy\tests\provider_testcase {
        $this->setUser($user2);

        $course = $this->getDataGenerator()->create_course();
+        $this->getDataGenerator()->enrol_user($user2->id, $course->id, 'editingteacher');
        $courseblock = $this->create_course_block($course, $title, $content, $blockformat);
        $coursecontext = \context_block::instance($courseblock->instance->id);

@@ -591,7 +591,7 @@ class main implements renderable, templatable {
        if ($CFG->coursecreationguide) {
            // Add quickstart guide link.
            $quickstart = new \moodle_url($CFG->coursecreationguide, ['lang' => current_language()]);
-            $docparams = [
+            $docparams += [
                'quickhref' => $quickstart->out(),
                'quicktitle' => get_string('viewquickstart', 'block_myoverview'),
                'quicktarget' => '_blank',
@@ -24,8 +24,6 @@
 }}

 <div id="block-myoverview-{{uniqid}}" class="block-myoverview block-cards" data-region="myoverview" role="navigation">
-    <hr class="mt-0"/>
-
    <div role="search" data-region="filter" class="d-flex align-items-center my-2" aria-label="{{#str}} aria:controls, block_myoverview {{/str}}">
        <div class="row g-0">
            {{> block_myoverview/nav-grouping-selector }}
@@ -51,7 +51,7 @@
                            {{{icon}}}
                        </div>
                        <div class="w-100 line-height-3 text-truncate ms-2">
-                            <h6 class="mb-0 text-truncate"><span class="clickable">{{{name}}}</span></h6>
+                            <h4 class="mb-0 text-truncate h6"><span class="clickable">{{{name}}}</span></h4>
                            <small class="text-truncate mb-0">{{{coursename}}}</small>
                        </div>
                    </div>
@@ -13,3 +13,7 @@
 .block_social_activities .instancename {
    word-break: break-all;
 }
+
+.block_social_activities .inplaceeditable.inplaceeditingon input {
+    width: 100%;
+}
@@ -44,6 +44,7 @@ final class externallib_test extends externallib_advanced_testcase {
        global $DB, $FULLME;

        $this->resetAfterTest(true);
+        $this->setAdminUser();

        $user = $this->getDataGenerator()->create_user();
        $course = $this->getDataGenerator()->create_course();
@@ -77,6 +78,7 @@ final class externallib_test extends externallib_advanced_testcase {
        global $DB, $FULLME;

        $this->resetAfterTest(true);
+        $this->setAdminUser();

        $user = $this->getDataGenerator()->create_user();

@@ -141,6 +143,7 @@ final class externallib_test extends externallib_advanced_testcase {
        global $DB, $FULLME;

        $this->resetAfterTest(true);
+        $this->setAdminUser();

        $user = $this->getDataGenerator()->create_user();
        $course = $this->getDataGenerator()->create_course();
@@ -237,6 +240,7 @@ final class externallib_test extends externallib_advanced_testcase {
        global $DB, $CFG;

        $this->resetAfterTest(true);
+        $this->setAdminUser();

        // Enable MathJax filter in content and headings.
        $this->configure_filters([
@@ -362,6 +366,7 @@ final class externallib_test extends externallib_advanced_testcase {
    public function test_get_dashboard_blocks_default_dashboard_including_sticky_block(): void {
        global $PAGE, $DB;
        $this->resetAfterTest(true);
+        $this->setAdminUser();

        $user = $this->getDataGenerator()->create_user();
        $PAGE->set_url('/my/index.php');    // Need this because some internal API calls require the $PAGE url to be set.
@@ -410,6 +415,7 @@ final class externallib_test extends externallib_advanced_testcase {
    public function test_get_dashboard_blocks_custom_user_dashboard(): void {
        global $PAGE, $DB;
        $this->resetAfterTest(true);
+        $this->setAdminUser();

        $user = $this->getDataGenerator()->create_user();
        $PAGE->set_url('/my/index.php');    // Need this because some internal API calls require the $PAGE url to be set.
@@ -62,13 +62,6 @@ if ($id) {

 $sitecontext = context_system::instance();
 $usercontext = context_user::instance($userid);
-if ($modid) {
-    $PAGE->set_context($sitecontext);
-} else {
-    $PAGE->set_context($usercontext);
-    $blognode = $PAGE->settingsnav->find('blogadd', null);
-    $blognode->make_active();
-}

 require_login($courseid);

@@ -80,8 +73,15 @@ if (isguestuser()) {
    throw new \moodle_exception('noguest');
 }

-$returnurl = new moodle_url('/blog/index.php');
+if ($modid) {
+    $PAGE->set_context($sitecontext);
+} else {
+    $PAGE->set_context($usercontext);
+    $blognode = $PAGE->settingsnav->find('blogadd', null);
+    $blognode->make_active();
+}

+$returnurl = new moodle_url('/blog/index.php');
 if (!empty($courseid) && empty($modid)) {
    $returnurl->param('courseid', $courseid);
 }
@@ -34,15 +34,21 @@ $PAGE->set_url(new moodle_url('/blog/external_blogs.php'));
 require_capability('moodle/blog:manageexternal', $context);

 $delete = optional_param('delete', null, PARAM_INT);
+$confirm = optional_param('confirm', false, PARAM_BOOL);

 $strexternalblogs = get_string('externalblogs', 'blog');
 $straddnewexternalblog = get_string('addnewexternalblog', 'blog');
 $strblogs = get_string('blogs', 'blog');
-$message = null;

-if ($delete && confirm_sesskey()) {
-    $externalblog = $DB->get_record('blog_external', array('id' => $delete));
-    if ($externalblog->userid == $USER->id) {
+$PAGE->set_title("{$strblogs}: {$strexternalblogs}");
+$PAGE->set_pagelayout('standard');
+
+if ($delete) {
+    $externalblog = $DB->get_record('blog_external', ['id' => $delete, 'userid' => $USER->id], '*', MUST_EXIST);
+
+    if ($confirm) {
+        require_sesskey();
+
        // Delete the external blog.
        $DB->delete_records('blog_external', array('id' => $delete));

@@ -60,23 +66,28 @@ if ($delete && confirm_sesskey()) {
        $event = \core\event\blog_external_removed::create($eventparms);
        $event->add_record_snapshot('blog_external', $externalblog);
        $event->trigger();
-        $message = get_string('externalblogdeleted', 'blog');
+
+        redirect($PAGE->url, get_string('externalblogdeleted', 'blog'));
+    } else {
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading("{$strexternalblogs}: " . s($externalblog->name), 2);
+
+        echo $OUTPUT->confirm(
+            get_string('deleteexternalblog', 'blog'),
+            new moodle_url($PAGE->url->out_omit_querystring(), ['delete' => $delete, 'confirm' => 1]),
+            $PAGE->url,
+        );
+
+        echo $OUTPUT->footer();
+        die;
    }
 }

 $blogs = $DB->get_records('blog_external', array('userid' => $USER->id));

-$PAGE->set_heading(fullname($USER));
-$PAGE->set_title("$strblogs: $strexternalblogs");
-$PAGE->set_pagelayout('standard');
-
 echo $OUTPUT->header();
 echo $OUTPUT->heading($strexternalblogs, 2);

-if (!empty($message)) {
-    echo $OUTPUT->notification($message);
-}
-
 echo $OUTPUT->box_start('generalbox boxaligncenter');

 if (!empty($blogs)) {
@@ -99,10 +110,8 @@ if (!empty($blogs)) {
        $editurl = new moodle_url('/blog/external_blog_edit.php', array('id' => $blog->id));
        $editicon = $OUTPUT->action_icon($editurl, new pix_icon('t/edit', get_string('editexternalblog', 'blog')));

-        $deletelink = new moodle_url('/blog/external_blogs.php', array('delete' => $blog->id, 'sesskey' => sesskey()));
-        $action = new confirm_action(get_string('externalblogdeleteconfirm', 'blog'));
-        $deleteicon = $OUTPUT->action_icon($deletelink, new pix_icon('t/delete', get_string('deleteexternalblog', 'blog')),
-                                           $action);
+        $deletelink = new moodle_url('/blog/external_blogs.php', ['delete' => $blog->id]);
+        $deleteicon = $OUTPUT->action_icon($deletelink, new pix_icon('t/delete', get_string('deleteexternalblog', 'blog')));

        $table->data[] = new html_table_row(array($blog->name,
                                                  $blog->url,
@@ -74,7 +74,7 @@ class footer_options_exporter extends exporter {
     */
    protected function get_manage_subscriptions_link(): ?string {
        if (calendar_user_can_add_event($this->calendar->course)) {
-            $managesubscriptionurl = new moodle_url('/calendar/managesubscriptions.php');
+            $managesubscriptionurl = new moodle_url('/calendar/managesubscriptions.php', ['course' => $this->calendar->courseid]);
            return $managesubscriptionurl->out(true);
        }
        return null;
@@ -213,7 +213,8 @@ class create extends \moodleform {
        $group[] = $mform->createElement('radio', 'duration', null, get_string('durationuntil', 'calendar'), 1);
        $group[] = $mform->createElement('date_time_selector', 'timedurationuntil', '');
        $group[] = $mform->createElement('radio', 'duration', null, get_string('durationminutes', 'calendar'), 2);
-        $group[] = $mform->createElement('text', 'timedurationminutes', get_string('durationminutes', 'calendar'));
+        $group[] = $mform->createElement('text', 'timedurationminutes',
+                get_string('durationminutes', 'calendar'), 'maxlength="7" size="7"');

        $mform->addGroup($group, 'durationgroup', get_string('eventduration', 'calendar'), '<br />', false);
        $mform->setAdvanced('durationgroup');
@@ -227,6 +228,9 @@ class create extends \moodleform {

        $mform->setType('timedurationminutes', PARAM_INT);
        $mform->disabledIf('timedurationminutes', 'duration', 'noteq', 2);
+        $mform->addGroupRule('durationgroup', [
+            'timedurationminutes' => [[get_string('maximumchars', '', 7), 'maxlength', 7, 'server']],
+        ]);

        $mform->setDefault('duration', 0);
    }
@@ -238,11 +242,12 @@ class create extends \moodleform {
     */
    protected function add_event_repeat_elements($mform) {
        $mform->addElement('checkbox', 'repeat', get_string('repeatevent', 'calendar'), null);
-        $mform->addElement('text', 'repeats', get_string('repeatweeksl', 'calendar'), 'maxlength="10" size="10"');
+        $mform->addElement('text', 'repeats', get_string('repeatweeksl', 'calendar'), 'maxlength="3" size="3"');
        $mform->setType('repeats', PARAM_INT);
        $mform->setDefault('repeats', 1);
        $mform->disabledIf('repeats', 'repeat', 'notchecked');
        $mform->setAdvanced('repeat');
        $mform->setAdvanced('repeats');
+        $mform->addRule('repeats', get_string('maximumchars', '', 3), 'maxlength', 3, 'server');
    }
 }
@@ -121,7 +121,8 @@ class event_form extends moodleform {
        $group[] =& $mform->createElement('radio', 'duration', null, get_string('durationuntil', 'calendar'), 1);
        $group[] =& $mform->createElement('date_time_selector', 'timedurationuntil', '');
        $group[] =& $mform->createElement('radio', 'duration', null, get_string('durationminutes', 'calendar'), 2);
-        $group[] =& $mform->createElement('text', 'timedurationminutes', get_string('durationminutes', 'calendar'));
+        $group[] =& $mform->createElement('text', 'timedurationminutes',
+                get_string('durationminutes', 'calendar'), 'maxlength="7" size="7"');

        $mform->addGroup($group, 'durationgroup', '', '<br />', false);

@@ -134,6 +135,9 @@ class event_form extends moodleform {

        $mform->setType('timedurationminutes', PARAM_INT);
        $mform->disabledIf('timedurationminutes','duration','noteq', 2);
+        $mform->addGroupRule('durationgroup', [
+            'timedurationminutes' => [[get_string('maximumchars', '', 7), 'maxlength', 7, 'server']],
+        ]);

        $mform->setDefault('duration', ($hasduration)?1:0);

@@ -141,10 +145,11 @@ class event_form extends moodleform {

            $mform->addElement('header', 'repeatevents', get_string('repeatedevents', 'calendar'));
            $mform->addElement('checkbox', 'repeat', get_string('repeatevent', 'calendar'), null);
-            $mform->addElement('text', 'repeats', get_string('repeatweeksl', 'calendar'), 'maxlength="10" size="10"');
+            $mform->addElement('text', 'repeats', get_string('repeatweeksl', 'calendar'), 'maxlength="3" size="3"');
            $mform->setType('repeats', PARAM_INT);
            $mform->setDefault('repeats', 1);
            $mform->disabledIf('repeats','repeat','notchecked');
+            $mform->addRule('repeats', get_string('maximumchars', '', 3), 'maxlength', 3, 'server');

        } else if ($repeatedevents) {

@@ -3642,7 +3642,7 @@ function calendar_output_fragment_event_form($args) {
            $groupcoursedata = groups_get_course_data($courseid);
            $formoptions['groups'] = [];
            foreach ($groupcoursedata->groups as $groupid => $groupdata) {
-                $formoptions['groups'][$groupid] = $groupdata->name;
+                $formoptions['groups'][$groupid] = format_string($groupdata->name, false, ['context' => $context]);
            }
        }

@@ -3686,7 +3686,7 @@ function calendar_output_fragment_event_form($args) {
            $groupcoursedata = groups_get_course_data($event->courseid);
            $formoptions['groups'] = [];
            foreach ($groupcoursedata->groups as $groupid => $groupdata) {
-                $formoptions['groups'][$groupid] = $groupdata->name;
+                $formoptions['groups'][$groupid] = format_string($groupdata->name, false, ['context' => $context]);
            }
        }

@@ -55,7 +55,7 @@
                {{/icon}}
            </div>
            <div class="overflow-auto">
-                <h6 class="d-flex mb-1">
+                <h4 class="d-flex mb-1 h6">
                    <a{{!
                        }} class="text-truncate"{{!
                        }} data-type="event"{{!
@@ -64,7 +64,7 @@
                        }} href="{{viewurl}}"{{!
                        }} title="{{name}}"{{!
                    }}>{{{name}}}</a>
-                </h6>
+                </h4>
                <div class="date small">{{{formattedtime}}}</div>
            </div>
        </div>
@@ -27,8 +27,8 @@ Feature: Perform basic calendar functionality
      | teacher1 | C1 | teacher |
      | admin    | C1 | editingteacher |
    And the following "groups" exist:
-      | name | course | idnumber |
-      | Group 1 | C1 | G1 |
+      | name                                                                                           | course | idnumber |
+      | <span lang="en" class="multilang">Group</span><span lang="es" class="multilang">Grupo</span> 1 | C1     | G1       |
    And the following "group members" exist:
      | user | group |
      | student1 | G1 |
@@ -75,7 +75,9 @@ Feature: Perform basic calendar functionality

  @javascript
  Scenario: Create a group event
-    Given I log in as "teacher1"
+    Given the "multilang" filter is "on"
+    And the "multilang" filter applies to "content and headings"
+    And I log in as "teacher1"
    And I follow "Full calendar"
    And I set the field "course" to "Course 1"
    And I create a calendar event:
@@ -322,18 +324,23 @@ Feature: Perform basic calendar functionality

  @javascript
  Scenario: Changing the event type should clear previous data
-    Given I am on the "Course 1" course page logged in as admin
+    Given the "multilang" filter is "on"
+    And the "multilang" filter applies to "content and headings"
+    And I am on the "Course 1" course page logged in as admin
    And I follow "Course calendar"
    And I press "New event"
    And I set the following fields to these values:
      | Event title | Group 1 event |
      | Type of event | Group       |
+    And I should see "Group 1"
+    And I should not see "GroupGrupo 1"
    And I press "Save"
    And I am on "Course 1" course homepage
    And I follow "Course calendar"
    And I click on "Group 1 event" "link"
    And I should see "Group event"
    And I should see "Group 1"
+    And I should not see "GroupGrupo 1"
    When I click on "Edit" "button" in the "Group 1 event" "dialogue"
    And I set the following fields to these values:
      | Event title | My own user event |
@@ -369,7 +376,9 @@ Feature: Perform basic calendar functionality

  @javascript
  Scenario: Changing the event type from user to anything else should work
-    Given I log in as "teacher1"
+    Given the "multilang" filter is "on"
+    And the "multilang" filter applies to "content and headings"
+    And I log in as "teacher1"
    # We need this so we can see the groups.
    And the following "course enrolments" exist:
      | user     | course | role           |
--- a/Show More
+++ b/Show More