Moodle release 4.3.3

weekly release 4.3.2+
NOBUG: Fixed SVG browser compatibility
2024-02-09 10:33:30 +08:00 · 2024-02-08 16:18:12 +01:00 · 2024-02-08 16:18:09 +01:00 · 2024-02-08 11:26:47 +01:00 · 2024-02-08 10:12:54 +00:00 · 2024-02-08 16:06:15 +08:00
1427 changed files with 14271 additions and 5117 deletions
@@ -7,6 +7,12 @@ on:
      - MOODLE_[0-9]+_STABLE
    tags-ignore:
      - v[0-9]+.[0-9]+.[0-9]+*
+  workflow_dispatch:
+    inputs:
+      phpunit_extra_options:
+        description: Additional options to apply to PHPUnit
+        required: false
+        default: ''

 env:
  php: 8.2
@@ -17,10 +23,10 @@ jobs:

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

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

@@ -99,7 +105,7 @@ jobs:
          coverage: none

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

      - name: Setting up PHPUnit
        env:
@@ -115,4 +121,4 @@ jobs:
        env:
          dbtype: ${{ matrix.db }}
          phpunit_options: ${{ secrets.phpunit_options }}
-        run: vendor/bin/phpunit $phpunit_options
+        run: vendor/bin/phpunit $phpunit_options ${{ inputs.phpunit_extra_options }}
@@ -1,7 +1,12 @@
 name: Windows Testing

 on:
-  workflow_dispatch
+  workflow_dispatch:
+    inputs:
+      phpunit_extra_options:
+        description: Additional options to apply to PHPUnit
+        required: false
+        default: ''
 env:
  php: 8.2

@@ -16,10 +21,10 @@ jobs:
          git config --global core.eol lf

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

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

@@ -112,7 +117,7 @@ jobs:
          git config --global core.eol lf

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

      # Needs to be done after php is available, git configured and Moodle checkout has happened.
      - name: Setting up moodle-exttests service
@@ -141,4 +146,4 @@ jobs:
        env:
          dbtype: ${{ matrix.db }}
          phpunit_options: ${{ secrets.phpunit_options }}
-        run: vendor/bin/phpunit $phpunit_options
+        run: vendor/bin/phpunit $phpunit_options ${{ inputs.phpunit_extra_options }}
@@ -19,7 +19,7 @@ namespace core_admin\table;
 use moodle_url;

 /**
- * Tiny admin settings.
+ * Admin tool settings.
 *
 * @package core_admin
 * @copyright 2023 Andrew Lyons <andrew@nicols.co.uk>
@@ -30,12 +30,6 @@ class tool_plugin_management_table extends \core_admin\table\plugin_management_t
        return 'tool';
    }

-    public function guess_base_url(): void {
-        $this->define_baseurl(
-            new moodle_url('/admin/tools.php')
-        );
-    }
-
    protected function get_column_list(): array {
        $columns = parent::get_column_list();

@@ -45,6 +39,6 @@ class tool_plugin_management_table extends \core_admin\table\plugin_management_t
    }

    protected function get_action_url(array $params = []): moodle_url {
-        return new moodle_url('/admin/tool.php', $params);
+        return new moodle_url('/admin/settings.php', array_merge(['section' => 'toolsmanagement'], $params));
    }
 }
@@ -80,8 +80,8 @@ if (!$category = $DB->get_record('course_categories', ['id' => $options['categor
    throw new \moodle_exception('invalidcategoryid');
 }

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

 cli_heading(get_string('extractingbackupfileto', 'backup', $path));
 $fp = get_file_packer('application/vnd.moodle.backup');
@@ -4305,4 +4305,195 @@
      </CUSTOM_CHECK>
    </CUSTOM_CHECKS>
  </MOODLE>
+  <MOODLE version="4.4" requires="4.1.2">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.6.7" />
+      <VENDOR name="mysql" version="8.0" />
+      <VENDOR name="postgres" version="13" />
+      <VENDOR name="mssql" version="14.0" />
+      <VENDOR name="oracle" version="19" />
+    </DATABASE>
+    <PHP version="8.1.0" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="mbstringrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+      <PHP_EXTENSION name="sodium" level="required"/>
+      <PHP_EXTENSION name="exif" level="optional"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="sixtyfourbitsrequired" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iscustomadminwarnings" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_db_prefix_length" level="required">
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -761,8 +761,8 @@ class manager {
    public function delete_preset(int $presetid): void {
        global $DB;

-        // Check the preset exists.
-        $preset = $DB->get_record('adminpresets', ['id' => $presetid]);
+        // Check the preset exists (cannot delete the pre-installed core "Starter" and "Full" presets).
+        $preset = $DB->get_record('adminpresets', ['id' => $presetid, 'iscore' => self::NONCORE_PRESET]);
        if (!$preset) {
            throw new moodle_exception('errordeleting', 'core_adminpresets');
        }
@@ -16,6 +16,7 @@

 namespace core_adminpresets;

+use moodle_exception;
 use stdClass;

 /**
@@ -599,10 +600,28 @@ class manager_test extends \advanced_testcase {

        $manager = new manager();

-        $this->expectException(\moodle_exception::class);
+        $this->expectException(moodle_exception::class);
+        $this->expectExceptionMessage('Error deleting from database');
        $manager->delete_preset($unexistingid);
    }

+    /**
+     * Test trying to delete the core/pre-defined presets
+     *
+     * @covers ::delete_preset
+     */
+    public function test_delete_preset_core(): void {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        $starterpreset = $DB->get_record('adminpresets', ['iscore' => manager::STARTER_PRESET]);
+
+        $this->expectException(moodle_exception::class);
+        $this->expectExceptionMessage('Error deleting from database');
+        (new manager())->delete_preset($starterpreset->id);
+    }
+
    /**
     * Test the behaviour of delete_preset() method.
     *
@@ -49,26 +49,11 @@ if ($action == 'newon') {

 admin_externalpage_setup($pagename);

-$sesskeyurl = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php?sesskey=' . sesskey();
-$baseurl    = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php';
-
-$configstr  = get_string('manage', 'repository');
+// The URL used for redirection, and that all edit related URLs will be based off.
+$baseurl = new moodle_url('/admin/repository.php');

 $return = true;

-if (!empty($action)) {
-    require_sesskey();
-}
-
-/**
- * Helper function that generates a moodle_url object
- * relevant to the repository
- */
-function repository_action_url($repository) {
-    global $baseurl;
-    return new moodle_url($baseurl, array('sesskey'=>sesskey(), 'repos'=>$repository));
-}
-
 if (($action == 'edit') || ($action == 'new')) {
    $pluginname = '';
    if ($action == 'edit') {
@@ -182,16 +167,12 @@ if (($action == 'edit') || ($action == 'new')) {
        }
    }
 } else if ($action == 'show') {
-    if (!confirm_sesskey()) {
-        throw new \moodle_exception('confirmsesskeybad', '', $baseurl);
-    }
+    require_sesskey();
    $class = \core_plugin_manager::resolve_plugininfo_class('repository');
    $class::enable_plugin($repository, 1);
    $return = true;
 } else if ($action == 'hide') {
-    if (!confirm_sesskey()) {
-        throw new \moodle_exception('confirmsesskeybad', '', $baseurl);
-    }
+    require_sesskey();
    $class = \core_plugin_manager::resolve_plugininfo_class('repository');
    $class::enable_plugin($repository, 0);
    $return = true;
@@ -199,9 +180,7 @@ if (($action == 'edit') || ($action == 'new')) {
    $repositorytype = repository::get_type_by_typename($repository);
    if ($sure) {
        $PAGE->set_pagetype('admin-repository-' . $repository);
-        if (!confirm_sesskey()) {
-            throw new \moodle_exception('confirmsesskeybad', '', $baseurl);
-        }
+        require_sesskey();

        if ($repositorytype->delete($downloadcontents)) {
            // Include this information into config changes table.
@@ -220,20 +199,15 @@ if (($action == 'edit') || ($action == 'new')) {
        $output = $OUTPUT->box_start('generalbox', 'notice');
        $output .= html_writer::tag('p', $message);

-        $removeurl = new moodle_url($sesskeyurl);
-        $removeurl->params(array(
+        $removeurl = new moodle_url($baseurl, [
            'action' =>'delete',
            'repos' => $repository,
            'sure' => 'yes',
-        ));
+        ]);

-        $removeanddownloadurl = new moodle_url($sesskeyurl);
-        $removeanddownloadurl->params(array(
-            'action' =>'delete',
-            'repos'=> $repository,
-            'sure' => 'yes',
+        $removeanddownloadurl = new moodle_url($removeurl, [
            'downloadcontents' => 1,
-        ));
+        ]);

        $output .= $OUTPUT->single_button($removeurl, get_string('continueuninstall', 'repository'));
        $output .= $OUTPUT->single_button($removeanddownloadurl, get_string('continueuninstallanddownload', 'repository'));
@@ -245,9 +219,11 @@ if (($action == 'edit') || ($action == 'new')) {
        $return = false;
    }
 } else if ($action == 'moveup') {
+    require_sesskey();
    $repositorytype = repository::get_type_by_typename($repository);
    $repositorytype->move_order('up');
 } else if ($action == 'movedown') {
+    require_sesskey();
    $repositorytype = repository::get_type_by_typename($repository);
    $repositorytype->move_order('down');
 } else {
@@ -339,8 +315,7 @@ if (($action == 'edit') || ($action == 'new')) {
                    $userinstancenumbertext = "";
                }

-                $settings .= '<a href="' . $sesskeyurl . '&amp;action=edit&amp;repos=' . $typename . '">' . $settingsstr .'</a>';
-
+                $settings = html_writer::link(new moodle_url($baseurl, ['action' => 'edit', 'repos' => $typename]), $settingsstr);
                $settings .= $OUTPUT->container_start('mdl-left');
                $settings .= '<br/>';
                $settings .= $admininstancenumbertext;
@@ -357,22 +332,34 @@ if (($action == 'edit') || ($action == 'new')) {
                $currentaction = 'hide';
            }

-            $select = new single_select(repository_action_url($typename, 'repos'), 'action', $actionchoicesforexisting, $currentaction, null, 'applyto' . basename($typename));
+            // Active toggle.
+            $selectaction = new moodle_url($baseurl, ['sesskey' => sesskey(), 'repos' => $typename]);
+            $select = new single_select($selectaction, 'action', $actionchoicesforexisting, $currentaction, null,
+                'applyto' . basename($typename));
            $select->set_label(get_string('action'), array('class' => 'accesshide'));
+
            // Display up/down link
            $updown = '';
            $spacer = $OUTPUT->spacer(array('height'=>15, 'width'=>15)); // should be done with CSS instead

            if ($updowncount > 1) {
-                $updown .= "<a href=\"$sesskeyurl&amp;action=moveup&amp;repos=".$typename."\">";
-                $updown .= $OUTPUT->pix_icon('t/up', get_string('moveup')) . "</a>&nbsp;";
+                $moveupaction = new moodle_url($baseurl, [
+                    'sesskey' => sesskey(),
+                    'action' => 'moveup',
+                    'repos' => $typename,
+                ]);
+                $updown .= html_writer::link($moveupaction, $OUTPUT->pix_icon('t/up', get_string('moveup'))) . '&nbsp;';
            }
            else {
                $updown .= $spacer;
            }
            if ($updowncount < $totalrepositorytypes) {
-                $updown .= "<a href=\"$sesskeyurl&amp;action=movedown&amp;repos=".$typename."\">";
-                $updown .= $OUTPUT->pix_icon('t/down', get_string('movedown')) . "</a>&nbsp;";
+                $movedownaction = new moodle_url($baseurl, [
+                    'sesskey' => sesskey(),
+                    'action' => 'movedown',
+                    'repos' => $typename,
+                ]);
+                $updown .= html_writer::link($movedownaction, $OUTPUT->pix_icon('t/down', get_string('movedown'))) . '&nbsp;';
            }
            else {
                $updown .= $spacer;
@@ -400,7 +387,9 @@ if (($action == 'edit') || ($action == 'new')) {
        foreach ($plugins as $plugin => $dir) {
            // Check that it has not already been listed
            if (!in_array($plugin, $alreadyplugins)) {
-                $select = new single_select(repository_action_url($plugin, 'repos'), 'action', $actionchoicesfornew, 'delete', null, 'applyto' . basename($plugin));
+                $selectaction = new moodle_url($baseurl, ['sesskey' => sesskey(), 'repos' => $plugin]);
+                $select = new single_select($selectaction, 'action', $actionchoicesfornew, 'delete', null,
+                    'applyto' . basename($plugin));
                $select->set_label(get_string('action'), array('class' => 'accesshide'));
                $uninstall = '';
                if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('repository_' . $plugin, 'manage')) {
@@ -18,8 +18,6 @@ require_once(__DIR__ . '/../config.php');
 require_once($CFG->dirroot . '/repository/lib.php');
 require_once($CFG->libdir . '/adminlib.php');

-require_sesskey();
-
 // id of repository
 $edit    = optional_param('edit', 0, PARAM_INT);
 $new     = optional_param('new', '', PARAM_PLUGIN);
@@ -43,12 +41,8 @@ if ($edit){

 admin_externalpage_setup($pagename, '', null, new moodle_url('/admin/repositoryinstance.php'));

-$baseurl = new moodle_url("/$CFG->admin/repositoryinstance.php", array('sesskey'=>sesskey()));
-
-$parenturl = new moodle_url("/$CFG->admin/repository.php", array(
-    'sesskey'=>sesskey(),
-    'action'=>'edit',
-));
+// The URL used for redirection, and that all edit related URLs will be based off.
+$parenturl = new moodle_url('/admin/repository.php', ['action' => 'edit']);

 if ($new) {
    $parenturl->param('repos', $new);
@@ -116,6 +110,7 @@ if (!empty($edit) || !empty($new)) {
        $return = false;
    }
 } else if (!empty($hide)) {
+    require_sesskey();
    $instance = repository::get_type_by_typename($hide);
    $instance->hide();
    core_plugin_manager::reset_caches();
@@ -129,6 +124,7 @@ if (!empty($edit) || !empty($new)) {
        throw new repository_exception('nopermissiontoaccess', 'repository');
    }
    if ($sure) {
+        require_sesskey();
        if ($instance->delete($downloadcontents)) {
            $deletedstr = get_string('instancedeleted', 'repository');
            core_plugin_manager::reset_caches();
@@ -141,14 +137,17 @@ if (!empty($edit) || !empty($new)) {

    echo $OUTPUT->header();
    echo $OUTPUT->box_start('generalbox', 'notice');
-    $continueurl = new moodle_url($baseurl, array(
+
+    $continueurl = new moodle_url($PAGE->url, [
        'type' => $type,
        'delete' => $delete,
        'sure' => 'yes',
-    ));
+    ]);
+
    $continueanddownloadurl = new moodle_url($continueurl, array(
        'downloadcontents' => 1
    ));
+
    $message = get_string('confirmdelete', 'repository', $instance->name);
    echo html_writer::tag('p', $message);

@@ -97,7 +97,7 @@ class role extends base {
            ->set_type(column::TYPE_TEXT)
            ->add_fields("{$rolealias}.name, {$rolealias}.shortname, {$rolealias}.id, {$contextalias}.id AS contextid")
            ->add_fields(context_helper::get_preload_record_columns_sql($contextalias))
-            ->set_is_sortable(true)
+            ->set_is_sortable(true, ["CASE WHEN {$rolealias}.name = '' THEN {$rolealias}.shortname ELSE {$rolealias}.name END"])
            ->set_callback(static function($name, stdClass $role): string {
                if ($name === null) {
                    return '';
@@ -76,7 +76,7 @@ switch ($action) {
            $optionsyes = array('action'=>'delete', 'roleid'=>$roleid, 'sesskey'=>sesskey(), 'confirm'=>1);
            $a = new stdClass();
            $a->id = $roleid;
-            $a->name = $roles[$roleid]->name;
+            $a->name = $roles[$roleid]->localname;
            $a->shortname = $roles[$roleid]->shortname;
            $a->count = $DB->count_records_select('role_assignments',
                'roleid = ?', array($roleid), 'COUNT(DISTINCT userid)');
@@ -200,14 +200,14 @@ reports,core_reportbuilder|/reportbuilder/index.php',
    ));

    $choices = [HOMEPAGE_SITE => new lang_string('home')];
-    if (!empty($CFG->enabledashboard)) {
+    if (!isset($CFG->enabledashboard) || $CFG->enabledashboard) {
        $choices[HOMEPAGE_MY] = new lang_string('mymoodle', 'admin');
    }
    $choices[HOMEPAGE_MYCOURSES] = new lang_string('mycourses', 'admin');
    $choices[HOMEPAGE_USER] = new lang_string('userpreference', 'admin');
    $temp->add(new admin_setting_configselect('defaulthomepage', new lang_string('defaulthomepage', 'admin'),
            new lang_string('configdefaulthomepage', 'admin'), get_default_home_page(), $choices));
-    if (!empty($CFG->enabledashboard)) {
+    if (!isset($CFG->enabledashboard) || $CFG->enabledashboard) {
        $temp->add(new admin_setting_configcheckbox(
            'allowguestmymoodle',
            new lang_string('allowguestmymoodle', 'admin'),
@@ -23,12 +23,15 @@
    * name - form element name
    * hasoptions - there are some options
    * options - list of options containing name, key, id, checked, label
+    * readonly - bool

    Example context (json):
    {
        "name": "test",
        "hasoptions": true,
-        "options": [ { "name": "Option", "key": "k1", "id": "id0", "checked": true, "label": "Option label"} ]
+        "options": [ { "name": "Option", "key": "k1", "id": "id0", "checked": true, "label": "Option label"} ],
+        "readonly": false
+
    }
 }}
 <div class="form-multicheckbox">
@@ -37,7 +40,7 @@
        <ul>
            {{#options}}
                <li>
-                    <input type="checkbox" name="{{name}}[{{key}}]" value="1" id="{{id}}_{{key}}" {{#checked}}checked{{/checked}}>
+                    <input type="checkbox" name="{{name}}[{{key}}]" value="1" id="{{id}}_{{key}}" {{#readonly}}disabled{{/readonly}} {{#checked}}checked{{/checked}}>
                    <label for="{{id}}_{{key}}">{{{label}}}</label>
                </li>
            {{/options}}
@@ -16,6 +16,7 @@

 namespace tool_admin_presets\local\action;

+use core_adminpresets\manager;
 use moodle_exception;

 /**
@@ -34,8 +35,8 @@ class delete extends base {
    public function show(): void {
        global $DB, $OUTPUT;

-        // Getting the preset name.
-        $presetdata = $DB->get_record('adminpresets', ['id' => $this->id], 'name');
+        // Check the preset exists (cannot delete the pre-installed core "Starter" and "Full" presets).
+        $presetdata = $DB->get_record('adminpresets', ['id' => $this->id, 'iscore' => manager::NONCORE_PRESET], 'name');

        if ($presetdata) {
            $deletetext = get_string('deletepreset', 'tool_admin_presets', $presetdata->name);
@@ -0,0 +1,34 @@
+@tool_behat
+Feature: Confirm that we can open multiple browser tabs
+  In order to use multiple browser tabs
+  As a test writer
+  I need the relevant Behat steps to work
+
+  @javascript @_switch_window
+  Scenario: Open multiple browser tabs
+    Given the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+      | Course 2 | C2        |
+      | Course 3 | C3        |
+    And I am on the "C1" "Course" page logged in as "admin"
+
+    # Open a new tab on the same page.
+    When I open a tab named "CourseViewer1" on the current page
+    And I should see "Course 1" in the "h1" "css_element"
+    And I am on the "C2" "Course" page
+
+    # Open new tab for specified page with identifier.
+    And I open a tab named "CourseViewer2" on the "C3" "Course" page
+
+    # And for a specified page without identifier.
+    And I open a tab named "CourseViewer4" on the "My courses" page
+
+    # Switch between all the tabs and confirm their different contents.
+    Then I should see "You're not enrolled in any course"
+    And I switch to "CourseViewer2" tab
+    And "Course 3" "heading" should exist
+    And I switch to "CourseViewer1" tab
+    And "Course 2" "heading" should exist
+    And I switch to the main tab
+    And "Course 1" "heading" should exist
@@ -170,6 +170,19 @@ class brickfield_accessibility_color_test extends brickfield_accessibility_test
        'yellowgreen' => '9acd32'
    ];

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

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

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

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

                    if (isset($style['font-weight'])) {
@@ -178,6 +178,54 @@ EOD;
    </html>
 EOD;

+    /** @var string HTML with px18 fail colour values. */
+    private $px18 = <<<EOD
+    <body><p style="color:#EF0000; background-color:white; font-size: 18px">
+    This is not contrasty enough.</p></body>
+EOD;
+
+    /** @var string HTML with px19bold pass colour values. */
+    private $px19bold = <<<EOD
+    <body><p style="color:#EF0000; background-color:white; font-size: 19px; font-weight: bold;">
+    This is contrasty enough.</p></body>
+EOD;
+
+    /** @var string HTML with px18 pass colour values. */
+    private $px18pass = <<<EOD
+    <body><p style="color:#E60000; background-color:white; font-size: 18px">
+    This is contrasty enough.</p></body>
+EOD;
+
+    /** @var string HTML with medium size colour values. */
+    private $mediumfail = <<<EOD
+    <body><p style="color:#EF0000; background-color:white; font-size: medium">
+    This is not contrasty enough.</p></body>
+EOD;
+
+    /** @var string HTML with px18 colour values. */
+    private $mediumpass = <<<EOD
+    <body><p style="color:#E60000; background-color:white; font-size: medium">
+    This is contrasty enough.</p></body>
+EOD;
+
+    /** @var string HTML with larger fail colour values. */
+    private $largerfail = <<<EOD
+    <body><p style="color:#FF6161; background-color:white; font-size: larger">
+    This is not contrasty enough.</p></body>
+EOD;
+
+    /** @var string HTML with px18 colour values. */
+    private $largerpass = <<<EOD
+    <body><p style="color:#FF5C5C; background-color:white; font-size: larger;">
+    This is contrasty enough.</p></body>
+EOD;
+
+    /** @var string HTML with px18 colour values. */
+    private $largerboldpass = <<<EOD
+    <body><p style="color:#FF5C5C; background-color:white; font-size: larger; font-weight: bold;">
+    This is contrasty enough.</p></body>
+EOD;
+
    /**
     * Test for the area assign intro
     */
@@ -235,4 +283,68 @@ EOD;
        $results = $this->get_checker_results($this->emptyvalue);
        $this->assertEmpty($results);
    }
+
+    /**
+     * Test for text px18 with insufficient contrast of 4.49.
+     */
+    public function test_check_for_px18_fail() {
+        $results = $this->get_checker_results($this->px18);
+        $this->assertTrue($results[0]->element->tagName == 'p');
+    }
+
+    /**
+     * Test for text px19 bold with sufficient contrast of 4.49.
+     */
+    public function test_check_for_px19bold_pass() {
+        $results = $this->get_checker_results($this->px19bold);
+        $this->assertEmpty($results);
+    }
+
+    /**
+     * Test for text px18 with sufficient contrast of 4.81.
+     */
+    public function test_check_for_px18_pass() {
+        $results = $this->get_checker_results($this->px18pass);
+        $this->assertEmpty($results);
+    }
+
+    /**
+     * Test for medium (12pt) text with insufficient contrast of 4.49.
+     */
+    public function test_check_for_medium_fail() {
+        $results = $this->get_checker_results($this->mediumfail);
+        $this->assertTrue($results[0]->element->tagName == 'p');
+    }
+
+    /**
+     * Test for medium (12pt) text with sufficient contrast of 4.81.
+     */
+    public function test_check_for_medium_pass() {
+        $results = $this->get_checker_results($this->mediumpass);
+        $this->assertEmpty($results);
+    }
+
+    /**
+     * Test for larger (14pt) text with insufficient contrast of 2.94.
+     */
+    public function test_check_for_larger_fail() {
+        $results = $this->get_checker_results($this->largerfail);
+        $this->assertTrue($results[0]->element->tagName == 'p');
+    }
+
+    /**
+     * Test for larger (14pt) text with insufficient contrast of 3.02.
+     */
+    public function test_check_for_larger_pass() {
+        $results = $this->get_checker_results($this->largerpass);
+        $this->assertTrue($results[0]->element->tagName == 'p');
+    }
+
+    /**
+     * Test for larger (14pt) bold text with sufficient contrast of 3.02.
+     */
+    public function test_check_for_largerbold_pass() {
+        $results = $this->get_checker_results($this->largerboldpass);
+        $this->assertEmpty($results);
+    }
 }
@@ -61,5 +61,8 @@ function xmldb_tool_cohortroles_upgrade($oldversion) {
        upgrade_plugin_savepoint(true, 2023042401, 'tool', 'cohortroles');
    }

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -24,7 +24,7 @@ The confirmation AMD module is loaded automatically, so the only thing you need
 to the target element:
 {{< highlight html >}}
 <button type="button" class="btn btn-primary" data-confirmation="modal" data-confirmation-title-str='["delete", "core"]'
-data-confirmation-question-str='["areyousure"]' data-confirmation-yes-button-str='["delete", "core"]'>Show confirmation modal</button>
+data-confirmation-content-str='["areyousure"]' data-confirmation-yes-button-str='["delete", "core"]'>Show confirmation modal</button>
 {{< /highlight >}}

 You can also use it on PHP, you just need to set the attributes parameter to any moodle output component that takes attributes:
@@ -32,7 +32,7 @@ You can also use it on PHP, you just need to set the attributes parameter to any
 echo $OUTPUT->single_button('#', get_string('delete'), 'get', [
    'data-confirmation' => 'modal',
    'data-confirmation-title-str' => json_encode(['delete', 'core']),
-    'data-confirmation-question-str' => json_encode(['areyousure']),
+    'data-confirmation-content-str' => json_encode(['areyousure']),
    'data-confirmation-yes-button-str' => json_encode(['delete', 'core'])
 ]);
 {{< / php >}}
@@ -56,8 +56,8 @@ echo $OUTPUT->single_button('#', get_string('delete'), 'get', [
      <td>The modal title language string identifier, must be provided in JSON encoded format.</td>
    </tr>
    <tr>
-      <td>data-confirmation-question-str</td>
-      <td>The confirmation question language string identifier, must be provided in JSON encoded format.</td>
+      <td>data-confirmation-content-str</td>
+      <td>The modal main content language string identifier, must be provided in JSON encoded format.</td>
    </tr>
    <tr>
      <td>data-confirmation-yes-button-str</td>
@@ -86,14 +86,14 @@ echo $OUTPUT->single_button('#', get_string('delete'), 'get', [

 {{< example >}}
 <button type="button" class="btn btn-primary" data-confirmation="modal" data-confirmation-title-str='["ok", "core"]'
-data-confirmation-question-str='["areyousure"]' data-confirmation-yes-button-str='["ok", "core"]'>Show confirmation modal</button>
+data-confirmation-content-str='["areyousure"]' data-confirmation-yes-button-str='["ok", "core"]'>Show confirmation modal</button>
 {{< /example >}}

 #### Delete Modal

 {{< example >}}
 <button type="button" class="btn btn-primary" data-confirmation="modal" data-confirmation-type="delete" data-confirmation-title-str='["delete", "core"]'
-data-confirmation-question-str='["areyousure"]' data-confirmation-yes-button-str='["delete", "core"]'>Show delete modal</button>
+data-confirmation-content-str='["areyousure"]' data-confirmation-yes-button-str='["delete", "core"]'>Show delete modal</button>
 {{< /example >}}


@@ -101,7 +101,7 @@ data-confirmation-question-str='["areyousure"]' data-confirmation-yes-button-str

 {{< example >}}
 <button type="button" class="btn btn-primary" data-confirmation="modal" data-confirmation-title-str='["save", "core"]'
-data-confirmation-question-str='["areyousure"]' data-confirmation-yes-button-str='["save", "core"]' data-confirmation-toast="true"
+data-confirmation-content-str='["areyousure"]' data-confirmation-yes-button-str='["save", "core"]' data-confirmation-toast="true"
 data-confirmation-toast-confirmation-str='["saved", "core_question", "My question"]'>Show confirmation modal</button>
 {{< /example >}}

@@ -109,6 +109,6 @@ data-confirmation-toast-confirmation-str='["saved", "core_question", "My questio

 {{< example >}}
 <button type="button" class="btn btn-primary" data-confirmation="modal" data-confirmation-title-str='["save", "core"]'
-data-confirmation-question-str='["areyousure"]' data-confirmation-yes-button-str='["save", "core"]'
+data-confirmation-content-str='["areyousure"]' data-confirmation-yes-button-str='["save", "core"]'
 data-confirmation-destination="http://moodle.com">Show confirmation modal</button>
 {{< /example >}}
@@ -41,5 +41,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -22,12 +22,12 @@ Feature: Within a moodle instance, an administrator should be able to modify lan
  Scenario: Edit an string but don't save it to lang pack.
    When I press "Apply changes and continue editing"
    Then I should not see "moodle documents" in the "page-footer" "region"
-    And I should see "Help and documentation" in the "page-footer" "region"
+    And I should see "Documentation for this page" in the "page-footer" "region"

  @javascript
  Scenario: Customize an string as admin and save it to lang pack.
    Given I press "Save changes to the language pack"
    And I should see "There are 1 modified strings."
    When I click on "Continue" "button"
-    Then I should not see "Help and documentation" in the "page-footer" "region"
+    Then I should not see "Documentation for this page" in the "page-footer" "region"
    And I should see "moodle documents" in the "page-footer" "region"
@@ -152,5 +152,8 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
        upgrade_plugin_savepoint(true, 2023062700, 'tool', 'dataprivacy');
    }

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -16,6 +16,7 @@

 namespace tool_dataprivacy\task;

+use core\task\task_trait;
 use tool_dataprivacy\api;

 defined('MOODLE_INTERNAL') || die();
@@ -30,6 +31,8 @@ require_once(__DIR__ . '/../data_privacy_testcase.php');
 */
 class task_test extends \data_privacy_testcase {

+    use task_trait;
+
    /**
     * Test tearDown.
     */
@@ -215,17 +218,4 @@ class task_test extends \data_privacy_testcase {
        $this->assertCount(1, \tool_dataprivacy\api::get_data_requests($user->id,
                [api::DATAREQUEST_STATUS_CANCELLED], [api::DATAREQUEST_TYPE_DELETE]));
    }
-
-    /**
-     * Helper to execute a particular task.
-     *
-     * @param string $task The task.
-     */
-    private function execute_task($task) {
-        // Run the scheduled task.
-        ob_start();
-        $task = \core\task\manager::get_scheduled_task($task);
-        $task->execute();
-        ob_end_clean();
-    }
 }
@@ -120,8 +120,7 @@ Feature: Add customised file types
      | Custom description | Froggy file                               |
    And I press "Save changes"
    # Create a resource activity and add it to a course
-    And I am on "Course 1" course homepage with editing mode on
-    When I add a "File" to section "1"
+    When I add a resource activity to course "Course 1" section "1"
    And I set the following fields to these values:
      | Name        | An example of customised file type |
      | Description | File description                   |
@@ -82,12 +82,24 @@ class tool_filetypes_test extends advanced_testcase {
    }

    /**
-     * Test get_file_icons() function to confirm no file icons are removed/added by mistake.
+     * Test get_file_icons() function to confirm no file icons are removed by mistake.
     *
     * @covers ::get_file_icons
     */
    public function test_get_file_icons() {
        $icons = utils::get_file_icons();
-        $this->assertCount(31, $icons);
+        $filetypes = core_filetypes::get_types();
+
+        $requiredicons = array_column($filetypes, 'icon');
+        $requireduniqueicons = array_unique($requiredicons);
+
+        // The 'folder' icon is not a file, however the test validates no
+        // file icons are removed by mistake from the directory pix/f.
+        // Adding the folder icon manually completes the scope of this test.
+        $requireduniqueicons[] = 'folder';
+
+        foreach ($requireduniqueicons as $requiredicon) {
+            $this->assertArrayHasKey($requiredicon, $icons, "Icon '$requiredicon' is missing.");
+        }
    }
 }
@@ -216,7 +216,7 @@ class tool_generator_course_backend extends tool_generator_backend {
     * @return int Course id
     */
    public function make() {
-        global $DB, $CFG;
+        global $DB, $CFG, $USER;
        require_once($CFG->dirroot . '/lib/phpunit/classes/util.php');

        raise_memory_limit(MEMORY_EXTRA);
@@ -252,6 +252,12 @@ class tool_generator_course_backend extends tool_generator_backend {
            }
        }

+        // We are checking 'enroladminnewcourse' setting to decide to enrol admins or not.
+        if (!empty($CFG->creatornewroleid) && !empty($CFG->enroladminnewcourse) && is_siteadmin($USER->id)) {
+            // Deal with course creators - enrol them internally with default role.
+            enrol_try_internal_enrol($this->course->id, $USER->id, $CFG->creatornewroleid);
+        }
+
        // Log total time.
        $this->log('coursecompleted', round(microtime(true) - $entirestart, 1));

@@ -0,0 +1,33 @@
+@core @core_course @tool_generator
+Feature: Admins can create test courses
+  In order to create testing information
+  As an admin
+  I need to create testing courses quickly
+
+  @javascript
+  Scenario: 'Auto-enrol admin in new courses' setting when creating a test course as admin
+    Given I log in as "admin"
+    And the following config values are set as admin:
+      | enroladminnewcourse | 0 |
+    And I navigate to "Development > Make test course" in site administration
+    And I set the following fields to these values:
+      | Size of course    | XS                      |
+      | Course full name  | Fake course for testing |
+      | Course short name | fake                    |
+    And I press "Create course"
+    And I click on "Continue" "link"
+    And I navigate to course participants
+    Then I should not see "Teacher"
+    And I should not see "Nothing to display"
+    And the following config values are set as admin:
+      | enroladminnewcourse | 1 |
+    And I navigate to "Courses > Add a new course" in site administration
+    And I navigate to "Development > Make test course" in site administration
+    And I set the following fields to these values:
+      | Size of course    | XS                          |
+      | Course full name  | New fake course for testing |
+      | Course short name | newfake                     |
+    And I press "Create course"
+    And I click on "Continue" "link"
+    And I navigate to course participants
+    And I should see "Teacher"
@@ -68,9 +68,14 @@ class maketestcourse_test extends \advanced_testcase {
        $this->assertEquals(2, count($modinfo->get_section_info_all()));

        // Check user is enrolled.
+        // enroladminnewcourse is enabled by default, so admin is also enrolled as teacher.
        $users = get_enrolled_users($context);
-        $this->assertEquals(1, count($users));
-        $this->assertEquals('tool_generator_000001', reset($users)->username);
+        $this->assertEquals(2, count($users));
+        $usernames = array_map(function($user) {
+            return $user->username;
+        }, $users);
+        $this->assertTrue(in_array('admin', $usernames));
+        $this->assertTrue(in_array('tool_generator_000001', $usernames));

        // Check there's a page on the course.
        $pages = $modinfo->get_instances_of('page');
@@ -114,7 +114,7 @@ if ($mode == DELETION_OF_SELECTED_LANG and (!empty($uninstalllang) or !empty($co
    }
 }

-if ($mode == UPDATE_ALL_LANG) {
+if ($mode == UPDATE_ALL_LANG && confirm_sesskey()) {
    core_php_time_limit::raise();
    $controller->update_all_installed_languages();
 }
@@ -87,6 +87,7 @@
                <div>
                    <form id="updateform" action="{{updateurl}}" method="post">
                        <fieldset>
+                            <input type="hidden" name="sesskey" value="{{sesskey}}">
                            <input type="submit" value="{{#str}}updatelangs, tool_langimport{{/str}}" class="btn btn-secondary">
                            {{#hasmanyinstalledlanguages}}
                                <p class="mt-2 small">{{#str}} updatelangsnote, tool_langimport, {"taskname": {{#quote}}{{updatelangstaskname}}{{/quote}} }{{/str}}</p>
@@ -82,7 +82,7 @@ trait reader {
     */
    public static function decode_other(?string $other) {
        if ($other === 'N;' || preg_match('~^.:~', $other ?? '')) {
-            return unserialize($other);
+            return unserialize($other, ['allowed_classes' => [stdClass::class]]);
        } else {
            return json_decode($other ?? '', true);
        }
@@ -45,5 +45,8 @@ function xmldb_tool_log_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -39,5 +39,8 @@ function xmldb_logstore_database_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -66,5 +66,8 @@ function xmldb_logstore_standard_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -102,7 +102,7 @@
        <strong>{{#str}}activities{{/str}}</strong>
        <ul class="inline list-inline p-2">
        {{#coursemodules}}
-            <li class="list-inline-item"><a href="{{url}}"><img src="{{iconurl}}"> {{name}} </a></li>
+            <li class="list-inline-item"><a href="{{url}}"><img class="icon" src="{{iconurl}}"> {{name}} </a></li>
        {{/coursemodules}}
        {{^coursemodules}}
            <li class="list-inline-item">{{#str}}noactivities, tool_lp{{/str}}</li>
@@ -49,7 +49,7 @@
        <p>
        <ul class="inline list-inline">
        {{#coursemodules}}
-            <li class="list-inline-item"><a href="{{url}}"><img src="{{iconurl}}"> {{name}} </a></li>
+            <li class="list-inline-item"><a href="{{url}}"><img class="icon" src="{{iconurl}}"> {{name}} </a></li>
        {{/coursemodules}}
        {{^coursemodules}}
            <li class="list-inline-item"><span class="alert">{{#str}}noactivities, tool_lp{{/str}}</span></li>
@@ -333,8 +333,8 @@ class renderer extends \plugin_renderer_base {

        // Auth rows.
        $authtypes = get_enabled_auth_plugins(true);
-        $row = [];
        foreach ($authtypes as $authtype) {
+            $row = [];
            $row[] = \html_writer::tag('b', $authtype);

            // Setup the overall totals columns.
@@ -46,5 +46,8 @@ function xmldb_factor_auth_upgrade($oldversion) {
        upgrade_plugin_savepoint(true, 2021020500, 'factor', 'auth');
    }

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -34,7 +34,7 @@ $string['error:futurecode'] = 'This code is invalid. Please verify the time on y
    Current system time is {$a}.';
 $string['error:oldcode'] = 'This code is too old. Please verify the time on your authenticator device is correct and try again.
    Current system time is {$a}.';
-$string['error:wrongverification'] = 'Incorrect verification code';
+$string['error:wrongverification'] = 'Incorrect verification code.';
 $string['factorsetup'] = 'App setup';
 $string['info'] = '<p>Use any time-based one-time password (TOTP) authenticator app on your device to generate a verification code, even when it is offline.</p>

@@ -384,7 +384,8 @@ class api {
            $settings->searchhideallcategory = $CFG->searchhideallcategory;
            $settings->searchmaxtopresults = $CFG->searchmaxtopresults;
            $settings->searchbannerenable = $CFG->searchbannerenable;
-            $settings->searchbanner = $CFG->searchbanner;
+            $settings->searchbanner = \core_external\util::format_text(
+                $CFG->searchbanner, FORMAT_HTML, $context)[0];
        }

        return $settings;
@@ -515,6 +516,7 @@ class api {
            'comments' => 'CoreBlockDelegate_AddonBlockComments',
            'completionstatus' => 'CoreBlockDelegate_AddonBlockCompletionStatus',
            'feedback' => 'CoreBlockDelegate_AddonBlockFeedback',
+            'globalsearch' => 'CoreBlockDelegate_AddonBlockGlobalSearch',
            'glossary_random' => 'CoreBlockDelegate_AddonBlockGlossaryRandom',
            'html' => 'CoreBlockDelegate_AddonBlockHtml',
            'lp' => 'CoreBlockDelegate_AddonBlockLp',
@@ -523,6 +525,7 @@ class api {
            'private_files' => 'CoreBlockDelegate_AddonBlockPrivateFiles',
            'recent_activity' => 'CoreBlockDelegate_AddonBlockRecentActivity',
            'rss_client' => 'CoreBlockDelegate_AddonBlockRssClient',
+            'search_forums' => 'CoreBlockDelegate_AddonBlockSearchForums',
            'selfcompletion' => 'CoreBlockDelegate_AddonBlockSelfCompletion',
            'tags' => 'CoreBlockDelegate_AddonBlockTags',
        );
@@ -47,5 +47,8 @@ function xmldb_tool_mobile_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -56,8 +56,9 @@ if (!empty($oauthsso) && is_enabled_auth('oauth2')) {

 // Check if the plugin is properly configured.
 $typeoflogin = get_config('tool_mobile', 'typeoflogin');
-if (empty($SESSION->justloggedin) and
-        $typeoflogin != tool_mobile\api::LOGIN_VIA_BROWSER and
+if (empty($SESSION->justloggedin) &&
+        !is_enabled_auth('oauth2') &&
+        $typeoflogin != tool_mobile\api::LOGIN_VIA_BROWSER &&
        $typeoflogin != tool_mobile\api::LOGIN_VIA_EMBEDDED_BROWSER) {
    throw new moodle_exception('pluginnotenabledorconfigured', 'tool_mobile');
 }
@@ -75,5 +75,8 @@ function xmldb_tool_monitor_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -155,5 +155,8 @@ function xmldb_tool_moodlenet_upgrade(int $oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -50,12 +50,10 @@ list($options, $unrecognized) = cli_get_params(
    )
 );

-if (file_exists(__DIR__.'/../../../../vendor/phpunit/phpunit/composer.json')) {
-    // Composer packages present.
-    require_once(__DIR__.'/../../../../vendor/autoload.php');
-
-} else {
-    // Note: installation via PEAR is not supported any more.
+// Basic check to see if phpunit is installed.
+if (!file_exists(__DIR__.'/../../../../vendor/phpunit/phpunit/composer.json') ||
+        !file_exists(__DIR__.'/../../../../vendor/bin/phpunit') ||
+        !file_exists(__DIR__.'/../../../../vendor/autoload.php')) {
    phpunit_bootstrap_error(PHPUNIT_EXITCODE_PHPUNITMISSING);
 }

@@ -74,12 +72,13 @@ if ($options['run']) {
        }
    }
    $_SERVER['argv'] = array_values($_SERVER['argv']);
-    PHPUnit\TextUI\Command::main();
+    require(__DIR__ . '/../../../../vendor/bin/phpunit');
    exit(0);
 }

 define('PHPUNIT_UTIL', true);

+require(__DIR__.'/../../../../vendor/autoload.php');
 require(__DIR__ . '/../../../../lib/phpunit/bootstrap.php');

 // from now on this is a regular moodle CLI_SCRIPT
@@ -46,5 +46,8 @@ function xmldb_tool_policy_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -35,7 +35,7 @@ $renderer = $PAGE->get_renderer('tool_task');
 if ($classname) {
    $pageurl = new moodle_url('/admin/tool/task/adhoctasks.php');
    $PAGE->navbar->add(get_string('adhoctasks', 'tool_task'), $pageurl);
-    $PAGE->navbar->add($classname, $PAGE->url);
+    $PAGE->navbar->add(s($classname), $PAGE->url);

    $tasks = core\task\manager::get_adhoc_tasks($classname, $failedonly);

@@ -80,6 +80,9 @@ $string['runnow'] = 'Run now';
 $string['runagain'] = 'Run again';
 $string['runadhoc_confirm'] = 'Tasks will run on the web server and may take some time to complete.';
 $string['runadhoc'] = 'Run ad hoc tasks now?';
+$string['runadhoctask'] = 'Run \'{$a->task}\' task ID {$a->taskid}';
+$string['runadhoctasks'] = 'Run all \'{$a}\' tasks';
+$string['runadhoctasksfailed'] = 'Run failed \'{$a}\' tasks';
 $string['runnow_confirm'] = 'Are you sure you want to run this task \'{$a}\' now? The task will run on the web server and may take some time to complete.';
 $string['runclassname'] = 'Run all';
 $string['runclassnamefailedonly'] = 'Run all failed';
@@ -45,5 +45,6 @@ function tool_task_status_checks() : array {
 * @param string $eol End of line character
 */
 function tool_task_mtrace_wrapper(string $message, string $eol): void {
-    echo s($message . $eol);
+    $message = s($message);
+    echo $message . $eol;
 }
@@ -82,7 +82,7 @@ class tool_task_renderer extends plugin_renderer_base {
                );
                $classcell = new html_table_cell($classcontent);
                $classcell->header = true;
-                $classcell->class = "task-class-summary text-ltr";
+                $classcell->attributes['class'] = "task-class-summary text-ltr";

                $duecontent = $stats['due'];
                if ($canruntasks && ($stats['due'] > 0 || $stats['failed'] > 0)) {
@@ -166,7 +166,7 @@ class tool_task_renderer extends plugin_renderer_base {
        // Main tasks table.
        $table = $this->generate_adhoc_tasks_simple_table($tasks, $canruntasks);

-        $table->caption = "$classname "
+        $table->caption = s($classname) . " "
            . get_string($failedonly ? 'adhoctasksfailed' : 'adhoctasks', 'tool_task');
        $table->head[3] .= " $failedorall"; // Spice up faildelay heading.

@@ -54,13 +54,19 @@ if ($taskid) {
        throw new \moodle_exception('invalidtaskid');
    }
    $classname = $record->classname;
-    $heading = "Run $classname task Id $taskid";
+    $heading = get_string('runadhoctask', 'tool_task', ['task' => $classname, 'taskid' => $taskid]);
    $tasks = [core\task\manager::adhoc_task_from_record($record)];
 } else {
    if (!$classname) {
        throw new \moodle_exception('noclassname', 'tool_task');
    }
-    $heading = "Run $classname " . ($failedonly ? "failed" : "all")." tasks";
+
+    $heading = get_string(
+        $failedonly ? 'runadhoctasksfailed' : 'runadhoctasks',
+        'tool_task',
+        s($classname),
+    );
+
    $now = time();
    $tasks = array_filter(
        core\task\manager::get_adhoc_tasks($classname, $failedonly, true),
@@ -111,6 +117,7 @@ require_sesskey();
 \core\session\manager::write_close();

 // Prepare to handle output via mtrace.
+require_once("{$CFG->dirroot}/{$CFG->admin}/tool/task/lib.php");
 $CFG->mtrace_wrapper = 'tool_task_mtrace_wrapper';

 // Run the specified tasks.
@@ -89,6 +89,8 @@ echo $OUTPUT->select_element_for_append();

 // Prepare to handle output via mtrace.
 echo html_writer::start_tag('pre', ['style' => 'color: #fff; background: #333; padding: 1em; min-height: 24lh']);
+
+require_once("{$CFG->dirroot}/{$CFG->admin}/tool/task/lib.php");
 $CFG->mtrace_wrapper = 'tool_task_mtrace_wrapper';

 // Run the specified task (this will output an error if it doesn't exist).
@@ -236,6 +236,8 @@ class form_test extends \advanced_testcase {
        $checker->set_day_of_week('6');
        $this->assertTrue($checker->is_valid($checker::FIELD_DAYOFWEEK));
        $checker->set_day_of_week('7');
+        $this->assertTrue($checker->is_valid($checker::FIELD_DAYOFWEEK));
+        $checker->set_day_of_week('8');
        $this->assertFalse($checker->is_valid($checker::FIELD_DAYOFWEEK));
        $checker->set_day_of_week('20');
        $this->assertFalse($checker->is_valid($checker::FIELD_DAYOFWEEK));
@@ -247,7 +249,7 @@ class form_test extends \advanced_testcase {
        $checker->set_day_of_week('*/6');
        $this->assertTrue($checker->is_valid($checker::FIELD_DAYOFWEEK));
        $checker->set_day_of_week('*/7');
-        $this->assertFalse($checker->is_valid($checker::FIELD_DAYOFWEEK));
+        $this->assertTrue($checker->is_valid($checker::FIELD_DAYOFWEEK));
        $checker->set_day_of_week('*/13');
        $this->assertFalse($checker->is_valid($checker::FIELD_DAYOFWEEK));
        $checker->set_day_of_week('*/35');
@@ -271,6 +273,8 @@ class form_test extends \advanced_testcase {
        $checker->set_day_of_week('65-2');
        $this->assertFalse($checker->is_valid($checker::FIELD_DAYOFWEEK));
        $checker->set_day_of_week('3-7');
+        $this->assertTrue($checker->is_valid($checker::FIELD_DAYOFWEEK));
+        $checker->set_day_of_week('3-8');
        $this->assertFalse($checker->is_valid($checker::FIELD_DAYOFWEEK));
    }
 }
@@ -367,6 +367,11 @@ class cli_helper {
                    $firstoption = reset($selectoptions);
                    $default = $firstoption['attr']['value'];
                }
+
+                // The menu profile field type allows for an empty default value, handle that here.
+                if (preg_match('/^profile_field_/', $name) && $default === '') {
+                    $possiblevalues[] = $default;
+                }
            }

            if ($element instanceof \HTML_QuickForm_checkbox) {
@@ -461,9 +461,22 @@ class process {
            return;
        }

-        $matchparam = $this->get_match_on_email() ? ['email' => $user->email] : ['username' => $user->username];
-        if ($existinguser = $DB->get_records('user', $matchparam + ['mnethostid' => $user->mnethostid])) {
-            if (is_array($existinguser) && count($existinguser) !== 1) {
+        if ($this->get_match_on_email()) {
+            // Case-insensitive query for the given email address.
+            $userselect = $DB->sql_equal('email', ':email', false);
+            $userparams = ['email' => $user->email];
+        } else {
+            $userselect = 'username = :username';
+            $userparams = ['username' => $user->username];
+        }
+
+        // Match the user, also accounting for multiple records by email.
+        $existinguser = $DB->get_records_select('user', "{$userselect} AND mnethostid = :mnethostid",
+            $userparams + ['mnethostid' => $user->mnethostid]);
+        $existingusercount = count($existinguser);
+
+        if ($existingusercount > 0) {
+            if ($existingusercount !== 1) {
                $this->upt->track('status', get_string('duplicateemail', 'tool_uploaduser', $user->email), 'warning');
                $this->userserrors++;
                return;
@@ -1371,8 +1384,14 @@ class process {
                }
            }
        }
+
+        // Warn user about invalid data values.
        if (($invalid = \core_user::validate($user)) !== true) {
-            $this->upt->track('status', get_string('invaliduserdata', 'tool_uploaduser', s($user->username)), 'warning');
+            $listseparator = get_string('listsep', 'langconfig') . ' ';
+            $this->upt->track('status', get_string('invaliduserdatavalues', 'tool_uploaduser', [
+                'username' => s($user->username),
+                'values' => implode($listseparator, array_keys($invalid)),
+            ]), 'warning');
        }
    }

@@ -50,6 +50,7 @@ The example text file may also be used for testing, as you are able to preview u
 $string['infoprefix'] = 'Info:';
 $string['invalidupdatetype'] = 'This option cannot be selected with the chosen upload type.';
 $string['invaliduserdata'] = 'Invalid data detected for user {$a} and it has been automatically cleaned.';
+$string['invaliduserdatavalues'] = 'Invalid data detected for user \'{$a->username}\' ({$a->values}), which has been automatically cleaned.';
 $string['invalidtheme'] = 'Theme "{$a}" is not installed and will be ignored.';
 $string['linex'] = 'Line {$a}';
 $string['matchemail'] = 'Match on email address';
@@ -186,6 +186,26 @@ EOF;
        $this->assertEquals('student1', reset($usersasdefaultrole)->username);
    }

+    /**
+     * Test that invalid data contained in uploaded CSV triggers appropriate warnings
+     */
+    public function test_user_upload_user_validate(): void {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        $csv = <<<EOF
+username,firstname,lastname,email,country
+student1,Student,One,s1@example.com,Wales
+EOF;
+
+        $output = $this->process_csv_upload($csv, ['--uutype=' . UU_USER_ADDNEW]);
+
+        // We should get the debugging from the user class itself, as well as warning in the output regarding the same.
+        $this->assertDebuggingCalled('The property \'country\' has invalid data and has been cleaned.');
+        $this->assertStringContainsString('Invalid data detected for user \'student1\' (country), ' .
+            'which has been automatically cleaned.', $output);
+    }
+
    /**
     * Generate cli_helper and mock $_SERVER['argv']
     *
@@ -97,9 +97,6 @@ class admin_uploaduser_form2 extends moodleform {
        $columns = $this->_customdata['columns'];
        $data    = $this->_customdata['data'];

-        // I am the template user, why should it be the administrator? we have roles now, other ppl may use this script ;-)
-        $templateuser = $USER;
-
        // upload settings and file
        $mform->addElement('header', 'settingsheader', get_string('settings'));

@@ -276,30 +273,19 @@ class admin_uploaduser_form2 extends moodleform {
        $mform->setDefault('autosubscribe', core_user::get_property_default('autosubscribe'));

        $mform->addElement('text', 'city', get_string('city'), 'maxlength="120" size="25"');
-        $mform->setType('city', PARAM_TEXT);
-        if (empty($CFG->defaultcity)) {
-            $mform->setDefault('city', $templateuser->city);
-        } else {
-            $mform->setDefault('city', core_user::get_property_default('city'));
-        }
+        $mform->setType('city', core_user::get_property_type('city'));
+        $mform->setDefault('city', core_user::get_property_default('city'));

-        $choices = get_string_manager()->get_list_of_countries();
-        $choices = array(''=>get_string('selectacountry').'...') + $choices;
-        $mform->addElement('select', 'country', get_string('selectacountry'), $choices);
-        if (empty($CFG->country)) {
-            $mform->setDefault('country', $templateuser->country);
-        } else {
-            $mform->setDefault('country', core_user::get_property_default('country'));
-        }
+        $mform->addElement('select', 'country', get_string('selectacountry'), core_user::get_property_choices('country'));
+        $mform->setDefault('country', core_user::get_property_default('country') ?: '');
        $mform->setAdvanced('country');

-        $choices = core_date::get_list_of_timezones($templateuser->timezone, true);
-        $mform->addElement('select', 'timezone', get_string('timezone'), $choices);
-        $mform->setDefault('timezone', $templateuser->timezone);
+        $mform->addElement('select', 'timezone', get_string('timezone'), core_date::get_list_of_timezones(null, true));
+        $mform->setDefault('timezone', core_user::get_property_default('timezone'));
        $mform->setAdvanced('timezone');

-        $mform->addElement('select', 'lang', get_string('preferredlanguage'), get_string_manager()->get_list_of_translations());
-        $mform->setDefault('lang', $templateuser->lang);
+        $mform->addElement('select', 'lang', get_string('preferredlanguage'), core_user::get_property_choices('lang'));
+        $mform->setDefault('lang', core_user::get_property_default('lang'));
        $mform->setAdvanced('lang');

        $editoroptions = array('maxfiles'=>0, 'maxbytes'=>0, 'trusttext'=>false, 'forcehttps'=>false);
@@ -313,25 +299,23 @@ class admin_uploaduser_form2 extends moodleform {
        $mform->setForceLtr('idnumber');

        $mform->addElement('text', 'institution', get_string('institution'), 'maxlength="255" size="25"');
-        $mform->setType('institution', PARAM_TEXT);
-        $mform->setDefault('institution', $templateuser->institution);
+        $mform->setType('institution', core_user::get_property_type('institution'));

        $mform->addElement('text', 'department', get_string('department'), 'maxlength="255" size="25"');
-        $mform->setType('department', PARAM_TEXT);
-        $mform->setDefault('department', $templateuser->department);
+        $mform->setType('department', core_user::get_property_type('department'));

        $mform->addElement('text', 'phone1', get_string('phone1'), 'maxlength="20" size="25"');
-        $mform->setType('phone1', PARAM_NOTAGS);
+        $mform->setType('phone1', core_user::get_property_type('phone1'));
        $mform->setAdvanced('phone1');
        $mform->setForceLtr('phone1');

        $mform->addElement('text', 'phone2', get_string('phone2'), 'maxlength="20" size="25"');
-        $mform->setType('phone2', PARAM_NOTAGS);
+        $mform->setType('phone2', core_user::get_property_type('phone2'));
        $mform->setAdvanced('phone2');
        $mform->setForceLtr('phone2');

        $mform->addElement('text', 'address', get_string('address'), 'maxlength="255" size="25"');
-        $mform->setType('address', PARAM_TEXT);
+        $mform->setType('address', core_user::get_property_type('address'));
        $mform->setAdvanced('address');

        // Next the profile defaults
@@ -102,7 +102,7 @@ class block extends base {
     */
    public static function add_disabled_constraints_to_form(\MoodleQuickForm $mform) {
        $mform->hideIf('targetvalue_block', 'targettype', 'noteq',
-                \tool_usertours\target::get_target_constant_for_class(get_class()));
+                \tool_usertours\target::get_target_constant_for_class(self::class));
    }

    /**
@@ -92,7 +92,7 @@ class selector extends base {
     */
    public static function add_disabled_constraints_to_form(\MoodleQuickForm $mform) {
        $mform->hideIf('targetvalue_selector', 'targettype', 'noteq',
-                \tool_usertours\target::get_target_constant_for_class(get_class()));
+                \tool_usertours\target::get_target_constant_for_class(self::class));
    }

    /**
@@ -81,7 +81,7 @@ class unattached extends base {
     * @param   MoodleQuickForm $mform      The form to add configuration to.
     */
    public static function add_disabled_constraints_to_form(\MoodleQuickForm $mform) {
-        $myvalue = \tool_usertours\target::get_target_constant_for_class(get_class());
+        $myvalue = \tool_usertours\target::get_target_constant_for_class(self::class);

        foreach (array_keys(self::$forcedsettings) as $settingname) {
            $mform->hideIf($settingname, 'targettype', 'eq', $myvalue);
@@ -146,5 +146,8 @@ function xmldb_tool_usertours_upgrade($oldversion) {
        upgrade_plugin_savepoint(true, 2023053000, 'tool', 'usertours');
    }

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -33,18 +33,17 @@ $userid = required_param('userid', PARAM_INT);
 admin_externalpage_setup('externalserviceusersettings');

 //define nav bar
-$PAGE->set_url('/' . $CFG->admin . '/webservice/service_user_settings.php',
-        array('id' => $serviceid, 'userid'  => $userid));
+$PAGE->set_url('/admin/webservice/service_user_settings.php', ['serviceid' => $serviceid, 'userid'  => $userid]);
 $node = $PAGE->settingsnav->find('externalservices', navigation_node::TYPE_SETTING);
 if ($node) {
    $node->make_active();
 }
-$PAGE->navbar->add(get_string('serviceusers', 'webservice'),
-        new moodle_url('/' . $CFG->admin . '/webservice/service_users.php', array('id' => $serviceid)));
+
+$returnurl = new moodle_url('/admin/webservice/service_users.php', ['id' => $serviceid]);
+$PAGE->navbar->add(get_string('serviceusers', 'webservice'), $returnurl);
 $PAGE->navbar->add(get_string('serviceusersettings', 'webservice'));

 $formaction = new moodle_url('', array('id' => $serviceid, 'userid' => $userid));
-$returnurl = new moodle_url('/' . $CFG->admin . '/webservice/service_users.php', array('id' => $serviceid));

 $webservicemanager = new webservice();
 $serviceuser = $webservicemanager->get_ws_authorised_user($serviceid, $userid);
@@ -52,5 +52,8 @@ function xmldb_auth_cas_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -90,7 +90,7 @@ class login implements renderable, templatable {
        $languagedata = new \core\output\language_menu($PAGE);

        $this->languagemenu = $languagedata->export_for_action_menu($OUTPUT);
-        $this->canloginasguest = $CFG->guestloginbutton and !isguestuser();
+        $this->canloginasguest = $CFG->guestloginbutton && !isguestuser();
        $this->canloginbyemail = !empty($CFG->authloginviaemail);
        $this->cansignup = $CFG->registerauth == 'email' || !empty($CFG->registerauth);
        if ($CFG->rememberusername == 0) {
@@ -44,5 +44,8 @@ function xmldb_auth_db_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -44,5 +44,8 @@ function xmldb_auth_email_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -52,5 +52,8 @@ function xmldb_auth_ldap_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -110,8 +110,7 @@ class auth_plugin_lti extends \auth_plugin_base {

        // The platform user is already linked with a user account.
        if ($this->get_user_binding($launchdata['iss'], $launchdata['sub'])) {
-            // Always sync the PII, regardless of whether we're already authenticated as this user or not.
-            $user = $this->find_or_create_user_from_launch($launchdata, true);
+            $user = $this->find_or_create_user_from_launch($launchdata);

            if (isloggedin()) {
                // If a different user is currently logged in, authenticate the linked user instead.
@@ -121,11 +120,13 @@ class auth_plugin_lti extends \auth_plugin_base {
                }
                // If the linked user is already logged in, skip the call to complete_user_login() because this affects deep linking
                // workflows on sites publishing and consuming resources on the same site, due to the regenerated sesskey.
-                return;
            } else {
                complete_user_login($user);
-                return;
+
            }
+            // Always sync the PII, regardless of whether we're already authenticated as this user or not.
+            $this->update_user_account($user, $launchdata, $launchdata['iss']);
+            return;
        }

        // The platform user is not bound to a user account, check provisioning mode now.
@@ -136,7 +137,9 @@ class auth_plugin_lti extends \auth_plugin_base {
        switch ($provisioningmode) {
            case self::PROVISIONING_MODE_AUTO_ONLY:
                // Automatic provisioning - this will create/migrate a user account and log the user in.
-                complete_user_login($this->find_or_create_user_from_launch($launchdata, true, $legacyconsumersecrets));
+                $user = $this->find_or_create_user_from_launch($launchdata, $legacyconsumersecrets);
+                complete_user_login($user);
+                $this->update_user_account($user, $launchdata, $launchdata['iss']);
                break;
            case self::PROVISIONING_MODE_PROMPT_NEW_EXISTING:
            case self::PROVISIONING_MODE_PROMPT_EXISTING_ONLY:
@@ -211,21 +214,13 @@ class auth_plugin_lti extends \auth_plugin_base {
     * itself and pass relevant data in - as auth_plugin_lti::complete_login() does.
     *
     * @param array $launchdata all data in the decoded JWT including iss and sub.
-     * @param bool $syncpicture whether to sync the user's picture with the picture sent in the launch.
     * @param array $legacyconsumersecrets all secrets found for the legacy consumer, facilitating user migration.
     * @return stdClass the Moodle user who is mapped to the platform user identified in the JWT data.
     */
-    public function find_or_create_user_from_launch(array $launchdata, bool $syncpicture = false,
-            array $legacyconsumersecrets = []): stdClass {
-
-        if (!$syncpicture) {
-            unset($launchdata['picture']);
-        }
+    public function find_or_create_user_from_launch(array $launchdata, array $legacyconsumersecrets = []): stdClass {

        if ($binduser = $this->get_user_binding($launchdata['iss'], $launchdata['sub'])) {
-            $user = \core_user::get_user($binduser);
-            $this->update_user_account($user, $launchdata, $launchdata['iss']);
-            return \core_user::get_user($user->id);
+            return \core_user::get_user($binduser);
        } else {
            // Is the intent to migrate a user account used in legacy launches?
            if (!empty($legacyconsumersecrets)) {
@@ -234,11 +229,10 @@ class auth_plugin_lti extends \auth_plugin_base {
                    $usermigrationclaim = new user_migration_claim($launchdata, $legacyconsumersecrets);
                    $username = 'enrol_lti' .
                        sha1($usermigrationclaim->get_consumer_key() . '::' .
-                        $usermigrationclaim->get_consumer_key() .':' .$usermigrationclaim->get_user_id());
-                    if ($user = \core_user::get_user_by_username($username)) {
+                            $usermigrationclaim->get_consumer_key() . ':' . $usermigrationclaim->get_user_id());
+                    if ($user = core_user::get_user_by_username($username)) {
                        $this->create_user_binding($launchdata['iss'], $launchdata['sub'], $user->id);
-                        $this->update_user_account($user, $launchdata, $launchdata['iss']);
-                        return \core_user::get_user($user->id);
+                        return core_user::get_user($user->id);
                    }
                } catch (Exception $e) {
                    // There was an issue validating the user migration claim. We don't want to fail auth entirely though.
@@ -247,9 +241,12 @@ class auth_plugin_lti extends \auth_plugin_base {
                        "'{$launchdata['iss']}'. The migration claim could not be validated. A new account will be created.");
                }
            }
+            // At the point of the creation, to ensure the user_created event correctly reflects the creating user of '0' (the user
+            // performing the action), ensure any active session is terminated and an empty session initialised.
+            $this->empty_session();
+
            $user = $this->create_new_account($launchdata, $launchdata['iss']);
-            $this->update_user_account($user, $launchdata, $launchdata['iss']);
-            return \core_user::get_user($user->id);
+            return core_user::get_user($user->id);
        }
    }

@@ -301,6 +298,17 @@ class auth_plugin_lti extends \auth_plugin_base {
        return $binduser;
    }

+    /**
+     * If there's an existing session, inits an empty session.
+     *
+     * @return void
+     */
+    protected function empty_session(): void {
+        if (isloggedin()) {
+            \core\session\manager::init_empty_session();
+        }
+    }
+
    /**
     * Check whether a provisioning mode is valid or not.
     *
@@ -361,7 +369,7 @@ class auth_plugin_lti extends \auth_plugin_base {
     * @param array $userdata the user data coming from either a launch or membership service call.
     * @param string $iss the issuer to which the user belongs.
     */
-    protected function update_user_account(stdClass $user, array $userdata, string $iss): void {
+    public function update_user_account(stdClass $user, array $userdata, string $iss): void {
        global $CFG;
        require_once($CFG->dirroot.'/user/lib.php');
        if ($user->auth !== 'lti') {
@@ -94,5 +94,8 @@ function xmldb_auth_lti_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -72,8 +72,9 @@ if ($newaccount) {
    } else {
        // Create a new account and link it, logging the user in.
        $auth = get_auth_plugin('lti');
-        $newuser = $auth->find_or_create_user_from_launch($launchdata, true);
+        $newuser = $auth->find_or_create_user_from_launch($launchdata);
        complete_user_login($newuser);
+        $auth->update_user_account($newuser, $launchdata, $launchdata['iss']);

        $PAGE->set_context(context_system::instance());
        $PAGE->set_url(new moodle_url('/auth/lti/login.php'));
@@ -214,7 +214,7 @@ class auth_test extends \advanced_testcase {
     * @param array $expected the test case expectations.
     * @covers ::find_or_create_user_from_launch
     */
-    public function test_find_or_create_user_from_launch(?array $legacydata, array $launchdata, array $expected) {
+    public function test_find_or_create_user_from_launch(?array $legacydata, array $launchdata, array $expected = []) {
        $this->resetAfterTest();
        global $DB;
        $auth = get_auth_plugin('lti');
@@ -251,7 +251,7 @@ class auth_test extends \advanced_testcase {
        // Authenticate the platform user.
        $sink = $this->redirectEvents();
        $countusersbefore = $DB->count_records('user');
-        $user = $auth->find_or_create_user_from_launch($mockjwtdata, true, $legacysecrets);
+        $user = $auth->find_or_create_user_from_launch($mockjwtdata, $legacysecrets);
        if (!empty($expected['migration_debugging'])) {
            $this->assertDebuggingCalled();
        }
@@ -266,47 +266,15 @@ class auth_test extends \advanced_testcase {
            0 : $numnewusers;
        $this->assertEquals($numnewusers, $countusersafter - $countusersbefore);

-        // Verify PII is updated appropriately.
-        switch ($expected['PII']) {
-            case self::PII_ALL:
-                $this->assertEquals($launchdata['user']['given_name'], $user->firstname);
-                $this->assertEquals($launchdata['user']['family_name'], $user->lastname);
-                $this->assertEquals($launchdata['user']['email'], $user->email);
-                break;
-            case self::PII_NAMES_ONLY:
-                $this->assertEquals($launchdata['user']['given_name'], $user->firstname);
-                $this->assertEquals($launchdata['user']['family_name'], $user->lastname);
-                $email = 'enrol_lti_13_' . sha1($mockjwtdata['iss'] . '_' . $mockjwtdata['sub']) . "@example.com";
-                $this->assertEquals($email, $user->email);
-                break;
-            case self::PII_EMAILS_ONLY:
-                $this->assertEquals($mockjwtdata['iss'], $user->lastname);
-                $this->assertEquals($mockjwtdata['sub'], $user->firstname);
-                $this->assertEquals($launchdata['user']['email'], $user->email);
-                break;
-            default:
-            case self::PII_NONE:
-                $this->assertEquals($mockjwtdata['iss'], $user->lastname);
-                $this->assertEquals($mockjwtdata['sub'], $user->firstname);
-                $email = 'enrol_lti_13_' . sha1($mockjwtdata['iss'] . '_' . $mockjwtdata['sub']) . "@example.com";
-                $this->assertEquals($email, $user->email);
-                break;
-        }
-
-        // Verify picture sync occurs, if expected.
-        if (!empty($expected['syncpicture'])) {
-            $this->verify_user_profile_image_updated($user->id);
-        }
-
        if (!empty($expected['migrated'])) {
            // If migrated, verify the user account is reusing the legacy user account.
            $legacyuserids = array_column($legacyusers, 'id');
            $this->assertContains($user->id, $legacyuserids);
-            $this->assertInstanceOf(\core\event\user_updated::class, $events[0]);
+            $this->assertEmpty($events); // No updates as part of this method.
        } else if (isset($firstauthuser)) {
            // If the user is authenticating a second time, confirm the same account is being returned.
            $this->assertEquals($firstauthuser->id, $user->id);
-            $this->assertEmpty($events); // The user authenticated with the same data once before, so we don't expect an update.
+            $this->assertEmpty($events); // No updates as part of this method.
        } else {
            // The user wasn't migrated and hasn't launched before, so we expect a user_created event.
            $this->assertInstanceOf(\core\event\user_created::class, $events[0]);
@@ -329,9 +297,6 @@ class auth_test extends \advanced_testcase {
                    )[0],
                    'migration_claim' => null
                ],
-                'expected' => [
-                    'PII' => self::PII_ALL,
-                ]
            ],
            'New (unlinked) platform learner excluding names, no legacy user, no migration claim' => [
                'legacy_data' => null,
@@ -343,9 +308,6 @@ class auth_test extends \advanced_testcase {
                    )[0],
                    'migration_claim' => null
                ],
-                'expected' => [
-                    'PII' => self::PII_EMAILS_ONLY,
-                ]
            ],
            'New (unlinked) platform learner excluding emails, no legacy user, no migration claim' => [
                'legacy_data' => null,
@@ -358,9 +320,6 @@ class auth_test extends \advanced_testcase {
                    )[0],
                    'migration_claim' => null
                ],
-                'expected' => [
-                    'PII' => self::PII_NAMES_ONLY,
-                ]
            ],
            'New (unlinked) platform learner excluding all PII, no legacy user, no migration claim' => [
                'legacy_data' => null,
@@ -373,9 +332,6 @@ class auth_test extends \advanced_testcase {
                    )[0],
                    'migration_claim' => null
                ],
-                'expected' => [
-                    'PII' => self::PII_NONE,
-                ]
            ],
            'New (unlinked) platform learner including PII, existing legacy user, valid migration claim' => [
                'legacy_data' => [
@@ -403,7 +359,6 @@ class auth_test extends \advanced_testcase {
                    ]
                ],
                'expected' => [
-                    'PII' => self::PII_ALL,
                    'migrated' => true
                ]
            ],
@@ -426,7 +381,6 @@ class auth_test extends \advanced_testcase {
                    'migration_claim' => null,
                ],
                'expected' => [
-                    'PII' => self::PII_ALL,
                    'migrated' => false,
                ]
            ],
@@ -455,7 +409,6 @@ class auth_test extends \advanced_testcase {
                    ]
                ],
                'expected' => [
-                    'PII' => self::PII_ALL,
                    'migrated' => false,
                    'migration_debugging' => true,
                ]
@@ -486,7 +439,6 @@ class auth_test extends \advanced_testcase {
                    ]
                ],
                'expected' => [
-                    'PII' => self::PII_ALL,
                    'migrated' => false,
                ]
            ],
@@ -516,7 +468,6 @@ class auth_test extends \advanced_testcase {
                    ]
                ],
                'expected' => [
-                    'PII' => self::PII_ALL,
                    'migrated' => false
                ]
            ],
@@ -546,7 +497,6 @@ class auth_test extends \advanced_testcase {
                    ]
                ],
                'expected' => [
-                    'PII' => self::PII_ALL,
                    'migrated' => true
                ]
            ],
@@ -576,7 +526,6 @@ class auth_test extends \advanced_testcase {
                    ]
                ],
                'expected' => [
-                    'PII' => self::PII_ALL,
                    'migrated' => false,
                    'migration_debugging' => true,
                ]
@@ -605,7 +554,6 @@ class auth_test extends \advanced_testcase {
                    ]
                ],
                'expected' => [
-                    'PII' => self::PII_ALL,
                    'migrated' => false
                ]
            ],
@@ -637,7 +585,6 @@ class auth_test extends \advanced_testcase {
                    ]
                ],
                'expected' => [
-                    'PII' => self::PII_NONE,
                    'migrated' => true
                ]
            ],
@@ -650,9 +597,6 @@ class auth_test extends \advanced_testcase {
                    )[0],
                    'migration_claim' => null
                ],
-                'expected' => [
-                    'PII' => self::PII_ALL,
-                ]
            ],
            'New (unlinked) platform instructor excluding PII, no legacy user, no migration claim' => [
                'legacy_data' => null,
@@ -665,9 +609,6 @@ class auth_test extends \advanced_testcase {
                    )[0],
                    'migration_claim' => null
                ],
-                'expected' => [
-                    'PII' => self::PII_NONE,
-                ]
            ],
            'New (unlinked) platform instructor including PII, existing legacy user, valid migration claim' => [
                'legacy_data' => [
@@ -695,7 +636,6 @@ class auth_test extends \advanced_testcase {
                    ]
                ],
                'expected' => [
-                    'PII' => self::PII_ALL,
                    'migrated' => true
                ]
            ],
@@ -709,9 +649,6 @@ class auth_test extends \advanced_testcase {
                    )[0],
                    'migration_claim' => null
                ],
-                'expected' => [
-                    'PII' => self::PII_ALL,
-                ]
            ],
            'Existing (linked) platform learner excluding PII, no legacy user, no migration claim' => [
                'legacy_data' => null,
@@ -725,9 +662,6 @@ class auth_test extends \advanced_testcase {
                    )[0],
                    'migration_claim' => null
                ],
-                'expected' => [
-                    'PII' => self::PII_NONE,
-                ]
            ],
            'Existing (linked) platform instructor including PII, no legacy user, no migration claim' => [
                'legacy_data' => null,
@@ -739,9 +673,6 @@ class auth_test extends \advanced_testcase {
                    )[0],
                    'migration_claim' => null
                ],
-                'expected' => [
-                    'PII' => self::PII_ALL,
-                ]
            ],
            'Existing (linked) platform instructor excluding PII, no legacy user, no migration claim' => [
                'legacy_data' => null,
@@ -755,9 +686,6 @@ class auth_test extends \advanced_testcase {
                    )[0],
                    'migration_claim' => null
                ],
-                'expected' => [
-                    'PII' => self::PII_NONE,
-                ]
            ],
            'New (unlinked) platform instructor excluding PII, picture included' => [
                'legacy_data' => null,
@@ -772,10 +700,6 @@ class auth_test extends \advanced_testcase {
                    )[0],
                    'migration_claim' => null
                ],
-                'expected' => [
-                    'PII' => self::PII_NONE,
-                    'syncpicture' => true
-                ]
            ]
        ];
    }
@@ -1154,4 +1078,226 @@ class auth_test extends \advanced_testcase {
        // Assert idempotency of the bind call.
        $this->assertNull($auth->create_user_binding($mockiss, $mocksub, $user->id));
    }
+
+    /**
+     * Test updating a user account based on a given set of launchdata.
+     *
+     * @param array $firstlaunchdata the data from the first launch the user made.
+     * @param array $launchdata the current launch data, which will dictate what data is updated.
+     * @param array $expected array of test expectations
+     * @dataProvider update_user_account_provider
+     * @covers ::update_user_account
+     */
+    public function test_update_user_account(array $firstlaunchdata, array $launchdata, array $expected): void {
+        $this->resetAfterTest();
+        $auth = get_auth_plugin('lti');
+
+        // Mock the first authentication of the user.
+        $firstmockjwtdata = $this->get_mock_launchdata_for_user($firstlaunchdata['user']);
+        $user = $auth->find_or_create_user_from_launch($firstmockjwtdata);
+
+        // Now, mock the recent authentication, confirming updates.
+        $mockjwtdata = $this->get_mock_launchdata_for_user($launchdata['user']);
+        $sink = $this->redirectEvents();
+        $auth->update_user_account($user, $mockjwtdata, $mockjwtdata['iss']);
+        $user = \core_user::get_user($user->id);
+        $events = $sink->get_events();
+        $sink->close();
+
+        if (!empty($expected['user_updated'])) {
+            $this->assertInstanceOf(\core\event\user_updated::class, $events[0]);
+        } else {
+            $this->assertEmpty($events);
+        }
+
+        // Verify PII is updated appropriately.
+        switch ($expected['PII']) {
+            case self::PII_ALL:
+                $this->assertEquals($launchdata['user']['given_name'], $user->firstname);
+                $this->assertEquals($launchdata['user']['family_name'], $user->lastname);
+                $this->assertEquals($launchdata['user']['email'], $user->email);
+                break;
+            case self::PII_NAMES_ONLY:
+                $this->assertEquals($launchdata['user']['given_name'], $user->firstname);
+                $this->assertEquals($launchdata['user']['family_name'], $user->lastname);
+                $email = 'enrol_lti_13_' . sha1($mockjwtdata['iss'] . '_' . $mockjwtdata['sub']) . "@example.com";
+                $this->assertEquals($email, $user->email);
+                break;
+            case self::PII_EMAILS_ONLY:
+                $this->assertEquals($mockjwtdata['iss'], $user->lastname);
+                $this->assertEquals($mockjwtdata['sub'], $user->firstname);
+                $this->assertEquals($launchdata['user']['email'], $user->email);
+                break;
+            default:
+            case self::PII_NONE:
+                $this->assertEquals($mockjwtdata['iss'], $user->lastname);
+                $this->assertEquals($mockjwtdata['sub'], $user->firstname);
+                $email = 'enrol_lti_13_' . sha1($mockjwtdata['iss'] . '_' . $mockjwtdata['sub']) . "@example.com";
+                $this->assertEquals($email, $user->email);
+                break;
+        }
+
+        // Verify picture sync occurs, if expected.
+        if (!empty($expected['picture_updated'])) {
+            $this->verify_user_profile_image_updated($user->id);
+        }
+    }
+
+    /**
+     * Data provider for testing user user_update_account.
+     *
+     * @return array the test case data.
+     */
+    public function update_user_account_provider(): array {
+        return [
+            'Full PII included in both auths, no picture in either' => [
+                'first_launch_data' => [
+                     'user' => $this->get_mock_users_with_ids(
+                        ['1'],
+                        'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
+                    )[0]
+                ],
+                'launch_data' => [
+                    'user' => $this->get_mock_users_with_ids(
+                        ['1'],
+                        'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
+                    )[0],
+                ],
+                'expected' => [
+                    'PII' => self::PII_ALL,
+                    'user_updated' => false,
+                    'picture_updated' => false
+                ]
+            ],
+            'No PII included in both auths, no picture in either' => [
+                'first_launch_data' => [
+                    'user' => $this->get_mock_users_with_ids(
+                        ['1'],
+                        'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
+                        false,
+                        false
+                    )[0]
+                ],
+                'launch_data' => [
+                    'user' => $this->get_mock_users_with_ids(
+                        ['1'],
+                        'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
+                        false,
+                        false
+                    )[0],
+                ],
+                'expected' => [
+                    'PII' => self::PII_NONE,
+                    'user_updated' => false,
+                    'picture_updated' => false
+                ]
+            ],
+            'First auth no PII, second auth including PII, no picture in either' => [
+                'first_launch_data' => [
+                    'user' => $this->get_mock_users_with_ids(
+                        ['1'],
+                        'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
+                        false,
+                        false
+                    )[0]
+                ],
+                'launch_data' => [
+                    'user' => $this->get_mock_users_with_ids(
+                        ['1'],
+                        'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
+                    )[0],
+                ],
+                'expected' => [
+                    'PII' => self::PII_ALL,
+                    'user_updated' => true,
+                    'picture_updated' => false
+                ]
+            ],
+            'First auth full PII, second auth no PII, no picture in either' => [
+                'first_launch_data' => [
+                    'user' => $this->get_mock_users_with_ids(
+                        ['1'],
+                        'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
+                    )[0]
+                ],
+                'launch_data' => [
+                    'user' => $this->get_mock_users_with_ids(
+                        ['1'],
+                        'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
+                        false,
+                        false
+                    )[0],
+                ],
+                'expected' => [
+                    'PII' => self::PII_NONE,
+                    'user_updated' => true,
+                    'picture_updated' => false
+                ]
+            ],
+            'First auth full PII, second auth emails only, no picture in either' => [
+                'first_launch_data' => [
+                    'user' => $this->get_mock_users_with_ids(
+                        ['1'],
+                        'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
+                    )[0]
+                ],
+                'launch_data' => [
+                    'user' => $this->get_mock_users_with_ids(
+                        ['1'],
+                        'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
+                        false
+                    )[0],
+                ],
+                'expected' => [
+                    'PII' => self::PII_EMAILS_ONLY,
+                    'user_updated' => true,
+                    'picture_updated' => false
+                ]
+            ],
+            'First auth full PII, second auth names only, no picture in either' => [
+                'first_launch_data' => [
+                    'user' => $this->get_mock_users_with_ids(
+                        ['1'],
+                        'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
+                    )[0]
+                ],
+                'launch_data' => [
+                    'user' => $this->get_mock_users_with_ids(
+                        ['1'],
+                        'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
+                        true,
+                        false
+                    )[0],
+                ],
+                'expected' => [
+                    'PII' => self::PII_NAMES_ONLY,
+                    'user_updated' => true,
+                    'picture_updated' => false
+                ]
+            ],
+            'Full PII included in both auths, picture included in the second auth' => [
+                'first_launch_data' => [
+                    'user' => $this->get_mock_users_with_ids(
+                        ['1'],
+                        'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner'
+                    )[0]
+                ],
+                'launch_data' => [
+                    'user' => $this->get_mock_users_with_ids(
+                        ['1'],
+                        'http://purl.imsglobal.org/vocab/lis/v2/membership#Learner',
+                        true,
+                        true,
+                        true
+                    )[0],
+                ],
+                'expected' => [
+                    'PII' => self::PII_ALL,
+                    'user_updated' => false,
+                    'picture_updated' => false
+                ]
+            ],
+        ];
+    }
+
 }
@@ -44,5 +44,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -44,5 +44,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -44,5 +44,8 @@ function xmldb_auth_none_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -45,5 +45,8 @@ function xmldb_auth_oauth2_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -66,5 +66,8 @@ function xmldb_auth_shibboleth_upgrade($oldversion) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -298,6 +298,7 @@ abstract class info {
            // So instead use the numbers (cmid) from the tag.
            $htmlname = preg_replace('~[^0-9]~', '', $name);
        }
+        $htmlname = html_to_text($htmlname, 75, false);
        $info = 'Error processing availability data for &lsquo;' . $htmlname
                 . '&rsquo;: ' . s($e->a);
        debugging($info, DEBUG_DEVELOPER);
@@ -740,11 +741,14 @@ abstract class info {
        $info = preg_replace_callback('~<AVAILABILITY_CMNAME_([0-9]+)/>~',
                function($matches) use($modinfo, $context) {
                    $cm = $modinfo->get_cm($matches[1]);
-                    if ($cm->has_view() and $cm->get_user_visible()) {
+                    $modulename = format_string($cm->get_name(), true, ['context' => $context]);
+                    // We make sure that we add a data attribute to the name so we can change it later if the
+                    // original module name changes.
+                    if ($cm->has_view() && $cm->get_user_visible()) {
                        // Help student by providing a link to the module which is preventing availability.
-                        return \html_writer::link($cm->get_url(), format_string($cm->get_name(), true, ['context' => $context]));
+                        return \html_writer::link($cm->get_url(), $modulename, ['data-cm-name-for' => $cm->id]);
                    } else {
-                        return format_string($cm->get_name(), true, ['context' => $context]);
+                        return \html_writer::span($modulename, '', ['data-cm-name-for' => $cm->id]);
                    }
                }, $info);
        $info = preg_replace_callback('~<AVAILABILITY_FORMAT_STRING>(.*?)</AVAILABILITY_FORMAT_STRING>~s',
@@ -149,15 +149,23 @@ class condition extends \core_availability\condition {

            $allow = true;
            if ($this->expectedcompletion == COMPLETION_COMPLETE) {
-                // Complete also allows the pass, fail states.
+                // Complete also allows the pass state.
                switch ($completiondata->completionstate) {
                    case COMPLETION_COMPLETE:
-                    case COMPLETION_COMPLETE_FAIL:
                    case COMPLETION_COMPLETE_PASS:
                        break;
                    default:
                        $allow = false;
                }
+            } else if ($this->expectedcompletion == COMPLETION_INCOMPLETE) {
+                // Incomplete also allows the fail state.
+                switch ($completiondata->completionstate) {
+                    case COMPLETION_INCOMPLETE:
+                    case COMPLETION_COMPLETE_FAIL:
+                        break;
+                    default:
+                        $allow = false;
+                }
            } else {
                // Other values require exact match.
                if ($completiondata->completionstate != $this->expectedcompletion) {
@@ -20,6 +20,8 @@ Feature: availability_completion
      | activity | course | name   | completion |
      | page     | C1     | Page 1 | 1          |
      | page     | C1     | Page 2 |            |
+      | page     | C1     | Page 3 | 1          |
+      | page     | C1     | Page 4 |            |

  @javascript
  Scenario: Test condition
@@ -74,3 +76,70 @@ Feature: availability_completion
    And I click on "forum 1" "link" in the "region-main" "region"
    And I am on "Course 1" course homepage
    And I should see "Page 2" in the "region-main" "region"
+
+  @javascript
+  Scenario Outline: Restrict access for activity completion should display correctly
+    Given the following "question categories" exist:
+      | contextlevel | reference | name           |
+      | Course       | C1        | Test questions |
+    And the following "questions" exist:
+      | questioncategory | qtype     | name           | questiontext              |
+      | Test questions   | truefalse | First question | Answer the first question |
+    And the following "activities" exist:
+      | activity   | name           | course | idnumber | gradepass | completion | completionpassgrade | completionusegrade |
+      | quiz       | Test quiz name | C1     | quiz1    | 5.00      | 2          | 1                   | 1                  |
+    And quiz "Test quiz name" contains the following questions:
+      | question       | page |
+      | First question | 1    |
+    And I am on the "Page 2" "page activity editing" page logged in as "teacher1"
+    And I expand all fieldsets
+    And I press "Add restriction..."
+    And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
+    And I click on ".availability-item .availability-eye img" "css_element"
+    And I set the following fields to these values:
+      | Required completion status | <condition>   |
+      | cm                         | quiz          |
+    And I press "Save and return to course"
+    And I am on the "Course 1" "course" page logged in as "student1"
+    And I <shouldornot> see "Page 2" in the "region-main" "region"
+    # Failed grade for quiz.
+    When user "student1" has attempted "Test quiz name" with responses:
+      | slot | response   |
+      | 1    | <answer1>  |
+    And I reload the page
+    And I <shouldornotanswer1> see "Page 2" in the "region-main" "region"
+    # Passing grade for quiz.
+    But user "student1" has attempted "Test quiz name" with responses:
+      | slot | response    |
+      | 1    | <answer2>   |
+    And I reload the page
+    And I <shouldornotanswer2> see "Page 2" in the "region-main" "region"
+
+    Examples:
+      | condition                        | answer1 | answer2 | shouldornot | shouldornotanswer1 | shouldornotanswer2 |
+      | must be marked complete          | False   | True    | should not  | should not         | should             |
+      | must not be marked complete      | False   | True    | should      | should             | should not         |
+      | must be complete with pass grade | False   | True    | should not  | should not         | should             |
+      | must be complete with fail grade | False   | True    | should not  | should             | should not         |
+
+  @javascript
+  Scenario: Edit dependent activity name should also change the access restriction message
+    Given I am on the "Page 2" "page activity editing" page logged in as "teacher1"
+    And I expand all fieldsets
+    And I click on "Add restriction..." "button"
+    And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
+    And I click on ".availability-item .availability-eye img" "css_element"
+    And I set the field "Activity or resource" to "Page 1"
+    And I press "Save and return to course"
+    And I am on the "Page 4" "page activity editing" page
+    And I expand all fieldsets
+    And I click on "Add restriction..." "button"
+    And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
+    And I click on ".availability-item .availability-eye img" "css_element"
+    And I set the field "Activity or resource" to "Page 3"
+    And I press "Save and return to course"
+    And I switch editing mode on
+    And I set the field "Edit title" in the "Page 1" "activity" to "Page X"
+    And I wait until the page is ready
+    Then I should see "Not available unless: The activity Page X is marked complete" in the "Page 2" "activity"
+    Then I should see "Not available unless: The activity Page 3 is marked complete" in the "Page 4" "activity"
@@ -301,14 +301,14 @@ class condition_test extends \advanced_testcase {
        $cond = new condition((object)[
            'cm' => (int)$assigncm->id, 'e' => COMPLETION_INCOMPLETE
        ]);
-        $this->assertFalse($cond->is_available(false, $info, true, $user->id));
-        $this->assertTrue($cond->is_available(true, $info, true, $user->id));
+        $this->assertTrue($cond->is_available(false, $info, true, $user->id));
+        $this->assertFalse($cond->is_available(true, $info, true, $user->id));

        $cond = new condition((object)[
            'cm' => (int)$assigncm->id, 'e' => COMPLETION_COMPLETE
        ]);
-        $this->assertTrue($cond->is_available(false, $info, true, $user->id));
-        $this->assertFalse($cond->is_available(true, $info, true, $user->id));
+        $this->assertFalse($cond->is_available(false, $info, true, $user->id));
+        $this->assertTrue($cond->is_available(true, $info, true, $user->id));

        $cond = new condition((object)[
            'cm' => (int)$assigncm->id, 'e' => COMPLETION_COMPLETE_PASS
@@ -531,10 +531,10 @@ class condition_test extends \advanced_testcase {
            ],
            // Depending on assign with grade.
            'Previous complete condition with previous fail grade' => [
-                40, COMPLETION_COMPLETE, '', 'page3', true, false, '~Assign!.*is marked complete~'
+                40, COMPLETION_COMPLETE, '', 'page3', false, true, '~Assign!.*is marked complete~',
            ],
            'Previous incomplete condition with previous fail grade' => [
-                40, COMPLETION_INCOMPLETE, '', 'page3', false, true, '~Assign!.*is incomplete~'
+                40, COMPLETION_INCOMPLETE, '', 'page3', true, false, '~Assign!.*is incomplete~',
            ],
            'Previous complete pass condition with previous fail grade' => [
                40, COMPLETION_COMPLETE_PASS, '', 'page3', false, true, '~Assign!.*is complete and passed~'
@@ -239,7 +239,7 @@ Feature: edit_availability
    And "Edit restrictions" "link" should exist in the "section-1" "core_availability > Section availability"
    When I click on "Edit restrictions" "link" in the "section-1" "core_availability > Section availability"
    Then I should see "Restrict access"
-    And I should not see "General"
+    And I should not see "Summary of General"
    And I should see "Collapse all"
    And I should not see "Expand all"
    And I click on "Cancel" "button"
@@ -264,3 +264,16 @@ Feature: edit_availability
    And I should not see "Content"
    And I should see "Collapse all"
    And I should not see "Expand all"
+
+  @javascript
+  Scenario: Edit activity availability button is shown after duplicating an activity
+    # Setting a restriction up
+    Given I am on the "MyForum" "forum activity editing" page logged in as teacher1
+    And I expand all fieldsets
+    And I press "Add restriction..."
+    And I click on "Date" "button" in the "Add restriction..." "dialogue"
+    When I press "Save and return to course"
+    And I turn editing mode on
+    And I duplicate "MyForum" activity
+    # Testing edit restrictions link
+    Then "Edit restrictions" "link" should exist in the "MyForum (copy)" "core_availability > Activity availability"
@@ -21,8 +21,7 @@ Feature: Private rule sets
      | Group A | C1     | GA       | 0          |
      | Group B | C1     | GB       | 1          |
    And I log in as "teacher1"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "Page" to section "1"
+    And I add a page activity to course "Course 1" section "1"
    And I expand all fieldsets

  Scenario: Add restriction with visible condition (must match), display option should be active
@@ -1663,7 +1663,13 @@ class backup_block_instance_structure_step extends backup_structure_step {
        // Transform configdata information if needed (process links and friends)
        $blockrec = $DB->get_record('block_instances', array('id' => $this->task->get_blockid()));
        if ($attrstotransform = $this->task->get_configdata_encoded_attributes()) {
-            $configdata = (array)unserialize(base64_decode($blockrec->configdata));
+            $configdata = array_filter(
+                (array) unserialize_object(base64_decode($blockrec->configdata)),
+                static function($value): bool {
+                    return !($value instanceof __PHP_Incomplete_Class);
+                }
+            );
+
            foreach ($configdata as $attribute => $value) {
                if (in_array($attribute, $attrstotransform)) {
                    $configdata[$attribute] = $this->contenttransformer->process($value);
@@ -4442,7 +4442,13 @@ class restore_block_instance_structure_step extends restore_structure_step {
        // Let's look for anything within configdata neededing processing
        // (nulls and uses of legacy file.php)
        if ($attrstotransform = $this->task->get_configdata_encoded_attributes()) {
-            $configdata = (array) unserialize_object(base64_decode($data->configdata));
+            $configdata = array_filter(
+                (array) unserialize_object(base64_decode($data->configdata)),
+                static function($value): bool {
+                    return !($value instanceof __PHP_Incomplete_Class);
+                }
+            );
+
            foreach ($configdata as $attribute => $value) {
                if (in_array($attribute, $attrstotransform)) {
                    $configdata[$attribute] = $this->contentprocessor->process_cdata($value);
@@ -160,12 +160,16 @@ if ($context->contextlevel == CONTEXT_MODULE) {
    $renderer = $PAGE->get_renderer('core', 'backup');
    echo $renderer->backup_files_viewer($treeview_options);
    echo $OUTPUT->container_end();
+    // Update the course context with the proper value, because $context contains the module context.
+    $coursecontext = \context_course::instance($course->id);
+} else {
+    $coursecontext = $context;
 }

 echo $OUTPUT->heading_with_help(get_string('choosefilefromcoursebackup', 'backup'), 'choosefilefromcoursebackup', 'backup');
 echo $OUTPUT->container_start();
 $treeview_options = array();
-$treeview_options['filecontext'] = $context;
+$treeview_options['filecontext'] = $coursecontext;
 $treeview_options['currentcontext'] = $context;
 $treeview_options['component']   = 'backup';
 $treeview_options['context']     = $context;
@@ -137,9 +137,11 @@ abstract class backup_cron_automated_helper {
            $rs->close();

            // Send email to admin if necessary.
-            if ($emailpending) {
-                self::send_backup_status_to_admin($admin);
-            }
+            set_config(
+                'backup_auto_emailpending',
+                $emailpending ? 1 : 0,
+                'backup',
+            );
        } finally {
            // Everything is finished release lock.
            $lock->release();
@@ -188,7 +190,7 @@ abstract class backup_cron_automated_helper {
     * @param stdClass $admin
     * @return array
     */
-    private static function send_backup_status_to_admin($admin) {
+    public static function send_backup_status_to_admin($admin) {
        global $DB, $CFG;

        mtrace("Sending email to admin");
@@ -386,7 +388,22 @@ abstract class backup_cron_automated_helper {
            'courseid' => $backupcourse->courseid,
            'adminid' => $admin->id
        ));
-        \core\task\manager::queue_adhoc_task($asynctask);
+        $taskid = \core\task\manager::queue_adhoc_task($asynctask);
+
+        // Get the queued tasks.
+        $queuedtasks = [];
+        if ($value = get_config('backup', 'backup_auto_adhoctasks')) {
+            $queuedtasks = explode(',', $value);
+        }
+        if ($taskid) {
+            $queuedtasks[] = (int) $taskid;
+        }
+        // Save the queued tasks.
+        set_config(
+            'backup_auto_adhoctasks',
+            implode(',', $queuedtasks),
+            'backup',
+        );

        $backupcourse->laststatus = self::BACKUP_STATUS_QUEUED;
        $DB->update_record('backup_courses', $backupcourse);
@@ -14,20 +14,17 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

+defined('MOODLE_INTERNAL') || die();
+
+use \core_badges\badge;
+
 /**
- * Local stuff for category enrolment plugin.
+ * Event observer for badges.
 *
 * @package    core_badges
 * @copyright  2013 Rajesh Taneja <rajesh@moodle.com>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-
-defined('MOODLE_INTERNAL') || die();
-
-use \core_badges\badge;
-/**
- * Event observer for badges.
- */
 class core_badges_observer {
    /**
     * Triggered when 'course_module_completion_updated' event is triggered.
@@ -188,8 +188,6 @@ class award_criteria_activity extends award_criteria {
     * @return bool Whether criteria is complete
     */
    public function review($userid, $filtered = false) {
-        $completionstates = array(COMPLETION_COMPLETE, COMPLETION_COMPLETE_PASS, COMPLETION_COMPLETE_FAIL);
-
        if ($this->course->startdate > time()) {
            return false;
        }
@@ -209,6 +207,15 @@ class award_criteria_activity extends award_criteria {
                $check_date = ($date <= $param['bydate']);
            }

+            // Successfull completion states depend on the completion settings.
+            if (isset($data->passgrade)) {
+                // Passing grade is required. Don't issue a badge when state is COMPLETION_COMPLETE_FAIL.
+                $completionstates = [COMPLETION_COMPLETE, COMPLETION_COMPLETE_PASS];
+            } else {
+                // Any grade is required. Issue a badge even when state is COMPLETION_COMPLETE_FAIL.
+                $completionstates = [COMPLETION_COMPLETE, COMPLETION_COMPLETE_PASS, COMPLETION_COMPLETE_FAIL];
+            }
+
            if ($this->method == BADGE_CRITERIA_AGGREGATION_ALL) {
                if (in_array($data->completionstate, $completionstates) && $check_date) {
                    $overall = true;
@@ -54,6 +54,8 @@ $badge = new badge($badgeid);
 $context = $badge->get_context();
 $navurl = new moodle_url('/badges/index.php', array('type' => $badge->type));

+require_capability('moodle/badges:viewawarded', $context);
+
 if ($badge->type == BADGE_TYPE_COURSE) {
    if (empty($CFG->badges_allowcoursebadges)) {
        throw new \moodle_exception('coursebadgesdisabled', 'badges');
@@ -1,14 +1,14 @@
-@mod @mod_quiz @core @core_badges @javascript
+@mod @mod_quiz @core @core_badges @core_completion @javascript
 Feature: Award badges based on activity completion
  In order to ensure a student has learned the material before being marked complete
  As a teacher
-  I need to set a quiz to award a badge when upon completion when the student receives a passing grade, or completed_fail if they use all attempts without passing
+  I need to configure an activity to grant a badge only when the student achieves a passing grade upon completion.

  Background:
    Given the following "users" exist:
      | username | firstname | lastname | email                |
      | student1 | Student   | 1        | student1@example.com |
-      | student2 | Student   | 1        | student2@example.com |
+      | student2 | Student   | 2        | student2@example.com |
      | teacher1 | Teacher   | 1        | teacher1@example.com |
    And the following "courses" exist:
      | fullname | shortname | category | enablecompletion |
@@ -27,96 +27,103 @@ Feature: Award badges based on activity completion
      | questioncategory | qtype     | name           | questiontext              |
      | Test questions   | truefalse | First question | Answer the first question |
    And the following "activities" exist:
-      | activity   | name           | course | idnumber | attempts | gradepass | completion | completionattemptsexhausted | completionpassgrade | completionusegrade |
-      | quiz       | Test quiz name | C1     | quiz1    | 2        | 5.00      | 2          | 1                           | 1                   | 1                  |
-    And quiz "Test quiz name" contains the following questions:
+      | activity   | name             | course | idnumber | attempts | gradepass | completion | completionpassgrade | completionusegrade |
+      | quiz       | Test quiz name 1 | C1     | quiz1    | 2        | 5.00      | 2          | 1                   | 1                  |
+      | quiz       | Test quiz name 2 | C1     | quiz2    | 2        | 5.00      | 2          | 0                   | 1                  |
+    And quiz "Test quiz name 1" contains the following questions:
+      | question       | page |
+      | First question | 1    |
+    And quiz "Test quiz name 2" contains the following questions:
      | question       | page |
      | First question | 1    |
-    And user "student1" has attempted "Test quiz name" with responses:
-      | slot | response |
-      |   1  | False    |
-    And user "student2" has attempted "Test quiz name" with responses:
-      | slot | response |
-      |   1  | False    |
    And the following "core_badges > Badge" exists:
-      | name        | Course Badge                 |
+      | name        | Course Badge 1               |
      | status      | 0                            |
      | type        | 2                            |
      | course      | C1                           |
-      | description | Course badge description     |
+      | description | Course badge 1 description   |
      | image       | badges/tests/behat/badge.png |
+    And the following "core_badges > Badge" exists:
+      | name        | Course Badge 2               |
+      | status      | 0                            |
+      | type        | 2                            |
+      | course      | C1                           |
+      | description | Course badge 2 description   |
+      | image       | badges/tests/behat/badge.png |
+    And I am on the "Course 1" course page logged in as teacher1

-  Scenario: Student earns a badge using activity completion, but does not get passing grade
-    Given I am on the "Course 1" course page logged in as teacher1
-    And I navigate to "Badges" in current page administration
+  Scenario: Student does not earn a badge using activity completion when does not get passing grade
+    Given I navigate to "Badges" in current page administration
    And I press "Manage badges"
-    And I follow "Course Badge"
+    And I follow "Course Badge 1"
    And I select "Criteria" from the "jump" singleselect
    And I set the field "type" to "Activity completion"
-    And I set the field "Quiz - Test quiz name" to "1"
+    And I set the field "Quiz - Test quiz name 1" to "1"
    And I press "Save"
    And I press "Enable access"
    And I press "Continue"
    And I should see "Recipients (0)"
-    And I log out
-    And I am on the "Course 1" course page logged in as student1
-    And the "Receive a grade" completion condition of "Test quiz name" is displayed as "done"
-    And the "Receive a passing grade" completion condition of "Test quiz name" is displayed as "failed"
-    And the "Receive a pass grade or complete all available attempts" completion condition of "Test quiz name" is displayed as "todo"
-    When I am on the "Test quiz name" "quiz activity" page
-    And I press "Re-attempt quiz"
-    And I set the field "False" to "1"
-    And I press "Finish attempt ..."
-    And I press "Submit all and finish"
-    And I click on "Submit" "button" in the "Submit all your answers and finish?" "dialogue"
-    And I log out
-
-    And I am on the "Course 1" course page logged in as teacher1
+    # Pass grade for student1. Activity is considered complete because student1 got a passing grade.
+    And user "student1" has attempted "Test quiz name 1" with responses:
+      | slot | response |
+      | 1    | True     |
+    # Fail grade for student2. Activity is considered incomplete because student2 got a failing grade.
+    And user "student2" has attempted "Test quiz name 1" with responses:
+      | slot | response |
+      | 1    | False    |
    And I navigate to "Badges > Manage badges" in current page administration
-    And I follow "Course Badge"
+    And I follow "Course Badge 1"
    Then I should see "Recipients (1)"
+    And I select "Recipients (1)" from the "jump" singleselect
+    And I should see "Student 1"
+    And I should not see "Student 2"

-  Scenario Outline: Previously graded pass/fail students should earn a badge after enabling a badge
-    Given I am on the "Course 1" course page logged in as teacher1
-    And I navigate to "Badges" in current page administration
+  Scenario: Students with any grades in an activity will receive a badge if the completion condition is set to receive any grade
+    Given I navigate to "Badges" in current page administration
    And I press "Manage badges"
-    And I follow "Course Badge"
+    And I follow "Course Badge 2"
    And I select "Criteria" from the "jump" singleselect
    And I set the field "type" to "Activity completion"
-    And I click on "Expand all" "link" in the "region-main" "region"
-    And I set the field "Quiz - Test quiz name" to "1"
-    And I set the field "<aggregationcriteria>" to "1"
+    And I set the field "Quiz - Test quiz name 2" to "1"
    And I press "Save"
-
-    # Fail grade with student2
-    And I am on the "Course 1" course page logged in as student2
-    And I am on the "Test quiz name" "quiz activity" page
-    And I press "Re-attempt quiz"
-    And I set the field "False" to "1"
-    And I press "Finish attempt ..."
-    And I press "Submit all and finish"
-    And I click on "Submit" "button" in the "Submit all your answers and finish?" "dialogue"
-    And I log out
-
-    # Pass grade with student1
-    And I am on the "Course 1" course page logged in as student1
-    And I am on the "Test quiz name" "quiz activity" page
-    And I press "Re-attempt quiz"
-    And I set the field "False" to "0"
-    And I press "Finish attempt ..."
-    And I press "Submit all and finish"
-    And I click on "Submit" "button" in the "Submit all your answers and finish?" "dialogue"
-    And I log out
-
-    # Enable badge access once all students have completed an activity.
-    And I am on the "Course 1" course page logged in as teacher1
+    And I press "Enable access"
+    And I press "Continue"
+    # Pass grade for student1.
+    And user "student1" has attempted "Test quiz name 2" with responses:
+      | slot | response |
+      | 1    | True     |
+    # Fail grade for student2. Activity is considered complete even if student2 got a failing grade.
+    And user "student2" has attempted "Test quiz name 2" with responses:
+      | slot | response |
+      | 1    | False    |
    And I navigate to "Badges > Manage badges" in current page administration
-    And I follow "Course Badge"
+    And I follow "Course Badge 2"
+    Then I should see "Recipients (2)"
+    And I select "Recipients (2)" from the "jump" singleselect
+    And I should see "Student 1"
+    And I should see "Student 2"
+
+  Scenario: Previously graded pass/fail students should earn a badge after enabling a badge
+    # Pass grade for student1.
+    Given user "student1" has attempted "Test quiz name 1" with responses:
+      | slot | response |
+      | 1    | True     |
+    # Fail grade for student2.
+    And user "student2" has attempted "Test quiz name 1" with responses:
+      | slot | response |
+      | 1    | False    |
+    And I navigate to "Badges" in current page administration
+    And I press "Manage badges"
+    And I follow "Course Badge 1"
+    And I select "Criteria" from the "jump" singleselect
+    And I set the field "type" to "Activity completion"
+    And I set the field "Quiz - Test quiz name 1" to "1"
+    And I press "Save"
+    # Enable badge access once students have completed the activity.
    When I press "Enable access"
    And I press "Continue"
-    Then I should see "Recipients (2)"
-
-    Examples:
-      | aggregationcriteria                         |
-      | Any of the selected activities is complete  |
-      | All of the selected activities are complete |
+    # Only student1 should earn the badge because student2 did not pass the quiz.
+    Then I should see "Recipients (1)"
+    And I select "Recipients (1)" from the "jump" singleselect
+    And I should see "Student 1"
+    And I should not see "Student 2"
@@ -0,0 +1,53 @@
+@core @core_badges
+Feature: Delete course badge already awarded
+  As a teacher
+  I can delete awarded course badge
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email                |
+      | teacher1 | Teacher   | 1        | teacher1@example.com |
+      | student1 | Student   | 1        | student1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+      | student1 | C1     | student        |
+
+  @javascript
+  Scenario Outline: Delete course badge already awarded to student
+    Given the following "core_badges > Badges" exist:
+      | name        | course | description             | image                        | status | type |
+      | <badgename> | C1     | <badgename> description | badges/tests/behat/badge.png | active | 2    |
+    And the following "core_badges > Criterias" exist:
+      | badge       | role           |
+      | <badgename> | editingteacher |
+    And the following "core_badges > Issued badges" exist:
+      | badge       | user     |
+      | <badgename> | student1 |
+    When I am on the "Course 1" "enrolled users" page logged in as "teacher1"
+    And I click on "Student 1" "link"
+    Then I should see "<badgename>"
+    And I am on the "Course 1" course page
+    # Navigate to Manage Badges page in order to delete the badge
+    And I navigate to "Badges > Manage badges" in current page administration
+    # Delete the badge
+    And I open the action menu in "<badgename>" "table_row"
+    And I choose "Delete" in the open action menu
+    And I press "<deleteoption>"
+    And I am on the "Course 1" "enrolled users" page
+    And I click on "Student 1" "link"
+    # Confirm that Badge 1 is retained as awarded badge but Badge 2 is not
+    And I <visibility> see "<badgename>"
+    And I am on the "Course 1" course page
+    # Navigate to Badges page to confirm that no badges exist, hence, Manage badges would not exist
+    And I navigate to "Badges" in current page administration
+    # Confirm that badges are sucessfully deleted
+    And I should see "There are currently no badges available for users to earn."
+
+    Examples:
+      | badgename | deleteoption                             | visibility |
+      | Badge 1   | Delete and keep existing issued badges   | should     |
+      | Badge 2   | Delete and remove existing issued badges | should not |
@@ -57,5 +57,8 @@ function xmldb_block_badges_upgrade($oldversion, $block) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -72,5 +72,8 @@ function xmldb_block_calendar_month_upgrade($oldversion, $block) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -57,5 +57,8 @@ function xmldb_block_calendar_upcoming_upgrade($oldversion, $block) {
    // Automatically generated Moodle v4.2.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v4.3.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -59,7 +59,26 @@ function block_comments_comment_validate($comment_param) {
 * @return array
 */
 function block_comments_comment_permissions($args) {
-    return array('post'=>true, 'view'=>true);
+    global $DB, $USER;
+    // By default, anyone can post and view comments.
+    $canpost = $canview = true;
+    // Check if it's the user context and not the owner's profile.
+    if ($args->context->contextlevel == CONTEXT_USER && $USER->id != $args->context->instanceid) {
+        // Check whether the context owner has a comment block in the user's profile.
+        $sqlparam = [
+            'blockname' => 'comments',
+            'parentcontextid' => $args->context->id,
+            'pagetypepattern' => 'user-profile',
+        ];
+        // If the comment block is not present at the target user's profile,
+        // then the logged-in user cannot post or view comments.
+        $canpost = $canview = $DB->record_exists_select(
+            'block_instances',
+            'blockname = :blockname AND parentcontextid = :parentcontextid AND pagetypepattern = :pagetypepattern',
+            $sqlparam,
+        );
+    }
+    return ['post' => $canpost, 'view' => $canview];
 }

 /**
@@ -10,7 +10,7 @@ Feature: Add a comment to the comments block
      | Course 1 | C1 | 0 |
    And the following "users" exist:
      | username | firstname | lastname | email |
-      | teacher1 | Teacher | Frist | teacher1@example.com |
+      | teacher1 | Teacher | First | teacher1@example.com |
      | student1 | Student | First | student1@example.com |
    And the following "course enrolments" exist:
      | user | course | role |
@@ -25,11 +25,16 @@ Feature: Add a comment to the comments block
  Scenario: Add a comment with Javascript enabled
    When I add "I'm a comment from student1" comment to comments block
    Then I should see "I'm a comment from student1"
+    And I am on the "Course 1" course page logged in as teacher1
+    And I should see "I'm a comment from student1"

  Scenario: Add a comment with Javascript disabled
    When I follow "Show comments"
    And I add "I'm a comment from student1" comment to comments block
    Then I should see "I'm a comment from student1"
+    And I am on the "Course 1" course page logged in as teacher1
+    And I follow "Show comments"
+    And I should see "I'm a comment from student1"

  @javascript
  Scenario: Test comment block pagination
@@ -10,7 +10,7 @@ Feature: Enable Block comments on an activity page and view comments
      | Course 1 | C1 | 0 |
    And the following "users" exist:
      | username | firstname | lastname | email |
-      | teacher1 | Teacher | Frist | teacher1@example.com |
+      | teacher1 | Teacher | First | teacher1@example.com |
      | student1 | Student | First | student1@example.com |
    And the following "course enrolments" exist:
      | user | course | role |
@@ -1,27 +0,0 @@
-@block @block_comments
-Feature: Enable Block comments on a course page and view comments
-  In order to enable the comments block on a course page
-  As a teacher
-  I can add the comments block to the course page
-
-  Scenario: Add the comments block on the course page and add comments
-    Given the following "courses" exist:
-      | fullname | shortname | category |
-      | Course 1 | C1 | 0 |
-    And the following "users" exist:
-      | username | firstname | lastname | email |
-      | teacher1 | Teacher | Frist | teacher1@example.com |
-      | student1 | Student | First | student1@example.com |
-    And the following "course enrolments" exist:
-      | user | course | role |
-      | teacher1 | C1 | editingteacher |
-      | student1 | C1 | student |
-    And the following "blocks" exist:
-      | blockname | contextlevel | reference | pagetypepattern | defaultregion |
-      | comments  | Course       | C1        | course-view-*   | side-pre      |
-    And I am on the "Course 1" course page logged in as teacher1
-    And I follow "Show comments"
-    And I add "I'm a comment from the teacher" comment to comments block
-    When I am on the "Course 1" course page logged in as student1
-    And I follow "Show comments"
-    Then I should see "I'm a comment from the teacher"
--- a/Show More
+++ b/Show More