Moodle release 3.11.5

Search array of areas for expected question components, rather than assume an array position.

.eslintrc

@@ -2,6 +2,7 @@
   'plugins': [
     'babel',
     'promise',
+    'jsdoc',
   ],
   'env': {
     'browser': true,
@@ -191,7 +192,6 @@
         'property': 'str',
         'message': 'Use AMD module "core/str" or M.util.get_string()'
     }],
-
   },
   overrides: [
     {
@@ -200,7 +200,23 @@
       rules: {
         'no-undef': 'off',
         'no-unused-vars': 'off',
-        'no-unused-expressions': 'off'
+        'no-unused-expressions': 'off',
+
+        // === JSDocs ===
+        "jsdoc/check-access": 'off',
+        "jsdoc/check-alignment": 'off',
+        "jsdoc/check-param-names": 'off',
+        "jsdoc/check-property-names": 'off',
+        "jsdoc/empty-tags": 'off',
+        "jsdoc/implements-on-classes": 'off',
+        "jsdoc/multiline-blocks": 'off',
+        "jsdoc/require-jsdoc": 'off',
+        "jsdoc/require-param": 'off',
+        "jsdoc/require-param-name": 'off',
+        "jsdoc/require-param-type": 'off',
+        "jsdoc/require-property": 'off',
+        "jsdoc/require-property-name": 'off',
+        "jsdoc/require-property-type": 'off',
       }
     },
     {
@@ -238,7 +254,49 @@
         // === Promises ===
         // We have Promise now that we're using ES6.
         'promise/no-native': 'off',
-        'promise/avoid-new': 'off'
+        'promise/avoid-new': 'off',
+
+        // === JSDocs ===
+        "jsdoc/check-access": [
+          'error',
+        ],
+        "jsdoc/check-alignment": 1, // Recommended.
+        "jsdoc/check-param-names": [
+          'error',
+        ],
+        "jsdoc/check-property-names": [
+          'error',
+        ],
+        "jsdoc/empty-tags": [
+          'error',
+        ],
+        "jsdoc/implements-on-classes": [
+          'error',
+        ],
+        "jsdoc/multiline-blocks": [
+          'error',
+        ],
+        "jsdoc/require-jsdoc": [
+          'error',
+        ],
+        "jsdoc/require-param": [
+          'error',
+        ],
+        "jsdoc/require-param-name": [
+          'error',
+        ],
+        "jsdoc/require-param-type": [
+          'error',
+        ],
+        "jsdoc/require-property": [
+          'error',
+        ],
+        "jsdoc/require-property-name": [
+          'error',
+        ],
+        "jsdoc/require-property-type": [
+          'error',
+        ],
       },
       parserOptions: {
         'ecmaVersion': 9,

.github/workflows/push.yml

@@ -20,8 +20,9 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Configuring node & npm
-        shell: bash -l {0}
-        run: nvm install
+        uses: actions/setup-node@v2
+        with:
+          node-version-file: '.nvmrc'
 
       - name: Installing node stuff
         run: npm install

.grunt/babel-plugin-add-module-to-define.js

@@ -111,8 +111,22 @@ module.exports = ({template, types}) => {
                             if (!this.seenDefine && path.get('callee').isIdentifier({name: 'define'})) {
                                 // We only want to modify the first instance of define that we find.
                                 this.seenDefine = true;
+
                                 // Get the Moodle component for the file being processed.
                                 var moduleName = getModuleNameFromFileName(this.file.opts.filename);
+
+                                // The function signature of `define()` is:
+                                // define = function (name, deps, callback) {...}
+                                // Ensure that if the moduel supplied its own name that it is replaced.
+                                if (path.node.arguments.length > 0) {
+                                    // Ensure that there is only one name.
+                                    if (path.node.arguments[0].type === 'StringLiteral') {
+                                        // eslint-disable-next-line
+                                        console.log(`Replacing module name '${path.node.arguments[0].extra.rawValue}' with ${moduleName}`);
+                                        path.node.arguments.shift();
+                                    }
+                                }
+
                                 // Add the module name as the first argument to the define function.
                                 path.node.arguments.unshift(types.stringLiteral(moduleName));
                                 // Add a space after the define function in the built file so that previous versions

.nvmrc

@@ -1 +1 @@
-v14.15.0
+v14.18.0

admin/classes/local/settings/filesize.php

@@ -126,6 +126,7 @@ class filesize extends \admin_setting {
         if (is_null($bytes)) {
             return null;
         }
+        $bytes = intval($bytes);
 
         return self::parse_bytes($bytes);
     }
@@ -145,9 +146,10 @@ class filesize extends \admin_setting {
             return get_string('errorsetting', 'admin');
         }
 
+        // Calculate size in bytes, ensuring we don't overflow PHP_INT_MAX.
         $bytes = $data['v'] * $data['u'];
+        $result = (is_int($bytes) && $this->config_write($this->name, $bytes));
 
-        $result = $this->config_write($this->name, $bytes);
         return ($result ? '' : get_string('errorsetting', 'admin'));
     }
 

admin/cli/cfg.php

@@ -120,7 +120,14 @@ if ($options['unset'] || $options['set'] !== null) {
     }
 
     // Check that the variable is not hard-set in the main config.php already.
-    if (array_key_exists($options['name'], $CFG->config_php_settings)) {
+    $component = $options['component'];
+    if (!empty($component)) {
+        $componentsettings = $CFG->forced_plugin_settings[$component] ?? [];
+        $settinginconfig = array_key_exists($options['name'], $componentsettings);
+    } else {
+        $settinginconfig = array_key_exists($options['name'], $CFG->config_php_settings);
+    }
+    if ($settinginconfig) {
         cli_error('The configuration variable is hard-set in the config.php, unable to change.', 4);
     }
 

admin/environment.xml

@@ -3163,6 +3163,11 @@
           <ON_CHECK message="sixtyfourbitswarning" />
         </FEEDBACK>
       </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_igbinary322_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="igbinary322buggyversion" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
   <MOODLE version="3.10" requires="3.5">
@@ -3345,6 +3350,11 @@
           <ON_CHECK message="sixtyfourbitswarning" />
         </FEEDBACK>
       </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_igbinary322_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="igbinary322buggyversion" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
   <MOODLE version="3.11" requires="3.6">
@@ -3714,6 +3724,11 @@
       </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_CHECKS>
   </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/purgecaches.php

@@ -38,12 +38,11 @@ $form = new core_admin\form\purge_caches(null, ['returnurl' => $returnurl]);
 if ($data = $form->get_data()) {
 
     // Valid request. Purge, and redirect the user back to where they came from.
-    $selected = $data->purgeselectedoptions;
-    purge_caches($selected);
-
     if (isset($data->all)) {
+        purge_caches();
         $message = get_string('purgecachesfinished', 'admin');
     } else {
+        purge_caches($data->purgeselectedoptions);
         $message = get_string('purgeselectedcachesfinished', 'admin');
     }
 

admin/renderer.php

@@ -220,7 +220,7 @@ class core_admin_renderer extends plugin_renderer_base {
             $output .= $this->container_end();
         }
 
-        $button = new single_button($continueurl, get_string('upgradestart', 'admin'), 'get');
+        $button = new single_button($continueurl, get_string('upgradestart', 'admin'), 'get', true);
         $button->class = 'continuebutton';
         $output .= $this->render($button);
         $output .= $this->footer();
@@ -1616,12 +1616,18 @@ class core_admin_renderer extends plugin_renderer_base {
 
         $plugininfo = $pluginman->get_plugins();
 
-        $numtotal = $numextension = $numupdatable = 0;
+        $numtotal = $numextension = $numupdatable = $numinstallable = 0;
 
         foreach ($plugininfo as $type => $plugins) {
             foreach ($plugins as $name => $plugin) {
-                if ($plugin->available_updates()) {
+                if ($res = $plugin->available_updates()) {
                     $numupdatable++;
+                    foreach ($res as $updateinfo) {
+                        if ($pluginman->is_remote_plugin_installable($updateinfo->component, $updateinfo->version, $reason, false)) {
+                            $numinstallable++;
+                            break;
+                        }
+                    }
                 }
                 if ($plugin->get_status() === core_plugin_manager::PLUGIN_STATUS_MISSING) {
                     continue;
@@ -1664,16 +1670,13 @@ class core_admin_renderer extends plugin_renderer_base {
             $out .= $this->output->heading(get_string('overviewext', 'core_plugin'), 3);
         }
 
-        if ($numupdatable) {
-            $installableupdates = $pluginman->filter_installable($pluginman->available_updates());
-            if ($installableupdates) {
-                $out .= $this->output->single_button(
-                    new moodle_url($this->page->url, array('installupdatex' => 1)),
-                    get_string('updateavailableinstallall', 'core_admin', count($installableupdates)),
-                    'post',
-                    array('class' => 'singlebutton updateavailableinstallall')
-                );
-            }
+        if ($numinstallable) {
+            $out .= $this->output->single_button(
+                new moodle_url($this->page->url, array('installupdatex' => 1)),
+                get_string('updateavailableinstallall', 'core_admin', $numinstallable),
+                'post',
+                array('class' => 'singlebutton updateavailableinstallall')
+            );
         }
 
         $out .= html_writer::div($infoall, 'info info-all').
@@ -1907,7 +1910,7 @@ class core_admin_renderer extends plugin_renderer_base {
             'infos'
         );
 
-        if ($pluginman->is_remote_plugin_installable($updateinfo->component, $updateinfo->version, $reason)) {
+        if ($pluginman->is_remote_plugin_installable($updateinfo->component, $updateinfo->version, $reason, false)) {
             $box .= $this->output->single_button(
                 new moodle_url($this->page->url, array('installupdate' => $updateinfo->component,
                     'installupdateversion' => $updateinfo->version)),
@@ -2127,8 +2130,16 @@ class core_admin_renderer extends plugin_renderer_base {
         $output .= $this->container_start('upgradekeyreq');
         $output .= $this->heading(get_string('upgradekeyreq', 'core_admin'));
         $output .= html_writer::start_tag('form', array('method' => 'POST', 'action' => $url));
-        $output .= html_writer::empty_tag('input', array('name' => 'upgradekey', 'type' => 'password'));
-        $output .= html_writer::empty_tag('input', array('value' => get_string('submit'), 'type' => 'submit'));
+        $output .= html_writer::empty_tag('input', [
+            'name' => 'upgradekey',
+            'type' => 'password',
+            'class' => 'form-control w-auto',
+        ]);
+        $output .= html_writer::empty_tag('input', [
+            'type' => 'submit',
+            'value' => get_string('submit'),
+            'class' => 'btn btn-primary mt-3',
+        ]);
         $output .= html_writer::end_tag('form');
         $output .= $this->container_end();
         $output .= $this->footer();

admin/roles/tests/privacy/provider_test.php

@@ -22,16 +22,17 @@
  * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace core_role\privacy;
 
 defined('MOODLE_INTERNAL') || die();
 
-use \core_role\privacy\provider;
-use \core_privacy\local\request\approved_contextlist;
-use \core_privacy\local\request\writer;
-use \core_privacy\tests\provider_testcase;
-use \core_privacy\local\request\transform;
-use \tool_cohortroles\api;
-use \core_privacy\local\request\approved_userlist;
+use core_role\privacy\provider;
+use core_privacy\local\request\approved_contextlist;
+use core_privacy\local\request\writer;
+use core_privacy\tests\provider_testcase;
+use core_privacy\local\request\transform;
+use tool_cohortroles\api;
+use core_privacy\local\request\approved_userlist;
 
 /**
  * Privacy test for core_role
@@ -39,7 +40,7 @@ use \core_privacy\local\request\approved_userlist;
  * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class core_role_privacy_testcase extends provider_testcase {
+class provider_test extends provider_testcase {
     /**
      * Test to check export_user_preferences.
      * returns user preferences data.

admin/templates/setting_configcolourpicker.mustache

@@ -48,6 +48,6 @@
     </div>
     <input type="text" name="{{name}}" id="{{id}}" value="{{value}}" size="12" class="form-control text-ltr" {{#readonly}}disabled{{/readonly}}>
     {{#haspreviewconfig}}
-        <input type="button" id="{{id}}_preview" value={{#quote}}{{#str}}preview{{/str}}{{/quote}} class="admin_colourpicker_preview">
+        <input type="button" id="{{id}}_preview" value="{{#cleanstr}}preview{{/cleanstr}}" class="admin_colourpicker_preview">
     {{/haspreviewconfig}}
 </div>

admin/tests/behat/behat_admin.php

@@ -53,11 +53,8 @@ class behat_admin extends behat_base {
         }
 
         foreach ($data as $label => $value) {
-            $this->execute('behat_navigation::i_select_from_flat_navigation_drawer', [get_string('administrationsite')]);
-
-            // Search by label.
-            $this->execute('behat_forms::i_set_the_field_to', [get_string('search'), $label]);
-            $this->execute("behat_forms::press_button", get_string('search', 'admin'));
+            // Navigate straight to the search results fo rthis label.
+            $this->execute('behat_general::i_visit', ["/admin/search.php?query=" . urlencode($label)]);
 
             // Admin settings does not use the same DOM structure than other moodle forms
             // but we also need to use lib/behat/form_field/* to deal with the different moodle form elements.

admin/tests/behat/manage_tokens.feature

@@ -30,7 +30,7 @@ Feature: Manage external services tokens
     And I press "Delete"
     And "Firstname1 Lastname1" "table_row" should not exist
 
-  @javascript
+  @javascript @skip_chrome_zerosize
   Scenario: Tokens can be filtered by user and by service
     Given the following "core_webservice > Service" exists:
       | name      | Site information              |

admin/tool/analytics/cli/evaluate_model.php

@@ -137,7 +137,7 @@ if (!empty($validdatasets) && !$model->is_enabled() && $options['non-interactive
     }
 
     // Refresh the instance to prevent unexpected issues.
-    $model = new \core_analytics\model($modelobj);
+    $model = new \core_analytics\model($options['modelid']);
 
     // Set the time splitting method file and enable it.
     $model->enable($input);

admin/tool/behat/tests/behat/get_and_set_fields.feature

@@ -48,7 +48,7 @@ Feature: Verify that all form fields values can be get and set
     And the "Unenrol users" select box should not contain "Baker"
     And the "Unenrol users" select box should not contain "President, Baker"
     And I am on "Course 1" course homepage with editing mode on
-    And I follow "Test this one"
+    And I am on the "Test this one" "wiki activity" page
     And I press "Create page"
     # Text (textarea & editor) & Select (multi-select) - Checking "I set the following fields to these values".
     When I set the following fields to these values:
@@ -61,8 +61,7 @@ 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 should see "Test this one"
-    And I follow "Test this one"
+    And I am on the "Test this one" "wiki activity" page
     And I navigate to "Edit settings" in current page administration
     And I expand all fieldsets
     And the field "Force format" matches value "1"
@@ -70,8 +69,7 @@ Feature: Verify that all form fields values can be get and set
     # 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 should see "Test this one"
-    And I follow "Test this one"
+    And I am on the "Test this one" "wiki activity" page
     And I navigate to "Edit settings" in current page administration
     And I expand all fieldsets
     And the field "Force format" matches value ""
@@ -80,8 +78,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 should see "Test this one"
-    And I follow "Test this one"
+    And I am on the "Test this one" "wiki activity" page
     And I navigate to "Edit settings" in current page administration
     And I expand all fieldsets
     And the following fields match these values:
@@ -92,8 +89,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 should see "Test this one"
-    And I follow "Test this one"
+    And I am on the "Test this one" "wiki activity" page
     And I navigate to "Edit settings" in current page administration
     And I expand all fieldsets
     And the following fields match these values:
@@ -126,14 +122,13 @@ Feature: Verify that all form fields values can be get and set
       | section          | 1                            |
       | allowupdate      | 1                            |
     And I am on "Course 1" course homepage
-    And I follow "Test choice name"
-    And I navigate to "Edit settings" in current page administration
+    And I am on the "Test choice name" "choice activity editing" page
     And I set the field "Option 1" to "one"
     And I set the field "Option 2" to "two"
     And I set the field "Option 3" to "three"
     And I press "Save and return to course"
     And I am on "Course 1" course homepage
-    And I follow "Test choice name"
+    And I am on the "Test choice name" "choice activity" page
     And I set the field "one" to "1"
     And I press "Save my choice"
     And the field "one" matches value "1"
@@ -183,31 +178,23 @@ Feature: Verify that all form fields values can be get and set
     And I press "Cancel"
     # Advanced checkbox requires real browser to allow uncheck to work. MDL-58681. MDL-55386.
     # Advanced checkbox - Checking "I set the field" and "The field matches value" ticked.
-    And I am on "Course 1" course homepage
-    And I follow "Test this one"
-    And I navigate to "Edit settings" in current page administration
+    And I am on the "Test choice name" "choice activity editing" page
     And I set the field "Display description on course page" to "1"
     And I press "Save and return to course"
-    And I should see "Test this one"
-    And I follow "Test this one"
-    And I navigate to "Edit settings" in current page administration
+    And I am on the "Test choice name" "choice activity editing" page
     And the field "Display description on course page" matches value "1"
     And the field "Display description on course page" does not match value ""
     # Advanced checkbox - Checking "I set the field" and "The field matches value" unticked.
     And I set the field "Display description on course page" to ""
     And I press "Save and return to course"
-    And I should see "Test this one"
-    And I follow "Test this one"
-    And I navigate to "Edit settings" in current page administration
+    And I am on the "Test choice name" "choice activity editing" page
     And the field "Display description on course page" matches value ""
     And the field "Display description on course page" does not match value "1"
     # Advanced checkbox - Checking "I set the following fields to these values:" and "The following fields match these values" ticked.
     And I set the following fields to these values:
       | Display description on course page | 1 |
     And I press "Save and return to course"
-    And I should see "Test this one"
-    And I follow "Test this one"
-    And I navigate to "Edit settings" in current page administration
+    And I am on the "Test choice name" "choice activity editing" page
     And the following fields match these values:
       | Display description on course page | 1 |
     And the following fields do not match these values:
@@ -216,9 +203,7 @@ Feature: Verify that all form fields values can be get and set
     And I set the following fields to these values:
       | Display description on course page | |
     And I press "Save and return to course"
-    And I should see "Test this one"
-    And I follow "Test this one"
-    And I navigate to "Edit settings" in current page administration
+    And I am on the "Test choice name" "choice activity editing" page
     And the following fields match these values:
       | Display description on course page | |
     And the following fields do not match these values:

admin/tool/behat/tests/behat/i_am_on_page.feature

@@ -0,0 +1,85 @@
+@tool @tool_behat
+Feature: Use core page resolvers for the I am on the page steps
+  In order to write tests correctly
+  As a developer
+  I need to have steps which take me straight to a page
+
+  Scenario Outline: When I am on an instance
+    Given the following "categories" exist:
+      | name  | category | idnumber |
+      | Cat 1 | 0        | CAT1     |
+    And the following "course" exists:
+      | fullname  | Economics 101 |
+      | shortname | ECON101       |
+      | idnumber  | 2021-econ101  |
+    And the following "activity" exists:
+      | course   | ECON101                   |
+      | activity | forum                     |
+      | name     | Fundamentals of Economics |
+      | idnumber | fundamentalsofeconomics   |
+    And I log in as "admin"
+    When I am on the <identifier> <type> page
+    Then I should see "<shouldsee>"
+
+    Examples:
+      | description              | identifier                  | type                         | shouldsee                  |
+      | Course Category idnumber | CAT1                        | category                     | Add a new course           |
+      | Course Category name     | "Cat 1"                     | Category                     | Add a new course           |
+      | Course Full name         | "Economics 101"             | course                       | Fundamentals of Economics  |
+      | Course Short name        | ECON101                     | COURSE                       | Fundamentals of Economics  |
+      | Course idnumber          | "2021-econ101"              | Course                       | Fundamentals of Economics  |
+      | Forum idnumber           | fundamentalsofeconomics     | Activity                     | Add a new discussion       |
+      | Generic activity editing | fundamentalsofeconomics     | "Activity editing"           | Updating: Forum            |
+      | Forum name               | "Fundamentals of Economics" | "Forum activity"             | Add a new discussion       |
+      | Forum name editing       | "Fundamentals of Economics" | "Forum activity editing"     | Updating: Forum            |
+      | Forum name permissions   | "Fundamentals of Economics" | "Forum activity permissions" | Permissions in Forum: Fun  |
+      | Forum name roles         | "Fundamentals of Economics" | "Forum activity roles"       | Assign roles in Forum: Fun |
+
+  Scenario Outline: When I am on an instance logged in as
+    Given the following "categories" exist:
+      | name  | category | idnumber |
+      | Cat 1 | 0        | CAT1     |
+    And the following "course" exists:
+      | fullname  | Economics 101 |
+      | shortname | ECON101       |
+      | idnumber  | 2021-econ101  |
+    And the following "activity" exists:
+      | course   | ECON101                   |
+      | activity | forum                     |
+      | name     | Fundamentals of Economics |
+      | idnumber | fundamentalsofeconomics   |
+    When I am on the <identifier> <type> page logged in as admin
+    Then I should see "<shouldsee>"
+
+    Examples:
+      | description              | identifier                  | type                         | shouldsee                  |
+      | Course Category idnumber | CAT1                        | category                     | Add a new course           |
+      | Course Category name     | "Cat 1"                     | Category                     | Add a new course           |
+      | Course Full name         | "Economics 101"             | course                       | Fundamentals of Economics  |
+      | Course Short name        | ECON101                     | COURSE                       | Fundamentals of Economics  |
+      | Course idnumber          | "2021-econ101"              | Course                       | Fundamentals of Economics  |
+      | Forum idnumber           | fundamentalsofeconomics     | Activity                     | Add a new discussion       |
+      | Generic activity editing | fundamentalsofeconomics     | "Activity editing"           | Updating: Forum            |
+      | Forum name               | "Fundamentals of Economics" | "Forum activity"             | Add a new discussion       |
+      | Forum name editing       | "Fundamentals of Economics" | "Forum activity editing"     | Updating: Forum            |
+      | Forum name permissions   | "Fundamentals of Economics" | "Forum activity permissions" | Permissions in Forum: Fun  |
+      | Forum name roles         | "Fundamentals of Economics" | "Forum activity roles"       | Assign roles in Forum: Fun |
+
+  Scenario Outline: When I am on a named page
+    Given I log in as "admin"
+    When I am on the <identifier> page
+    Then I should see "<shouldsee>"
+
+    Examples:
+      | description | identifier | shouldsee                   |
+      | Admin page  | "Admin notifications"      | Check for available updates |
+      | Home page   | Homepage   | Recently accessed courses   |
+
+  Scenario Outline: When I am on a named page logged in as
+    When I am on the <identifier> page logged in as admin
+    Then I should see "<shouldsee>"
+
+    Examples:
+      | description | identifier            | shouldsee                   |
+      | Admin page  | "Admin notifications" | Check for available updates |
+      | Home page   | Homepage              | Recently accessed courses   |

admin/tool/behat/tests/behat/loginout.feature

@@ -0,0 +1,110 @@
+@tool_behat
+Feature: Verify that the behat login and logout steps work as expected
+  In order to use behat login and log out steps
+  As a test writer
+  I need to verify that login and logout happen when the steps are used
+
+  Scenario: Log in as a user using the step
+    Given the following "users" exist:
+      | username  | firstname | lastname |
+      | traverst1 | Thomas    | Travers  |
+    When I log in as "traverst1"
+    Then I should see "Thomas Travers"
+
+  @javascript
+  Scenario: Log in as a user using the step (javascript)
+    Given the following "users" exist:
+      | username  | firstname | lastname |
+      | traverst1 | Thomas    | Travers  |
+    When I log in as "traverst1"
+    Then I should see "Thomas Travers"
+
+  Scenario: Log out using the log out step
+    Given the following "users" exist:
+      | username  | firstname | lastname |
+      | traverst1 | Thomas    | Travers  |
+    And I am logged in as traverst1
+    When I log out
+    Then I should not see "Thomas Travers"
+    And I should see "You are not logged in"
+
+  @javascript
+  Scenario: Log out using the log out step (javascript)
+    Given the following "users" exist:
+      | username  | firstname | lastname |
+      | traverst1 | Thomas    | Travers  |
+    And I am logged in as traverst1
+    When I log out
+    Then I should not see "Thomas Travers"
+    And I should see "You are not logged in"
+
+  Scenario: Log in step should automatically log user out if already logged in
+    Given the following "users" exist:
+      | username  | firstname | lastname |
+      | traverst1 | Thomas    | Travers  |
+      | emeryj    | Jane      | Emery    |
+    And I am logged in as traverst1
+    When I log in as "emeryj"
+    Then I should not see "Thomas Travers"
+    And I should see "Jane Emery"
+
+  @javascript
+  Scenario: Log in step should automatically log user out if already logged in (javascript)
+    Given the following "users" exist:
+      | username  | firstname | lastname |
+      | traverst1 | Thomas    | Travers  |
+      | emeryj    | Jane      | Emery    |
+    And I am logged in as traverst1
+    When I log in as "emeryj"
+    Then I should not see "Thomas Travers"
+    And I should see "Jane Emery"
+
+  Scenario: I am on page logged in as should redirect to correct page
+    Given the following "users" exist:
+      | username  | firstname | lastname |
+      | traverst1 | Thomas    | Travers  |
+    And the following "course" exists:
+      | fullname  | Life, the Universe, and Everything |
+      | shortname | hhgttg                             |
+    When I am on the hhgttg Course page logged in as traverst1
+    Then I should see "Thomas Travers"
+    And I should see "Life, the Universe, and Everything"
+
+  @javascript
+  Scenario: I am on page logged in as should redirect to correct page (javascript)
+    Given the following "users" exist:
+      | username  | firstname | lastname |
+      | traverst1 | Thomas    | Travers  |
+    And the following "course" exists:
+      | fullname  | Life, the Universe, and Everything |
+      | shortname | hhgttg                             |
+    When I am on the hhgttg Course page logged in as traverst1
+    Then I should see "Thomas Travers"
+    And I should see "Life, the Universe, and Everything"
+
+  Scenario: I am on page logged in as should redirect to correct page when automatically logging a user out
+    Given the following "users" exist:
+      | username  | firstname | lastname |
+      | traverst1 | Thomas    | Travers  |
+      | emeryj    | Jane      | Emery    |
+    And the following "course" exists:
+      | fullname  | Life, the Universe, and Everything |
+      | shortname | hhgttg                             |
+    And I am logged in as emeryj
+    When I am on the hhgttg Course page logged in as traverst1
+    Then I should see "Thomas Travers"
+    And I should see "Life, the Universe, and Everything"
+
+  @javascript
+  Scenario: I am on page logged in as should redirect to correct page when automatically logging a user out (javacript)
+    Given the following "users" exist:
+      | username  | firstname | lastname |
+      | traverst1 | Thomas    | Travers  |
+      | emeryj    | Jane      | Emery    |
+    And the following "course" exists:
+      | fullname  | Life, the Universe, and Everything |
+      | shortname | hhgttg                             |
+    And I am logged in as emeryj
+    When I am on the hhgttg Course page logged in as traverst1
+    Then I should see "Thomas Travers"
+    And I should see "Life, the Universe, and Everything"

admin/tool/brickfield/classes/local/htmlchecker/common/checks/content_too_long.php

@@ -40,14 +40,15 @@ class content_too_long extends brickfield_accessibility_test {
 
         $contentlengthlimit = 500;
         $pagetext = '';
-        foreach ($this->get_all_elements(null, 'text') as $element) {
-            $text = $element->nodeValue;
+        // There will be only one, but array is returned anyway.
+        foreach ($this->get_all_elements('body') as $element) {
+            $text = $element->textContent;
             if ($text != null) {
                 $pagetext = $pagetext . $text;
             }
         }
 
-        $wordcount = str_word_count($pagetext);
+        $wordcount = count_words($pagetext);
         if ($wordcount > $contentlengthlimit) {
             $this->add_report(null, "<p id='wc'>Word Count: " . $wordcount . "</p>", false);
         }

admin/tool/brickfield/tests/area_test.php

@@ -16,6 +16,11 @@
 
 namespace tool_brickfield;
 
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->dirroot . '/admin/tool/brickfield/tests/area_test_base.php');
+
 /**
  * Class tool_brickfield_area_testcase
  *
@@ -23,8 +28,7 @@ namespace tool_brickfield;
  * @copyright  2020 onward: Brickfield Education Labs, https://www.brickfield.ie
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class area_test extends \advanced_testcase {
-
+class area_test extends area_test_base {
     /**
      * Test for the area assign intro
      */
@@ -46,7 +50,7 @@ class area_test extends \advanced_testcase {
         $resultsrs = $c->find_course_areas($course1->id);
         $resultsrs2 = $c->find_course_areas($course2->id);
         // Set up a results array from the recordset for easier testing.
-        $results = array_merge(self::array_from_recordset($resultsrs), self::array_from_recordset($resultsrs2));
+        $results = array_merge($this->array_from_recordset($resultsrs), $this->array_from_recordset($resultsrs2));
         $this->assertEquals([
             (object)[
                 'type' => area_base::TYPE_FIELD,
@@ -76,7 +80,7 @@ class area_test extends \advanced_testcase {
         $event = \core\event\course_module_updated::create_from_cm($cm1);
         $relevantresultsrs = $c->find_relevant_areas($event);
         // Set up a relevantresults array from the recordset for easier testing.
-        $relevantresults = self::array_from_recordset($relevantresultsrs);
+        $relevantresults = $this->array_from_recordset($relevantresultsrs);
         $this->assertEquals([$results[0]], $relevantresults);
     }
 
@@ -87,43 +91,57 @@ class area_test extends \advanced_testcase {
         $this->resetAfterTest();
         /** @var \core_question_generator $generator */
         $generator = $this->getDataGenerator()->get_plugin_generator('core_question');
+        $component = 'core_question';
+
         list($category1, $course1, $qcat1, $questions1) = $generator->setup_course_and_questions('course');
         list($category2, $course2, $qcat2, $questions2) = $generator->setup_course_and_questions('category');
         list($category3, $course3, $qcat3, $questions3) = $generator->setup_course_and_questions('system');
 
         $c = new \tool_brickfield\local\areas\core_question\questiontext();
-        $results1 = self::array_from_recordset($c->find_course_areas($course1->id));
-        $results2 = self::array_from_recordset($c->find_course_areas($course2->id));
-        $results3 = self::array_from_recordset($c->find_course_areas($course3->id));
-        $results4 = self::array_from_recordset($c->find_system_areas());
-        // Set up a results array from the recordset for easier testing.
+        // Set up results arrays from the recordset for easier testing.
+        $course1areas = $this->array_from_recordset($c->find_course_areas($course1->id));
+        $course2areas = $c->find_course_areas($course2->id);
+        $course3areas = $c->find_course_areas($course3->id);
+        $sysareas = $this->array_from_recordset($c->find_system_areas());
 
-        $this->assertCount(2, $results1);
-        $this->assertCount(0, $results2);
-        $this->assertCount(0, $results3);
-        $this->assertCount(4, $results4);
-
-        // Validate the contexts, courseid and categoryid of the returned results.
-        $this->assertEquals(\context_course::instance($course1->id)->id, $results1[0]->contextid);
-        $this->assertEquals($course1->id, $results1[0]->courseid);
-        $this->assertEmpty($results1[0]->categoryid);
-        $this->assertEquals(\context_coursecat::instance($category2->id)->id, $results4[0]->contextid);
-        $this->assertEquals(SITEID, $results4[0]->courseid);
-        $this->assertEquals($category2->id, $results4[0]->categoryid);
-        $this->assertEquals(\context_system::instance()->id, $results4[2]->contextid);
-        $this->assertEmpty($results4[2]->categoryid);
-        $this->assertEquals(SITEID, $results4[2]->courseid);
-        // Results4 should contain id's for questions 1 and 2.
-        $this->assertTrue(($questions3[0]->id == $results4[2]->itemid) || ($questions3[0]->id == $results4[3]->itemid));
-        $this->assertTrue(($questions3[1]->id == $results4[2]->itemid) || ($questions3[1]->id == $results4[3]->itemid));
+        // Assert the core_question area exists for the individual question's context, courseid and categoryid.
+        $this->assert_area_in_array(
+            $course1areas,
+            $component,
+            \context_course::instance($course1->id)->id,
+            $questions1[0]->id,
+            $course1->id,
+            null
+        );
+        $this->assert_area_in_array(
+            $sysareas,
+            $component,
+            \context_coursecat::instance($category2->id)->id,
+            $questions2[0]->id,
+            SITEID,
+            $category2->id
+        );
+        $this->assert_area_in_array(
+            $sysareas,
+            $component,
+            \context_system::instance()->id,
+            $questions3[0]->id,
+            SITEID,
+            null
+        );
 
         // Emulate the question_created event.
         $event = \core\event\question_created::create_from_question_instance($questions1[1],
             \context_course::instance($course1->id));
-        $relevantresultsrs = $c->find_relevant_areas($event);
-        // Set up a relevantresults array from the recordset for easier testing.
-        $relevantresults = self::array_from_recordset($relevantresultsrs);
-        $this->assertEquals([$results1[1]], $relevantresults);
+        $relevantresults = $this->array_from_recordset($c->find_relevant_areas($event));
+        $this->assert_area_in_array(
+            $course1areas,
+            $component,
+            \context_course::instance($relevantresults[0]->courseid)->id,
+            $relevantresults[0]->itemid,
+            $relevantresults[0]->courseid,
+            $relevantresults[0]->categoryid
+        );
     }
 
     /**
@@ -147,7 +165,7 @@ class area_test extends \advanced_testcase {
 
         $c = new \tool_brickfield\local\areas\core_question\questionanswers();
         $resultsrs = $c->find_course_areas($course->id);
-        $results = self::array_from_recordset($resultsrs);
+        $results = $this->array_from_recordset($resultsrs);
 
         // There will be the same number of results as the number of records in the question_answers table.
         $this->assertEquals(count($dbanswers), count($results));
@@ -157,7 +175,7 @@ class area_test extends \advanced_testcase {
             \context_course::instance($course->id));
         $relevantresultsrs = $c->find_relevant_areas($event);
         // Set up a relevantresults array from the recordset for easier testing.
-        $relevantresults = self::array_from_recordset($relevantresultsrs);
+        $relevantresults = $this->array_from_recordset($relevantresultsrs);
 
         $dbanswers = array_values($DB->get_records('question_answers', ['question' => $question1->id], 'id'));
         $this->assertEquals(count($dbanswers), count($relevantresults));
@@ -190,7 +208,7 @@ class area_test extends \advanced_testcase {
         $c = new \tool_brickfield\local\areas\mod_choice\intro();
         $resultsrs = $c->find_course_areas($course->id);
         // Set up a results array from the recordset for easier testing.
-        $results = self::array_from_recordset($resultsrs);
+        $results = $this->array_from_recordset($resultsrs);
 
         $this->assertCount(2, $results);
         $this->assertEquals($cm1->id, $results[0]->cmid);
@@ -199,14 +217,14 @@ class area_test extends \advanced_testcase {
         // Emulate the course_module_created event.
         $event = \core\event\course_module_created::create_from_cm($cm1);
         $relevantresultsrs = $c->find_relevant_areas($event);
-        $relevantresults = self::array_from_recordset($relevantresultsrs);
+        $relevantresults = $this->array_from_recordset($relevantresultsrs);
         $this->assertEquals([$results[0]], $relevantresults);
 
         // Testing the choice options.
         $c = new \tool_brickfield\local\areas\mod_choice\option();
         $resultsrs = $c->find_course_areas($course->id);
         // Set up a results array from the recordset for easier testing.
-        $results = self::array_from_recordset($resultsrs);
+        $results = $this->array_from_recordset($resultsrs);
 
         $this->assertCount(5, $results);
         $this->assertEquals($cm2->id, $results[3]->cmid);
@@ -220,21 +238,7 @@ class area_test extends \advanced_testcase {
         // Emulate the course_module_updated event.
         $event = \core\event\course_module_updated::create_from_cm($cm2);
         $relevantresultsrs = $c->find_relevant_areas($event);
-        $relevantresults = self::array_from_recordset($relevantresultsrs);
+        $relevantresults = $this->array_from_recordset($relevantresultsrs);
         $this->assertEquals([$results[3], $results[4]], $relevantresults);
     }
-
-    /**
-     * Array from recordset.
-     * @param \moodle_recordset $rs
-     * @return array
-     */
-    private static function array_from_recordset($rs) {
-        $records = [];
-        foreach ($rs as $record) {
-            $records[] = $record;
-        }
-        $rs->close();
-        return $records;
-    }
 }

admin/tool/brickfield/tests/area_test_base.php

@@ -0,0 +1,94 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace tool_brickfield;
+
+/**
+ * Class area_test_base provides some utility functions that can be used by testing.
+ *
+ * @package    tool_brickfield
+ * @copyright  2020 onward: Brickfield Education Labs, https://www.brickfield.ie
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+abstract class area_test_base extends \advanced_testcase {
+    /** @var string Message for failed area test. */
+    protected $areatestmessage = 'Expected %component% area not found';
+
+    /**
+     * Create and return an array from a recordset. Recordset is destroyed.
+     * @param \moodle_recordset $rs
+     * @return array
+     */
+    public function array_from_recordset(\moodle_recordset $rs): array {
+        $records = [];
+        foreach ($rs as $record) {
+            $records[] = $record;
+        }
+        // Can't rewind a recordset, so might as well close it.
+        $rs->close();
+        return $records;
+    }
+
+    /**
+     * Test for specified component information present in area recordset. Recordset cannot be reused.
+     * @param \moodle_recordset $areasrs
+     * @param string $component
+     * @param int $contextid
+     * @param int $itemid
+     * @param int|null $courseid
+     * @param int|null $categoryid
+     * @return void
+     */
+    public function assert_area_in_recordset(\moodle_recordset $areasrs, string $component, int $contextid, int $itemid,
+                                             ?int $courseid, ?int $categoryid): void {
+        $this->assert_area_in_array(
+            $this->array_from_recordset($areasrs),
+            $component,
+            $contextid,
+            $itemid,
+            $courseid,
+            $categoryid
+        );
+    }
+
+    /**
+     * Test for specified component information present in area array.
+     * @param array $areas
+     * @param string $component
+     * @param int $contextid
+     * @param int $itemid
+     * @param int|null $courseid
+     * @param int|null $categoryid
+     * @return void
+     */
+    public function assert_area_in_array(array $areas, string $component, int $contextid, int $itemid,
+                                         ?int $courseid, ?int $categoryid): void {
+        $found = false;
+        $message = str_replace('%component%', $component, $this->areatestmessage);
+        foreach ($areas as $area) {
+            if (($area->component == $component) &&
+                ($area->contextid == $contextid) &&
+                ((empty($courseid) ? empty($area->courseid) : ($area->courseid == $courseid))) &&
+                ((empty($categoryid) ? empty($area->categoryid) : ($area->categoryid == $categoryid))) &&
+                ($area->itemid == $itemid)
+            ) {
+                $found = true;
+                break;
+            }
+        }
+        $this->assertTrue($found, $message);
+    }
+}

admin/tool/brickfield/tests/filters_test.php

@@ -26,7 +26,7 @@ use tool_brickfield\local\tool\filter;
  * @author     Jay Churchward (jay.churchward@poetopensource.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class filter_test extends \advanced_testcase {
+class filters_test extends \advanced_testcase {
     public function test_constructor() {
         $this->resetAfterTest();
 

admin/tool/brickfield/tests/local/areas/core_question/questiontext_test.php

@@ -13,9 +13,15 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
 namespace tool_brickfield\local\areas\core_question;
 
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+require_once($CFG->dirroot . '/admin/tool/brickfield/tests/area_test_base.php');
+
+use tool_brickfield\area_test_base;
+
 /**
  * Tests for questiontext.
  *
@@ -23,8 +29,7 @@ namespace tool_brickfield\local\areas\core_question;
  * @copyright   2020 onward: Brickfield Education Labs, https://www.brickfield.ie
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class questiontext_test extends \advanced_testcase {
-
+class questiontext_test extends area_test_base {
     /**
      * Set up before class.
      */
@@ -158,30 +163,31 @@ class questiontext_test extends \advanced_testcase {
         $catcontext = \context_coursecat::instance($category->id);
         $systemcontext = \context_system::instance();
         $generator = $this->getDataGenerator()->get_plugin_generator('core_question');
+        $component = 'core_question';
+
         $cat = $generator->create_question_category(['contextid' => $catcontext->id]);
         $cat2 = $generator->create_question_category(['contextid' => $systemcontext->id]);
         $question = $generator->create_question('multichoice', null, ['category' => $cat2->id]);
         $question2 = $generator->create_question('multichoice', null, ['category' => $cat->id]);
         $questiontext = new questiontext();
-        $rs = $questiontext->find_system_areas();
-        $this->assertNotNull($rs);
+        $areas = $this->array_from_recordset($questiontext->find_system_areas());
 
-        $count = 0;
-        foreach ($rs as $rec) {
-            $count++;
-            if ($count <= 1) {
-                $this->assertEquals($systemcontext->id, $rec->contextid);
-                $this->assertEquals(1, $rec->courseid);
-                $this->assertEquals(0, $rec->categoryid);
-                $this->assertEquals($question->id, $rec->itemid);
-            } else {
-                $this->assertEquals($catcontext->id, $rec->contextid);
-                $this->assertEquals(1, $rec->courseid);
-                $this->assertEquals($category->id, $rec->categoryid);
-                $this->assertEquals($question2->id, $rec->itemid);
-            }
-        }
-        $rs->close();
-        $this->assertEquals(2, $count);
+        // Assert the core_question area exists for the individual question's context, courseid and categoryid.
+        $this->assert_area_in_array(
+            $areas,
+            $component,
+            $systemcontext->id,
+            $question->id,
+            SITEID,
+            null
+        );
+        $this->assert_area_in_array(
+            $areas,
+            $component,
+            $catcontext->id,
+            $question2->id,
+            SITEID,
+            $category->id
+        );
     }
 }

admin/tool/brickfield/tests/local/htmlchecker/common/checks/content_too_long_test.php

@@ -37,20 +37,15 @@ class content_too_long_test extends all_checks {
 
     /** @var string Html fail */
     private $htmlfail = <<<EOD
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-    <html lang="en">
-    <head>
-    <title>Content must not exceed a certain length</title>
-    </head>
-    <body>
-    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent accumsan, ante varius viverra aliquam, dolor risus
+    <p><span>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent accumsan, ante varius viverra aliquam, dolor risus
     scelerisque massa, ut lacinia ipsum felis id est. Nullam convallis odio ante, in commodo elit fermentum sed. Vivamus ullamcorper
     tincidunt sagittis. Sed et semper sapien. Quisque malesuada lacus nec libero cursus, aliquam malesuada neque ultricies. Cras sit
     amet enim vel orci tristique porttitor a vitae urna. Suspendisse mi leo, hendrerit et eleifend a, mollis at ex. Maecenas eget
     magna nec sem dignissim pharetra vel nec ex. Donec in porta lectus. Aenean porttitor euismod lectus, sodales eleifend ex egestas
-    in. Donec sed metus sodales, lobortis velit quis, dictum arcu.
-    Praesent mollis urna eget odio cursus, sit amet sollicitudin ante aliquam. Integer nec massa nec ipsum tincidunt laoreet in
-    vitae metus. Integer massa lacus, elementum quis dui sed, eleifend fringilla turpis. In hac habitasse platea dictumst. Phasellus
+    in. Donec sed metus sodales, lobortis velit quis, dictum arcu.</span></p>
+    <p><span>Praesent mollis urna eget odio cursus, sit amet sollicitudin ante aliquam. Integer nec massa nec ipsum tincidunt
+    laoreet in vitae metus.
+    Integer massa lacus, elementum quis dui sed, eleifend fringilla turpis. In hac habitasse platea dictumst. Phasellus
     efficitur quis felis non eleifend. Sed et mauris vel lorem ultrices porta. Mauris commodo condimentum felis, vel dictum ex
     laoreet sit amet. Duis venenatis ut lacus non ultrices. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per
     inceptos himenaeos. Nam nunc magna, semper feugiat feugiat a, pellentesque vel nulla.
@@ -59,9 +54,10 @@ class content_too_long_test extends all_checks {
     blandit eget elit sit amet, suscipit mollis ligula. Suspendisse rutrum sem ex, eu commodo nisi aliquam sit amet. Fusce ut felis
     justo. Sed a quam at lectus consectetur vulputate. Proin elementum dui nisi, in condimentum diam porttitor eget. Donec vehicula
     condimentum velit vel semper. Mauris vehicula tortor lectus, quis convallis erat aliquet vel. In dictum nunc ac posuere porta.
-    Sed vel leo aliquam, volutpat ligula ac, blandit diam. Donec nec ligula lacus.
-    Mauris ac libero vel ex fringilla fringilla. Ut vehicula justo eu nunc imperdiet ultricies. Sed interdum ligula at nisi rhoncus
-    auctor. Sed tempus tellus eget risus placerat, et viverra dolor gravida. Sed ultricies neque id ex tempor viverra. Ut imperdiet
+    Sed vel leo aliquam, volutpat ligula ac, blandit diam. Donec nec ligula lacus.</span></p>
+    <p><span>Mauris ac libero vel ex fringilla fringilla. Ut vehicula justo eu nunc imperdiet ultricies. Sed interdum ligula at nisi
+    rhoncus auctor.
+    Sed tempus tellus eget risus placerat, et viverra dolor gravida. Sed ultricies neque id ex tempor viverra. Ut imperdiet
     pharetra magna sed tristique. Pellentesque blandit elit ac neque lacinia finibus. Lorem ipsum dolor sit amet, consectetur
     adipiscing elit. Donec vel auctor dolor. Morbi id elit mollis ante mattis semper eu ac lectus. Integer elit turpis, facilisis
     vel metus eget, blandit tempus arcu. Pellentesque eget magna eu ex eleifend tincidunt. Curabitur sit amet congue nisi.
@@ -69,29 +65,60 @@ class content_too_long_test extends all_checks {
     turpis. Aenean tincidunt tristique dui, pretium lacinia felis posuere vel. Donec massa ligula, luctus vitae enim nec, sagittis
     hendrerit lorem. In consequat sodales metus vel porttitor. Aenean fringilla fringilla risus, vitae interdum turpis egestas quis.
     Aenean volutpat arcu leo, ut dictum purus consectetur id. Cras enim ipsum, tincidunt vitae mi vel, varius convallis ex. Fusce
-    pretium porttitor tempus.
-    Morbi laoreet dapibus lectus ut efficitur. Donec at hendrerit nunc. Vivamus venenatis augue non nulla finibus vestibulum. Nam
+    pretium porttitor tempus.</span></p>
+    <p>Morbi laoreet dapibus lectus ut efficitur. Donec at hendrerit nunc. Vivamus venenatis augue non nulla finibus vestibulum. Nam
     nunc magna, hendrerit a ipsum nec, pulvinar imperdiet augue. Fusce vel metus maximus, mattis magna at, egestas enim. Suspendisse
     et nisl at enim mollis scelerisque. Duis ut ipsum vel turpis eleifend aliquet a a ante. Nam lacinia purus vulputate purus
     tincidunt, aliquet sagittis nisi sagittis. Pellentesque efficitur massa non ex sodales pretium. Cras convallis vitae ex et
     dignissim. Nunc suscipit bibendum aliquam. Maecenas interdum tellus varius, laoreet velit sed, ornare arcu. Nunc pulvinar
     elementum sem eget scelerisque. Duis volutpat tellus ut risus finibus, nec molestie erat fermentum
     </p>
-    </body>
-    </html>
+EOD;
+
+    /** @var string Multibyte html falure */
+    private $htmlfail2 = <<<EOD
+    <p><span>ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル ブルース カンベッル
+    </span></p>
 EOD;
 
     /** @var string Html pass */
     private $htmlpass = <<<EOD
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN""http://www.w3.org/TR/REC-html40/loose.dtd">
-    <html lang="en">
-    <head>
-    <title>Content must not exceed a certain length/title>
-    </head>
-    <body>
     <p>Nice and short text</p>
-    </body>
-    </html>
 EOD;
 
     /**
@@ -101,6 +128,9 @@ EOD;
         $results = $this->get_checker_results($this->htmlfail);
         $this->assertTrue($results[0]->message == '<p id=\'wc\'>Word Count: 578</p>');
 
+        $results = $this->get_checker_results($this->htmlfail2);
+        $this->assertTrue($results[0]->message == '<p id=\'wc\'>Word Count: 504</p>');
+
         $results = $this->get_checker_results($this->htmlpass);
         $this->assertEmpty($results);
     }

admin/tool/capability/tests/locallib_test.php

@@ -21,6 +21,7 @@
  * @copyright 2021 The Open University
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
  */
+namespace tool_capability;
 
 defined('MOODLE_INTERNAL') || die();
 global $CFG;
@@ -30,7 +31,7 @@ require_once($CFG->dirroot . '/' . $CFG->admin . '/tool/capability/locallib.php'
 /**
  * Tests for the capability overview helper functions.
  */
-class tool_capability_locallib_testcase extends advanced_testcase {
+class locallib_test extends \advanced_testcase {
 
     /**
      * Test the function that gets the data - simple case.
@@ -40,7 +41,7 @@ class tool_capability_locallib_testcase extends advanced_testcase {
 
         $data = tool_capability_calculate_role_data('mod/quiz:attempt', get_all_roles());
 
-        $systcontext = context_system::instance();
+        $systcontext = \context_system::instance();
         $studentroleid = $DB->get_field('role', 'id', ['shortname' => 'student']);
 
         $this->assertArrayHasKey($systcontext->id, $data);
@@ -63,10 +64,10 @@ class tool_capability_locallib_testcase extends advanced_testcase {
 
         // This simulates a situation that seems to happen sometimes, where
         // we end up with contexts with path = NULL in the database.
-        $systcontext = context_system::instance();
+        $systcontext = \context_system::instance();
         $generator = $this->getDataGenerator();
         $course = $generator->create_course();
-        $coursecontext = context_course::instance($course->id);
+        $coursecontext = \context_course::instance($course->id);
         $studentroleid = $DB->get_field('role', 'id', ['shortname' => 'student']);
         role_change_permission($studentroleid, $coursecontext, 'mod/quiz:attempt', CAP_PREVENT);
         // This is where we simulate the breakage.

admin/tool/cohortroles/tests/privacy/provider_test.php

@@ -22,14 +22,15 @@
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace tool_cohortroles\privacy;
 
 defined('MOODLE_INTERNAL') || die();
 global $CFG;
 
-use \core_privacy\local\request\writer;
-use \core_privacy\local\request\approved_contextlist;
-use \tool_cohortroles\api;
-use \tool_cohortroles\privacy\provider;
+use core_privacy\local\request\writer;
+use core_privacy\local\request\approved_contextlist;
+use tool_cohortroles\api;
+use tool_cohortroles\privacy\provider;
 use core_privacy\local\request\approved_userlist;
 
 /**
@@ -38,7 +39,7 @@ use core_privacy\local\request\approved_userlist;
  * @copyright  2018 Zig Tan <zig@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_testcase {
+class provider_test extends \core_privacy\tests\provider_testcase {
 
     /**
      * Overriding setUp() function to always reset after tests.
@@ -61,7 +62,7 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
         // Create course category.
         $coursecategory = $this->getDataGenerator()->create_category();
         $coursecategoryctx = \context_coursecat::instance($coursecategory->id);
-        $systemctx = context_system::instance();
+        $systemctx = \context_system::instance();
         // Create course.
         $course = $this->getDataGenerator()->create_course();
         $coursectx = \context_course::instance($course->id);
@@ -102,7 +103,7 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
         // Create course category.
         $coursecategory = $this->getDataGenerator()->create_category();
         $coursecategoryctx = \context_coursecat::instance($coursecategory->id);
-        $systemctx = context_system::instance();
+        $systemctx = \context_system::instance();
         // Create course.
         $course = $this->getDataGenerator()->create_course();
         $coursectx = \context_course::instance($course->id);
@@ -154,7 +155,7 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
         // Create course category.
         $coursecategory = $this->getDataGenerator()->create_category();
         $coursecategoryctx = \context_coursecat::instance($coursecategory->id);
-        $systemctx = context_system::instance();
+        $systemctx = \context_system::instance();
 
         $this->setup_test_scenario_data($user->id, $systemctx, 1);
         $this->setup_test_scenario_data($user->id, $coursecategoryctx, 1, 'Sausage roll 2',
@@ -170,7 +171,7 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
         $this->assertCount(2, $contexts);
 
         // Make sure the user data is only being deleted in within the system and course category context.
-        $usercontext = context_user::instance($user->id);
+        $usercontext = \context_user::instance($user->id);
         // Delete all the User's records in mdl_tool_cohortroles table by the user context.
         provider::delete_data_for_all_users_in_context($usercontext);
 
@@ -213,7 +214,7 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
         // Create course category.
         $coursecategory = $this->getDataGenerator()->create_category();
         $coursecategoryctx = \context_coursecat::instance($coursecategory->id);
-        $systemctx = context_system::instance();
+        $systemctx = \context_system::instance();
 
         $this->setup_test_scenario_data($user->id, $systemctx, 1);
         $this->setup_test_scenario_data($user->id, $coursecategoryctx, 1, 'Sausage roll 2',
@@ -229,7 +230,7 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
         $this->assertCount(2, $contexts);
 
         // Make sure the user data is only being deleted in within the system and the course category contexts.
-        $usercontext = context_user::instance($user->id);
+        $usercontext = \context_user::instance($user->id);
         // Delete all the User's records in mdl_tool_cohortroles table by the specified approved context list.
         $approvedcontextlist = new approved_contextlist($user, 'tool_cohortroles', [$usercontext->id]);
         provider::delete_data_for_user($approvedcontextlist);
@@ -255,12 +256,12 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
 
         // Create a user.
         $user = $this->getDataGenerator()->create_user();
-        $usercontext = context_user::instance($user->id);
+        $usercontext = \context_user::instance($user->id);
 
         // Create course category.
         $coursecategory = $this->getDataGenerator()->create_category();
         $coursecategoryctx = \context_coursecat::instance($coursecategory->id);
-        $systemctx = context_system::instance();
+        $systemctx = \context_system::instance();
 
         $this->setAdminUser();
 
@@ -301,12 +302,12 @@ class tool_cohortroles_privacy_testcase extends \core_privacy\tests\provider_tes
         $user2 = $this->getDataGenerator()->create_user();
         // Create user3.
         $user3 = $this->getDataGenerator()->create_user();
-        $usercontext3 = context_user::instance($user3->id);
+        $usercontext3 = \context_user::instance($user3->id);
 
         // Create course category.
         $coursecategory = $this->getDataGenerator()->create_category();
         $coursecategoryctx = \context_coursecat::instance($coursecategory->id);
-        $systemctx = context_system::instance();
+        $systemctx = \context_system::instance();
 
         $this->setAdminUser();
 

admin/tool/customlang/templates/translator.mustache

@@ -97,7 +97,7 @@
                 {{#modified}}list-group-item-info{{/modified}}"
             >
             <div class="row">
-                <div class="col-sm-4 col-md-2">
+                <div class="col-sm-4 col-md-2 text-break">
                     <div class="d-md-none">
                         <strong>{{#str}}headingcomponent, tool_customlang{{/str}}</strong>
                     </div>

admin/tool/customlang/tests/local/mlang/langstring_test.php

@@ -36,7 +36,7 @@ use moodle_exception;
  * @copyright  2020 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class langstring_testcase extends advanced_testcase {
+class langstring_test extends advanced_testcase {
 
     /**
      * Sanity 1.x string

admin/tool/customlang/tests/local/mlang/phpparser_test.php

@@ -34,7 +34,7 @@ use moodle_exception;
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class phpparser_testcase extends advanced_testcase {
+class phpparser_test extends advanced_testcase {
 
 
     /**

admin/tool/dataprivacy/templates/data_request_email.mustache

@@ -56,7 +56,7 @@
 <head>
     <meta charset="UTF-8">
     <style>
-        table, th, td {
+        table.dataprivacy_email_table, .dataprivacy_email_table th, .dataprivacy_email_table td {
             border: 1px solid black;
             padding: 0.5em;
         }
@@ -67,7 +67,7 @@
     <div>
         <p>{{#str}}emailsalutation, tool_dataprivacy, {{dponame}}{{/str}}</p>
         <p>{{#str}}requestemailintro, tool_dataprivacy{{/str}}</p>
-        <table>
+        <table class="dataprivacy_email_table">
             <tr>
                 <th scope="row">
                     {{#str}}requesttype, tool_dataprivacy{{/str}}

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

@@ -9,10 +9,8 @@ Feature: Manage data requests
       | username | firstname | lastname | email          |
       | student1 | John      | Doe      | s1@example.com |
       | student2 | Jane      | Doe      | s2@example.com |
-    And I log in as "admin"
-    And I set the following administration settings values:
-      | contactdataprotectionofficer | 1 |
-    And I log out
+    And the following config values are set as admin:
+      | contactdataprotectionofficer | 1 | tool_dataprivacy |
 
   @javascript
   Scenario: Marking general enquiries as complete

admin/tool/dataprivacy/tests/privacy/provider_test.php

@@ -21,6 +21,7 @@
  * @copyright  2020 Paul Holden <paulh@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace tool_dataprivacy\privacy;
 
 defined('MOODLE_INTERNAL') || die();
 
@@ -38,7 +39,7 @@ use tool_dataprivacy\privacy\provider;
  * @copyright  2020 Paul Holden <paulh@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class tool_dataprivacy_privacy_provider_testcase extends provider_testcase {
+class provider_test extends provider_testcase {
 
     /**
      * Test provider get_contexts_for_userid method
@@ -49,7 +50,7 @@ class tool_dataprivacy_privacy_provider_testcase extends provider_testcase {
         $this->resetAfterTest();
 
         $user = $this->getDataGenerator()->create_user();
-        $context = context_user::instance($user->id);
+        $context = \context_user::instance($user->id);
 
         // Returned context list should contain a single item.
         $contextlist = $this->get_contexts_for_userid($user->id, 'tool_dataprivacy');
@@ -68,7 +69,7 @@ class tool_dataprivacy_privacy_provider_testcase extends provider_testcase {
         $this->resetAfterTest();
 
         $user = $this->getDataGenerator()->create_user();
-        $context = context_user::instance($user->id);
+        $context = \context_user::instance($user->id);
 
         $userlist = new userlist($context, 'tool_dataprivacy');
         provider::get_users_in_context($userlist);
@@ -82,7 +83,7 @@ class tool_dataprivacy_privacy_provider_testcase extends provider_testcase {
      * @return void
      */
     public function test_get_users_in_context_non_user_context() {
-        $context = context_system::instance();
+        $context = \context_system::instance();
 
         $userlist = new userlist($context, 'tool_dataprivacy');
         provider::get_users_in_context($userlist);
@@ -99,7 +100,7 @@ class tool_dataprivacy_privacy_provider_testcase extends provider_testcase {
         $this->resetAfterTest();
 
         $user = $this->getDataGenerator()->create_user();
-        $context = context_user::instance($user->id);
+        $context = \context_user::instance($user->id);
 
         $this->setUser($user);
 
@@ -170,7 +171,7 @@ class tool_dataprivacy_privacy_provider_testcase extends provider_testcase {
         provider::export_user_preferences($user->id);
 
         /** @var \core_privacy\tests\request\content_writer $writer */
-        $writer = writer::with_context(context_system::instance());
+        $writer = writer::with_context(\context_system::instance());
         $this->assertTrue($writer->has_any_data());
 
         /** @var stdClass[] $preferences */

admin/tool/filetypes/revert.php

@@ -27,7 +27,7 @@ require_once($CFG->libdir . '/adminlib.php');
 
 admin_externalpage_setup('tool_filetypes');
 
-$extension = required_param('extension', PARAM_RAW);
+$extension = required_param('extension', PARAM_ALPHANUMEXT);
 $redirecturl = new \moodle_url('/admin/tool/filetypes/index.php');
 
 if (optional_param('revert', 0, PARAM_INT)) {

admin/tool/generator/classes/testplan_backend.php

@@ -100,10 +100,12 @@ class tool_generator_testplan_backend extends tool_generator_backend {
      *
      * @param int $courseid The target course id
      * @param bool $updateuserspassword Updates the course users password to $CFG->tool_generator_users_password
+     * @param int|null $size of the test plan. Used to limit the number of users exported
+     *                 to match the threads in the plan. For BC, defaults to null that means all enrolled users.
      * @return stored_file
      */
-    public static function create_users_file($courseid, $updateuserspassword) {
-        $csvcontents = self::generate_users_file($courseid, $updateuserspassword);
+    public static function create_users_file($courseid, $updateuserspassword, ?int $size = null) {
+        $csvcontents = self::generate_users_file($courseid, $updateuserspassword, $size);
 
         $fs = get_file_storage();
         $filerecord = self::get_file_record('users', 'csv');
@@ -171,14 +173,18 @@ class tool_generator_testplan_backend extends tool_generator_backend {
      *
      * @param int $targetcourseid
      * @param bool $updateuserspassword Updates the course users password to $CFG->tool_generator_users_password
+     * @param int|null $size of the test plan. Used to limit the number of users exported
+     *                 to match the threads in the plan. For BC, defaults to null that means all enrolled users.
      * @return string The users csv file contents.
      */
-    protected static function generate_users_file($targetcourseid, $updateuserspassword) {
+    protected static function generate_users_file($targetcourseid, $updateuserspassword, ?int $size = null) {
         global $CFG;
 
         $coursecontext = context_course::instance($targetcourseid);
 
-        $users = get_enrolled_users($coursecontext, '', 0, 'u.id, u.username, u.auth', 'u.username ASC');
+        // If requested, get the number of users (threads) to use in the plan. We only need those in the exported file.
+        $planusers = self::$users[$size] ?? 0;
+        $users = get_enrolled_users($coursecontext, '', 0, 'u.id, u.username, u.auth', 'u.username ASC', 0, $planusers);
         if (!$users) {
             print_error('coursewithoutusers', 'tool_generator');
         }

admin/tool/generator/cli/maketestplan.php

@@ -98,7 +98,7 @@ if (empty($CFG->tool_generator_users_password) || is_bool($CFG->tool_generator_u
 
 // Create files.
 $courseid = $DB->get_field('course', 'id', array('shortname' => $shortname));
-$usersfile = tool_generator_testplan_backend::create_users_file($courseid, !empty($options['updateuserspassword']));
+$usersfile = tool_generator_testplan_backend::create_users_file($courseid, !empty($options['updateuserspassword']), $size);
 $testplanfile = tool_generator_testplan_backend::create_testplan_file($courseid, $size);
 
 // One file path per line so other CLI scripts can easily parse the output.

admin/tool/generator/maketestplan.php

@@ -51,7 +51,7 @@ if ($data = $mform->get_data()) {
 
     // Creating both test plan and users files.
     $testplanfile = tool_generator_testplan_backend::create_testplan_file($data->courseid, $data->size);
-    $usersfile = tool_generator_testplan_backend::create_users_file($data->courseid, $data->updateuserspassword);
+    $usersfile = tool_generator_testplan_backend::create_users_file($data->courseid, $data->updateuserspassword, $data->size);
 
     // Test plan link.
     $testplanurl = moodle_url::make_pluginfile_url(

admin/tool/generator/upgrade.txt

@@ -1,6 +1,13 @@
 This files describes API changes in core libraries and APIs,
 information provided here is intended especially for developers.
 
+=== 3.11.4 ===
+
+* Function tool_generator_testplan_backend::create_users_file() now supports to pass the size of the testing plan,
+  that needs to be equal or smaller than the size of the generated site. That's used to effectively restrict the
+  exported number of users to the number of threads the jmeter plan will have (previously all the enrolled users
+  were being exported, with that leading to "false" loops (users not really looping X times).
+
 === 3.7 ===
 
 * Function tool_generator_testplan_backend::get_course_options() is removed, the 'course' form element is used instead.

admin/tool/log/store/database/tests/privacy/provider_test.php

@@ -23,6 +23,7 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace logstore_database\privacy;
 
 defined('MOODLE_INTERNAL') || die();
 global $CFG;
@@ -34,7 +35,7 @@ use core_privacy\local\request\transform;
 use core_privacy\local\request\writer;
 use logstore_database\privacy\provider;
 
-require_once(__DIR__ . '/fixtures/event.php');
+require_once(__DIR__ . '/../fixtures/event.php');
 
 /**
  * Data provider testcase class.
@@ -48,7 +49,7 @@ require_once(__DIR__ . '/fixtures/event.php');
  * @author     Frédéric Massart <fred@branchup.tech>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class logstore_database_privacy_testcase extends provider_testcase {
+class provider_test extends provider_testcase {
 
     public function setUp(): void {
         global $CFG;
@@ -105,11 +106,11 @@ class logstore_database_privacy_testcase extends provider_testcase {
         $c2 = $this->getDataGenerator()->create_course();
         $cm2 = $this->getDataGenerator()->create_module('url', ['course' => $c2]);
 
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($c1->id);
-        $c2ctx = context_course::instance($c2->id);
-        $cm1ctx = context_module::instance($cm1->cmid);
-        $cm2ctx = context_module::instance($cm2->cmid);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($c1->id);
+        $c2ctx = \context_course::instance($c2->id);
+        $cm1ctx = \context_module::instance($cm1->cmid);
+        $cm2ctx = \context_module::instance($cm2->cmid);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -143,7 +144,7 @@ class logstore_database_privacy_testcase extends provider_testcase {
         $this->assert_contextlist_equals($this->get_contextlist_for_user($u3), [$sysctx, $c1ctx]);
         $this->assert_contextlist_equals($this->get_contextlist_for_user($admin), [$sysctx, $c1ctx]);
         $this->setAdminUser();
-        \core\session\manager::loginas($u1->id, context_system::instance());
+        \core\session\manager::loginas($u1->id, \context_system::instance());
         $e = \logstore_database\event\unittest_executed::create(['context' => $c2ctx, 'relateduserid' => $u3->id]);
         $e->trigger();
         $this->assert_contextlist_equals($this->get_contextlist_for_user($u1), [$sysctx, $cm1ctx, $c2ctx]);
@@ -163,8 +164,8 @@ class logstore_database_privacy_testcase extends provider_testcase {
 
         $c1 = $this->getDataGenerator()->create_course();
 
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($c1->id);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($c1->id);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -185,7 +186,7 @@ class logstore_database_privacy_testcase extends provider_testcase {
         $e->trigger();
         // The admin user should be added (realuserid).
         $this->setAdminUser();
-        \core\session\manager::loginas($u2->id, context_system::instance());
+        \core\session\manager::loginas($u2->id, \context_system::instance());
         $e = \logstore_database\event\unittest_executed::create(['context' => $sysctx]);
         $e->trigger();
         // Set off an event in a different context. User 4 should not be returned below.
@@ -206,9 +207,9 @@ class logstore_database_privacy_testcase extends provider_testcase {
         $u2 = $this->getDataGenerator()->create_user();
         $c1 = $this->getDataGenerator()->create_course();
         $c2 = $this->getDataGenerator()->create_course();
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($c1->id);
-        $c2ctx = context_course::instance($c2->id);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($c1->id);
+        $c2ctx = \context_course::instance($c2->id);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -247,9 +248,9 @@ class logstore_database_privacy_testcase extends provider_testcase {
         $u2 = $this->getDataGenerator()->create_user();
         $c1 = $this->getDataGenerator()->create_course();
         $c2 = $this->getDataGenerator()->create_course();
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($c1->id);
-        $c2ctx = context_course::instance($c2->id);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($c1->id);
+        $c2ctx = \context_course::instance($c2->id);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -294,8 +295,8 @@ class logstore_database_privacy_testcase extends provider_testcase {
         $u4 = $this->getDataGenerator()->create_user();
 
         $course = $this->getDataGenerator()->create_course();
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($course->id);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($course->id);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -337,11 +338,11 @@ class logstore_database_privacy_testcase extends provider_testcase {
         $cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]);
         $c2 = $this->getDataGenerator()->create_course();
         $cm2 = $this->getDataGenerator()->create_module('url', ['course' => $c2]);
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($c1->id);
-        $c2ctx = context_course::instance($c2->id);
-        $cm1ctx = context_module::instance($cm1->cmid);
-        $cm2ctx = context_module::instance($cm2->cmid);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($c1->id);
+        $c2ctx = \context_course::instance($c2->id);
+        $cm1ctx = \context_module::instance($cm1->cmid);
+        $cm2ctx = \context_module::instance($cm2->cmid);
 
         $path = [get_string('privacy:path:logs', 'tool_log'), get_string('pluginname', 'logstore_database')];
         $this->enable_logging();

admin/tool/log/store/legacy/tests/privacy/provider_test.php

@@ -23,6 +23,7 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace logstore_legacy\privacy;
 
 defined('MOODLE_INTERNAL') || die();
 global $CFG;
@@ -35,7 +36,7 @@ use core_privacy\local\request\writer;
 use logstore_legacy\privacy\provider;
 use logstore_legacy\event\unittest_executed;
 
-require_once(__DIR__ . '/fixtures/event.php');
+require_once(__DIR__ . '/../fixtures/event.php');
 
 /**
  * Data provider testcase class.
@@ -46,7 +47,7 @@ require_once(__DIR__ . '/fixtures/event.php');
  * @author     Frédéric Massart <fred@branchup.tech>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class logstore_legacy_privacy_testcase extends provider_testcase {
+class provider_test extends provider_testcase {
 
     public function setUp(): void {
         $this->resetAfterTest();
@@ -58,9 +59,9 @@ class logstore_legacy_privacy_testcase extends provider_testcase {
         $u3 = $this->getDataGenerator()->create_user();
         $c1 = $this->getDataGenerator()->create_course();
         $cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]);
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($c1->id);
-        $cm1ctx = context_module::instance($cm1->cmid);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($c1->id);
+        $cm1ctx = \context_module::instance($cm1->cmid);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -96,11 +97,11 @@ class logstore_legacy_privacy_testcase extends provider_testcase {
         $u3 = $this->getDataGenerator()->create_user();
         $course = $this->getDataGenerator()->create_course();
         $module = $this->getDataGenerator()->create_module('url', ['course' => $course]);
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($course->id);
-        $cm1ctx = context_module::instance($module->cmid);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($course->id);
+        $cm1ctx = \context_module::instance($module->cmid);
 
-        $userctx = context_user::instance($u1->id);
+        $userctx = \context_user::instance($u1->id);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -161,10 +162,10 @@ class logstore_legacy_privacy_testcase extends provider_testcase {
         $c1 = $this->getDataGenerator()->create_course();
         $c2 = $this->getDataGenerator()->create_course();
         $cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]);
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($c1->id);
-        $c2ctx = context_course::instance($c2->id);
-        $cm1ctx = context_module::instance($cm1->cmid);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($c1->id);
+        $c2ctx = \context_course::instance($c2->id);
+        $cm1ctx = \context_module::instance($cm1->cmid);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -238,10 +239,10 @@ class logstore_legacy_privacy_testcase extends provider_testcase {
         $c1 = $this->getDataGenerator()->create_course();
         $c2 = $this->getDataGenerator()->create_course();
         $cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]);
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($c1->id);
-        $c2ctx = context_course::instance($c2->id);
-        $cm1ctx = context_module::instance($cm1->cmid);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($c1->id);
+        $c2ctx = \context_course::instance($c2->id);
+        $cm1ctx = \context_module::instance($cm1->cmid);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -317,11 +318,11 @@ class logstore_legacy_privacy_testcase extends provider_testcase {
         $u3 = $this->getDataGenerator()->create_user();
         $course = $this->getDataGenerator()->create_course();
         $module = $this->getDataGenerator()->create_module('url', ['course' => $course]);
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($course->id);
-        $cm1ctx = context_module::instance($module->cmid);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($course->id);
+        $cm1ctx = \context_module::instance($module->cmid);
 
-        $userctx = context_user::instance($u1->id);
+        $userctx = \context_user::instance($u1->id);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -377,10 +378,10 @@ class logstore_legacy_privacy_testcase extends provider_testcase {
         $c1 = $this->getDataGenerator()->create_course();
         $c2 = $this->getDataGenerator()->create_course();
         $cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]);
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($c1->id);
-        $c2ctx = context_course::instance($c2->id);
-        $cm1ctx = context_module::instance($cm1->cmid);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($c1->id);
+        $c2ctx = \context_course::instance($c2->id);
+        $cm1ctx = \context_module::instance($cm1->cmid);
 
         $this->enable_logging();
         $manager = get_log_manager(true);

admin/tool/log/store/standard/tests/privacy/provider_test.php

@@ -23,6 +23,7 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace logstore_standard\privacy;
 
 defined('MOODLE_INTERNAL') || die();
 global $CFG;
@@ -34,7 +35,7 @@ use core_privacy\local\request\transform;
 use core_privacy\local\request\writer;
 use logstore_standard\privacy\provider;
 
-require_once(__DIR__ . '/fixtures/event.php');
+require_once(__DIR__ . '/../fixtures/event.php');
 
 /**
  * Data provider testcase class.
@@ -45,7 +46,7 @@ require_once(__DIR__ . '/fixtures/event.php');
  * @author     Frédéric Massart <fred@branchup.tech>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class logstore_standard_privacy_testcase extends provider_testcase {
+class provider_test extends provider_testcase {
 
     public function setUp(): void {
         $this->resetAfterTest();
@@ -63,11 +64,11 @@ class logstore_standard_privacy_testcase extends provider_testcase {
         $c2 = $this->getDataGenerator()->create_course();
         $cm2 = $this->getDataGenerator()->create_module('url', ['course' => $c2]);
 
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($c1->id);
-        $c2ctx = context_course::instance($c2->id);
-        $cm1ctx = context_module::instance($cm1->cmid);
-        $cm2ctx = context_module::instance($cm2->cmid);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($c1->id);
+        $c2ctx = \context_course::instance($c2->id);
+        $cm1ctx = \context_module::instance($cm1->cmid);
+        $cm2ctx = \context_module::instance($cm2->cmid);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -101,7 +102,7 @@ class logstore_standard_privacy_testcase extends provider_testcase {
         $this->assert_contextlist_equals($this->get_contextlist_for_user($u3), [$sysctx, $c1ctx]);
         $this->assert_contextlist_equals($this->get_contextlist_for_user($admin), [$sysctx, $c1ctx]);
         $this->setAdminUser();
-        \core\session\manager::loginas($u1->id, context_system::instance());
+        \core\session\manager::loginas($u1->id, \context_system::instance());
         $e = \logstore_standard\event\unittest_executed::create(['context' => $c2ctx, 'relateduserid' => $u3->id]);
         $e->trigger();
         $this->assert_contextlist_equals($this->get_contextlist_for_user($u1), [$sysctx, $cm1ctx, $c2ctx]);
@@ -118,8 +119,8 @@ class logstore_standard_privacy_testcase extends provider_testcase {
 
         $c1 = $this->getDataGenerator()->create_course();
 
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($c1->id);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($c1->id);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -140,7 +141,7 @@ class logstore_standard_privacy_testcase extends provider_testcase {
         $e->trigger();
         // The admin user should be added (realuserid).
         $this->setAdminUser();
-        \core\session\manager::loginas($u2->id, context_system::instance());
+        \core\session\manager::loginas($u2->id, \context_system::instance());
         $e = \logstore_standard\event\unittest_executed::create(['context' => $sysctx]);
         $e->trigger();
         // Set off an event in a different context. User 4 should not be returned below.
@@ -161,9 +162,9 @@ class logstore_standard_privacy_testcase extends provider_testcase {
         $u2 = $this->getDataGenerator()->create_user();
         $c1 = $this->getDataGenerator()->create_course();
         $c2 = $this->getDataGenerator()->create_course();
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($c1->id);
-        $c2ctx = context_course::instance($c2->id);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($c1->id);
+        $c2ctx = \context_course::instance($c2->id);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -202,9 +203,9 @@ class logstore_standard_privacy_testcase extends provider_testcase {
         $u2 = $this->getDataGenerator()->create_user();
         $c1 = $this->getDataGenerator()->create_course();
         $c2 = $this->getDataGenerator()->create_course();
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($c1->id);
-        $c2ctx = context_course::instance($c2->id);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($c1->id);
+        $c2ctx = \context_course::instance($c2->id);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -246,8 +247,8 @@ class logstore_standard_privacy_testcase extends provider_testcase {
         $u4 = $this->getDataGenerator()->create_user();
 
         $course = $this->getDataGenerator()->create_course();
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($course->id);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($course->id);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -289,11 +290,11 @@ class logstore_standard_privacy_testcase extends provider_testcase {
         $cm1 = $this->getDataGenerator()->create_module('url', ['course' => $c1]);
         $c2 = $this->getDataGenerator()->create_course();
         $cm2 = $this->getDataGenerator()->create_module('url', ['course' => $c2]);
-        $sysctx = context_system::instance();
-        $c1ctx = context_course::instance($c1->id);
-        $c2ctx = context_course::instance($c2->id);
-        $cm1ctx = context_module::instance($cm1->cmid);
-        $cm2ctx = context_module::instance($cm2->cmid);
+        $sysctx = \context_system::instance();
+        $c1ctx = \context_course::instance($c1->id);
+        $c2ctx = \context_course::instance($c2->id);
+        $cm1ctx = \context_module::instance($cm1->cmid);
+        $cm2ctx = \context_module::instance($cm2->cmid);
 
         $path = [get_string('privacy:path:logs', 'tool_log'), get_string('pluginname', 'logstore_standard')];
         $this->enable_logging();

admin/tool/log/stores.php

@@ -50,6 +50,7 @@ switch ($action) {
     case 'disable':
         unset($enabled[$enrol]);
         set_config('enabled_stores', implode(',', array_keys($enabled)), 'tool_log');
+        add_to_config_log('tool_logstore_visibility', '1', '0', $enrol);
         break;
 
     case 'enable':
@@ -59,6 +60,7 @@ switch ($action) {
         $enabled = array_keys($enabled);
         $enabled[] = $enrol;
         set_config('enabled_stores', implode(',', $enabled), 'tool_log');
+        add_to_config_log('tool_logstore_visibility', '0', '1', $enrol);
         break;
 
     case 'up':

admin/tool/log/tests/behat/logstore_store_visibility_change.feature

@@ -0,0 +1,19 @@
+@tool_log @report @report_configlog
+Feature: In a report, admin can see logstore visibility changes
+
+  # Change log stores visibility so the report contains known data.
+  Background:
+    Given I log in as "admin"
+    And the following config values are set as admin:
+      | enabled_stores | logstore_standard  | tool_log |
+
+  @javascript
+  Scenario: Display configuration changes report
+    When I navigate to "Plugins > Logging > Manage log stores" in site administration
+    And I click on "Disable" "icon" in the "Standard log" "table_row"
+    And I click on "Enable" "icon" in the "External database log" "table_row"
+    And I navigate to "Reports > Config changes" in site administration
+    Then the following should exist in the "report-configlog-report-table" table:
+      | User       | Plugin               | Setting                  | New value | Original value |
+      | Admin User | logstore_standard    | tool_logstore_visibility | 0         | 1              |
+      | Admin User | logstore_database    | tool_logstore_visibility | 1         | 0              |

admin/tool/log/tests/privacy/provider_test.php

@@ -23,6 +23,7 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace tool_log\privacy;
 
 defined('MOODLE_INTERNAL') || die();
 global $CFG;
@@ -49,7 +50,7 @@ require_once($CFG->dirroot . '/admin/tool/log/store/standard/tests/fixtures/even
  * @author     Frédéric Massart <fred@branchup.tech>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class tool_log_privacy_testcase extends provider_testcase {
+class provider_test extends provider_testcase {
 
     public function setUp(): void {
         $this->resetAfterTest();
@@ -60,7 +61,7 @@ class tool_log_privacy_testcase extends provider_testcase {
         $admin = \core_user::get_user(2);
         $u1 = $this->getDataGenerator()->create_user();
         $c1 = $this->getDataGenerator()->create_course();
-        $c1ctx = context_course::instance($c1->id);
+        $c1ctx = \context_course::instance($c1->id);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -77,7 +78,7 @@ class tool_log_privacy_testcase extends provider_testcase {
         $u1 = $this->getDataGenerator()->create_user();
         $u2 = $this->getDataGenerator()->create_user();
         $c1 = $this->getDataGenerator()->create_course();
-        $c1ctx = context_course::instance($c1->id);
+        $c1ctx = \context_course::instance($c1->id);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -111,7 +112,7 @@ class tool_log_privacy_testcase extends provider_testcase {
         $u1 = $this->getDataGenerator()->create_user();
         $u2 = $this->getDataGenerator()->create_user();
         $c1 = $this->getDataGenerator()->create_course();
-        $c1ctx = context_course::instance($c1->id);
+        $c1ctx = \context_course::instance($c1->id);
 
         $this->enable_logging();
         $manager = get_log_manager(true);
@@ -144,7 +145,7 @@ class tool_log_privacy_testcase extends provider_testcase {
         $admin = \core_user::get_user(2);
         $u1 = $this->getDataGenerator()->create_user();
         $c1 = $this->getDataGenerator()->create_course();
-        $c1ctx = context_course::instance($c1->id);
+        $c1ctx = \context_course::instance($c1->id);
 
         $path = [get_string('privacy:path:logs', 'tool_log'), get_string('pluginname', 'logstore_standard')];
         $this->enable_logging();

admin/tool/lp/amd/src/competency_rule.js

@@ -98,8 +98,7 @@ define(['jquery'], function($) {
     /**
      * Callback to inject the template.
      *
-     * @param  {Node} container Node to inject in.
-     * @return {Promise} Resolved when done.
+     * @returns {Promise} Resolved when done.
      * @method injectTemplate
      */
     Rule.prototype.injectTemplate = function() {

admin/tool/lp/amd/src/competencydialogue.js

@@ -37,9 +37,6 @@ define(['jquery',
 
     /**
      * Constructor for CompetencyDialogue.
-     *
-     * @param {Object} options
-     *
      */
     var Competencydialogue = function() {
       // Intentionally left empty.

admin/tool/lp/amd/src/competencyruleconfig.js

@@ -156,9 +156,8 @@ define(['jquery',
     /**
      * Opens the picker.
      *
-     * @param {Number} competencyId The competency ID of the competency to work on.
      * @method display
-     * @return {Promise}
+     * @returns {Promise}
      */
     RuleConfig.prototype.display = function() {
         var self = this;

admin/tool/lp/amd/src/course_competency_settings.js

@@ -137,7 +137,6 @@ define(['jquery',
     /**
      * Refresh the course competencies page.
      *
-     * @param {Event} e
      * @method saveSettings
      */
     settingsMod.prototype.refreshCourseCompetenciesPage = function() {

admin/tool/lp/amd/src/dragdrop-reorder.js

@@ -26,7 +26,7 @@ define(['core/str', 'core/yui'], function(str, Y) {
     /**
      * Store the current instance of the core drag drop.
      *
-     * @property dragDropInstance M.tool_lp.dragdrop_reorder
+     * @property {object} dragDropInstance M.tool_lp.dragdrop_reorder
      */
     var dragDropInstance = null;
 

admin/tool/lp/amd/src/grade_dialogue.js

@@ -99,7 +99,6 @@ define(['jquery',
     /**
      * Opens the picker.
      *
-     * @param {Number} competencyId The competency ID of the competency to work on.
      * @method display
      * @return {Promise}
      */

admin/tool/lp/amd/src/menubar.js

@@ -43,8 +43,8 @@ define(['jquery'], function($) {
     /**
      * Constructor
      *
-     * @param {$} menuRoot Jquery collection matching the root of the menu.
-     * @param {Function[]} handlers, called when a menu item is chosen.
+     * @param {jQuery} menuRoot Jquery collection matching the root of the menu.
+     * @param {Function[]} handlers called when a menu item is chosen.
      */
     var Menubar = function(menuRoot, handlers) {
         // Setup private class variables.

admin/tool/lp/amd/src/tree.js

@@ -574,8 +574,6 @@ define(['jquery', 'core/url', 'core/log'], function($, url, log) {
      * Handle a blur event
      *
      * @method handleBlur
-     * @param {Object} item item is the jquery id of the parent item of the group
-     * @param {Event} e The event.
      * @return {Boolean}
      */
     Tree.prototype.handleBlur = function() {
@@ -587,7 +585,6 @@ define(['jquery', 'core/url', 'core/log'], function($, url, log) {
      *
      * @method handleFocus
      * @param {Object} item item is the jquery id of the parent item of the group
-     * @param {Event} e The event.
      * @return {Boolean}
      */
     Tree.prototype.handleFocus = function(item) {

admin/tool/lp/amd/src/user_competency_workflow.js

@@ -31,8 +31,6 @@ define(['jquery',
 
     /**
      * UserCompetencyWorkflow class.
-     *
-     * @param {String} selector The node containing the buttons to switch mode.
      */
     var UserCompetencyWorkflow = function() {
         EventBase.prototype.constructor.apply(this, []);

admin/tool/lp/amd/src/user_evidence_actions.js

@@ -195,7 +195,6 @@ define(['jquery',
      *
      * @param {Object} evidenceData Evidence data from evidence node.
      * @param {Number} competencyIds The competency IDs.
-     * @param {Boolean} requestReview Send competencies to review.
      */
     UserEvidenceActions.prototype._doCreateUserEvidenceCompetency = function(evidenceData, competencyIds) {
         var self = this,

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

@@ -24,9 +24,7 @@ Feature: See the competencies for an activity on the course competencies page.
       | activity | name       | intro      | course | idnumber | completion | completionview |
       | page     | PageName1  | PageDesc1  | C1     | PAGE1    | 1          | 1              |
       | page     | PageName2  | PageDesc2  | C1     | PAGE2    | 1          | 1              |
-    And I log in as "admin"
-    And I am on site homepage
-    And I follow "Course 1"
+    And I am on the "Course 1" course page logged in as admin
     And I follow "Competencies"
     And I press "Add competencies to course"
     And "Competency picker" "dialogue" should be visible
@@ -36,9 +34,7 @@ Feature: See the competencies for an activity on the course competencies page.
     And "Competency picker" "dialogue" should be visible
     And I select "Test-Comp2" of the competency tree
     And I click on "Add" "button" in the "Competency picker" "dialogue"
-    And I am on "Course 1" course homepage
-    And I follow "PageName1"
-    And I navigate to "Edit settings" in current page administration
+    And I am on the PageName1 "page activity editing" page
     And I follow "Expand all"
     And I set the field "Course competencies" to "Test-Comp1"
     And I press "Save and return to course"
@@ -46,10 +42,8 @@ Feature: See the competencies for an activity on the course competencies page.
 
   @javascript
   Scenario: Go to the competency course competencies page.
-    When I log in as "student1"
-    And I am on site homepage
-    And I follow "Course 1"
-    And I follow "Competencies"
+    Given I am on the "Course 1" course page logged in as student1
+    When I follow "Competencies"
     Then I should see "Test-Comp1"
     And I should see "Test-Comp2"
     And I set the field "Filter competencies by resource or activity" to "PageName1"
@@ -64,12 +58,5 @@ Feature: See the competencies for an activity on the course competencies page.
 
   @javascript
   Scenario: None course competencies page.
-    When I log in as "student1"
-    And I am on site homepage
-    And I follow "Course 1"
-    And I follow "PageName1"
-    Then I should see "Test page content"
-    And I am on site homepage
-    And I follow "Course 1"
-    And I follow "PageName1"
+    When I am on the PageName1 "page activity" page logged in as student1
     Then I should see "Test page content"

admin/tool/messageinbound/tests/privacy/provider_test.php

@@ -23,6 +23,7 @@
  * @author     Frédéric Massart <fred@branchup.tech>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace tool_messageinbound\privacy;
 
 defined('MOODLE_INTERNAL') || die();
 global $CFG;
@@ -44,7 +45,7 @@ use tool_messageinbound\privacy\provider;
  * @author     Frédéric Massart <fred@branchup.tech>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class tool_messageinbound_privacy_testcase extends provider_testcase {
+class provider_test extends provider_testcase {
 
     public function setUp(): void {
         global $CFG;
@@ -60,8 +61,8 @@ class tool_messageinbound_privacy_testcase extends provider_testcase {
         $dg = $this->getDataGenerator();
         $u1 = $dg->create_user();
         $u2 = $dg->create_user();
-        $u1ctx = context_user::instance($u1->id);
-        $u2ctx = context_user::instance($u2->id);
+        $u1ctx = \context_user::instance($u1->id);
+        $u2ctx = \context_user::instance($u2->id);
 
         $contexts = provider::get_contexts_for_userid($u1->id)->get_contexts();
         $this->assertCount(1, $contexts);
@@ -81,9 +82,9 @@ class tool_messageinbound_privacy_testcase extends provider_testcase {
         $u1 = $dg->create_user();
         $u2 = $dg->create_user();
         $u3 = $dg->create_user();
-        $u1ctx = context_user::instance($u1->id);
-        $u2ctx = context_user::instance($u2->id);
-        $u3ctx = context_user::instance($u3->id);
+        $u1ctx = \context_user::instance($u1->id);
+        $u2ctx = \context_user::instance($u2->id);
+        $u3ctx = \context_user::instance($u3->id);
 
         $addressmanager = new \core\message\inbound\address_manager();
         $addressmanager->set_handler('\tool_messageinbound\message\inbound\invalid_recipient_handler');
@@ -122,8 +123,8 @@ class tool_messageinbound_privacy_testcase extends provider_testcase {
         $dg = $this->getDataGenerator();
         $u1 = $dg->create_user();
         $u2 = $dg->create_user();
-        $u1ctx = context_user::instance($u1->id);
-        $u2ctx = context_user::instance($u2->id);
+        $u1ctx = \context_user::instance($u1->id);
+        $u2ctx = \context_user::instance($u2->id);
 
         $addressmanager = new \core\message\inbound\address_manager();
         $addressmanager->set_handler('\tool_messageinbound\message\inbound\invalid_recipient_handler');
@@ -166,8 +167,8 @@ class tool_messageinbound_privacy_testcase extends provider_testcase {
         $dg = $this->getDataGenerator();
         $u1 = $dg->create_user();
         $u2 = $dg->create_user();
-        $u1ctx = context_user::instance($u1->id);
-        $u2ctx = context_user::instance($u2->id);
+        $u1ctx = \context_user::instance($u1->id);
+        $u2ctx = \context_user::instance($u2->id);
 
         $addressmanager = new \core\message\inbound\address_manager();
         $addressmanager->set_handler('\tool_messageinbound\message\inbound\invalid_recipient_handler');
@@ -214,8 +215,8 @@ class tool_messageinbound_privacy_testcase extends provider_testcase {
         $dg = $this->getDataGenerator();
         $u1 = $dg->create_user();
         $u2 = $dg->create_user();
-        $u1ctx = context_user::instance($u1->id);
-        $u2ctx = context_user::instance($u2->id);
+        $u1ctx = \context_user::instance($u1->id);
+        $u2ctx = \context_user::instance($u2->id);
 
         $addressmanager = new \core\message\inbound\address_manager();
         $addressmanager->set_handler('\tool_messageinbound\message\inbound\invalid_recipient_handler');
@@ -246,8 +247,8 @@ class tool_messageinbound_privacy_testcase extends provider_testcase {
         $dg = $this->getDataGenerator();
         $u1 = $dg->create_user();
         $u2 = $dg->create_user();
-        $u1ctx = context_user::instance($u1->id);
-        $u2ctx = context_user::instance($u2->id);
+        $u1ctx = \context_user::instance($u1->id);
+        $u2ctx = \context_user::instance($u2->id);
 
         $addressmanager = new \core\message\inbound\address_manager();
         $addressmanager->set_handler('\tool_messageinbound\message\inbound\invalid_recipient_handler');

admin/tool/mobile/classes/api.php

@@ -329,6 +329,11 @@ class api {
             $settings->supportpage = $CFG->supportpage;
         }
 
+        if (empty($section) || $section === 'graceperiodsettings') {
+            $settings->coursegraceperiodafter = $CFG->coursegraceperiodafter;
+            $settings->coursegraceperiodbefore = $CFG->coursegraceperiodbefore;
+        }
+
         return $settings;
     }
 
@@ -583,66 +588,64 @@ class api {
 
         $warnings = array();
 
-        $curl = new curl();
-        // Return certificate information and verify the certificate.
-        $curl->setopt(array('CURLOPT_CERTINFO' => 1, 'CURLOPT_SSL_VERIFYPEER' => true));
-        $httpswwwroot = str_replace('http:', 'https:', $CFG->wwwroot); // Force https url.
-        // Check https using a page not redirecting or returning exceptions.
-        $curl->head($httpswwwroot . "/$CFG->admin/tool/mobile/mobile.webmanifest.php");
-        $info = $curl->get_info();
+        if (is_https()) {
+            $curl = new curl();
+            // Return certificate information and verify the certificate.
+            $curl->setopt(array('CURLOPT_CERTINFO' => 1, 'CURLOPT_SSL_VERIFYPEER' => true));
+            // Check https using a page not redirecting or returning exceptions.
+            $curl->head("$CFG->wwwroot/$CFG->admin/tool/mobile/mobile.webmanifest.php");
+            $info = $curl->get_info();
 
-        // First of all, check the server certificate (if any).
-        if (empty($info['http_code']) or ($info['http_code'] >= 400)) {
-            $warnings[] = ['nohttpsformobilewarning', 'admin'];
-        } else {
             // Check the certificate is not self-signed or has an untrusted-root.
             // This may be weak in some scenarios (when the curl SSL verifier is outdated).
-            if (empty($info['certinfo'])) {
+            if (empty($info['http_code']) || empty($info['certinfo'])) {
                 $warnings[] = ['selfsignedoruntrustedcertificatewarning', 'tool_mobile'];
             } else {
                 $timenow = time();
-                $expectedissuer = null;
-                foreach ($info['certinfo'] as $cert) {
+                $infokeys = array_keys($info['certinfo']);
+                $lastkey = end($infokeys);
+
+                if (count($info['certinfo']) == 1) {
+                    // This will work in a normal browser because it will complete the chain, but not in a mobile app.
+                    $warnings[] = ['invalidcertificatechainwarning', 'tool_mobile'];
+                }
+
+                foreach ($info['certinfo'] as $key => $cert) {
+                    // Convert to lower case the keys, some OS/curl implementations differ.
+                    $cert = array_change_key_case($cert, CASE_LOWER);
 
                     // Due to a bug in certain curl/openssl versions the signature algorithm isn't always correctly parsed.
                     // See https://github.com/curl/curl/issues/3706 for reference.
-                    if (!array_key_exists('Signature Algorithm', $cert)) {
+                    if (!array_key_exists('signature algorithm', $cert)) {
                         // The malformed field that does contain the algorithm we're looking for looks like the following:
                         // <WHITESPACE>Signature Algorithm: <ALGORITHM><CRLF><ALGORITHM>.
-                        preg_match('/\s+Signature Algorithm: (?<algorithm>[^\s]+)/', $cert['Public Key Algorithm'], $matches);
+                        preg_match('/\s+Signature Algorithm: (?<algorithm>[^\s]+)/', $cert['public key algorithm'], $matches);
 
                         $signaturealgorithm = $matches['algorithm'] ?? '';
                     } else {
-                        $signaturealgorithm = $cert['Signature Algorithm'];
+                        $signaturealgorithm = $cert['signature algorithm'];
                     }
 
                     // Check if the signature algorithm is weak (Android won't work with SHA-1).
-                    if ($signaturealgorithm == 'sha1WithRSAEncryption' || $signaturealgorithm == 'sha1WithRSA') {
-                        $warnings[] = ['insecurealgorithmwarning', 'tool_mobile'];
+                    if ($key != $lastkey &&
+                            ($signaturealgorithm == 'sha1WithRSAEncryption' || $signaturealgorithm == 'sha1WithRSA')) {
+                        $warnings['insecurealgorithmwarning'] = ['insecurealgorithmwarning', 'tool_mobile'];
                     }
                     // Check certificate start date.
-                    if (strtotime($cert['Start date']) > $timenow) {
-                        $warnings[] = ['invalidcertificatestartdatewarning', 'tool_mobile'];
+                    if (strtotime($cert['start date']) > $timenow) {
+                        $warnings['invalidcertificatestartdatewarning'] = ['invalidcertificatestartdatewarning', 'tool_mobile'];
                     }
                     // Check certificate end date.
-                    if (strtotime($cert['Expire date']) < $timenow) {
-                        $warnings[] = ['invalidcertificateexpiredatewarning', 'tool_mobile'];
+                    if (strtotime($cert['expire date']) < $timenow) {
+                        $warnings['invalidcertificateexpiredatewarning'] = ['invalidcertificateexpiredatewarning', 'tool_mobile'];
                     }
-                    // Check the chain.
-                    if ($expectedissuer !== null) {
-                        if ($expectedissuer !== $cert['Subject'] || $cert['Subject'] === $cert['Issuer']) {
-                            $warnings[] = ['invalidcertificatechainwarning', 'tool_mobile'];
-                        }
-                    }
-                    $expectedissuer = $cert['Issuer'];
                 }
             }
+        } else {
+            // Warning for non https sites.
+            $warnings[] = ['nohttpsformobilewarning', 'admin'];
         }
-        // Now check typical configuration problems.
-        if ((int) $CFG->userquota === PHP_INT_MAX) {
-            // In old Moodle version was a text so was possible to have numeric values > PHP_INT_MAX.
-            $warnings[] = ['invaliduserquotawarning', 'tool_mobile'];
-        }
+
         // Check ADOdb debug enabled.
         if (get_config('auth_db', 'debugauthdb') || get_config('enrol_database', 'debugdb')) {
             $warnings[] = ['adodbdebugwarning', 'tool_mobile'];

admin/tool/mobile/lang/en/tool_mobile.php

@@ -73,7 +73,7 @@ $string['forcelogout_desc'] = 'If enabled, the app option \'Change site\' is rep
 $string['h5poffline'] = 'View H5P content offline';
 $string['httpsrequired'] = 'HTTPS required';
 $string['insecurealgorithmwarning'] = 'It seems that the HTTPS certificate uses an insecure algorithm for signing (SHA-1). Please try updating the certificate.';
-$string['invalidcertificatechainwarning'] = 'It seems that the certificate chain is invalid.';
+$string['invalidcertificatechainwarning'] = 'It seems that the certificate chain is invalid. This certificate might work for a browser but not for a mobile app.';
 $string['invalidcertificateexpiredatewarning'] = 'It seems that the HTTPS certificate for the site has expired.';
 $string['invalidcertificatestartdatewarning'] = 'It seems that the HTTPS certificate for the site is not yet valid (with a start date in the future).';
 $string['invalidprivatetoken'] = 'Invalid private token. Token should not be empty or passed via GET parameter.';
@@ -124,7 +124,7 @@ $string['qrcodetypelogin'] = 'QR code with automatic login';
 $string['readingthisemailgettheapp'] = '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.';
+$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.';
 $string['setuplink'] = 'App download page';
 $string['setuplink_desc'] = 'URL of page with options to download the mobile app from the App Store and Google Play. The app download page link is displayed in the page footer and in a user\'s profile. Leave blank to not display a link.';
 $string['smartappbanners'] = 'App Banners';

admin/tool/mobile/tests/api_test.php

@@ -78,7 +78,7 @@ class tool_mobile_api_testcase extends externallib_advanced_testcase {
         $CFG->debugdisplay = 1;
         set_config('debugauthdb', 1, 'auth_db');
         set_config('debugdb', 1, 'enrol_database');
-        $expectedissues = array('nohttpsformobilewarning', 'invaliduserquotawarning', 'adodbdebugwarning', 'displayerrorswarning');
+        $expectedissues = array('adodbdebugwarning', 'displayerrorswarning');
 
         $issues = api::get_potential_config_issues();
         $this->assertCount(count($expectedissues), $issues);

admin/tool/mobile/tests/externallib_test.php

@@ -234,6 +234,9 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase {
         $expected[] = ['name' => 'supportemail', 'value' => $CFG->supportemail];
         $expected[] = ['name' => 'supportpage', 'value' => $CFG->supportpage];
 
+        $expected[] = ['name' => 'coursegraceperiodafter', 'value' => $CFG->coursegraceperiodafter];
+        $expected[] = ['name' => 'coursegraceperiodbefore', 'value' => $CFG->coursegraceperiodbefore];
+
         $this->assertCount(0, $result['warnings']);
         $this->assertEquals($expected, $result['settings']);
 

admin/tool/mobile/tests/privacy/provider_test.php

@@ -21,6 +21,8 @@
  * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace tool_mobile\privacy;
+
 defined('MOODLE_INTERNAL') || die();
 
 use core_privacy\local\request\writer;
@@ -35,7 +37,7 @@ use tool_mobile\privacy\provider;
  * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class tool_mobile_privacy_testcase extends \core_privacy\tests\provider_testcase {
+class provider_test extends \core_privacy\tests\provider_testcase {
 
     /**
      * Basic setup for these tests.

admin/tool/monitor/tests/privacy/provider_test.php

@@ -22,13 +22,14 @@
  * @copyright  2018 Adrian Greeve <adriangreeve.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace tool_monitor\privacy;
 
 defined('MOODLE_INTERNAL') || die();
 
-use \tool_monitor\privacy\provider;
-use \core_privacy\local\request\approved_contextlist;
-use \core_privacy\local\request\approved_userlist;
-use \core_privacy\tests\provider_testcase;
+use tool_monitor\privacy\provider;
+use core_privacy\local\request\approved_contextlist;
+use core_privacy\local\request\approved_userlist;
+use core_privacy\tests\provider_testcase;
 
 /**
  * Privacy test for the event monitor
@@ -38,7 +39,7 @@ use \core_privacy\tests\provider_testcase;
  * @copyright  2018 Adrian Greeve <adriangreeve.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class tool_monitor_privacy_testcase extends provider_testcase {
+class provider_test extends provider_testcase {
 
     /**
      * Set up method.
@@ -115,7 +116,7 @@ class tool_monitor_privacy_testcase extends provider_testcase {
 
         $this->setUser($user2);
 
-        $record = new stdClass();
+        $record = new \stdClass();
         $record->courseid = 0;
         $record->userid = $user2->id;
         $record->ruleid = $rule->id;
@@ -164,7 +165,7 @@ class tool_monitor_privacy_testcase extends provider_testcase {
         // Create a subscription with user2.
         $this->setUser($user2);
 
-        $record = new stdClass();
+        $record = new \stdClass();
         $record->courseid = 0;
         $record->userid = $user2->id;
         $record->ruleid = $rule->id;
@@ -251,7 +252,7 @@ class tool_monitor_privacy_testcase extends provider_testcase {
         $subscription3 = $monitorgenerator->create_subscription($subscription3);
 
         // Try a different context first.
-        provider::delete_data_for_all_users_in_context(context_system::instance());
+        provider::delete_data_for_all_users_in_context(\context_system::instance());
 
         // Get all of the monitor rules.
         $dbrules = $DB->get_records('tool_monitor_rules');

admin/tool/moodlenet/tests/import_handler_info_test.php

@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Class tool_moodlenet_import_handler_info_testcase, providing test cases for the import_handler_info class.
  */
-class tool_moodlenet_import_handler_info_testcase extends \advanced_testcase {
+class import_handler_info_test extends \advanced_testcase {
 
     /**
      * Test init and the getters.

admin/tool/moodlenet/tests/import_handler_registry_test.php

@@ -36,7 +36,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Class tool_moodlenet_import_handler_registry_testcase, providing test cases for the import_handler_registry class.
  */
-class tool_moodlenet_import_handler_registry_testcase extends \advanced_testcase {
+class import_handler_registry_test extends \advanced_testcase {
 
     /**
      * Test confirming the behaviour of get_resource_handlers_for_strategy with different params.

admin/tool/moodlenet/tests/import_info_test.php

@@ -33,7 +33,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Class tool_moodlenet_import_info_testcase, providing test cases for the import_info class.
  */
-class tool_moodlenet_import_info_testcase extends \advanced_testcase {
+class import_info_test extends \advanced_testcase {
 
     /**
      * Create some test objects.

admin/tool/moodlenet/tests/import_processor_test.php

@@ -36,7 +36,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Class tool_moodlenet_import_processor_testcase, providing test cases for the import_processor class.
  */
-class tool_moodlenet_import_processor_testcase extends \advanced_testcase {
+class import_processor_test extends \advanced_testcase {
 
     /**
      * An integration test, this confirms the ability to construct an import processor and run the import for the current user.

admin/tool/moodlenet/tests/lib_test.php

@@ -21,6 +21,7 @@
  * @copyright  2020 Peter Dias
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace tool_moodlenet;
 
 defined('MOODLE_INTERNAL') || die();
 
@@ -30,7 +31,7 @@ require_once($CFG->dirroot . '/admin/tool/moodlenet/lib.php');
 /**
  * Test moodlenet functions
  */
-class tool_moodlenet_lib_testcase extends advanced_testcase {
+class lib_test extends \advanced_testcase {
 
     /**
      * Test the generate_mnet_endpoint function

admin/tool/moodlenet/tests/remote_resource_test.php

@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Class tool_moodlenet_remote_resource_testcase, providing test cases for the remote_resource class.
  */
-class tool_moodlenet_remote_resource_testcase extends \advanced_testcase {
+class remote_resource_test extends \advanced_testcase {
 
     /**
      * Test getters.

admin/tool/moodlenet/tests/url_test.php

@@ -31,7 +31,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Class tool_moodlenet_url_testcase, providing test cases for the url class.
  */
-class tool_moodlenet_url_testcase extends \advanced_testcase {
+class url_test extends \advanced_testcase {
 
     /**
      * Test the parsing to host + path components.

admin/tool/oauth2/issuers.php

@@ -104,7 +104,11 @@ if ($mform && $mform->is_cancelled()) {
 } else if ($action == 'savetemplate') {
 
     $type = required_param('type', PARAM_ALPHANUM);
-    $mform = new \tool_oauth2\form\issuer(null, ['persistent' => $issuer, 'type' => $type]);
+    $mform = new \tool_oauth2\form\issuer(null, [
+        'persistent' => $issuer,
+        'type' => $type,
+        'showrequireconfirm' => true, // Ensure the "requireconfirmation" field is included in form data.
+    ]);
     if ($mform->is_cancelled()) {
         redirect(new moodle_url('/admin/tool/oauth2/issuers.php'));
     }

admin/tool/policy/amd/src/policyactions.js

@@ -30,6 +30,8 @@ function($, Ajax, Notification, ModalFactory, ModalEvents) {
 
     /**
      * PolicyActions class.
+     *
+     * @param {jQuery} root
      */
     var PolicyActions = function(root) {
         this.registerEvents(root);
@@ -37,6 +39,8 @@ function($, Ajax, Notification, ModalFactory, ModalEvents) {
 
     /**
      * Register event listeners.
+     *
+     * @param {jQuery} root
      */
     PolicyActions.prototype.registerEvents = function(root) {
         root.on("click", function(e) {
@@ -115,6 +119,7 @@ function($, Ajax, Notification, ModalFactory, ModalEvents) {
          * Initialise the actions helper.
          *
          * @method init
+         * @param {object} root
          * @return {PolicyActions}
          */
         'init': function(root) {

admin/tool/policy/templates/page_agreedocs.mustache

@@ -134,9 +134,9 @@
 {{# str }}somefieldsrequired, form, <i class="icon fa fa-exclamation-circle text-danger fa-fw" title="{{# str }} required {{/ str }}" ></i>{{/ str }}
 <hr>
 
-<input type="submit" class="btn btn-primary" name="submit" value={{#quote}}{{#str}} next {{/str}}{{/quote}}>
+<input type="submit" class="btn btn-primary" name="submit" value="{{#cleanstr}} next {{/cleanstr}}">
 {{#cancancel}}
-<input type="submit" class="btn btn-secondary" name="cancel" value={{#quote}}{{#str}} cancel {{/str}}{{/quote}}>
+<input type="submit" class="btn btn-secondary" name="cancel" value="{{#cleanstr}} cancel {{/cleanstr}}">
 {{/cancancel}}
 </form>
 

admin/tool/policy/tests/privacy/provider_test.php

@@ -22,6 +22,7 @@
  * @copyright  2018 Sara Arjona <sara@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace tool_policy\privacy;
 
 use core_privacy\local\metadata\collection;
 use tool_policy\privacy\provider;
@@ -38,7 +39,7 @@ defined('MOODLE_INTERNAL') || die();
  * @copyright  2018 Sara Arjona <sara@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class tool_policy_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
+class provider_test extends \core_privacy\tests\provider_testcase {
     /** @var stdClass The user object. */
     protected $user;
 
@@ -59,7 +60,7 @@ class tool_policy_privacy_provider_testcase extends \core_privacy\tests\provider
 
         // Create manager user.
         $this->manager = $generator->create_user();
-        $this->syscontext = context_system::instance();
+        $this->syscontext = \context_system::instance();
         $rolemanagerid = create_role('Policy manager', 'policymanager', 'Can manage policy documents');
         assign_capability('tool/policy:managedocs', CAP_ALLOW, $rolemanagerid, $this->syscontext->id);
         assign_capability('tool/policy:acceptbehalf', CAP_ALLOW, $rolemanagerid, $this->syscontext->id);

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

@@ -42,9 +42,7 @@ Feature: Backup user data
       | Feedback for the response 'True'.  | So you think it is true                 |
       | Feedback for the response 'False'. | So you think it is false                |
     And I log out
-    And I log in as "student1"
-    And I am on "Course 1" course homepage
-    And I follow "Quiz 1"
+    When I am on the "Quiz 1" "quiz activity" page logged in as student1
     And I press "Attempt quiz now"
     And I click on "True" "radio" in the "First question" "question"
     And I click on "False" "radio" in the "Second question" "question"

admin/tool/task/schedule_task.php

@@ -59,10 +59,14 @@ if (!$task) {
 }
 
 // Start output.
-$PAGE->set_url(new moodle_url('/admin/tool/task/schedule_task.php'));
+$PAGE->set_url(new moodle_url('/admin/tool/task/schedule_task.php', ['task' => $taskname]));
 $PAGE->set_context($context);
-$PAGE->navbar->add(get_string('scheduledtasks', 'tool_task'), new moodle_url('/admin/tool/task/scheduledtasks.php'));
+$PAGE->set_heading($SITE->fullname);
+$PAGE->set_title($task->get_name());
+
+navigation_node::override_active_url(new moodle_url('/admin/tool/task/scheduledtasks.php'));
 $PAGE->navbar->add(s($task->get_name()));
+
 echo $OUTPUT->header();
 echo $OUTPUT->heading($task->get_name());
 

admin/tool/uploadcourse/classes/step2_form.php

@@ -84,6 +84,7 @@ class tool_uploadcourse_step2_form extends tool_uploadcourse_base_form {
 
         $displaylist = core_course_category::make_categories_list('moodle/course:create');
         $mform->addElement('autocomplete', 'defaults[category]', get_string('coursecategory'), $displaylist);
+        $mform->addRule('defaults[category]', null, 'required', null, 'client');
         $mform->addHelpButton('defaults[category]', 'coursecategory');
 
         $choices = array();

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

@@ -1199,6 +1199,7 @@ export default class Tour {
             return this;
         }
 
+        stepConfig.placement = this.recalculatePlacement(stepConfig);
         let flipBehavior;
         switch (stepConfig.placement) {
             case 'left':
@@ -1293,6 +1294,33 @@ export default class Tour {
         return this;
     }
 
+    /**
+     * For left/right placement, checks that there is room for the step at current window size.
+     *
+     * If there is not enough room, changes placement to 'top'.
+     *
+     * @method  recalculatePlacement
+     * @param   {Object}    stepConfig      The step configuration of the step
+     * @return  {String}                    The placement after recalculate
+     */
+    recalculatePlacement(stepConfig) {
+        const buffer = 10;
+        const arrowWidth = 16;
+        let target = this.getStepTarget(stepConfig);
+        let widthContent = this.currentStepNode.width() + arrowWidth;
+        let targetOffsetLeft = target.offset().left - buffer;
+        let targetOffsetRight = target.offset().left + target.width() + buffer;
+        let placement = stepConfig.placement;
+
+        if (['left', 'right'].indexOf(placement) !== -1) {
+            if ((targetOffsetLeft < (widthContent + buffer)) &&
+                ((targetOffsetRight + widthContent + buffer) > document.documentElement.clientWidth)) {
+                placement = 'top';
+            }
+        }
+        return placement;
+    }
+
     /**
      * Add the backdrop.
      *

admin/tool/usertours/classes/manager.php

@@ -622,7 +622,26 @@ class manager {
      * @return  array
      */
     public static function get_matching_tours(\moodle_url $pageurl): array {
-        global $PAGE;
+        global $PAGE, $USER;
+
+        // The following three checks make sure that the user is fully ready to use the site. If not, we do not show any tours.
+        // We need the user to get properly set up so that all require_login() and other bits work as expected.
+
+        if (user_not_fully_set_up($USER)) {
+            return [];
+        }
+
+        if (get_user_preferences('auth_forcepasswordchange', false)) {
+            return [];
+        }
+
+        if (empty($USER->policyagreed) && !is_siteadmin()) {
+            $manager = new \core_privacy\local\sitepolicy\manager();
+
+            if ($manager->is_defined(isguestuser())) {
+                return [];
+            }
+        }
 
         $tours = cache::get_matching_tourdata($pageurl);
 

admin/tool/usertours/lang/en/tool_usertours.php

@@ -99,8 +99,7 @@ Some example values include:
 * /mod/forum/view.php% - to match the forum discussion list
 * /user/profile.php% - to match the user profile page
 
-If you wish to display a tour on the Site Home page, you can use the value: "FRONTPAGE".
-';
+If you wish to display a tour on the site home, you can use the value: "FRONTPAGE".';
 $string['placement'] = 'Placement';
 $string['pluginname'] = 'User tours';
 $string['previousstep'] = 'Previous';

admin/tool/usertours/tests/manager_test.php

@@ -325,6 +325,8 @@ class tool_usertours_manager_testcase extends advanced_testcase {
     public function test_get_matching_tours(array $alltours, string $url, array $expected) {
         $this->resetAfterTest();
 
+        $this->setGuestUser();
+
         foreach ($alltours as $tourconfig) {
             $tour = $this->helper_create_tour((object) $tourconfig);
             $this->helper_create_step((object) ['tourid' => $tour->get_id()]);
@@ -336,4 +338,34 @@ class tool_usertours_manager_testcase extends advanced_testcase {
             $this->assertEquals($expected[$i], $matches[$i]->get_name());
         }
     }
+
+    /**
+     * Test that no matching tours are returned if there is pending site policy agreement.
+     */
+    public function test_get_matching_tours_for_user_without_site_policy_agreed() {
+        global $CFG;
+
+        $this->resetAfterTest();
+        $this->setGuestUser();
+
+        $tour = $this->helper_create_tour((object) [
+            'pathmatch' => '/%',
+            'enabled' => true,
+            'name' => 'Test tour',
+            'description' => '',
+            'configdata' => '',
+        ]);
+
+        $this->helper_create_step((object) [
+            'tourid' => $tour->get_id(),
+        ]);
+
+        $matches = \tool_usertours\manager::get_matching_tours(new moodle_url('/'));
+        $this->assertEquals(1, count($matches));
+
+        $CFG->sitepolicyguest = 'https://example.com';
+
+        $matches = \tool_usertours\manager::get_matching_tours(new moodle_url('/'));
+        $this->assertEmpty($matches);
+    }
 }

admin/tool/usertours/tests/privacy/provider_test.php

@@ -22,13 +22,14 @@
  * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace tool_usertours\privacy;
 
 defined('MOODLE_INTERNAL') || die();
 
-use \core_privacy\local\metadata\collection;
-use \core_privacy\local\request\writer;
-use \tool_usertours\tour;
-use \tool_usertours\privacy\provider;
+use core_privacy\local\metadata\collection;
+use core_privacy\local\request\writer;
+use tool_usertours\tour;
+use tool_usertours\privacy\provider;
 
 /**
  * Unit tests for the tool_usertours implementation of the privacy API.
@@ -36,7 +37,7 @@ use \tool_usertours\privacy\provider;
  * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class tool_usertours_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
+class provider_test extends \core_privacy\tests\provider_testcase {
 
     /**
      * Helper method for creating a tour

admin/webservice/documentation.php

@@ -25,7 +25,7 @@
  */
 require_once('../../config.php');
 require_once($CFG->libdir . '/adminlib.php');
-require($CFG->dirroot . '/webservice/lib.php');
+require_once($CFG->dirroot . '/webservice/lib.php');
 
 admin_externalpage_setup('webservicedocumentation');
 

analytics/classes/local/target/base.php

@@ -279,7 +279,7 @@ abstract class base extends \core_analytics\calculable {
         } else if ($context->contextlevel >= CONTEXT_COURSE) {
             // At course level or below only enrolled users although this is not ideal for
             // teachers assigned at category level.
-            $users = get_enrolled_users($context, 'moodle/analytics:listinsights');
+            $users = get_enrolled_users($context, 'moodle/analytics:listinsights', 0, 'u.*', null, 0, 0, true);
         } else {
             $users = get_users_by_capability($context, 'moodle/analytics:listinsights');
         }

analytics/classes/model_config.php

@@ -77,7 +77,7 @@ class model_config {
         // Model config in JSON.
         $modeldata = $this->export_model_data();
 
-        $exporttmpdir = make_request_directory('analyticsexport');
+        $exporttmpdir = make_request_directory();
         $jsonfilepath = $exporttmpdir . DIRECTORY_SEPARATOR . 'model-config.json';
         if (!file_put_contents($jsonfilepath, json_encode($modeldata))) {
             print_error('errornoexportconfig', 'analytics');
@@ -256,7 +256,7 @@ class model_config {
      */
     public function extract_import_contents(string $zipfilepath) : array {
 
-        $importtempdir = make_request_directory('analyticsimport' . microtime(false));
+        $importtempdir = make_request_directory();
 
         $zip = new \zip_packer();
         $filelist = $zip->extract_to_pathname($zipfilepath, $importtempdir);

analytics/tests/privacy/provider_test.php

@@ -21,8 +21,9 @@
  * @copyright 2018 David Monllaó {@link http://www.davidmonllao.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace core_analytics\privacy;
 
-use \core_analytics\privacy\provider;
+use core_analytics\privacy\provider;
 use core_privacy\local\request\transform;
 use core_privacy\local\request\writer;
 use core_privacy\local\request\approved_contextlist;
@@ -30,10 +31,10 @@ use core_privacy\local\request\approved_userlist;
 
 defined('MOODLE_INTERNAL') || die();
 
-require_once(__DIR__ . '/fixtures/test_indicator_max.php');
-require_once(__DIR__ . '/fixtures/test_indicator_min.php');
-require_once(__DIR__ . '/fixtures/test_target_site_users.php');
-require_once(__DIR__ . '/fixtures/test_target_course_users.php');
+require_once(__DIR__ . '/../fixtures/test_indicator_max.php');
+require_once(__DIR__ . '/../fixtures/test_indicator_min.php');
+require_once(__DIR__ . '/../fixtures/test_target_site_users.php');
+require_once(__DIR__ . '/../fixtures/test_target_course_users.php');
 
 /**
  * Unit tests for privacy.
@@ -42,7 +43,7 @@ require_once(__DIR__ . '/fixtures/test_target_course_users.php');
  * @copyright 2018 David Monllaó {@link http://www.davidmonllao.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class core_analytics_privacy_model_testcase extends \core_privacy\tests\provider_testcase {
+class provider_test extends \core_privacy\tests\provider_testcase {
 
     public function setUp(): void {
 

auth/db/auth.php

@@ -131,11 +131,11 @@ class auth_plugin_db extends auth_plugin_base {
             $authdb->Close();
 
             if ($this->config->passtype === 'plaintext') {
-                return ($fromdb == $extpassword);
+                return ($fromdb === $extpassword);
             } else if ($this->config->passtype === 'md5') {
-                return (strtolower($fromdb) == md5($extpassword));
+                return (strtolower($fromdb) === md5($extpassword));
             } else if ($this->config->passtype === 'sha1') {
-                return (strtolower($fromdb) == sha1($extpassword));
+                return (strtolower($fromdb) === sha1($extpassword));
             } else if ($this->config->passtype === 'saltedcrypt') {
                 return password_verify($extpassword, $fromdb);
             } else {

auth/db/tests/db_test.php

@@ -334,12 +334,28 @@ class auth_db_testcase extends advanced_testcase {
         $DB->update_record('auth_db_users', $user3);
         $this->assertTrue($auth->user_login('u3', 'heslo'));
 
+        // Test user created to see if the checking happens strictly.
+        $usermd5 = (object)['name' => 'usermd5', 'pass' => '0e462097431906509019562988736854'];
+        $usermd5->id = $DB->insert_record('auth_db_users', $usermd5);
+
+        // md5('240610708') === '0e462097431906509019562988736854'.
+        $this->assertTrue($auth->user_login('usermd5', '240610708'));
+        $this->assertFalse($auth->user_login('usermd5', 'QNKCDZO'));
+
         set_config('passtype', 'sh1', 'auth_db');
         $auth->config->passtype = 'sha1';
         $user3->pass = sha1('heslo');
         $DB->update_record('auth_db_users', $user3);
         $this->assertTrue($auth->user_login('u3', 'heslo'));
 
+        // Test user created to see if the checking happens strictly.
+        $usersha1 = (object)['name' => 'usersha1', 'pass' => '0e66507019969427134894567494305185566735'];
+        $usersha1->id = $DB->insert_record('auth_db_users', $usersha1);
+
+        // sha1('aaroZmOk') === '0e66507019969427134894567494305185566735'.
+        $this->assertTrue($auth->user_login('usersha1', 'aaroZmOk'));
+        $this->assertFalse($auth->user_login('usersha1', 'aaK1STfY'));
+
         set_config('passtype', 'saltedcrypt', 'auth_db');
         $auth->config->passtype = 'saltedcrypt';
         $user3->pass = password_hash('heslo', PASSWORD_BCRYPT);

auth/ldap/auth.php

@@ -1228,18 +1228,18 @@ class auth_plugin_ldap extends auth_plugin_base {
                     empty($nuvalue) ? $nuvalue = array() : $nuvalue;
                     $ouvalue = core_text::convert($oldvalue, 'utf-8', $this->config->ldapencoding);
                     foreach ($ldapkeys as $ldapkey) {
-                        // Skip update if $ldapkey does not exist in LDAP.
-                        if (!isset($user_entry[$ldapkey][0])) {
-                            $success = false;
-                            error_log($this->errorlogtag.get_string('updateremfailfield', 'auth_ldap',
-                                                                     array('ldapkey' => $ldapkey,
-                                                                            'key' => $key,
-                                                                            'ouvalue' => $ouvalue,
-                                                                            'nuvalue' => $nuvalue)));
-                            continue;
+                        // If the field is empty in LDAP there are two options:
+                        // 1. We get the LDAP field using ldap_first_attribute.
+                        // 2. LDAP don't send the field using  ldap_first_attribute.
+                        // So, for option 1 we check the if the field is retrieve it.
+                        // And get the original value of field in LDAP if the field.
+                        // Otherwise, let value in blank and delegate the check in ldap_modify.
+                        if (isset($user_entry[$ldapkey][0])) {
+                            $ldapvalue = $user_entry[$ldapkey][0];
+                        } else {
+                            $ldapvalue = '';
                         }
 
-                        $ldapvalue = $user_entry[$ldapkey][0];
                         if (!$ambiguous) {
                             // Skip update if the values already match
                             if ($nuvalue !== $ldapvalue) {

auth/manual/tests/privacy/provider_test.php

@@ -21,15 +21,16 @@
  * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace auth_manual\privacy;
 
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
 require_once($CFG->dirroot.'/auth/manual/auth.php');
 
-use \core_privacy\local\request\writer;
-use \core_privacy\local\request\transform;
-use \auth_manual\privacy\provider;
+use core_privacy\local\request\writer;
+use core_privacy\local\request\transform;
+use auth_manual\privacy\provider;
 
 /**
  * Unit tests for the auth_manual implementation of the privacy API.
@@ -37,9 +38,9 @@ use \auth_manual\privacy\provider;
  * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class auth_manual_privacy_testcase extends \core_privacy\tests\provider_testcase {
+class provider_test extends \core_privacy\tests\provider_testcase {
 
-    /** @var auth_plugin_manual Keeps the authentication plugin. */
+    /** @var \auth_plugin_manual Keeps the authentication plugin. */
     protected $authplugin;
 
     /**
@@ -47,7 +48,7 @@ class auth_manual_privacy_testcase extends \core_privacy\tests\provider_testcase
      */
     public function setUp(): void {
         $this->resetAfterTest(true);
-        $this->authplugin = new auth_plugin_manual();
+        $this->authplugin = new \auth_plugin_manual();
     }
 
     /**