Moodle release 4.0.7

weekly release 4.0.6+
Merge branch 'install_400_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_400_STABLE
2023-03-11 13:10:44 +08:00 · 2023-03-10 22:09:56 +08:00 · 2023-03-10 22:09:54 +08:00 · 2023-03-10 14:51:24 +08:00 · 2023-03-10 14:11:23 +08:00 · 2023-03-10 13:32:15 +08:00
866 changed files with 13678 additions and 5525 deletions
@@ -6,6 +6,10 @@
  ],
  'env': {
    'browser': true,
+    // Enable ES6+ features by default.
+    // See http://eslint.org/docs/user-guide/configuring#specifying-environments
+    // Note: The YUI override must exactly match this when disabling the ES6+ version because those features are not supported by Shifter.
+    'es2020': true,
    'amd': true
  },
  'globals': {
@@ -83,6 +87,7 @@
    'no-octal-escape': 'error',
    'no-proto': 'error',
    'no-redeclare': 'warn',
+    'no-restricted-globals': ['error', { 'name': 'Notification' }],
    'no-return-assign': 'error',
    'no-script-url': 'error',
    'no-self-assign': 'error',
@@ -196,6 +201,10 @@
  overrides: [
    {
      files: ["**/yui/src/**/*.js"],
+      'env': {
+        // Disable ES6+ for YUI files.
+        'es2020': false,
+      },
      // Disable some rules which we can't safely define for YUI rollups.
      rules: {
        'no-undef': 'off',
@@ -221,10 +230,6 @@
    },
    {
      files: ["**/amd/src/*.js", "**/amd/src/**/*.js", "Gruntfile.js", ".grunt/*.js", ".grunt/tasks/*.js", "jsdoc.conf.js"],
-      // We support es6 now. Woot!
-      env: {
-        es6: true
-      },
      // We're using babel transpiling so use their parser
      // for linting.
      parser: '@babel/eslint-parser',
@@ -299,7 +304,6 @@
        ],
      },
      parserOptions: {
-        'ecmaVersion': 9,
        'sourceType': 'module',
        'requireConfigFile': false,
      }
@@ -66,7 +66,7 @@ jobs:
    steps:
      - name: Setting up DB mysql
        if: ${{ matrix.db == 'mysqli' }}
-        uses: johanmeiring/mysql-action@tmpfs-patch
+        uses: moodlehq/mysql-action@v1
        with:
          collation server: utf8mb4_bin
          mysql version: 5.7
@@ -74,6 +74,8 @@ jobs:
          mysql user: test
          mysql password: test
          use tmpfs: true
+          tmpfs size: '1024M'
+          extra conf: --skip-log-bin

      - name: Setting up DB pgsql
        if: ${{ matrix.db == 'pgsql' }}
@@ -54,5 +54,5 @@ moodle-plugin-ci.phar
 /admin/tool/componentlibrary/docs
 /admin/tool/componentlibrary/hugo/site/data/my-index.json
 .hugo_build.lock
-.phpcs.xml
+phpcs.xml
 jsconfig.json
@@ -39,7 +39,7 @@ module.exports = grunt => {
                {
                    rule: {
                        _attrs: {
-                            ref: './.phpcs.xml.dist',
+                            ref: './phpcs.xml.dist',
                        },
                    },
                },
@@ -52,7 +52,7 @@ module.exports = grunt => {
            });
        });

-        grunt.file.write('.phpcs.xml', toXML(config, {
+        grunt.file.write('phpcs.xml', toXML(config, {
            header: true,
            indent: '  ',
        }) + "\n");
@@ -81,7 +81,8 @@ install:
            sudo service mysql stop
            sudo mv /var/lib/mysql /mnt/ramdisk
            sudo ln -s /mnt/ramdisk/mysql /var/lib/mysql
-            sudo service mysql restart
+            echo -e "[mysqld]\nskip-log-bin" | sudo tee -a /etc/mysql/my.cnf
+            sudo service mysql start
        fi
    - >
        if [ "$DB" = 'pgsql' ];
@@ -92,6 +93,7 @@ install:
            sudo mv /var/lib/postgresql /mnt/ramdisk
            sudo ln -s /mnt/ramdisk/postgresql /var/lib/postgresql
            sudo service postgresql start 9.6
+            sh -c 'until pg_isready -p 5432; do echo "Waiting for the DB to be up..."; sleep 2; done'
        fi
    - >
        if [ "$TASK" = 'PHPUNIT' ];
@@ -1,48 +1,66 @@
 MOODLE TRADEMARKS POLICY
 ========================

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

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

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

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

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

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

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

-* You can’t use "Moodle" in the name of your software (including Mobile apps)
-* You can’t use "Moodle" in your company name
-* You can’t use "Moodle" in your domain name
-* You can’t use "Moodle" in advertising-related keywords (such as Adsense)
-* You can’t use "Moodle" to describe services around Moodle (such as hosting,
-  training, support, consulting, course creation services, theme development,
-  customisation, installation, integration and certification). This applies
-  even if you do not charge for the services. Note that usually only Moodle
-  Partners have this permission.
-
-For information about the Moodle Partner Certification Mark as well as for how
-to contact us, please see <https://moodle.com/trademarks/>.
+* You can't use the word "Moodle" or any Moodle logos for commercial purposes
+  without prior written permission from Moodle HQ.
+* You can't use "Moodle" in the name of your software (including Mobile apps).
+* You can't use "Moodle" in your company name.
+* You can't use "Moodle" in your domain name.
+* You can't use "Moodle" in advertising-related keywords (such as Adsense).
+* You can't use "Moodle" to describe services around Moodle
+  (such as hosting, training, support, consulting, course creation services,
+  theme development, customisation, installation, integration, analytics
+  and certification) that cause consumers to be confused that you are
+  associated with Moodle HQ if you are not.
+  This applies even if you do not charge for the services.
+  Note that usually only Moodle Partners have this permission.
@@ -3371,6 +3371,7 @@
      <VENDOR name="oracle" version="11.2" />
    </DATABASE>
    <PHP version="7.3.0" level="required">
+      <RESTRICT function="restrict_php_version_81" message="unsupportedphpversion81" />
    </PHP>
    <PCREUNICODE level="optional">
      <FEEDBACK>
@@ -3557,6 +3558,7 @@
      <VENDOR name="oracle" version="11.2" />
    </DATABASE>
    <PHP version="7.3.0" level="required">
+      <RESTRICT function="restrict_php_version_81" message="unsupportedphpversion81" />
    </PHP>
    <PCREUNICODE level="optional">
      <FEEDBACK>
@@ -3922,4 +3924,191 @@
      </CUSTOM_CHECK>
    </CUSTOM_CHECKS>
  </MOODLE>
+  <MOODLE version="4.2" requires="3.11.8">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.6.7" />
+      <VENDOR name="mysql" version="8.0" />
+      <VENDOR name="postgres" version="13" />
+      <VENDOR name="mssql" version="14.0" />
+      <VENDOR name="oracle" version="19" />
+    </DATABASE>
+    <PHP version="8.0.0" level="required">
+    </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_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -46,11 +46,23 @@

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

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

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

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

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

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

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

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

    echo $OUTPUT->header();
@@ -16,6 +16,8 @@

 namespace core_adminpresets\local\setting;

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

-    protected function set_value($value) {
-        $this->value = clean_param($value, PARAM_BOOL);
-        $this->set_visiblevalue();
-
-        return true;
-    }
-
+    /**
+     * Sets the visible name for the setting selected value
+     */
    protected function set_visiblevalue() {
-        if ($this->value) {
+        /** @var admin_setting_configcheckbox $settingdata */
+        $settingdata = $this->get_settingdata();
+
+        // We need to compare the "yes" value of the inner checkbox, which isn't necessarily boolean.
+        if ($this->value == $settingdata->yes) {
            $str = get_string('yes');
        } else {
            $str = get_string('no');
@@ -34,7 +34,7 @@ class adminpresets_admin_setting_configselect extends adminpresets_setting {
     */
    protected function set_value($value) {
        // When we intantiate the class we need the choices.
-        if (empty($this->settindata->choices) && method_exists($this->settingdata, 'load_choices')) {
+        if (empty($this->settingdata->choices) && method_exists($this->settingdata, 'load_choices')) {
            $this->settingdata->load_choices();
        }

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

+use core_question\local\bank\question_version_status;

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

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

-$sql = "SELECT result.qtype,
-               SUM(result.numquestions) AS numquestions,
-               SUM(result.numhidden) AS numhidden,
-               SUM(result.numdraft) AS numdraft
-          FROM (SELECT data.qtype,
-                       data.versionid,
-                       COUNT(data.numquestions) AS numquestions,
-                       (SELECT COUNT(qv.id)
-                          FROM {question_versions} qv
-                         WHERE qv.id = data.versionid
-                           AND qv.status = :hiddenstatus) AS numhidden,
-                       (SELECT COUNT(qv.id)
-                         FROM {question_versions} qv
-                        WHERE qv.id = data.versionid
-                          AND qv.status = :draftstatus) AS numdraft
-                  FROM (SELECT q.qtype, qv.id AS versionid, 1 AS numquestions
-                         FROM {question} q
-                         JOIN {question_versions} qv ON qv.questionid = q.id
-                         JOIN {question_bank_entries} qbe ON qbe.id = qv.questionbankentryid
-                         AND qv.version = (SELECT MAX(v.version)
-                                             FROM {question_versions} v
-                                             JOIN {question_bank_entries} be ON be.id = v.questionbankentryid
-                                            WHERE be.id = qbe.id)) data
-                GROUP BY data.qtype, data.versionid) result
-       GROUP BY result.qtype";
-
-$counts = $DB->get_records_sql($sql, ['hiddenstatus' => $hiddenstatus, 'draftstatus' => $draftstatus]);
 $needed = [];
 foreach ($qtypes as $qtypename => $qtype) {
    if (!isset($counts[$qtypename])) {
@@ -477,7 +477,8 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    $temp->add(new admin_setting_heading('automatedsettings', new lang_string('automatedsettings','backup'), new lang_string('recyclebin_desc', 'backup')));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_users', new lang_string('generalusers', 'backup'), new lang_string('configgeneralusers', 'backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_role_assignments', new lang_string('generalroleassignments','backup'), new lang_string('configgeneralroleassignments','backup'), 1));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', new lang_string('generalactivities','backup'), new lang_string('configgeneralactivities','backup'), 1));
+    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', new lang_string('generalactivities', 'backup'),
+        new lang_string('backupautoactivitiesdescription', 'backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_blocks', new lang_string('generalblocks','backup'), new lang_string('configgeneralblocks','backup'), 1));
    $temp->add(new admin_setting_configcheckbox(
            'backup/backup_auto_files',
@@ -51,12 +51,12 @@
 <div class="form-password">
    <span data-passwordunmask="wrapper" data-passwordunmaskid="{{ id }}">
        <span data-passwordunmask="editor">
-            <input  type="hidden"
+            <input  type="password"
                    name="{{ name }}"
                    id="{{ id }}"
                    value="{{ value }}"
                    data-size="{{ size }}"
-                    class="form-control d-inline-block"
+                    class="form-control d-none"
                    >
        </span>
        <a href="#" data-passwordunmask="edit" title="{{ edithint }}">
@@ -18,7 +18,7 @@ Feature: An administrator can browse user accounts
    When I navigate to "Users > Accounts > Browse list of users" in site administration
    # Name field always present, email field is default for showidentity.
    Then the following should exist in the "users" table:
-      | First name / Surname | Email address   |
+      | First name / Last name | Email address   |
      | User One             | one@example.com |
      | User Two             | two@example.com |
    # Should not see other identity fields or non-default name fields.
@@ -34,7 +34,7 @@ Feature: An administrator can browse user accounts
      | alternativefullnameformat | firstnamephonetic lastname |
    When I navigate to "Users > Accounts > Browse list of users" in site administration
    Then the following should exist in the "users" table:
-      | First name - phonetic / Surname | Email address   |
+      | First name - phonetic / Last name | Email address   |
      | Yewzer One                      | one@example.com |
      | Yoozare Two                     | two@example.com |

@@ -43,7 +43,7 @@ Feature: An administrator can browse user accounts
      | showuseridentity | department,profile_field_frog |
    When I navigate to "Users > Accounts > Browse list of users" in site administration
    Then the following should exist in the "users" table:
-      | First name / Surname | Favourite frog  | Department |
+      | First name / Last name | Favourite frog  | Department |
      | User One             | Kermit          | Attack     |
      | User Two             | Tree            | Defence    |
    And I should not see "Email address" in the "table" "css_element"
@@ -15,7 +15,7 @@ Feature: Allowing multiple accounts to have the same email address
    And I set the following fields to these values:
      | Username      | s2      |
      | First name    | Jane    |
-      | Surname       | Doe     |
+      | Last name     | Doe     |
      | Email address | <email> |
      | New password  | test    |
    And I press "Create user"
@@ -35,9 +35,7 @@ Feature: Allowing multiple accounts to have the same email address
      | username  | firstname | lastname | email           |
      | s1        | John      | Doe      | s1@example.com  |
      | s2        | Jane      | Doe      | s2@example.com  |
-    When I log in as "admin"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I click on "Edit" "link" in the "Jane Doe" "table_row"
+    When I am on the "s2" "user > editing" page logged in as "admin"
    And I set the field "Email address" to "<email>"
    And I press "Update profile"
    Then I should <expect> "This email address is already registered."
@@ -8,7 +8,7 @@ Feature: An administrator can configure the available user list filters
    When I log in as "admin"
    And I navigate to "Users > Accounts > Browse list of users" in site administration
    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
    And I should not see "Firstname" in the "New filter" "fieldset"
    And I should not see "Username" in the "New filter" "fieldset"
    And I should not see "Email address" in the "New filter" "fieldset"
@@ -30,7 +30,7 @@ Feature: An administrator can configure the available user list filters
    And I should not see "MNet ID provider" in the "New filter" "fieldset"
    And I navigate to "Users > Accounts > Bulk user actions" in site administration
    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
    And I should not see "Firstname" in the "New filter" "fieldset"
    And I should not see "Username" in the "New filter" "fieldset"
    And I should not see "Email address" in the "New filter" "fieldset"
@@ -57,7 +57,7 @@ Feature: An administrator can configure the available user list filters
    And I log in as "admin"
    And I navigate to "Users > Accounts > Browse list of users" in site administration
    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
    And I should not see "Firstname" in the "New filter" "fieldset"
    And I should see "Username" in the "New filter" "fieldset"
    And I should see "Email address" in the "New filter" "fieldset"
@@ -79,7 +79,7 @@ Feature: An administrator can configure the available user list filters
    And I should not see "MNet ID provider" in the "New filter" "fieldset"
    And I navigate to "Users > Accounts > Bulk user actions" in site administration
    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
    And I should not see "Firstname" in the "New filter" "fieldset"
    And I should see "Username" in the "New filter" "fieldset"
    And I should see "Email address" in the "New filter" "fieldset"
@@ -106,7 +106,7 @@ Feature: An administrator can configure the available user list filters
    And I log in as "admin"
    And I navigate to "Users > Accounts > Browse list of users" in site administration
    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
    And I should not see "Firstname" in the "New filter" "fieldset"
    And I should not see "Username" in the "New filter" "fieldset"
    And I should not see "Email address" in the "New filter" "fieldset"
@@ -128,7 +128,7 @@ Feature: An administrator can configure the available user list filters
    And I should not see "MNet ID provider" in the "New filter" "fieldset"
    And I navigate to "Users > Accounts > Bulk user actions" in site administration
    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
+    And I should not see "Last name" in the "New filter" "fieldset"
    And I should not see "Firstname" in the "New filter" "fieldset"
    And I should not see "Username" in the "New filter" "fieldset"
    And I should not see "Email address" in the "New filter" "fieldset"
@@ -11,8 +11,11 @@ Feature: I can add a new preset with current settings
    And I set the field "Name" to "Starter"
    And I set the field "Description" to "Non-core starter preset"
    When I click on "Create preset" "button"
-    Then I should see "Moodle with all of the most popular features" in the "Starter" "table_row"
-    And I should see "Starter" in the "Non-core starter preset" "table_row"
+    Then the following should exist in the "Site admin presets table" table:
+      | Name    | Description                                                                                                                        |
+      | Starter | Moodle with all of the most popular features, including Assignment, Feedback, Forum, H5P, Quiz and Completion tracking.            |
+      | Full    | All the Starter features plus External (LTI) tool, SCORM, Workshop, Analytics, Badges, Competencies, Learning plans and lots more. |
+      | Starter | Non-core starter preset                                                                                                            |

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

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

@@ -24,6 +24,8 @@

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

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

        // Steps definitions.
@@ -29,3 +29,9 @@
 #page-admin-tool-behat-index .steps-definitions .stepregex {
    color: #060;
 }
+
+#page-admin-tool-behat-index .steprequiredfields {
+    font-weight: bold;
+    font-size: 1em;
+    margin-top: 1em;
+}
@@ -0,0 +1,33 @@
+{{!
+    This file is part of Moodle - https://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template tool_behat/steprequiredfields
+
+    Display a Gherkin-style table row showing required columns for a step.
+
+    Example context (json):
+    {
+        "fields": [
+            "user",
+            "role",
+            "context"
+        ]
+    }
+}}
+<pre class="steprequiredfields">
+    |{{#fields}} {{{.}}} |{{/fields}}
+</pre>
@@ -30,10 +30,9 @@ Feature: Verify that all form fields values can be get and set
      | student2 | G2 |
      | student3 | G2 |
    And the following "activities" exist:
-      | activity | course | idnumber | name | intro | firstpagetitle | wikimode | visible |
-      | wiki | C1 | wiki1 | Test this one | Test this one | Test this one | collaborative | 0 |
-    And I log in as "admin"
-    And I am on the "Course 1" "reset" page
+      | activity | course | idnumber | name          | firstpagetitle | wikimode      | visible |
+      | wiki     | C1     | wiki1    | Test this one | Test this one  | collaborative | 0       |
+    And I am on the "Course 1" "reset" page logged in as admin
    # Select (multi-select) - Checking "the select box should contain".
    And I expand all fieldsets
    And the "Unenrol users" select box should contain "No roles"
@@ -60,16 +59,14 @@ Feature: Verify that all form fields values can be get and set
    # Checkbox - Checking "I set the field" and "The field matches value" ticked.
    And I set the field "Force format" to "1"
    And I press "Save and return to course"
-    And I am on the "Test this one" "wiki activity" page
-    And I navigate to "Settings" in current page administration
+    And I am on the "Test this one" "wiki activity editing" page
    And I expand all fieldsets
    And the field "Force format" matches value "1"
    And the field "Force format" does not match value ""
    # Checkbox - Checking "I set the field" and "The field matches value" unticked.
    And I set the field "Force format" to ""
    And I press "Save and return to course"
-    And I am on the "Test this one" "wiki activity" page
-    And I navigate to "Settings" in current page administration
+    And I am on the "Test this one" "wiki activity editing" page
    And I expand all fieldsets
    And the field "Force format" matches value ""
    And the field "Force format" does not match value "1"
@@ -77,8 +74,7 @@ Feature: Verify that all form fields values can be get and set
    And I set the following fields to these values:
      | Force format | 1 |
    And I press "Save and return to course"
-    And I am on the "Test this one" "wiki activity" page
-    And I navigate to "Settings" in current page administration
+    And I am on the "Test this one" "wiki activity editing" page
    And I expand all fieldsets
    And the following fields match these values:
      | Force format | 1 |
@@ -88,8 +84,7 @@ Feature: Verify that all form fields values can be get and set
    And I set the following fields to these values:
      | Force format | |
    And I press "Save and return to course"
-    And I am on the "Test this one" "wiki activity" page
-    And I navigate to "Settings" in current page administration
+    And I am on the "Test this one" "wiki activity editing" page
    And I expand all fieldsets
    And the following fields match these values:
      | Force format | |
@@ -142,10 +137,11 @@ Feature: Verify that all form fields values can be get and set
    And I navigate to "Settings" in current page administration
    And the field "Course ID number" matches value "Course id number"

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

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

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

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

  Scenario: Use double quotes
@@ -48,11 +48,11 @@ Feature: Transform steps arguments
  Scenario: Nasty strings with other contents
    When I set the field "First name" to "My Firstname $NASTYSTRING1"
    And I set the following fields to these values:
-      | Surname | My Surname $NASTYSTRING2 |
+      | Last name | My Last name $NASTYSTRING2 |
    And I press "Update profile"
    And I click on "Edit profile" "link" in the "region-main" "region"
    Then I should not see "NASTYSTRING"
    And I should see "My Firstname"
-    And I should see "My Surname"
+    And I should see "My Last name"
    And the field "First name" matches value "My Firstname $NASTYSTRING1"
-    And the field "Surname" matches value "My Surname $NASTYSTRING2"
+    And the field "Last name" matches value "My Last name $NASTYSTRING2"
@@ -0,0 +1,104 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Unit tests for get_entity_generator web service
+ *
+ * @package   tool_behat
+ * @copyright 2022 onwards Catalyst IT EU {@link https://catalyst-eu.net}
+ * @author    Mark Johnson <mark.johnson@catalyst-eu.net>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace tool_behat\external;
+
+/**
+ * Tests for get_entity_generator web service
+ *
+ * @covers \tool_behat\external\get_entity_generator
+ */
+class get_entity_generator_test extends \advanced_testcase {
+
+    /**
+     * Log in as admin
+     *
+     * @return void
+     */
+    public function setUp(): void {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+    }
+
+    /**
+     * Get the generator for a core entity.
+     *
+     * @return void
+     */
+    public function test_execute_core_entity(): void {
+        $generator = get_entity_generator::execute('users');
+        $this->assertEquals(['required' => ['username']], $generator);
+    }
+
+    /**
+     * Get the generator for the plugin entity.
+     *
+     * @return void
+     */
+    public function test_execute_plugin_entity(): void {
+        $generator = get_entity_generator::execute('mod_book > chapters');
+        $this->assertEquals(['required' => ['book', 'title', 'content']], $generator);
+    }
+
+    /**
+     * Get the generator for an entity with no required fields.
+     *
+     * @return void
+     */
+    public function test_execute_no_requried(): void {
+        $generator = get_entity_generator::execute('mod_forum > posts');
+        $this->assertEquals(['required' => []], $generator);
+    }
+
+    /**
+     * Attempt to get the generator for a core entity that does not exist.
+     *
+     * @return void
+     */
+    public function test_execute_invalid_entity(): void {
+        $this->expectException('coding_exception');
+        get_entity_generator::execute('foo');
+    }
+
+    /**
+     * Attempt to get a generator form a plugin that does not exist.
+     *
+     * @return void
+     */
+    public function test_execute_invalid_plugin(): void {
+        $this->expectException('coding_exception');
+        get_entity_generator::execute('foo > bar');
+    }
+
+    /**
+     * Attempt to get a generator for an entity that does not exist, from a plugin that does.
+     *
+     * @return void
+     */
+    public function test_execute_invalid_plugin_entity(): void {
+        $this->expectException('coding_exception');
+        get_entity_generator::execute('mod_book > bar');
+    }
+}
@@ -24,6 +24,6 @@

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

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

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

    /**
@@ -81,6 +81,30 @@ $activity-icon-colors: (
 );
 {{</ highlight >}}

+### Custom activity icons
+
+Some activities allow icons to be customised. This can be done by implementing callback XXX_get_coursemodule_info() returning instance of object e.g. mod/lti/lib.php
+
+{{< php >}}
+$info = new cached_cm_info();
+$info->iconurl = new moodle_url('https://moodle.org/theme/moodleorg/pix/moodle_logo_small.svg');
+{{< /php >}}
+
+To get this customised icon, use:
+
+{{< php >}}
+$iconurl = get_fast_modinfo($courseid)->get_cm($cmid)->get_icon_url()->out(false);
+{{< /php >}}
+
+<div class="media mb-3">
+    <div class="activityiconcontainer lti mr-3">
+        <img alt="lti icon" title="lti icon" src="https://moodle.org/theme/moodleorg/pix/moodle_logo_small.svg" class="activityicon ">    </div>
+    <div class="media-body align-self-center">
+        <div class="text-uppercase small">external</div>
+        <div class="activityname"><a href="#">External tool module</a></div>
+    </div>
+</div>
+
 ## Examples

 <div class="media mb-3">
@@ -5,6 +5,6 @@
 * @copyright  2018 Adrian Greeve
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-define("tool_dataprivacy/expand_contract",["jquery","core/url","core/str"],(function($,url,str){var expandedImage=$('<img alt="" src="'+url.imageUrl("t/expanded")+'"/>'),collapsedImage=$('<img alt="" src="'+url.imageUrl("t/collapsed")+'"/>'),CLASSES_EXPAND="fa-caret-right",CLASSES_COLLAPSE="fa-caret-down";return{expandCollapse:function(targetnode,thisnode){targetnode.hasClass("hide")?(targetnode.removeClass("hide"),targetnode.addClass("visible"),targetnode.attr("aria-expanded",!0),thisnode.find(":header i.fa").removeClass(CLASSES_EXPAND),thisnode.find(":header i.fa").addClass(CLASSES_COLLAPSE),thisnode.find(":header img.icon").attr("src",expandedImage.attr("src"))):(targetnode.removeClass("visible"),targetnode.addClass("hide"),targetnode.attr("aria-expanded",!1),thisnode.find(":header i.fa").removeClass(CLASSES_COLLAPSE),thisnode.find(":header i.fa").addClass(CLASSES_EXPAND),thisnode.find(":header img.icon").attr("src",collapsedImage.attr("src")))},expandCollapseAll:function(nextstate){var currentstate="visible"==nextstate?"hide":"visible",ariaexpandedstate="visible"==nextstate,iconclassnow="visible"==nextstate?CLASSES_EXPAND:CLASSES_COLLAPSE,iconclassnext="visible"==nextstate?CLASSES_COLLAPSE:CLASSES_EXPAND,imagenow="visible"==nextstate?expandedImage.attr("src"):collapsedImage.attr("src");$("."+currentstate).each((function(){$(this).removeClass(currentstate),$(this).addClass(nextstate),$(this).attr("aria-expanded",ariaexpandedstate)})),$(".tool_dataprivacy-expand-all").data("visibilityState",currentstate),str.get_string(currentstate,"tool_dataprivacy").then((function(langString){$(".tool_dataprivacy-expand-all").html(langString)})).catch(Notification.exception),$(":header i.fa").each((function(){$(this).removeClass(iconclassnow),$(this).addClass(iconclassnext)})),$(":header img.icon").each((function(){$(this).attr("src",imagenow)}))}}}));
+define("tool_dataprivacy/expand_contract",["jquery","core/url","core/str","core/notification"],(function($,url,str,Notification){var expandedImage=$('<img alt="" src="'+url.imageUrl("t/expanded")+'"/>'),collapsedImage=$('<img alt="" src="'+url.imageUrl("t/collapsed")+'"/>'),CLASSES_EXPAND="fa-caret-right",CLASSES_COLLAPSE="fa-caret-down";return{expandCollapse:function(targetnode,thisnode){targetnode.hasClass("hide")?(targetnode.removeClass("hide"),targetnode.addClass("visible"),targetnode.attr("aria-expanded",!0),thisnode.find(":header i.fa").removeClass(CLASSES_EXPAND),thisnode.find(":header i.fa").addClass(CLASSES_COLLAPSE),thisnode.find(":header img.icon").attr("src",expandedImage.attr("src"))):(targetnode.removeClass("visible"),targetnode.addClass("hide"),targetnode.attr("aria-expanded",!1),thisnode.find(":header i.fa").removeClass(CLASSES_COLLAPSE),thisnode.find(":header i.fa").addClass(CLASSES_EXPAND),thisnode.find(":header img.icon").attr("src",collapsedImage.attr("src")))},expandCollapseAll:function(nextstate){var currentstate="visible"==nextstate?"hide":"visible",ariaexpandedstate="visible"==nextstate,iconclassnow="visible"==nextstate?CLASSES_EXPAND:CLASSES_COLLAPSE,iconclassnext="visible"==nextstate?CLASSES_COLLAPSE:CLASSES_EXPAND,imagenow="visible"==nextstate?expandedImage.attr("src"):collapsedImage.attr("src");$("."+currentstate).each((function(){$(this).removeClass(currentstate),$(this).addClass(nextstate),$(this).attr("aria-expanded",ariaexpandedstate)})),$(".tool_dataprivacy-expand-all").data("visibilityState",currentstate),str.get_string(currentstate,"tool_dataprivacy").then((function(langString){$(".tool_dataprivacy-expand-all").html(langString)})).catch(Notification.exception),$(":header i.fa").each((function(){$(this).removeClass(iconclassnow),$(this).addClass(iconclassnext)})),$(":header img.icon").each((function(){$(this).attr("src",imagenow)}))}}}));

 //# sourceMappingURL=expand_contract.min.js.map
@@ -21,7 +21,7 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-define(['jquery', 'core/url', 'core/str'], function($, url, str) {
+define(['jquery', 'core/url', 'core/str', 'core/notification'], function($, url, str, Notification) {

    var expandedImage = $('<img alt="" src="' + url.imageUrl('t/expanded') + '"/>');
    var collapsedImage = $('<img alt="" src="' + url.imageUrl('t/collapsed') + '"/>');
@@ -274,7 +274,7 @@ $string['requesttypedelete'] = 'Delete all of my personal data';
 $string['requesttypedeleteshort'] = 'Delete';
 $string['requesttypeexport'] = 'Export all of my personal data';
 $string['requesttypeexportshort'] = 'Export';
-$string['requesttypeothers'] = 'General inquiry';
+$string['requesttypeothers'] = 'General enquiry';
 $string['requesttypeothersshort'] = 'Message';
 $string['requireallenddatesforuserdeletion'] = 'Consider courses without end date as active';
 $string['requireallenddatesforuserdeletion_desc'] = 'When calculating user expiry, several factors are considered:
@@ -20,7 +20,7 @@ Feature: Contact the privacy officer
    And I click on "Send" "button" in the "Contact the privacy officer" "dialogue"
    Then I should see "Your request has been submitted to the privacy officer"
    And I click on "Data requests" "link"
-    And I should see "Hello DPO!" in the "General inquiry" "table_row"
+    And I should see "Hello DPO!" in the "General enquiry" "table_row"

  Scenario: Contacting the privacy officer when not enabled
    When I log in as "student1"
@@ -5,6 +5,6 @@ define("tool_langimport/search",["exports","core/pending","core/utils"],(functio
   * @module      tool_langimport/search
   * @copyright   2021 Paul Holden <paulh@moodle.com>
   * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
-   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_pending=(obj=_pending)&&obj.__esModule?obj:{default:obj};const SELECTORS_AVAILABLE_LANG_SELECT="select",SELECTORS_AVAILABLE_LANG_SEARCH='[data-action="search"]';var _default={init:form=>{const availableLangsElement=form.querySelector(SELECTORS_AVAILABLE_LANG_SELECT),availableLangsFilter=event=>{const pendingPromise=new _pending.default("tool_langimport/search:filter");availableLangsElement.querySelectorAll("option").forEach((option=>{option.remove()}));const searchTerm=event.target.value.toLowerCase(),availableLanguages=JSON.parse(availableLangsElement.dataset.availableLanguages),filteredLanguages=Object.keys(availableLanguages).reduce(((matches,langcode)=>(availableLanguages[langcode].toLowerCase().includes(searchTerm)&&(matches[langcode]=availableLanguages[langcode]),matches)),[]);Object.entries(filteredLanguages).forEach((_ref=>{let[langcode,langname]=_ref;const option=document.createElement("option");option.value=langcode,option.innerText=langname,availableLangsElement.append(option)})),pendingPromise.resolve()},availableLanguages={};availableLangsElement.querySelectorAll("option").forEach((option=>{availableLanguages[option.value]=option.text})),availableLangsElement.dataset.availableLanguages=JSON.stringify(availableLanguages);const availableLangsSearch=form.querySelector(SELECTORS_AVAILABLE_LANG_SEARCH);availableLangsSearch.addEventListener("keydown",(event=>{"Enter"===event.key&&event.preventDefault()})),availableLangsSearch.addEventListener("keyup",(event=>{const pendingPromise=new _pending.default("tool_langimport/search:keyup");(0,_utils.debounce)(availableLangsFilter,250)(event),setTimeout((()=>{pendingPromise.resolve()}),250)}))}};return _exports.default=_default,_exports.default}));
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,_pending=(obj=_pending)&&obj.__esModule?obj:{default:obj};const SELECTORS_AVAILABLE_LANG_SELECT="select",SELECTORS_AVAILABLE_LANG_SEARCH='[data-action="search"]';_exports.init=form=>{const availableLangsElement=form.querySelector(SELECTORS_AVAILABLE_LANG_SELECT),availableLanguages={};availableLangsElement.querySelectorAll("option").forEach((option=>{availableLanguages[option.value]=option.text})),availableLangsElement.dataset.availableLanguages=JSON.stringify(availableLanguages);const availableLangsSearch=form.querySelector(SELECTORS_AVAILABLE_LANG_SEARCH);availableLangsSearch.addEventListener("keydown",(event=>{"Enter"===event.key&&event.preventDefault()}));const availableLangsSearchDebounce=(0,_utils.debounce)((event=>{const pendingPromise=new _pending.default("tool_langimport/search:filter");availableLangsElement.querySelectorAll("option").forEach((option=>{option.remove()}));const searchTerm=event.target.value.toLowerCase(),availableLanguages=JSON.parse(availableLangsElement.dataset.availableLanguages),filteredLanguages=Object.keys(availableLanguages).reduce(((matches,langcode)=>(availableLanguages[langcode].toLowerCase().includes(searchTerm)&&(matches[langcode]=availableLanguages[langcode]),matches)),[]);Object.entries(filteredLanguages).forEach((_ref=>{let[langcode,langname]=_ref;const option=document.createElement("option");option.value=langcode,option.innerText=langname,availableLangsElement.append(option)})),pendingPromise.resolve()}),250);availableLangsSearch.addEventListener("keyup",(event=>{const pendingPromise=new _pending.default("tool_langimport/search:keyup");availableLangsSearchDebounce(event),setTimeout((()=>{pendingPromise.resolve()}),250)}))}}));

 //# sourceMappingURL=search.min.js.map
@@ -36,7 +36,7 @@ const DEBOUNCE_TIMER = 250;
 *
 * @param {Element} form
 */
-const init = (form) => {
+export const init = form => {
    const availableLangsElement = form.querySelector(SELECTORS.AVAILABLE_LANG_SELECT);

    const availableLangsFilter = (event) => {
@@ -84,16 +84,13 @@ const init = (form) => {
    });

    // Debounce the event listener to allow the user to finish typing.
+    const availableLangsSearchDebounce = debounce(availableLangsFilter, DEBOUNCE_TIMER);
    availableLangsSearch.addEventListener('keyup', (event) => {
        const pendingPromise = new Pending('tool_langimport/search:keyup');

-        debounce(availableLangsFilter, DEBOUNCE_TIMER)(event);
+        availableLangsSearchDebounce(event);
        setTimeout(() => {
            pendingPromise.resolve();
        }, DEBOUNCE_TIMER);
    });
 };
-
-export default {
-    init: init,
-};
@@ -79,6 +79,19 @@ class locale {
     * @return string|false Returns the new current locale, or FALSE on error.
     */
    protected function set_locale(int $category = LC_ALL, string $locale = '0') {
-        return setlocale($category, $locale);
+        if (strlen($locale) <= 255 || PHP_OS_FAMILY === 'BSD' || PHP_OS_FAMILY === 'Darwin') {
+            // We can set the whole locale all together.
+            return setlocale($category, $locale);
+        }
+
+        // Too long locale with linux or windows, let's split it into known and supported categories.
+        $split = explode(';', $locale);
+        foreach ($split as $element) {
+            [$category, $value] = explode('=', $element);
+            if (defined($category)) { // Only if the category exists, there are OS differences.
+                setlocale(constant($category), $value);
+            }
+        }
+        return setlocale(LC_ALL, 0); // Finally, return the complete configured locale.
    }
 }
@@ -14,14 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

-/**
- * Tests for \tool_langimport\locale class.
- *
- * @package    tool_langimport
- * @copyright  2018 Université Rennes 2 {@link https://www.univ-rennes2.fr}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace tool_langimport;

 /**
@@ -29,6 +21,7 @@ namespace tool_langimport;
 *
 * @package    tool_langimport
 * @category   test
+ * @coversDefaultClass \tool_langimport\locale
 * @copyright  2018 Université Rennes 2 {@link https://www.univ-rennes2.fr}
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
@@ -36,6 +29,7 @@ class locale_test extends \advanced_testcase {
    /**
     * Test that \tool_langimport\locale::check_locale_availability() works as expected.
     *
+     * @covers ::check_locale_availability
     * @return void
     */
    public function test_check_locale_availability() {
@@ -43,7 +37,7 @@ class locale_test extends \advanced_testcase {
        // - first setlocale() call which backup current locale
        // - second setlocale() call which try to set new 'es' locale
        // - third setlocale() call which restore locale.
-        $mock = $this->getMockBuilder(\tool_langimport\locale::class)
+        $mock = $this->getMockBuilder(locale::class)
            ->onlyMethods(['set_locale'])
            ->getMock();
        $mock->method('set_locale')->will($this->onConsecutiveCalls('en', 'es', 'en'));
@@ -56,7 +50,7 @@ class locale_test extends \advanced_testcase {
        // - first setlocale() call which backup current locale
        // - second setlocale() call which fail to set new locale
        // - third setlocale() call which restore locale.
-        $mock = $this->getMockBuilder(\tool_langimport\locale::class)
+        $mock = $this->getMockBuilder(locale::class)
            ->onlyMethods(['set_locale'])
            ->getMock();
        $mock->method('set_locale')->will($this->onConsecutiveCalls('en', false, 'en'));
@@ -66,8 +60,104 @@ class locale_test extends \advanced_testcase {
        $this->assertFalse($result);

        // Test an invalid parameter.
-        $locale = new \tool_langimport\locale();
+        $locale = new locale();
        $this->expectException(\coding_exception::class);
        $locale->check_locale_availability('');
    }
+
+    /**
+     * Test \tool_langimport\locale::set_locale() own logic.
+     *
+     * We have to explicitly test set_locale() own logic and results,
+     * that effectively sets the current locale, so we need to restore
+     * the original locale after every test (ugly, from a purist unit test
+     * point of view, but needed).
+     *
+     * @dataProvider set_locale_provider
+     * @covers ::set_locale
+     *
+     * @param string $set locale string to be set.
+     * @param string $ret expected results returned after setting the locale.
+     */
+    public function test_set_locale(string $set, string $ret) {
+        // Make set_locale() public.
+        $loc = new locale();
+        $rc = new \ReflectionClass(locale::class);
+        $rm = $rc->getMethod('set_locale');
+        $rm->setAccessible(true);
+
+        // Capture current locale for later restore (funnily, using the set_locale() method itself.
+        $originallocale = $rm->invokeArgs($loc, [LC_ALL, 0]);
+
+        // Assert we get the locale defined as expected.
+        $this->assertEquals($ret, $rm->invokeArgs($loc, [LC_ALL, $set]));
+
+        // We have finished, restore the original locale, so this doesn't affect other tests at distance.
+        // (again, funnily, using the very same set_locale() method).
+        $rm->invokeArgs($loc, [LC_ALL, $originallocale]);
+
+    }
+
+    /**
+     * Data provider for test_set_locale().
+     *
+     * Provides a locale to be set (as 'set') and a expected return value (as 'ret'). Note that
+     * some of the locales are OS dependent, so only the ones matching the OS will be provided.
+     *
+     * We make extensive use of the en_AU.UTF-8/English_Australia.1252 locale that is mandatory to
+     * be installed in any system running PHPUnit tests.
+     */
+    public function set_locale_provider(): array {
+        // Let's list the allowed categories by OS.
+        $bsdallowed = ['LC_COLLATE', 'LC_CTYPE', 'LC_MESSAGES', 'LC_MONETARY', 'LC_NUMERIC', 'LC_TIME'];
+        $winallowed = ['LC_COLLATE', 'LC_CTYPE', 'LC_MONETARY', 'LC_NUMERIC', 'LC_TIME'];
+        $linuxallowed = [
+            'LC_COLLATE', 'LC_CTYPE', 'LC_MESSAGES', 'LC_MONETARY', 'LC_NUMERIC', 'LC_TIME',
+            'LC_PAPER', 'LC_NAME', 'LC_ADDRESS', 'LC_TELEPHONE', 'LC_MEASUREMENT', 'LC_IDENTIFICATION'
+        ];
+
+        // The base locale name is also OS dependent.
+        $baselocale = get_string('locale', 'langconfig');
+        if (PHP_OS_FAMILY === 'Windows') {
+            $baselocale = get_string('localewin', 'langconfig');
+        }
+
+        // Here we'll go accumulating cases to be provided.
+        $cases = [];
+
+        // First, the simplest case, just pass a locale name, without categories.
+        $cases['rawlocale'] = [
+            'set' => $baselocale,
+            'ret' => $baselocale,
+        ];
+
+        // Now, let's fill ALL LC categories, we should get back the locale name if all them are set with same value.
+        // Note that this case is the one that, under Linux only, covers the changes performed to the set_locale() method.
+        // Pick the correct categories depending on the OS.
+        $oscategories = $bsdallowed; // Default to BSD/Dawrwin ones because they are the standard 6 supported by PHP.
+        if (PHP_OS_FAMILY === 'Windows') {
+            $oscategories = $winallowed;
+        } else if (PHP_OS_FAMILY === 'Linux') {
+            $oscategories = $linuxallowed;
+        }
+
+        $localestr = '';
+        foreach ($oscategories as $category) {
+            // Format is different by OS too, so let build the string conditionally.
+            if (PHP_OS_FAMILY === 'BSD' || PHP_OS_FAMILY === 'Darwin') {
+                // BSD uses slashes (/) separated list of the 6 values in exact order.
+                $localestr .= '/' . $baselocale;
+            } else {
+                // Linux/Windows use semicolon (;) separated list of category=value pairs.
+                $localestr .= ';' . $category . '=' . $baselocale;
+            }
+        }
+        $cases['allcategories'] = [
+            'set' => trim($localestr, ';/'),
+            'ret' => $baselocale,
+        ];
+
+        // Return all the built cases.
+        return $cases;
+    }
 }
@@ -33,3 +33,26 @@ Feature: Licence manager
    And "This is the site default licence" "icon" should exist in the "cc" "table_row"
    And "Enable licence" "icon" should not exist in the "cc" "table_row"
    And "This is the site default licence" "icon" should not exist in the "public" "table_row"
+
+  @javascript @_file_upload
+  Scenario Outline: User licence preference is remembered depending of setting value
+    Given the following config values are set as admin:
+      | sitedefaultlicense      | cc                        |
+      | rememberuserlicensepref | <rememberuserlicensepref> |
+    And I log in as "admin"
+    And I follow "Private files" in the user menu
+    And I follow "Add..."
+    And I follow "Upload a file"
+    And the field with xpath "//select[@name='license']" matches value "Creative Commons"
+    And I click on "Close" "button" in the "File picker" "dialogue"
+    When I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager as:
+      | Save as | empty_copy.txt |
+      | license | Public domain |
+    And I press "Save changes"
+    And I follow "Add..."
+    Then the field with xpath "//select[@name='license']" matches value "<expectedlicence>"
+
+    Examples:
+      | rememberuserlicensepref | expectedlicence  |
+      | 0                       | Creative Commons |
+      | 1                       | Public domain    |
@@ -57,7 +57,7 @@ trait store {
            throw new \coding_exception("Store $called doesn't define classes in correct namespaces.");
        }
        $this->component = $parts[0];
-        $this->store = str_replace('logstore_', '', $this->store);
+        $this->store = str_replace('logstore_', '', $this->component);
    }

    /**
@@ -33,8 +33,7 @@ class store_test extends \advanced_testcase {
     * Tests log writing.
     *
     * @param bool $jsonformat True to test with JSON format
-     * @dataProvider test_log_writing_provider
-     * @throws moodle_exception
+     * @dataProvider log_writing_provider
     */
    public function test_log_writing(bool $jsonformat) {
        global $DB, $CFG;
@@ -252,9 +251,9 @@ class store_test extends \advanced_testcase {
     * Returns different JSON format settings so the test can be run with JSON format either on or
     * off.
     *
-     * @return [bool] Array of true/false
+     * @return bool[] Array of true/false
     */
-    public static function test_log_writing_provider(): array {
+    public static function log_writing_provider(): array {
        return [
            [false],
            [true]
@@ -311,17 +310,16 @@ class store_test extends \advanced_testcase {
        $logmanager = get_log_manager();
        $allreports = \core_component::get_plugin_list('report');

-        $supportedreports = array(
-            'report_log' => '/report/log',
-            'report_loglive' => '/report/loglive'
-        );
-
        // Make sure all supported reports are installed.
-        $expectedreports = array_keys(array_intersect_key($allreports, $supportedreports));
-        $reports = $logmanager->get_supported_reports('logstore_database');
-        $reports = array_keys($reports);
+        $expectedreports = array_intersect_key([
+            'log' => 'report_log',
+            'loglive' => 'report_loglive',
+        ], $allreports);
+
+        $supportedreports = $logmanager->get_supported_reports('logstore_database');
+
        foreach ($expectedreports as $expectedreport) {
-            $this->assertContains($expectedreport, $reports);
+            $this->assertArrayHasKey($expectedreport, $supportedreports);
        }
    }
 }
@@ -217,20 +217,19 @@ class store_test extends \advanced_testcase {
        $logmanager = get_log_manager();
        $allreports = \core_component::get_plugin_list('report');

-        $supportedreports = array(
-            'report_log' => '/report/log',
-            'report_loglive' => '/report/loglive',
-            'report_outline' => '/report/outline',
-            'report_participation' => '/report/participation',
-            'report_stats' => '/report/stats'
-        );
-
        // Make sure all supported reports are installed.
-        $expectedreports = array_keys(array_intersect_key($allreports, $supportedreports));
-        $reports = $logmanager->get_supported_reports('logstore_legacy');
-        $reports = array_keys($reports);
+        $expectedreports = array_intersect_key([
+            'log' => 'report_log',
+            'loglive' => 'report_loglive',
+            'outline' => 'report_outline',
+            'participation' => 'report_participation',
+            'stats' => 'report_stats'
+        ], $allreports);
+
+        $supportedreports = $logmanager->get_supported_reports('logstore_legacy');
+
        foreach ($expectedreports as $expectedreport) {
-            $this->assertContains($expectedreport, $reports);
+            $this->assertArrayHasKey($expectedreport, $supportedreports);
        }
    }

@@ -38,8 +38,7 @@ class store_test extends \advanced_testcase {
     * Tests log writing.
     *
     * @param bool $jsonformat True to test with JSON format
-     * @dataProvider test_log_writing_provider
-     * @throws moodle_exception
+     * @dataProvider log_writing_provider
     */
    public function test_log_writing(bool $jsonformat) {
        global $DB;
@@ -223,9 +222,9 @@ class store_test extends \advanced_testcase {
     * Returns different JSON format settings so the test can be run with JSON format either on or
     * off.
     *
-     * @return [bool] Array of true/false
+     * @return bool[] Array of true/false
     */
-    public static function test_log_writing_provider(): array {
+    public static function log_writing_provider(): array {
        return [
            [false],
            [true]
@@ -239,20 +238,19 @@ class store_test extends \advanced_testcase {
        $logmanager = get_log_manager();
        $allreports = \core_component::get_plugin_list('report');

-        $supportedreports = array(
-            'report_log' => '/report/log',
-            'report_loglive' => '/report/loglive',
-            'report_outline' => '/report/outline',
-            'report_participation' => '/report/participation',
-            'report_stats' => '/report/stats'
-        );
-
        // Make sure all supported reports are installed.
-        $expectedreports = array_keys(array_intersect_key($allreports, $supportedreports));
-        $reports = $logmanager->get_supported_reports('logstore_standard');
-        $reports = array_keys($reports);
+        $expectedreports = array_intersect_key([
+            'log' => 'report_log',
+            'loglive' => 'report_loglive',
+            'outline' => 'report_outline',
+            'participation' => 'report_participation',
+            'stats' => 'report_stats'
+        ], $allreports);
+
+        $supportedreports = $logmanager->get_supported_reports('logstore_standard');
+
        foreach ($expectedreports as $expectedreport) {
-            $this->assertContains($expectedreport, $reports);
+            $this->assertArrayHasKey($expectedreport, $supportedreports);
        }
    }

@@ -368,7 +366,7 @@ class store_test extends \advanced_testcase {
     * Tests the decode_other function can cope with both JSON and PHP serialized format.
     *
     * @param mixed $value Value to encode and decode
-     * @dataProvider test_decode_other_provider
+     * @dataProvider decode_other_provider
     */
    public function test_decode_other($value) {
        $this->assertEquals($value, \logstore_standard\log\store::decode_other(serialize($value)));
@@ -387,7 +385,7 @@ class store_test extends \advanced_testcase {
     *
     * @return array Array of parameters
     */
-    public function test_decode_other_provider(): array {
+    public function decode_other_provider(): array {
        return [
            [['info' => 'd2819896', 'logurl' => 'discuss.php?d=2819896']],
            [null],
@@ -400,8 +398,7 @@ class store_test extends \advanced_testcase {
     * Checks that backup and restore of log data works correctly.
     *
     * @param bool $jsonformat True to test with JSON format
-     * @dataProvider test_log_writing_provider
-     * @throws moodle_exception
+     * @dataProvider log_writing_provider
     */
    public function test_backup_restore(bool $jsonformat) {
        global $DB;
@@ -278,7 +278,7 @@ class external extends external_api {
        ));

        $competency = api::read_competency($params['competencyid']);
-        $framework = api::read_framework($competency->get_competencyframeworkid());
+        $framework = api::read_framework($competency->get('competencyframeworkid'));
        self::validate_context($framework->get_context());
        $renderable = new output\competency_summary($competency, $framework, $params['includerelated'], $params['includecourses']);
        $renderer = $PAGE->get_renderer('tool_lp');
@@ -229,7 +229,6 @@ class page_helper {
        $PAGE->set_pagelayout('standard');
        $PAGE->set_url($url);
        $PAGE->set_title($title);
-        $PAGE->set_heading($title);

        if (!empty($plan)) {
            $PAGE->navbar->add($title, $planurl);
@@ -303,7 +302,6 @@ class page_helper {
        $PAGE->set_pagelayout('standard');
        $PAGE->set_url($url);
        $PAGE->set_title($title);
-        $PAGE->set_heading($title);

        if (!empty($evidence)) {
            $PAGE->navbar->add($title, $evidenceurl);
@@ -125,7 +125,7 @@ $string['qrcodetypeurl'] = 'QR code with site URL';
 $string['qrcodetypelogin'] = 'QR code with automatic login';
 $string['qrkeyttl'] = 'QR authentication key duration';
 $string['qrkeyttl_desc'] = 'The length of time for which a QR code for automatic login is valid.';
-$string['readingthisemailgettheapp'] = 'Reading this in an email? <a href="{$a}">Download the mobile app and receive notifications on your mobile device</a>.';
+$string['readingthisemailgettheapp'] = 'Are you reading this in an email? <a href="{$a}">Download the mobile app and receive notifications on your mobile device</a>.';
 $string['remoteaddons'] = 'Remote add-ons';
 $string['scanqrcode'] = 'Scan QR code';
 $string['selfsignedoruntrustedcertificatewarning'] = 'It seems that the HTTPS certificate is self-signed or not trusted. The mobile app will only work with trusted sites. Please use any online SSL checker to diagnose the problem. If it indicates that your certificate is OK, you can ignore this warning.';
@@ -59,22 +59,26 @@ class api_test extends \externallib_advanced_testcase {
     */
    public function test_get_potential_config_issues() {
        global $CFG;
-        require_once($CFG->dirroot . '/message/lib.php');

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

-        $CFG->userquota = '73289234723498234723423489273423497234234';
+        // Set non-SSL wwwroot, to avoid spurious certificate checking.
+        $CFG->wwwroot = 'http://www.example.com';
        $CFG->debugdisplay = 1;
+
        set_config('debugauthdb', 1, 'auth_db');
        set_config('debugdb', 1, 'enrol_database');
-        $expectedissues = array('adodbdebugwarning', 'displayerrorswarning');

+        // Get potential issues, obtain their keys for comparison.
        $issues = api::get_potential_config_issues();
-        $this->assertCount(count($expectedissues), $issues);
-        foreach ($issues as $issue) {
-            $this->assertTrue(in_array($issue[0], $expectedissues));
-        }
+        $issuekeys = array_column($issues, 0);
+
+        $this->assertEqualsCanonicalizing([
+            'nohttpsformobilewarning',
+            'adodbdebugwarning',
+            'displayerrorswarning',
+        ], $issuekeys);
    }

    /**
@@ -108,7 +108,7 @@ class issuer extends persistent {
        $mform->addHelpButton('clientsecret', 'issuerclientsecret', 'tool_oauth2');

        // Use basic authentication.
-        $mform->addElement('checkbox', 'basicauth', get_string('usebasicauth', 'tool_oauth2'));
+        $mform->addElement('advcheckbox', 'basicauth', get_string('usebasicauth', 'tool_oauth2'));
        $mform->addHelpButton('basicauth', 'usebasicauth', 'tool_oauth2');

        // Base Url.
@@ -244,7 +244,6 @@ class issuer extends persistent {
     * @return array of additional errors, or overridden errors.
     */
    protected function extra_validation($data, $files, array &$errors) {
-        $errors = [];
        if ($data->showonloginpage != \core\oauth2\issuer::SERVICEONLY) {
            if (!strlen(trim($data->loginscopes))) {
                $errors['loginscopes'] = get_string('required');
@@ -218,9 +218,13 @@ Feature: Basic OAuth2 functionality
      | Name                       | Invalid custom service                    |
      | Client ID                  | thisistheclientid                         |
      | Client secret              | supersecret                               |
-      | Service base URL           | https://dc.imsglobal.org/                 |
+      | Service base URL           | http://dc.imsglobal.org/                 |
    When I press "Save changes"
-    Then I should see "Could not discover end points for identity issuer: Invalid custom service"
+    Then I should see "For security reasons only https connections are allowed, sorry"
+    And I set the following fields to these values:
+      | Service base URL           | https://dc.imsglobal.org/                 |
+    And I press "Save changes"
+    And I should see "Could not discover end points for identity issuer: Invalid custom service"
    And I should see "URL: https://dc.imsglobal.org/.well-known/openid-configuration"
    And "Allow services" "icon" should exist in the "Invalid custom service" "table_row"
    And "Do not allow login" "icon" should exist in the "Invalid custom service" "table_row"
@@ -358,3 +362,21 @@ Feature: Basic OAuth2 functionality
    And I navigate to "Server > OAuth 2 services" in site administration
    And "Allow login" "icon" should exist in the "Empty custom service" "table_row"
    And "Do not allow services" "icon" should exist in the "Empty custom service" "table_row"
+
+  @javascript
+  Scenario: Changes to "Authenticate token requests via HTTP headers" are saved
+    Given I press "Custom"
+    And I set the following fields to these values:
+      | Name                              | Custom service                     |
+      | Client ID                         | thisistheclientid                  |
+      | Client secret                     | supersecret                        |
+    And I press "Save changes"
+    When I click on "Edit" "link" in the "Custom service" "table_row"
+    And I click on "Authenticate token requests via HTTP headers" "checkbox"
+    And I press "Save changes"
+    And I click on "Edit" "link" in the "Custom service" "table_row"
+    And the field "Authenticate token requests via HTTP headers" matches value "1"
+    And I click on "Authenticate token requests via HTTP headers" "checkbox"
+    And I press "Save changes"
+    And I click on "Edit" "link" in the "Custom service" "table_row"
+    Then the field "Authenticate token requests via HTTP headers" matches value ""
@@ -19,7 +19,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
      | Email address | user1@address.invalid |
      | Email (again) | user1@address.invalid |
      | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
    And I press "Create my new account"
    And I should see "Confirm your account"
    And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -53,7 +53,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
      | Email address | user1@address.invalid |
      | Email (again) | user1@address.invalid |
      | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
    And I press "Create my new account"
    And I should see "Confirm your account"
    And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -98,7 +98,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
      | Email address | user1@address.invalid |
      | Email (again) | user1@address.invalid |
      | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
    And I press "Create my new account"
    And I should see "Confirm your account"
    And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -157,7 +157,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
      | Email address | user1@address.invalid |
      | Email (again) | user1@address.invalid |
      | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
    And I press "Create my new account"
    And I should see "Confirm your account"
    And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -210,7 +210,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
      | Email address | user1@address.invalid |
      | Email (again) | user1@address.invalid |
      | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
    And I press "Create my new account"
    And I should see "Confirm your account"
    And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -462,7 +462,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
    And I am on site homepage
    And I change window size to "large"
    And I follow "Log in"
-    When I press "Log in as a guest"
+    When I press "Access as a guest"
    Then I should see "If you continue browsing this website, you agree to our policies"
    # Confirm when navigating, the pop-up policies are displayed.
    When I am on the "My courses" page
@@ -522,7 +522,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
      | Email address | user1@address.invalid |
      | Email (again) | user1@address.invalid |
      | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
    When I press "Create my new account"
    Then I should see "Confirm your account"
    And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -626,7 +626,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
    And I am on site homepage
    And I follow "Log in"
    # First log in as a guest
-    And I press "Log in as a guest"
+    And I press "Access as a guest"
    # Now sign up
    And I follow "Log in"
    When I click on "Create new account" "link"
@@ -647,7 +647,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
      | Email address | user1@address.invalid |
      | Email (again) | user1@address.invalid |
      | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
    And I press "Create my new account"
    And I should see "Confirm your account"
    And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -716,7 +716,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
      | Email address | user1@address.invalid |
      | Email (again) | user1@address.invalid |
      | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
    And I press "Create my new account"
    And I should see "Confirm your account"
    And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -858,7 +858,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
      | Email address | user1@address.invalid |
      | Email (again) | user1@address.invalid |
      | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
    And I press "Create my new account"
    And I should see "Confirm your account"
    And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -86,7 +86,7 @@ Feature: Optional policies
      | Email address | user3@address.invalid |
      | Email (again) | user3@address.invalid |
      | First name    | User3                 |
-      | Surname       | L3                    |
+      | Last name       | L3                    |
    And I press "Create my new account"
    And I should see "Confirm your account"
    And I should see "An email should have been sent to your address at user3@address.invalid"
@@ -51,6 +51,12 @@ if ($listurl) {
    $PAGE->navbar->add($listurl, $listurlnav);
 }

+// Add a new nav item to make $listurl clickable for the Boost theme.
+if (isset($script)) {
+    $lastrunnav = get_string('lastrun', 'tool_profiling');
+    $PAGE->navbar->add($lastrunnav);
+}
+
 // Header
 echo $OUTPUT->header();

@@ -41,6 +41,7 @@ $string['importok'] = 'File "{$a}" imported successfully.';
 $string['importprefix'] = 'Import prefix';
 $string['importproblem'] = 'Some problem happened importing the file "{$a}".';
 $string['lastrunof'] = 'Summary of last run of {$a}';
+$string['lastrun'] = 'Summary of last run';
 $string['markreferencerun'] = 'Mark as reference run/comment';
 $string['memory'] = 'Memory used';
 $string['pluginname'] = 'Profiling runs';
@@ -243,6 +243,16 @@ class category_bin extends base_bin {
            throw new \moodle_exception("Could not create course to restore into.");
        }

+        // As far as recycle bin is using MODE_AUTOMATED, it observes the General restore settings.
+        // For recycle bin we want to ensure that backup files are always restore the users and groups information.
+        // In order to achieve that, we hack the setting here via $CFG->forced_plugin_settings,
+        // so it won't interfere other operations.
+        // See MDL-65218 and MDL-35773 for more information.
+        // This hack will be removed once recycle bin switches to use its own backup mode, with
+        // own preferences and 100% separate from MOODLE_AUTOMATED.
+        // TODO: Remove this as part of MDL-65228.
+        $CFG->forced_plugin_settings['restore'] = ['restore_general_users' => 1, 'restore_general_groups' => 1];
+
        // Define the import.
        $controller = new \restore_controller(
            $tempdir,
@@ -277,6 +287,10 @@ class category_bin extends base_bin {
        // Run the import.
        $controller->execute_plan();

+        // We don't need the forced setting anymore, hence unsetting it.
+        // TODO: Remove this as part of MDL-65228.
+        unset($CFG->forced_plugin_settings['restore']);
+
        // Have finished with the controller, let's destroy it, freeing mem and resources.
        $controller->destroy();

@@ -133,6 +133,16 @@ class course_bin extends base_bin {
            \backup::MODE_AUTOMATED,
            $user->id
        );
+
+        // When "backup_auto_activities" setting is disabled, activities can't be restored from recycle bin.
+        $plan = $controller->get_plan();
+        $activitiessettings = $plan->get_setting('activities');
+        $settingsvalue = $activitiessettings->get_value();
+        if (empty($settingsvalue)) {
+            $controller->destroy();
+            return;
+        }
+
        $controller->execute_plan();

        // We don't need the forced setting anymore, hence unsetting it.
@@ -234,6 +244,16 @@ class course_bin extends base_bin {
        $fb = get_file_packer('application/vnd.moodle.backup');
        $fb->extract_to_pathname($file, $fulltempdir);

+        // As far as recycle bin is using MODE_AUTOMATED, it observes the General restore settings.
+        // For recycle bin we want to ensure that backup files are always restore the users and groups information.
+        // In order to achieve that, we hack the setting here via $CFG->forced_plugin_settings,
+        // so it won't interfere other operations.
+        // See MDL-65218 and MDL-35773 for more information.
+        // This hack will be removed once recycle bin switches to use its own backup mode, with
+        // own preferences and 100% separate from MOODLE_AUTOMATED.
+        // TODO: Remove this as part of MDL-65228.
+        $CFG->forced_plugin_settings['restore'] = ['restore_general_users' => 1, 'restore_general_groups' => 1];
+
        // Define the import.
        $controller = new \restore_controller(
            $tempdir,
@@ -264,6 +284,10 @@ class course_bin extends base_bin {
        // Run the import.
        $controller->execute_plan();

+        // We don't need the forced setting anymore, hence unsetting it.
+        // TODO: Remove this as part of MDL-65228.
+        unset($CFG->forced_plugin_settings['restore']);
+
        // Have finished with the controller, let's destroy it, freeing mem and resources.
        $controller->destroy();

@@ -22,35 +22,30 @@ Feature: Backup user data
    And the following "activities" exist:
      | activity | course | section | name   | intro                 |
      | quiz     | C1     | 1       | Quiz 1 | Test quiz description |
+    And the following "question categories" exist:
+      | contextlevel | reference | name           |
+      | Course       | C1        | Test questions |
+    And the following "questions" exist:
+      | questioncategory | qtype     | name | questiontext    |
+      | Test questions   | truefalse | TF1  | First question  |
+      | Test questions   | truefalse | TF2  | Second question |
+    And quiz "Quiz 1" contains the following questions:
+      | question | page |
+      | TF1      | 1    |
+      | TF2      | 1    |

  @javascript
-  Scenario: Delete and restore a quiz with user data
-    Given I am on the "Quiz 1" "quiz activity" page logged in as teacher1
-    And I add a "True/False" question to the "Quiz 1" quiz with:
-      | Question name                      | TF1                          |
-      | Question text                      | First question               |
-      | General feedback                   | Thank you, this is the general feedback |
-      | Correct answer                     | False                                   |
-      | Feedback for the response 'True'.  | So you think it is true                 |
-      | Feedback for the response 'False'. | So you think it is false                |
-    And I add a "True/False" question to the "Quiz 1" quiz with:
-      | Question name                      | TF2                                     |
-      | Question text                      | Second question                         |
-      | General feedback                   | Thank you, this is the general feedback |
-      | Correct answer                     | False                                   |
-      | Feedback for the response 'True'.  | So you think it is true                 |
-      | Feedback for the response 'False'. | So you think it is false                |
-    And I set the field "maxgrade" to "10.0"
-    And I press "savechanges"
-    And I log out
-    When I am on the "Quiz 1" "quiz activity" page logged in as student1
+  Scenario Outline: Delete and restore a quiz with user data
+    Given the following config values are set as admin:
+      | restore_general_users | <include_user> | restore |
+    And I am on the "Quiz 1" "quiz activity" page logged in as student1
    And I press "Attempt quiz"
    And I click on "True" "radio" in the "First question" "question"
    And I click on "False" "radio" in the "Second question" "question"
    And I press "Finish attempt"
    And I press "Submit all and finish"
    And I click on "Submit all and finish" "button" in the "Confirmation" "dialogue"
-    And I should see "5.00 out of 10.00"
+    And I should see "50.00 out of 100.00"
    And I log out
    And I log in as "teacher1"
    And I am on "Course 1" course homepage with editing mode on
@@ -63,5 +58,10 @@ Feature: Backup user data
    And I log in as "student1"
    And I am on "Course 1" course homepage
    When I navigate to "User report" in the course gradebook
-    Then "Quiz 1" row "Grade" column of "user-grade" table should contain "5"
+    Then "Quiz 1" row "Grade" column of "user-grade" table should contain "50"
    And "Quiz 1" row "Percentage" column of "user-grade" table should contain "50"
+
+    Examples:
+      | include_user | case_explanation |
+      | 1            | Checked          |
+      | 1            | Unchecked        |
@@ -190,6 +190,11 @@ class category_bin_test extends \advanced_testcase {
                (object)['plugin' => 'backup', 'name' => 'backup_auto_storage', 'value' => 2],
                (object)['plugin' => 'backup', 'name' => 'backup_auto_destination', 'value' => true],
            ]],
+
+            'restore/restore_general_users moodle' => [[
+                (object)['plugin' => 'restore', 'name' => 'restore_general_users', 'value' => 0],
+                (object)['plugin' => 'restore', 'name' => 'restore_general_groups', 'value' => 0],
+            ]],
        ];
    }

@@ -187,6 +187,11 @@ class course_bin_test extends \advanced_testcase {
                (object)['plugin' => 'backup', 'name' => 'backup_auto_storage', 'value' => 2],
                (object)['plugin' => 'backup', 'name' => 'backup_auto_destination', 'value' => true],
            ]],
+
+            'restore/restore_general_users moodle' => [[
+                (object)['plugin' => 'restore', 'name' => 'restore_general_users', 'value' => 0],
+                (object)['plugin' => 'restore', 'name' => 'restore_general_groups', 'value' => 0],
+            ]],
        ];
    }

@@ -237,6 +242,29 @@ class course_bin_test extends \advanced_testcase {
        $this->assertEquals(true, $attemptobj->is_finished());
    }

+    /**
+     * Test that the activity is NOT stored in bin when
+     * in Automated backup setup settings "backup_auto_activities" is disabled.
+     *
+     * @dataProvider recycle_bin_settings_provider
+     * @covers ::store_item
+     */
+    public function test_coursemodule_restore_with_activity_setting_disabled() {
+
+        // Set the configuration to not include activities in the automated backup.
+        set_config('backup_auto_activities', false, 'backup');
+
+        // Delete the course module.
+        course_delete_module($this->quiz->cmid);
+
+        // Now, run the course module deletion adhoc task.
+        \phpunit_util::run_all_adhoc_tasks();
+
+        // Check there is no items in the recycle bin.
+        $recyclebin = new \tool_recyclebin\course_bin($this->course->id);
+        $this->assertEquals(0, count($recyclebin->get_items()));
+    }
+
    /**
     * Tests that user data is not restored when module is restored.
     *
@@ -38,15 +38,6 @@ use core\check\result;
 */
 class adhocqueue extends check {

-    /**
-     * Constructor
-     */
-    public function __construct() {
-        global $CFG;
-        $this->id = 'adhocqueue';
-        $this->name = get_string('checkadhocqueue', 'tool_task');
-    }
-
    /**
     * Return result
     * @return result
@@ -38,17 +38,14 @@ use core\check\result;
 class cronrunning extends check {

    /**
-     * Constructor
+     * A link the running tasks report
+     *
+     * @return action_link|null
     */
-    public function __construct() {
-        global $CFG;
-        $this->id = 'cronrunning';
-        $this->name = get_string('checkcronrunning', 'tool_task');
-        if (empty($CFG->cronclionly)) {
-            $this->actionlink = new \action_link(
-                new \moodle_url('/admin/cron.php'),
-                get_string('cron', 'admin'));
-        }
+    public function get_action_link(): ?\action_link {
+        return new \action_link(
+            new \moodle_url('/admin/tool/task/runningtasks.php'),
+            get_string('runningtasks', 'tool_task'));
    }

    /**
@@ -39,15 +39,13 @@ use core\check\result;
 class maxfaildelay extends check {

    /**
-     * Constructor
+     * Links to the task log report
+     *
+     * @return \action_link|null
     */
-    public function __construct() {
-        global $CFG;
-        $this->id = 'cronfaildelay';
-        $this->name = get_string('checkmaxfaildelay', 'tool_task');
-        $this->actionlink = new \action_link(
-            new \moodle_url('/admin/tool/task/scheduledtasks.php'),
-            get_string('scheduledtasks', 'tool_task'));
+    public function get_action_link(): ?\action_link {
+        $url = new \moodle_url('/admin/tasklogs.php');
+        return new \action_link($url, get_string('tasklogs', 'tool_task'));
    }

    /**
@@ -66,14 +66,10 @@ Feature: Upload users
  @javascript
  Scenario: Upload users with custom profile fields
    # Create user profile field.
-    Given I log in as "admin"
-    And I navigate to "Users > Accounts > User profile fields" in site administration
-    And I click on "Create a new profile field" "link"
-    And I click on "Text area" "link"
-    And I set the following fields to these values:
-      | Short name | superfield  |
-      | Name       | Super field |
-    And I click on "Save changes" "button"
+    Given the following "custom profile fields" exist:
+      | datatype | shortname  | name        |
+      | text     | superfield | Super field |
+    And I log in as "admin"
    # Upload users.
    When I navigate to "Users > Accounts > Upload users" in site administration
    And I upload "lib/tests/fixtures/upload_users_profile.csv" file to "File" filemanager
@@ -129,12 +125,10 @@ Feature: Upload users
    And I should see "Users created: 4"
    And I press "Continue"
    # Boost check.
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I click on ".icon[title=Edit]" "css_element" in the "jonest@example.com" "table_row"
+    And I am on the "jonest@example.com" "user > editing" page
    And I should see "Boost"
    # Classic check.
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I click on ".icon[title=Edit]" "css_element" in the "reznor@example.com" "table_row"
+    And I am on the "reznor@example.com" "user > editing" page
    And I should see "Classic"

  @javascript
@@ -44,7 +44,7 @@ import {prefetchStrings} from 'core/prefetch';
 * @constant
 * @type {number}
 */
-const MINSPACING = 50;
+const MINSPACING = 10;

 /**
 * A user tour.
@@ -83,6 +83,12 @@ const Tour = class {
        // Apply configuration.
        this.configure.apply(this, arguments);

+        // Unset recalculate state.
+        this.possitionNeedToBeRecalculated = false;
+
+        // Unset recalculate count.
+        this.recalculatedNo = 0;
+
        try {
            this.storage = window.sessionStorage;
            this.storageKey = 'tourstate_' + this.tourName;
@@ -396,6 +402,11 @@ const Tour = class {
            return false;
        }

+        // Check if the CSS styles are allowed on the browser or not.
+        if (!this.isCSSAllowed()) {
+            return false;
+        }
+
        let target = this.getStepTarget(stepConfig);
        if (target && target.length && target.is(':visible')) {
            // Without a target, there can be no step.
@@ -405,6 +416,22 @@ const Tour = class {
        return false;
    }

+    /**
+     * Is the browser actually allow CSS styles?
+     *
+     * @returns {boolean} True if the browser is allowing CSS styles
+     */
+    isCSSAllowed() {
+        const testCSSElement = document.createElement('div');
+        testCSSElement.classList.add('hide');
+        document.body.appendChild(testCSSElement);
+        const styles = window.getComputedStyle(testCSSElement);
+        const isAllowed = styles.display === 'none';
+        testCSSElement.remove();
+
+        return isAllowed;
+    }
+
    /**
     * Go to the next step in the tour.
     *
@@ -924,6 +951,7 @@ const Tour = class {
        // Configure ARIA attributes on the target.
        let target = this.getStepTarget(stepConfig);
        if (target) {
+            target.data('original-tabindex', target.attr('tabindex'));
            if (!target.attr('tabindex')) {
                target.attr('tabindex', 0);
            }
@@ -1150,6 +1178,12 @@ const Tour = class {

                if (target.data('original-tabindex')) {
                    target.attr('tabindex', target.data('tabindex'));
+                } else {
+                    // If the target does not have the tabindex attribute at the beginning. We need to remove it.
+                    // We should wait a little here before removing the attribute to prevent the browser from adding it again.
+                    window.setTimeout(() => {
+                        target.removeAttr('tabindex');
+                    }, 400);
                }
            }

@@ -1296,6 +1330,7 @@ const Tour = class {
     */
    positionStep(stepConfig) {
        let content = this.currentStepNode;
+        let thisT = this;
        if (!content || !content.length) {
            // Unable to find the step node.
            return this;
@@ -1335,9 +1370,15 @@ const Tour = class {
            },
            onCreate: function(data) {
                recalculateArrowPosition(data);
+                recalculateStepPosition(data);
            },
            onUpdate: function(data) {
                recalculateArrowPosition(data);
+                if (thisT.possitionNeedToBeRecalculated) {
+                    thisT.recalculatedNo++;
+                    thisT.possitionNeedToBeRecalculated = false;
+                    recalculateStepPosition(data);
+                }
            },
        };

@@ -1387,6 +1428,90 @@ const Tour = class {
            }
        };

+        const recalculateStepPosition = function(data) {
+            const placement = data.placement.split('-')[0];
+            const isVertical = ['left', 'right'].indexOf(placement) !== -1;
+            const popperElement = $(data.instance.popper);
+            const targetElement = $(data.instance.reference);
+            const arrowElement = popperElement.find('[data-role="arrow"]');
+            const stepElement = popperElement.find('[data-role="flexitour-step"]');
+            const viewportHeight = $(window).height();
+            const viewportWidth = $(window).width();
+            const arrowHeight = parseFloat(arrowElement.outerHeight(true));
+            const popperHeight = parseFloat(popperElement.outerHeight(true));
+            const targetHeight = parseFloat(targetElement.outerHeight(true));
+            const arrowWidth = parseFloat(arrowElement.outerWidth(true));
+            const popperWidth = parseFloat(popperElement.outerWidth(true));
+            const targetWidth = parseFloat(targetElement.outerWidth(true));
+            let maxHeight;
+
+            if (thisT.recalculatedNo > 1) {
+                // The current screen is too small, and cannot fit with the original placement.
+                // We should set the placement to auto so the PopperJS can calculate the perfect placement.
+                thisT.currentStepPopper.options.placement = isVertical ? 'auto-left' : 'auto-bottom';
+            }
+            if (thisT.recalculatedNo > 2) {
+                // Return here to prevent recursive calling.
+                return;
+            }
+
+            if (isVertical) {
+                // Find the best place to put the tour: Left of right.
+                const leftSpace = targetElement.offset().left > 0 ? targetElement.offset().left : 0;
+                const rightSpace = viewportWidth - leftSpace - targetWidth;
+                const remainingSpace = leftSpace >= rightSpace ? leftSpace : rightSpace;
+                maxHeight = viewportHeight - MINSPACING * 2;
+                if (remainingSpace < (popperWidth + arrowWidth)) {
+                    const maxWidth = remainingSpace - MINSPACING - arrowWidth;
+                    if (maxWidth > 0) {
+                        popperElement.css({
+                            'max-width': maxWidth + 'px',
+                        });
+                        // Not enough space, flag true to make Popper to recalculate the position.
+                        thisT.possitionNeedToBeRecalculated = true;
+                    }
+                } else if (maxHeight < popperHeight) {
+                    // Check if the Popper's height can fit the viewport height or not.
+                    // If not, set the correct max-height value for the Popper element.
+                    popperElement.css({
+                        'max-height': maxHeight + 'px',
+                    });
+                }
+            } else {
+                // Find the best place to put the tour: Top of bottom.
+                const topSpace = targetElement.offset().top > 0 ? targetElement.offset().top : 0;
+                const bottomSpace = viewportHeight - topSpace - targetHeight;
+                const remainingSpace = topSpace >= bottomSpace ? topSpace : bottomSpace;
+                maxHeight = remainingSpace - MINSPACING - arrowHeight;
+                if (remainingSpace < (popperHeight + arrowHeight)) {
+                    // Not enough space, flag true to make Popper to recalculate the position.
+                    thisT.possitionNeedToBeRecalculated = true;
+                }
+            }
+
+            // Check if the Popper's height can fit the viewport height or not.
+            // If not, set the correct max-height value for the body.
+            const currentStepBody = stepElement.find('[data-placeholder="body"]').first();
+            const headerEle = stepElement.find('.modal-header').first();
+            const footerEle = stepElement.find('.modal-footer').first();
+            const headerHeight = headerEle.outerHeight(true) ?? 0;
+            const footerHeight = footerEle.outerHeight(true) ?? 0;
+            maxHeight = maxHeight - headerHeight - footerHeight;
+            if (maxHeight > 0) {
+                headerEle.removeClass('minimal');
+                footerEle.removeClass('minimal');
+                currentStepBody.css({
+                    'max-height': maxHeight + 'px',
+                    'overflow': 'auto',
+                });
+            } else {
+                headerEle.addClass('minimal');
+                footerEle.addClass('minimal');
+            }
+            // Call the Popper update method to update the position.
+            thisT.currentStepPopper.update();
+        };
+
        let background = $('[data-flexitour="step-background"]');
        if (background.length) {
            target = background;
@@ -1503,9 +1628,7 @@ const Tour = class {
                }

                let targetPosition = this.calculatePosition(targetNode);
-                if (targetPosition === 'fixed') {
-                    background.css('top', 0);
-                } else if (targetPosition === 'absolute') {
+                if (targetPosition === 'absolute') {
                    background.css('position', 'fixed');
                }

@@ -14,6 +14,12 @@ span[data-flexitour="container"] .modal-dialog .modal-content .modal-header {
    border-bottom: 0;
 }

+span[data-flexitour="container"] .modal-dialog .modal-content .modal-header.minimal,
+span[data-flexitour="container"] .modal-dialog .modal-content .modal-footer.minimal {
+    padding-top: 0;
+    padding-bottom: 0;
+}
+
 span[data-flexitour="container"] .modal-dialog .modal-content .modal-footer {
    justify-content: flex-start;
    border-top: 0;
@@ -152,14 +152,11 @@ Feature: Apply tour filters to a tour
      | fullname | shortname | format | enablecompletion |
      | Course 1 | C1        | topics | 1                |
      | Course 2 | C2        | topics | 1                |
+    And the following "activities" exist:
+      | activity | course | name           | firstpagetitle | wikimode      |
+      | wiki     | C1     | Test wiki name | First page     | collaborative |
    And I log in as "admin"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "Wiki" to section "1" and I fill the form with:
-      | Wiki name       | Test wiki name        |
-      | Description     | Test wiki description |
-      | First page name | First page            |
-      | Wiki mode       | Collaborative wiki    |
-    And I am on "Course 2" course homepage
+    And I am on "Course 2" course homepage with editing mode on
    And I add a "Forum" to section "1" and I fill the form with:
      | Forum name  | Test forum name                |
      | Forum type  | Standard forum for general use |
@@ -22,6 +22,8 @@
 * @package    core
 */

+use core_user\fields;
+
 define('NO_OUTPUT_BUFFERING', true);
 require_once('../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
@@ -37,7 +39,7 @@ if (empty($SESSION->bulk_users)) {
 }

 if ($dataformat) {
-    $fields = array('id'        => 'id',
+    $originfields = array('id'        => 'id',
                    'username'  => 'username',
                    'email'     => 'email',
                    'firstname' => 'firstname',
@@ -51,8 +53,10 @@ if ($dataformat) {
                    'country'   => 'country');

    $extrafields = profile_get_user_fields_with_data(0);
+    $profilefields = [];
    foreach ($extrafields as $formfield) {
-        $fields['profile_field_'.$formfield->get_shortname()] = 'profile_field_'.$formfield->get_shortname();
+        $profilefields[fields::PROFILE_FIELD_PREFIX . $formfield->get_shortname()] = fields::PROFILE_FIELD_PREFIX .
+            $formfield->get_shortname();
    }

    $filename = clean_filename(get_string('users'));
@@ -60,17 +64,17 @@ if ($dataformat) {
    $downloadusers = new ArrayObject($SESSION->bulk_users);
    $iterator = $downloadusers->getIterator();

-    \core\dataformat::download_data($filename, $dataformat, $fields, $iterator, function($userid, $supportshtml)
-            use ($extrafields, $fields) {
+    \core\dataformat::download_data($filename, $dataformat, array_merge($originfields, $profilefields), $iterator,
+            function($userid, $supportshtml) use ($originfields) {

        global $DB;

        if (!$user = $DB->get_record('user', array('id' => $userid))) {
            return null;
        }
-        profile_load_data($user);
+
        $userprofiledata = array();
-        foreach ($fields as $field => $unused) {
+        foreach ($originfields as $field) {
            // Custom user profile textarea fields come in an array
            // The first element is the text and the second is the format.
            // We only take the text.
@@ -82,6 +86,19 @@ if ($dataformat) {
                $userprofiledata[$field] = $user->$field;
            }
        }
+
+
+        // Formatting extra field if transform is true.
+        $extrafields = profile_get_user_fields_with_data($userid);
+        foreach ($extrafields as $field) {
+            $fieldkey = fields::PROFILE_FIELD_PREFIX . $field->get_shortname();
+            if ($field->is_transform_supported()) {
+                $userprofiledata[$fieldkey] = $field->display_data();
+            } else {
+                $userprofiledata[$fieldkey] = $field->data;
+            }
+        }
+
        return $userprofiledata;
    });

@@ -18,7 +18,7 @@ Feature: User must accept policy when logging in and signing up
      | Email address | user1@address.invalid |
      | Email (again) | user1@address.invalid |
      | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
    And I press "Create my new account"
    And I should see "Confirm your account"
    And I should see "An email should have been sent to your address at user1@address.invalid"
@@ -48,7 +48,7 @@ Feature: User must accept policy when logging in and signing up
      | Email address | user1@address.invalid |
      | Email (again) | user1@address.invalid |
      | First name    | User1                 |
-      | Surname       | L1                    |
+      | Last name     | L1                    |
      | I understand and agree | 1            |
    And I press "Create my new account"
    And I should see "Confirm your account"
@@ -81,7 +81,7 @@ Feature: User must accept policy when logging in and signing up
      | Email address | <email1> |
      | Email (again) | <email2> |
      | First name    | Jane    |
-      | Surname       | Doe     |
+      | Last name     | Doe     |
    And I press "Create my new account"
    Then I should <expect> "This email address is already registered. Perhaps you created an account in the past?"
    And I should <expect2> "Invalid email address"
@@ -59,8 +59,8 @@ $string['privacy:metadata:mnet_external:institution'] = 'The institution that th
 $string['privacy:metadata:mnet_external:lang'] = 'A user preference for the language shown.';
 $string['privacy:metadata:mnet_external:lastaccess'] = 'The time that the user last accessed the site.';
 $string['privacy:metadata:mnet_external:lastlogin'] = 'The last login of this user.';
-$string['privacy:metadata:mnet_external:lastname'] = 'The surname of the user.';
-$string['privacy:metadata:mnet_external:lastnamephonetic'] = 'The phonetic details about the user\'s surname.';
+$string['privacy:metadata:mnet_external:lastname'] = 'The last name of the user.';
+$string['privacy:metadata:mnet_external:lastnamephonetic'] = 'The phonetic details of the user\'s last name.';
 $string['privacy:metadata:mnet_external:maildigest'] = 'A setting for the mail digest for this user.';
 $string['privacy:metadata:mnet_external:maildisplay'] = 'A preference for the user about displaying their email address to other users.';
 $string['privacy:metadata:mnet_external:middlename'] = 'The middle name of the user';
@@ -86,7 +86,7 @@ Please log in as before, using the link on the login page.
 {$a->admin}';
 $string['emailpasswordchangeinfosubject'] = '{$a}: Change password information';
 $string['info'] = 'External account';
-$string['issuer'] = 'OAuth 2 Service';
+$string['issuer'] = 'OAuth 2 service';
 $string['issuernologin'] = 'This issuer can not be used to login';
 $string['linkedlogins'] = 'Linked logins';
 $string['linkedloginshelp'] = 'Help with linked logins';
@@ -95,7 +95,7 @@ $string['loginerror_nouserinfo'] = 'No user information was returned. The OAuth
 $string['loginerror_invaliddomain'] = 'The email address is not allowed at this site.';
 $string['loginerror_authenticationfailed'] = 'The authentication process failed.';
 $string['loginerror_cannotcreateaccounts'] = 'An account with your email address could not be found.';
-$string['noissuersavailable'] = 'None of the configured OAuth2 services allow you to link login accounts';
+$string['noissuersavailable'] = 'None of the configured OAuth 2 services allow you to link login accounts.';
 $string['notloggedindebug'] = 'The login attempt failed. Reason: {$a}';
 $string['notwhileloggedinas'] = 'Linked logins cannot be managed while logged in as another user.';
 $string['oauth2:managelinkedlogins'] = 'Manage own linked login accounts';
@@ -277,13 +277,13 @@ class condition extends \core_availability\condition {
                if (!isset($sectionprevious[$othercm->section])) {
                    $sectionprevious[$othercm->section] = $lastcmid;
                }
+                if ($lastcmid) {
+                    $this->modfastprevious[$othercm->id] = $lastcmid;
+                }
                // Load previous to all cms with completion.
                if ($othercm->completion == COMPLETION_TRACKING_NONE) {
                    continue;
                }
-                if ($lastcmid) {
-                    $this->modfastprevious[$othercm->id] = $lastcmid;
-                }
                $lastcmid = $othercm->id;
            }
            // Fill empty sections index.
@@ -32,7 +32,7 @@ Feature: Confirm that availability_completion works with previous activity setti
    And I expand all fieldsets
    And I click on "Add restriction..." "button"
    And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed greyed-out if user does not meet this condition • Click to hide" "link"
+    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
    And I set the field "Activity or resource" to "Previous activity with completion"
    And I press "Save and return to course"
    Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region"
@@ -58,7 +58,7 @@ Feature: Confirm that availability_completion works with previous activity setti
    And I expand all fieldsets
    And I click on "Add restriction..." "button"
    And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed greyed-out if user does not meet this condition • Click to hide" "link"
+    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
    And I set the field "Activity or resource" to "Previous activity with completion"
    And I press "Save and return to course"
    Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region"
@@ -83,7 +83,7 @@ Feature: Confirm that availability_completion works with previous activity setti
    And I expand all fieldsets
    And I click on "Add restriction..." "button"
    And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed greyed-out if user does not meet this condition • Click to hide" "link"
+    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
    And I set the field "Activity or resource" to "Previous activity with completion"
    And I press "Save and return to course"
    Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region"
@@ -112,7 +112,7 @@ Feature: Confirm that availability_completion works with previous activity setti
    And I expand all fieldsets
    And I click on "Add restriction..." "button"
    And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed greyed-out if user does not meet this condition • Click to hide" "link"
+    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
    And I set the field "Activity or resource" to "Previous activity with completion"
    And I press "Save changes"
    Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region"
@@ -138,7 +138,7 @@ Feature: Confirm that availability_completion works with previous activity setti
    And I expand all fieldsets
    And I click on "Add restriction..." "button"
    And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed greyed-out if user does not meet this condition • Click to hide" "link"
+    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
    Then the "Activity or resource" select box should not contain "Previous activity with completion"

    # Set Page2 restriction to Previous Activity with completion and delete Page1.
@@ -148,7 +148,7 @@ Feature: Confirm that availability_completion works with previous activity setti
    And I expand all fieldsets
    And I click on "Add restriction..." "button"
    And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed greyed-out if user does not meet this condition • Click to hide" "link"
+    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
    And I set the field "Activity or resource" to "Previous activity with completion"
    And I press "Save and return to course"
    Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region"
@@ -170,7 +170,7 @@ Feature: Confirm that availability_completion works with previous activity setti
    And I expand all fieldsets
    And I click on "Add restriction..." "button"
    And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed greyed-out if user does not meet this condition • Click to hide" "link"
+    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
    And I set the field "Activity or resource" to "Previous activity with completion"
    And I press "Save changes"
    Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region"
@@ -184,7 +184,7 @@ Feature: Confirm that availability_completion works with previous activity setti
    And I expand all fieldsets
    And I click on "Add restriction..." "button"
    And I click on "Activity completion" "button" in the "Add restriction..." "dialogue"
-    And I click on "Displayed greyed-out if user does not meet this condition • Click to hide" "link"
+    And I click on "Displayed if student doesn't meet this condition • Click to hide" "link"
    And I set the field "Activity or resource" to "Previous activity with completion"
    And I press "Save changes"
    Then I should see "Not available unless: The previous activity with completion" in the "region-main" "region"
@@ -380,7 +380,7 @@ class condition_test extends \advanced_testcase {
    /**
     * Tests the is_available and get_description functions for previous activity option.
     *
-     * @dataProvider test_previous_activity_data
+     * @dataProvider previous_activity_data
     * @param int $grade the current assign grade (0 for none)
     * @param int $condition true for complete, false for incomplete
     * @param string $mark activity to mark as complete
@@ -469,7 +469,7 @@ class condition_test extends \advanced_testcase {
        $this->assertMatchesRegularExpression($description, $information);
    }

-    public function test_previous_activity_data(): array {
+    public function previous_activity_data(): array {
        // Assign grade, condition, activity to complete, activity to test, result, resultnot, description.
        return [
            'Missing previous activity complete' => [
@@ -561,7 +561,7 @@ class condition_test extends \advanced_testcase {
     * Tests the is_available and get_description functions for
     * previous activity option in course sections.
     *
-     * @dataProvider test_section_previous_activity_data
+     * @dataProvider section_previous_activity_data
     * @param int $condition condition value
     * @param bool $mark if Page 1 must be mark as completed
     * @param string $section section to add the availability
@@ -634,7 +634,7 @@ class condition_test extends \advanced_testcase {

    }

-    public function test_section_previous_activity_data(): array {
+    public function section_previous_activity_data(): array {
        return [
            // Condition, Activity completion, section to test, result, resultnot, description.
            'Completion complete Section with no previous activity' => [
@@ -34,11 +34,11 @@ $string['option_min'] = 'must be &#x2265;';
 $string['option_max'] = 'must be <';
 $string['pluginname'] = 'Restriction by grades';
 $string['requires_any'] = 'You have a grade in <strong>{$a}</strong>';
-$string['requires_max'] = 'You get an appropriate score in <strong>{$a}</strong>';
-$string['requires_min'] = 'You achieve a required score in <strong>{$a}</strong>';
+$string['requires_max'] = 'You achieve lower than a certain score in <strong>{$a}</strong>';
+$string['requires_min'] = 'You achieve higher than a certain score in <strong>{$a}</strong>';
 $string['requires_notany'] = 'You do not have a grade in <strong>{$a}</strong>';
 $string['requires_notgeneral'] = 'You do not get certain scores in <strong>{$a}</strong>';
-$string['requires_range'] = 'You get a particular score in <strong>{$a}</strong>';
+$string['requires_range'] = 'You achieve a score within a certain range in <strong>{$a}</strong>';
 $string['missing'] = '(missing activity)';
 $string['title'] = 'Grade';
 $string['privacy:metadata'] = 'The Restriction by grades plugin does not store any personal data.';
@@ -159,5 +159,5 @@ Feature: availability_grade

    # Student sees information about no access to group, with group name in correct language.
    When I am on the "C1" "Course" page logged in as "student1"
-    Then I should see "Not available unless: You achieve a required score in A-One"
+    Then I should see "Not available unless: You achieve higher than a certain score in A-One"
    And I should not see "A-Un"
@@ -77,7 +77,7 @@ class condition_test extends \advanced_testcase {
        $this->assertFalse($cond->is_available(false, $info, true, $user->id));
        $information = $cond->get_description(false, false, $info);
        $information = \core_availability\info::format_info($information, $course);
-        $this->assertMatchesRegularExpression('~achieve a required score.*Test!~', $information);
+        $this->assertMatchesRegularExpression('~achieve higher than.*Test!~', $information);
        $this->assertTrue($cond->is_available(true, $info, true, $user->id));

        // Min grade (success).
@@ -95,7 +95,7 @@ class condition_test extends \advanced_testcase {
        $this->assertFalse($cond->is_available(false, $info, true, $user->id));
        $information = $cond->get_description(false, false, $info);
        $information = \core_availability\info::format_info($information, $course);
-        $this->assertMatchesRegularExpression('~get an appropriate score.*Test!~', $information);
+        $this->assertMatchesRegularExpression('~achieve lower than a certain score in.*Test!~', $information);
        $this->assertTrue($cond->is_available(true, $info, true, $user->id));

        // Max grade (success).
@@ -113,7 +113,7 @@ class condition_test extends \advanced_testcase {
        $this->assertFalse($cond->is_available(false, $info, true, $user->id));
        $information = $cond->get_description(false, false, $info);
        $information = \core_availability\info::format_info($information, $course);
-        $this->assertMatchesRegularExpression('~get a particular score.*Test!~', $information);
+        $this->assertMatchesRegularExpression('~achieve a score within a certain range.*Test!~', $information);
        $this->assertTrue($cond->is_available(true, $info, true, $user->id));

        // Still fail (other end).
@@ -64,7 +64,7 @@ class frontend extends \core_availability\frontend {
        global $DB;
        if ($courseid != $this->allgroupingscourseid) {
            $this->allgroupings = $DB->get_records('groupings',
-                    array('courseid' => $courseid), 'id, name');
+                    ['courseid' => $courseid], 'name');
            $this->allgroupingscourseid = $courseid;
        }
        return $this->allgroupings;
@@ -197,7 +197,12 @@ class condition extends \core_availability\condition {
                        $this->customfield);
            }
        } else {
-            $translatedfieldname = \core_user\fields::get_display_name($this->standardfield);
+            $standardfields = self::get_standard_profile_fields();
+            if (array_key_exists($this->standardfield, $standardfields)) {
+                $translatedfieldname = $standardfields[$this->standardfield];
+            } else {
+                $translatedfieldname = get_string('missing', 'availability_profile', $this->standardfield);
+            }
        }
        $a = new \stdClass();
        // Not safe to call format_string here; use the special function to call it later.
@@ -321,6 +326,27 @@ class condition extends \core_availability\condition {
        return $fieldconditionmet;
    }

+    /**
+     * Return list of standard user profile fields used by the condition
+     *
+     * @return string[]
+     */
+    public static function get_standard_profile_fields(): array {
+        return [
+            'firstname' => \core_user\fields::get_display_name('firstname'),
+            'lastname' => \core_user\fields::get_display_name('lastname'),
+            'email' => \core_user\fields::get_display_name('email'),
+            'city' => \core_user\fields::get_display_name('city'),
+            'country' => \core_user\fields::get_display_name('country'),
+            'idnumber' => \core_user\fields::get_display_name('idnumber'),
+            'institution' => \core_user\fields::get_display_name('institution'),
+            'department' => \core_user\fields::get_display_name('department'),
+            'phone1' => \core_user\fields::get_display_name('phone1'),
+            'phone2' => \core_user\fields::get_display_name('phone2'),
+            'address' => \core_user\fields::get_display_name('address'),
+        ];
+    }
+
    /**
     * Gets data about custom profile fields. Cached statically in current
     * request.
@@ -472,6 +498,11 @@ class condition extends \core_availability\condition {
            $valuefield = 'data';
            $default = $customfield->defaultdata;
        } else {
+            $standardfields = self::get_standard_profile_fields();
+            if (!array_key_exists($this->standardfield, $standardfields)) {
+                // If the field isn't found, nobody matches.
+                return [];
+            }
            $values = $DB->get_records_select('user', 'id ' . $sql, $params,
                    '', 'id, '. $this->standardfield);
            $valuefield = $this->standardfield;
@@ -595,6 +626,11 @@ class condition extends \core_availability\condition {
                $where = "(ud.data IS NOT NULL AND $condition)";
            }
        } else {
+            $standardfields = self::get_standard_profile_fields();
+            if (!array_key_exists($this->standardfield, $standardfields)) {
+                // If the field isn't found, nobody matches.
+                return ['SELECT id FROM {user} WHERE 0 = 1', []];
+            }
            $tablesql = "JOIN {user} u ON u.id = userids.id";
            list ($where, $mainparams) = $this->get_condition_sql(
                    'u.' . $this->standardfield);
@@ -42,20 +42,9 @@ class frontend extends \core_availability\frontend {

    protected function get_javascript_init_params($course, \cm_info $cm = null,
            \section_info $section = null) {
+
        // Standard user fields.
-        $standardfields = array(
-            'firstname' => \core_user\fields::get_display_name('firstname'),
-            'lastname' => \core_user\fields::get_display_name('lastname'),
-            'email' => \core_user\fields::get_display_name('email'),
-            'city' => \core_user\fields::get_display_name('city'),
-            'country' => \core_user\fields::get_display_name('country'),
-            'idnumber' => \core_user\fields::get_display_name('idnumber'),
-            'institution' => \core_user\fields::get_display_name('institution'),
-            'department' => \core_user\fields::get_display_name('department'),
-            'phone1' => \core_user\fields::get_display_name('phone1'),
-            'phone2' => \core_user\fields::get_display_name('phone2'),
-            'address' => \core_user\fields::get_display_name('address')
-        );
+        $standardfields = condition::get_standard_profile_fields();
        \core_collator::asort($standardfields);

        // Custom fields.
@@ -39,7 +39,7 @@ $string['requires_notendswith'] = 'Your <strong>{$a->field}</strong> does not en
 $string['requires_notisequalto'] = 'Your <strong>{$a->field}</strong> is not <strong>{$a->value}</strong>';
 $string['requires_notstartswith'] = 'Your <strong>{$a->field}</strong> does not start with <strong>{$a->value}</strong>';
 $string['requires_startswith'] = 'Your <strong>{$a->field}</strong> starts with <strong>{$a->value}</strong>';
-$string['missing'] = '(Missing custom field: {$a})';
+$string['missing'] = '(Missing field: {$a})';
 $string['title'] = 'User profile';
 $string['op_contains'] = 'contains';
 $string['op_doesnotcontain'] = 'doesn\'t contain';
@@ -62,19 +62,11 @@ Feature: availability_profile

  @javascript
  Scenario: Test with custom user profile field
-    # Add custom field.
-    Given I log in as "admin"
-    And I navigate to "Users > Accounts > User profile fields" in site administration
-    And I click on "Create a new profile field" "link"
-    And I click on "Text input" "link"
-    And I set the following fields to these values:
-      | Short name | superfield  |
-      | Name       | Super field |
-    And I click on "Save changes" "button"
-
+    Given the following "custom profile fields" exist:
+      | datatype | shortname  | name        |
+      | text     | superfield | Super field |
    # Set field value for user.
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I click on ".icon[title=Edit]" "css_element" in the "s@example.com" "table_row"
+    And I am on the "s@example.com" "user > editing" page logged in as "admin"
    And I expand all fieldsets
    And I set the field "Super field" to "Bananaman"
    And I click on "Update profile" "button"
@@ -55,7 +55,7 @@ Feature: display_availability
    And I set the field "x[month]" to "March"
    And I press "Save and return to course"

-    # Add a Page with 2 restrictions - one is set to hide from students if failed.
+    # Add a Page with 2 restrictions - one is set to Hide on course page if failed.
    And I add a "Page" to section "2"
    And I set the following fields to these values:
      | Name         | Page 2 |
@@ -86,13 +86,13 @@ Feature: edit_availability
    And I should see "Date" in the "Restrict access" "fieldset"
    And ".availability-item .availability-eye img" "css_element" should be visible
    And ".availability-item .availability-delete img" "css_element" should be visible
-    And the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Displayed greyed-out"
+    And the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Displayed if student"

    # Toggle the eye icon.
    When I click on ".availability-item .availability-eye img" "css_element"
    Then the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Hidden entirely"
    When I click on ".availability-item .availability-eye img" "css_element"
-    Then the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Displayed greyed-out"
+    Then the "alt" attribute of ".availability-item .availability-eye img" "css_element" should contain "Displayed if student"

    # Click the delete button.
    When I click on ".availability-item .availability-delete img" "css_element"
@@ -48,7 +48,7 @@ class backup_files_edit_form extends moodleform {
        $mform->setType('component', PARAM_COMPONENT);

        $mform->addElement('hidden', 'returnurl', $this->_customdata['returnurl']);
-        $mform->setType('returnurl', PARAM_URL);
+        $mform->setType('returnurl', PARAM_LOCALURL);

        $this->add_action_buttons(true, get_string('savechanges'));
        $this->set_data($this->_customdata['data']);
@@ -546,9 +546,11 @@ class backup_course_structure_step extends backup_structure_step {
                                     backup_helper::is_sqlparam('course'),
                                     backup::VAR_PARENTID));

+        // Section level settings are dealt with in backup_section_structure_step.
+        // We only need to deal with course level (sectionid = 0) here.
        $courseformatoption->set_source_sql('SELECT id, format, sectionid, name, value
                                 FROM {course_format_options}
-                                 WHERE courseid = ?', [ backup::VAR_PARENTID ]);
+                                 WHERE courseid = ? AND sectionid = 0', [ backup::VAR_PARENTID ]);

        $handler = core_course\customfield\course_handler::create();
        $fieldsforbackup = $handler->get_instance_data_for_backup($this->task->get_courseid());
@@ -246,16 +246,6 @@ abstract class restore_activity_task extends restore_task {
        }
    }

-    /**
-     * Given a commment area, return the itemname that contains the itemid mappings
-     *
-     * By default both are the same (commentarea = itemname), so return it. If some
-     * module uses a different approach, this method can be overriden in its taks
-     */
-    public function get_comment_mapping_itemname($commentarea) {
-        return $commentarea;
-    }
-
    /**
     * Define (add) particular steps that each activity can have
     */
@@ -767,6 +767,7 @@ class restore_decode_interlinks extends restore_execution_step {

    protected function define_execution() {
        // Get the decoder (from the plan)
+        /** @var restore_decode_processor $decoder */
        $decoder = $this->task->get_decoder();
        restore_decode_processor::register_link_decoders($decoder); // Add decoder contents and rules
        // And launch it, everything will be processed
@@ -1952,6 +1953,10 @@ class restore_course_structure_step extends restore_structure_step {
        // Course record ready, update it
        $DB->update_record('course', $data);

+        // Apply any course format options that may be saved against the course
+        // entity in earlier-version backups.
+        course_get_format($data)->update_course_format_options($data);
+
        // Role name aliases
        restore_dbops::set_course_role_names($this->get_restoreid(), $this->get_courseid());
    }
@@ -1989,8 +1994,14 @@ class restore_course_structure_step extends restore_structure_step {
    public function process_course_format_option(array $data) : void {
        global $DB;

+        if ($data['sectionid']) {
+            // Ignore section-level format options saved course-level in earlier-version backups.
+            return;
+        }
+
        $courseid = $this->get_courseid();
-        $record = $DB->get_record('course_format_options', [ 'courseid' => $courseid, 'name' => $data['name'] ], 'id');
+        $record = $DB->get_record('course_format_options', [ 'courseid' => $courseid, 'name' => $data['name'],
+                'format' => $data['format'], 'sectionid' => 0 ], 'id');
        if ($record !== false) {
            $DB->update_record('course_format_options', (object) [ 'id' => $record->id, 'value' => $data['value'] ]);
        } else {
@@ -5261,6 +5272,7 @@ class restore_move_module_questions_categories extends restore_execution_step {
                                                       AND parentitemid = ?", array($this->get_restoreid(), $contextid));
                $top = question_get_top_category($newcontext->newitemid, true);
                $oldtopid = 0;
+                $categoryids = [];
                foreach ($modulecats as $modulecat) {
                    // Before 3.5, question categories could be created at top level.
                    // From 3.5 onwards, all question categories should be a child of a special category called the "top" category.
@@ -5276,6 +5288,7 @@ class restore_move_module_questions_categories extends restore_execution_step {
                            $cat->parent = $top->id;
                        }
                        $DB->update_record('question_categories', $cat);
+                        $categoryids[] = (int)$cat->id;
                    }

                    // And set new contextid (and maybe update newitemid) also in question_category mapping (will be
@@ -5284,6 +5297,30 @@ class restore_move_module_questions_categories extends restore_execution_step {
                            $modulecat->newitemid, $newcontext->newitemid);
                }

+                // Update the context id of any tags applied to any questions in these categories.
+                if ($categoryids) {
+                    [$categorysql, $categoryidparams] = $DB->get_in_or_equal($categoryids, SQL_PARAMS_NAMED);
+                    $sqlupdate = "UPDATE {tag_instance}
+                                     SET contextid = :newcontext
+                                   WHERE component = :component
+                                         AND itemtype = :itemtype
+                                         AND itemid IN (SELECT DISTINCT bi.newitemid as questionid
+                                                          FROM {backup_ids_temp} bi
+                                                          JOIN {question} q ON q.id = bi.newitemid
+                                                          JOIN {question_versions} qv ON qv.questionid = q.id
+                                                          JOIN {question_bank_entries} qbe ON qbe.id = qv.questionbankentryid
+                                                         WHERE bi.backupid = :backupid AND bi.itemname = 'question_created'
+                                                               AND qbe.questioncategoryid {$categorysql}) ";
+                    $params = [
+                        'newcontext' => $newcontext->newitemid,
+                        'component' => 'core_question',
+                        'itemtype' => 'question',
+                        'backupid' => $this->get_restoreid(),
+                    ];
+                    $params += $categoryidparams;
+                    $DB->execute($sqlupdate, $params);
+                }
+
                // Now set the parent id for the question categories that were in the top category in the course context
                // and have been moved now.
                if ($oldtopid) {
@@ -5432,17 +5469,22 @@ class restore_process_file_aliases_queue extends restore_execution_step {
    protected function define_execution() {
        global $DB;

-        $this->log('processing file aliases queue', backup::LOG_DEBUG);
-
        $fs = get_file_storage();

        // Load the queue.
+        $aliascount = $DB->count_records('backup_ids_temp',
+            ['backupid' => $this->get_restoreid(), 'itemname' => 'file_aliases_queue']);
        $rs = $DB->get_recordset('backup_ids_temp',
-            array('backupid' => $this->get_restoreid(), 'itemname' => 'file_aliases_queue'),
+            ['backupid' => $this->get_restoreid(), 'itemname' => 'file_aliases_queue'],
            '', 'info');

+        $this->log('processing file aliases queue. ' . $aliascount . ' entries.', backup::LOG_DEBUG);
+        $progress = $this->task->get_progress();
+        $progress->start_progress('Processing file aliases queue', $aliascount);
+
        // Iterate over aliases in the queue.
        foreach ($rs as $record) {
+            $progress->increment_progress();
            $info = backup_controller_dbops::decode_backup_temp_info($record->info);

            // Try to pick a repository instance that should serve the alias.
@@ -5567,6 +5609,7 @@ class restore_process_file_aliases_queue extends restore_execution_step {
                }
            }
        }
+        $progress->end_progress();
        $rs->close();
    }

@@ -0,0 +1,24 @@
+@core @core_backup
+Feature: Backup and restore of the question that was tagged
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1        | 0        |
+
+  @javascript @_file_upload
+  Scenario: Restore the quiz containing the question that was tagged
+    Given I am on the "Course 1" "restore" page logged in as "admin"
+    And I press "Manage backup files"
+    And I upload "backup/moodle2/tests/fixtures/test_tags_backup.mbz" file to "Files" filemanager
+    And I press "Save changes"
+    And I restore "test_tags_backup.mbz" backup into a new course using this options:
+      | Schema | Course name       | Course 2 |
+      | Schema | Course short name | C2       |
+    When I am on the "TF1" "core_question > edit" page logged in as admin
+    And I expand all fieldsets
+    Then I should see "Tag1-TF1"
+    And I should see "Tag2-TF1"
+    And I am on the "TF2" "core_question > edit" page logged in as admin
+    And I expand all fieldsets
+    And I should see "Tag1-TF2"
@@ -1806,10 +1806,9 @@ abstract class restore_dbops {
    public static function calculate_course_names($courseid, $fullname, $shortname) {
        global $CFG, $DB;

-        $currentfullname = '';
-        $currentshortname = '';
        $counter = 0;
-        // Iteratere while the name exists
+
+        // Iterate while fullname or shortname exist.
        do {
            if ($counter) {
                $suffixfull  = ' ' . get_string('copyasnoun') . ' ' . $counter;
@@ -1818,8 +1817,11 @@ abstract class restore_dbops {
                $suffixfull  = '';
                $suffixshort = '';
            }
-            $currentfullname = $fullname.$suffixfull;
-            $currentshortname = substr($shortname, 0, 100 - strlen($suffixshort)).$suffixshort; // < 100cc
+
+            // Ensure we don't overflow maximum length of name fields, in multi-byte safe manner.
+            $currentfullname = core_text::substr($fullname, 0, 254 - strlen($suffixfull)) . $suffixfull;
+            $currentshortname = core_text::substr($shortname, 0, 100 - strlen($suffixshort)) . $suffixshort;
+
            $coursefull  = $DB->get_record_select('course', 'fullname = ? AND id != ?',
                    array($currentfullname, $courseid), '*', IGNORE_MULTIPLE);
            $courseshort = $DB->get_record_select('course', 'shortname = ? AND id != ?', array($currentshortname, $courseid));
@@ -96,6 +96,21 @@ class async_helper  {
        return $user;
    }

+    /**
+     * Return appropriate description for current async operation {@see async_helper::type}
+     *
+     * @return string
+     */
+    private function get_operation_description(): string {
+        $operations = [
+            'backup' => new lang_string('backup'),
+            'copy' => new lang_string('copycourse'),
+            'restore' => new lang_string('restore'),
+        ];
+
+        return (string) ($operations[$this->type] ?? $this->type);
+    }
+
    /**
     * Callback for preg_replace_callback.
     * Replaces message placeholders with real values.
@@ -105,7 +120,7 @@ class async_helper  {
     */
    private function lookup_message_variables($matches) {
        $options = array(
-                'operation' => $this->type,
+                'operation' => $this->get_operation_description(),
                'backupid' => $this->backupid,
                'user_username' => $this->user->username,
                'user_email' => $this->user->email,
@@ -77,6 +77,7 @@ class restore_decode_processor {
     */
    public function execute() {
        // Iterate over all contents, visiting them
+        /** @var restore_decode_content $content */
        foreach ($this->contents as $content) {
            $content->process($this);
        }
@@ -30,6 +30,7 @@ require_once($CFG->dirroot . '/backup/util/includes/restore_includes.php');
 * Asyncronhous helper tests.
 *
 * @package    core_backup
+ * @covers     \async_helper
 * @copyright  2018 Matt Porritt <mattp@catalyst-au.net>
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
@@ -47,7 +48,7 @@ class async_helper_test extends \advanced_testcase {
        set_config('backup_async_message_users', '1', 'backup');
        set_config('backup_async_message_subject', 'Moodle {operation} completed sucessfully', 'backup');
        set_config('backup_async_message',
-                'Dear {user_firstname} {user_lastname}, <br/> Your {operation} (ID: {backupid}) has completed successfully!',
+                'Dear {user_firstname} {user_lastname}, your {operation} (ID: {backupid}) has completed successfully!',
                'backup');
        set_config('allowedemaildomains', 'example.com');

@@ -76,15 +77,17 @@ class async_helper_test extends \advanced_testcase {
        $this->assertCount(1, $emails);
        $email = reset($emails);

-        $this->assertSame($USER->email, $email->from);
-        $this->assertSame($user2->email, $email->to);
-        $this->assertSame('Moodle backup completed sucessfully', $email->subject);
-        $this->assertNotEmpty($email->header);
-        $this->assertNotEmpty($email->body);
-        $this->assertMatchesRegularExpression("/$backupid/", $email->body);
-        $this->assertThat($email->body, $this->logicalNot($this->stringContains('{')));
        $this->assertGreaterThan(0, $messageid);
        $sink->clear();
+
+        $this->assertSame($USER->email, $email->from);
+        $this->assertSame($user2->email, $email->to);
+        $this->assertSame('Moodle Backup completed sucessfully', $email->subject);
+
+        // Assert body placeholders have all been replaced.
+        $this->assertStringContainsString('Dear test human, your Backup', $email->body);
+        $this->assertStringContainsString("(ID: {$backupid})", $email->body);
+        $this->assertStringNotContainsString('{', $email->body);
    }

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