Moodle release 4.4.1

It's not available during, and breaks, site installation. The output
class doesn't necessarily need it in 78db6bbce8, so switch to simple
templatable interface instead.

.github/workflows/onebyone.yml

@@ -0,0 +1,143 @@
+name: One by One Testing
+# Run all the individual unit tests one by one, with
+# fully independent PHPUnit executions. Useful to
+# detect issues with some tests that are using stuff
+# that has been made available by others, but is not
+# available when running individually.
+#
+# Note that we aren't using PHPUnit's own isolation
+# here but completely separated runs, one for each
+# test.
+#
+# The workflow will fail reporting all the tests
+# that have failed (and will pass if no failure is
+# detected, of course).
+#
+# It's only executed via workflow dispatch (automated
+# or manual), not by push/tag. And acceptd configuration
+# of phpunit, specially useful to run it with PHPUnit's
+# own isolation or any other option.
+
+on:
+  workflow_dispatch:
+    inputs:
+      phpunit_extra_options:
+        description: Additional options to apply to PHPUnit
+        required: false
+        default: ''
+
+env:
+  chunks: 7
+
+jobs:
+  collect:
+    name: Collect individual unit tests
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{steps.individual-tests.outputs.matrix }}
+
+    steps:
+      - name: Checking out code
+        uses: actions/checkout@v4
+
+      - name: Looking for all individual tests
+        id: individual-tests
+        run: |
+          count=0  # Number of individual tests found.
+          while read -r testfile; do # For each test file.
+              while read -r testname; do # For each unit test in a file.
+                  count=$((count + 1))
+                  # Sent it to the correct chunk file.
+                  chunk=$(((($count % $chunks)) + 1))
+                  echo "$testname $testfile" >> ./chunk_$chunk.txt
+              done < <(grep "function test_" "${testfile}" | sed -r "s/^.*function (test_[a-zA-Z0-9_]+).*/\1/")
+          done < <(find . -name "*_test.php")
+          # Generate the matrix to run tests.
+          echo "matrix=$(ls -1 chunk_*.txt | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
+          echo "$count individual tests collected in $chunks files"
+
+      - name: Upload individual tests files
+        uses: actions/upload-artifact@v4
+        with:
+          name: individual_tests
+          path: chunk_*.txt
+          retention-days: 1
+
+  test:
+    name: Run tests
+    needs: collect
+    runs-on: ubuntu-latest
+    services:
+      exttests:
+        image: moodlehq/moodle-exttests
+        ports:
+          - 8080:80
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+    strategy:
+      fail-fast: false
+      matrix:
+        file: ${{ fromJson(needs.collect.outputs.matrix) }}
+
+    steps:
+      - name: Setting up DB pgsql
+        uses: m4nu56/postgresql-action@v1
+        with:
+          postgresql version: 13
+          postgresql db: test
+          postgresql user: test
+          postgresql password: test
+
+      - name: Setting up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.3
+          ini-values: max_input_vars=5000
+          coverage: none
+
+      - name: Checking out code
+        uses: actions/checkout@v4
+
+      - name: Download individual test files
+        uses: actions/download-artifact@v4
+        with:
+          name: individual_tests # Make all the chunk files available for the next steps.
+
+      - name: Setting up PHPUnit
+        env:
+          dbtype: pgsql
+        run: |
+          echo "pathtophp=$(which php)" >> $GITHUB_ENV
+          cp .github/workflows/config-template.php config.php
+          mkdir ../moodledata
+          sudo locale-gen en_AU.UTF-8
+          php admin/tool/phpunit/cli/init.php --no-composer-self-update
+
+      - name: Run PHPUnit test (one by one)
+        env:
+          dbtype: pgsql
+        run: |
+          status=0
+          count=0
+          while read -r line; do # For each line in the chunk file
+              count=$((count + 1))
+              filter="${line% *}"
+              file="${line#* }"
+              # Run the individual unit test and report problems if needed to.
+              if ! php vendor/bin/phpunit \
+                      --fail-on-empty-test-suite \
+                      --fail-on-warning \
+                      --fail-on-risky \
+                      --filter "$filter" ${{ inputs.phpunit_extra_options }} \
+                      "$file" >/dev/null 2>&1; then
+                  if [ $status -eq 0 ]; then
+                      echo "Problems found, list of PHPUnit commands failing:"
+                  fi
+                  echo "vendor/bin/phpunit --filter '${filter}' ${{ inputs.phpunit_extra_options }} $file"
+                  status=$((status + 1))
+              fi
+          done < ${{ matrix.file }}
+          echo "Finished: $count individual tests executed, $status tests failed"
+          exit $status

admin/amd/build/bulk_user_actions.min.js

@@ -5,6 +5,6 @@ define("core_admin/bulk_user_actions",["exports","core_reportbuilder/local/selec
    * @module     core_admin/bulk_user_actions
    * @copyright  2024 Marina Glancy
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
-   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,reportSelectors=_interopRequireWildcard(reportSelectors),tableEvents=_interopRequireWildcard(tableEvents),FormChangeChecker=_interopRequireWildcard(FormChangeChecker),CustomEvents=_interopRequireWildcard(CustomEvents),_jquery=(obj=_jquery)&&obj.__esModule?obj:{default:obj};const Selectors_bulkActionsForm="form#user-bulk-action-form",Selectors_userReportWrapper='[data-region="report-user-list-wrapper"]',Selectors_checkbox='input[type="checkbox"][data-togglegroup="report-select-all"][data-toggle="slave"]',Selectors_masterCheckbox='input[type="checkbox"][data-togglegroup="report-select-all"][data-toggle="master"]',Selectors_checkedRows='[data-togglegroup="report-select-all"][data-toggle="slave"]:checked';_exports.init=()=>{var _userBulkForm$closest;const userBulkForm=document.querySelector(Selectors_bulkActionsForm),userReport=null==userBulkForm||null===(_userBulkForm$closest=userBulkForm.closest(Selectors_userReportWrapper))||void 0===_userBulkForm$closest?void 0:_userBulkForm$closest.querySelector(reportSelectors.regions.report);if(!userBulkForm||!userReport)return;const actionSelect=userBulkForm.querySelector("select");CustomEvents.define(actionSelect,[CustomEvents.events.accessibleChange]),(0,_jquery.default)(actionSelect).on(CustomEvents.events.accessibleChange,(event=>{if(event.target.value&&"0"!=="".concat(event.target.value)){const e=new Event("submit",{cancelable:!0});userBulkForm.dispatchEvent(e),e.defaultPrevented||(FormChangeChecker.markFormSubmitted(userBulkForm),userBulkForm.submit())}}));const updateUserIds=()=>{const selectedUsers=[...userReport.querySelectorAll(Selectors_checkedRows)],selectedUserIds=selectedUsers.map((check=>parseInt(check.value)));userBulkForm.querySelector('[name="userids"]').value=selectedUserIds.join(","),actionSelect.disabled=0===selectedUsers.length;const selectedUsersNames=selectedUsers.map((check=>document.querySelector('label[for="'.concat(check.id,'"]')).textContent));userBulkForm.data={userids:selectedUserIds,usernames:selectedUsersNames}};updateUserIds(),document.addEventListener("change",(event=>{(event.target.matches(Selectors_checkbox)||event.target.matches(Selectors_masterCheckbox))&&userReport.contains(event.target)&&updateUserIds()})),document.addEventListener(tableEvents.tableContentRefreshed,(event=>{userReport.contains(event.target)&&updateUserIds()}))}}));
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,reportSelectors=_interopRequireWildcard(reportSelectors),tableEvents=_interopRequireWildcard(tableEvents),FormChangeChecker=_interopRequireWildcard(FormChangeChecker),CustomEvents=_interopRequireWildcard(CustomEvents),_jquery=(obj=_jquery)&&obj.__esModule?obj:{default:obj};const Selectors_bulkActionsForm="form#user-bulk-action-form",Selectors_userReportWrapper='[data-region="report-user-list-wrapper"]',Selectors_checkbox='input[type="checkbox"][data-togglegroup="report-select-all"][data-toggle="slave"]',Selectors_masterCheckbox='input[type="checkbox"][data-togglegroup="report-select-all"][data-toggle="master"]',Selectors_checkedRows='[data-togglegroup="report-select-all"][data-toggle="slave"]:checked';_exports.init=()=>{var _userBulkForm$closest;const userBulkForm=document.querySelector(Selectors_bulkActionsForm),userReport=null==userBulkForm||null===(_userBulkForm$closest=userBulkForm.closest(Selectors_userReportWrapper))||void 0===_userBulkForm$closest?void 0:_userBulkForm$closest.querySelector(reportSelectors.regions.report);if(!userBulkForm||!userReport)return;const actionSelect=userBulkForm.querySelector("select");CustomEvents.define(actionSelect,[CustomEvents.events.accessibleChange]),(0,_jquery.default)(actionSelect).on(CustomEvents.events.accessibleChange,(event=>{if(event.target.value&&"0"!=="".concat(event.target.value)){const e=new Event("submit",{cancelable:!0});userBulkForm.dispatchEvent(e),e.defaultPrevented||(FormChangeChecker.markFormSubmitted(userBulkForm),userBulkForm.submit())}}));const updateUserIds=()=>{const selectedUsers=[...userReport.querySelectorAll(Selectors_checkedRows)],selectedUserIds=selectedUsers.map((check=>parseInt(check.value)));userBulkForm.querySelector('[name="userids"]').value=selectedUserIds.join(","),actionSelect.disabled=0===selectedUsers.length,actionSelect.disabled&&(actionSelect.value="0");const selectedUsersNames=selectedUsers.map((check=>document.querySelector('label[for="'.concat(check.id,'"]')).textContent));userBulkForm.data={userids:selectedUserIds,usernames:selectedUsersNames}};updateUserIds(),document.addEventListener("change",(event=>{(event.target.matches(Selectors_checkbox)||event.target.matches(Selectors_masterCheckbox))&&userReport.contains(event.target)&&updateUserIds()})),document.addEventListener(tableEvents.tableContentRefreshed,(event=>{userReport.contains(event.target)&&updateUserIds()}))}}));
 
 //# sourceMappingURL=bulk_user_actions.min.js.map

admin/amd/src/bulk_user_actions.js

@@ -65,7 +65,13 @@ export const init = () => {
         const selectedUsers = [...userReport.querySelectorAll(Selectors.checkedRows)];
         const selectedUserIds = selectedUsers.map(check => parseInt(check.value));
         userBulkForm.querySelector('[name="userids"]').value = selectedUserIds.join(',');
+
+        // Disable the action selector if nothing selected, and reset the current selection.
         actionSelect.disabled = selectedUsers.length === 0;
+        if (actionSelect.disabled) {
+            actionSelect.value = "0";
+        }
+
         const selectedUsersNames = selectedUsers.map(check => document.querySelector(`label[for="${check.id}"]`).textContent);
         // Add the user ids and names to the form data attributes so they can be available from the
         // other JS modules that listen to the form submit event.

admin/classes/reportbuilder/local/systemreports/users.php

@@ -184,6 +184,7 @@ class users extends system_report {
         $entityuseralias = $entityuser->get_table_alias('user');
 
         $filters = [
+            'user:fullname',
             'user:firstname',
             'user:lastname',
             'user:username',

admin/presets/tests/manager_test.php

@@ -29,6 +29,14 @@ use stdClass;
  * @coversDefaultClass \core_adminpresets\manager
  */
 class manager_test extends \advanced_testcase {
+    /**
+     * Include required libraries.
+     */
+    public static function setUpBeforeClass(): void {
+        global $CFG;
+        require_once($CFG->libdir.'/adminlib.php');
+    }
+
     /**
      * Test the behaviour of protected get_site_settings method.
      *

admin/settings/appearance.php

@@ -349,14 +349,17 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) { // sp
         new lang_string('themeselector', 'admin'), $CFG->wwwroot . '/admin/themeselector.php'));
 
     // Settings page for each theme.
+    $ADMIN->add('appearance', new admin_category('themes', new lang_string('themesettingscustom', 'admin')));
     foreach (core_component::get_plugin_list('theme') as $theme => $themedir) {
         $settingspath = "$themedir/settings.php";
         if (file_exists($settingspath)) {
-            $settings = new admin_externalpage('themesetting' . $theme, new lang_string('pluginname', 'theme_'.$theme),
-                new moodle_url($settingspath), 'moodle/site:config', true);
+            $settings = new admin_settingpage("themesetting$theme", new lang_string('pluginname', "theme_$theme"),
+                'moodle/site:config', true
+            );
             include($settingspath);
-            if ($settings) {
-                $ADMIN->add('appearance', $settings);
+            // Add settings if not hidden (to avoid displaying the section if it appears empty in the UI).
+            if ($settings && !$settings->hidden) {
+                $ADMIN->add('themes', $settings);
             }
         }
     }

admin/tests/behat/filter_users.feature

@@ -159,3 +159,24 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
     And I should not see "User One" in the "reportbuilder-table" "table"
     And I should not see "User Three" in the "reportbuilder-table" "table"
     And I should not see "User Four" in the "reportbuilder-table" "table"
+
+  @javascript
+  Scenario: Filter users by full name
+    When I click on "Filters" "button"
+    And I set the following fields in the "Full name" "core_reportbuilder > Filter" to these values:
+      | Full name operator | Is equal to |
+      | Full name value    | User One    |
+    And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
+    Then I should see "User One" in the "reportbuilder-table" "table"
+    And I should not see "User Two" in the "reportbuilder-table" "table"
+    And I should not see "User Three" in the "reportbuilder-table" "table"
+    And I should not see "User Four" in the "reportbuilder-table" "table"
+    And I click on "Reset all" "button" in the "[data-region='report-filters']" "css_element"
+    And I set the following fields in the "Full name" "core_reportbuilder > Filter" to these values:
+      | Full name operator | Is equal to |
+      | Full name value    | User Two    |
+    And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
+    And I should see "User Two" in the "reportbuilder-table" "table"
+    And I should not see "User One" in the "reportbuilder-table" "table"
+    And I should not see "User Three" in the "reportbuilder-table" "table"
+    And I should not see "User Four" in the "reportbuilder-table" "table"

admin/tool/admin_presets/classes/local/action/delete.php

@@ -65,7 +65,7 @@ class delete extends base {
      * Delete the DB preset
      */
     public function execute(): void {
-        confirm_sesskey();
+        require_sesskey();
 
         $this->manager->delete_preset($this->id);
 

admin/tool/admin_presets/classes/local/action/export.php

@@ -52,8 +52,6 @@ class export extends base {
      * Stores a preset into the DB.
      */
     public function execute(): void {
-        confirm_sesskey();
-
         $url = new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'export', 'mode' => 'execute']);
         $this->moodleform = new export_form($url);
 
@@ -87,7 +85,7 @@ class export extends base {
      * @throws xml_writer_exception
      */
     public function download_xml(): void {
-        confirm_sesskey();
+        require_sesskey();
 
         list($xmlstr, $filename) = $this->manager->download_preset($this->id);
 

admin/tool/admin_presets/classes/local/action/import.php

@@ -40,8 +40,6 @@ class import extends base {
      * Imports the xmlfile into DB
      */
     public function execute(): void {
-        confirm_sesskey();
-
         $url = new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'import', 'mode' => 'execute']);
         $this->moodleform = new import_form($url);
 

admin/tool/admin_presets/classes/local/action/load.php

@@ -38,8 +38,6 @@ class load extends base {
     public function execute(): void {
         global $OUTPUT;
 
-        confirm_sesskey();
-
         $url = new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'load', 'mode' => 'execute']);
         $this->moodleform = new load_form($url);
 

admin/tool/admin_presets/classes/local/action/rollback.php

@@ -73,7 +73,7 @@ class rollback extends base {
     public function execute(): void {
         global $OUTPUT;
 
-        confirm_sesskey();
+        require_sesskey();
 
         list($presetapp, $rollback, $failures) = $this->manager->revert_preset($this->id);
 

admin/tool/admin_presets/version.php

@@ -26,5 +26,5 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'tool_admin_presets';
-$plugin->version = 2023100900;
-$plugin->requires = 2023100400;
+$plugin->version = 2024042200;
+$plugin->requires = 2024041600;

admin/tool/analytics/model.php

@@ -97,28 +97,28 @@ if ($onlycli === false) {
 switch ($action) {
 
     case 'enable':
-        confirm_sesskey();
+        require_sesskey();
 
         $model->enable();
         redirect($returnurl);
         break;
 
     case 'disable':
-        confirm_sesskey();
+        require_sesskey();
 
         $model->update(0, false, false);
         redirect($returnurl);
         break;
 
     case 'delete':
-        confirm_sesskey();
+        require_sesskey();
 
         $model->delete();
         redirect($returnurl);
         break;
 
     case 'edit':
-        confirm_sesskey();
+        require_sesskey();
 
         $invalidcurrenttimesplitting = $model->invalid_timesplitting_selected();
         $potentialtimesplittings = $model->get_potential_timesplittings();
@@ -183,7 +183,7 @@ switch ($action) {
         break;
 
     case 'evaluate':
-        confirm_sesskey();
+        require_sesskey();
 
         if ($model->is_static()) {
             throw new moodle_exception('errornostaticevaluate', 'tool_analytics');
@@ -226,7 +226,7 @@ switch ($action) {
         break;
 
     case 'scheduledanalysis':
-        confirm_sesskey();
+        require_sesskey();
 
         if ($onlycli) {
             throw new moodle_exception('erroronlycli', 'tool_analytics');
@@ -292,7 +292,7 @@ switch ($action) {
         break;
 
     case 'clear':
-        confirm_sesskey();
+        require_sesskey();
 
         $model->clear();
         redirect($returnurl);

admin/tool/analytics/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_analytics'; // Full name of the plugin (used for diagnostics).

admin/tool/availabilityconditions/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2023100900;
-$plugin->requires = 2023100400;
+$plugin->version = 2024042200;
+$plugin->requires = 2024041600;
 $plugin->component = 'tool_availabilityconditions';

admin/tool/behat/tests/manager_util_test.php

@@ -25,6 +25,10 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+namespace tool_behat;
+
+use behat_config_util;
+
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
@@ -39,7 +43,7 @@ require_once($CFG->libdir . '/behat/classes/behat_config_manager.php');
  * @copyright  2016 Rajesh Taneja
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class tool_behat_manager_util_testcase extends advanced_testcase {
+class manager_util_test extends \advanced_testcase {
 
     /** @var array Fixtures features which are available. */
     private $featurepaths = array(

admin/tool/behat/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900;   // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400;   // Requires this Moodle version.
+$plugin->version   = 2024042200;   // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600;   // Requires this Moodle version.
 $plugin->component = 'tool_behat'; // Full name of the plugin (used for diagnostics)

admin/tool/brickfield/version.php

@@ -25,5 +25,5 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'tool_brickfield';
-$plugin->version = 2023100900;
-$plugin->requires = 2023100400;
+$plugin->version = 2024042200;
+$plugin->requires = 2024041600;

admin/tool/capability/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_capability'; // Full name of the plugin (used for diagnostics).

admin/tool/cohortroles/db/upgrade.php

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

admin/tool/cohortroles/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_cohortroles'; // Full name of the plugin (used for diagnostics).

admin/tool/componentlibrary/version.php

@@ -21,6 +21,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 defined('MOODLE_INTERNAL') || die();
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_componentlibrary';

admin/tool/customlang/db/upgrade.php

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

admin/tool/customlang/version.php

@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900;
-$plugin->requires  = 2023100400;
+$plugin->version   = 2024042200;
+$plugin->requires  = 2024041600;
 $plugin->component = 'tool_customlang'; // Full name of the plugin (used for diagnostics)

admin/tool/dataprivacy/classes/hook_callbacks.php

@@ -45,6 +45,7 @@ class hook_callbacks {
             $hook->add_html(
                 html_writer::div(
                     html_writer::link($url, get_string('dataretentionsummary', 'tool_dataprivacy')),
+                    'tool_dataprivacy',
                 ),
             );
         }

admin/tool/dataprivacy/db/upgrade.php

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

admin/tool/dataprivacy/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version   = 2023100901;
-$plugin->requires  = 2023100400;
+$plugin->version   = 2024042200;
+$plugin->requires  = 2024041600;
 $plugin->component = 'tool_dataprivacy';

admin/tool/dbtransfer/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_dbtransfer'; // Full name of the plugin (used for diagnostics).

admin/tool/filetypes/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2023100900;
-$plugin->requires = 2023100400;
+$plugin->version = 2024042200;
+$plugin->requires = 2024041600;
 $plugin->component = 'tool_filetypes';

admin/tool/generator/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2023100900;
-$plugin->requires = 2023100400;
+$plugin->version = 2024042200;
+$plugin->requires = 2024041600;
 $plugin->component = 'tool_generator';

admin/tool/httpsreplace/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_httpsreplace'; // Full name of the plugin (used for diagnostics).

admin/tool/innodb/version.php

@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_innodb'; // Full name of the plugin (used for diagnostics)

admin/tool/installaddon/version.php

@@ -24,6 +24,6 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component  = 'tool_installaddon';
-$plugin->version    = 2023100900;
-$plugin->requires   = 2023100400;
+$plugin->version    = 2024042200;
+$plugin->requires   = 2024041600;
 $plugin->maturity   = MATURITY_STABLE;

admin/tool/langimport/version.php

@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_langimport'; // Full name of the plugin (used for diagnostics)

admin/tool/licensemanager/classes/form/edit_license.php

@@ -77,7 +77,7 @@ class edit_license extends moodleform {
         $mform = $this->_form;
 
         $mform->addElement('text', 'shortname', get_string('shortname', 'tool_licensemanager'));
-        $mform->setType('shortname', PARAM_ALPHANUMEXT);
+        $mform->setType('shortname', PARAM_NOTAGS);
         // Shortname is only editable when user is creating a license.
         if ($this->action != manager::ACTION_CREATE) {
             $mform->freeze('shortname');

admin/tool/licensemanager/index.php

@@ -29,7 +29,7 @@ require_once($CFG->libdir . '/licenselib.php');
 require_admin();
 
 $action = optional_param('action', '', PARAM_ALPHANUMEXT);
-$license = optional_param('license', '', PARAM_SAFEDIR);
+$license = optional_param('license', '', PARAM_NOTAGS);
 
 // Route via the manager.
 $licensemanager = new \tool_licensemanager\manager();

admin/tool/licensemanager/version.php

@@ -24,8 +24,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900;
-$plugin->requires  = 2023100400;         // Requires this Moodle version.
+$plugin->version   = 2024042200;
+$plugin->requires  = 2024041600;         // Requires this Moodle version.
 $plugin->component = 'tool_licensemanager';
 
 $plugin->maturity = MATURITY_STABLE;

admin/tool/log/db/upgrade.php

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

admin/tool/log/store/database/db/upgrade.php

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

admin/tool/log/store/database/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2023100400; // Requires this Moodle version.
+$plugin->version = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2024041600; // Requires this Moodle version.
 $plugin->component = 'logstore_database'; // Full name of the plugin (used for diagnostics).

admin/tool/log/store/standard/db/upgrade.php

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

admin/tool/log/store/standard/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2023100400; // Requires this Moodle version.
+$plugin->version = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2024041600; // Requires this Moodle version.
 $plugin->component = 'logstore_standard'; // Full name of the plugin (used for diagnostics).

admin/tool/log/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2023100400; // Requires this Moodle version.
+$plugin->version = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_log'; // Full name of the plugin (used for diagnostics).

admin/tool/lp/version.php

@@ -25,6 +25,6 @@
 defined('MOODLE_INTERNAL') || die();
 
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_lp'; // Full name of the plugin (used for diagnostics).

admin/tool/lpimportcsv/version.php

@@ -25,8 +25,8 @@
 defined('MOODLE_INTERNAL') || die();
 
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_lpimportcsv'; // Full name of the plugin (used for diagnostics).
-$plugin->dependencies = ['tool_lp' => 2023100400];
+$plugin->dependencies = ['tool_lp' => 2024041600];
 

admin/tool/lpmigrate/version.php

@@ -24,8 +24,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_lpmigrate'; // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = [
     'tool_lp' => ANY_VERSION,

admin/tool/messageinbound/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900;
-$plugin->requires  = 2023100400;
+$plugin->version   = 2024042200;
+$plugin->requires  = 2024041600;
 $plugin->component = 'tool_messageinbound';

admin/tool/mfa/auth.php

@@ -42,7 +42,20 @@ $PAGE->set_title($pagetitle);
 
 // Logout if it was requested.
 $logout = optional_param('logout', false, PARAM_BOOL);
+$sesskey = optional_param('sesskey', '_none_', PARAM_RAW);
+
 if ($logout) {
+    if (!confirm_sesskey($sesskey)) {
+        echo $OUTPUT->header();
+        echo $OUTPUT->confirm(
+            get_string('logoutconfirm'),
+            new moodle_url($PAGE->url, ['logout' => 1, 'sesskey' => sesskey()]),
+            new moodle_url('/'),
+        );
+        echo $OUTPUT->footer();
+        die;
+    }
+
     if (!empty($SESSION->wantsurl)) {
         // If we have the wantsurl, we should redirect there, to keep it intact.
         $wantsurl = $SESSION->wantsurl;

admin/tool/mfa/classes/hook/after_user_passed_mfa.php

@@ -16,7 +16,6 @@
 
 namespace tool_mfa\hook;
 
-use core\hook\described_hook;
 use core\hook\stoppable_trait;
 
 /**
@@ -26,26 +25,10 @@ use core\hook\stoppable_trait;
  * @copyright  2024 Juan Leyva
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+#[\core\attribute\label('Allow plugins to callback as soon possible after user has passed MFA.')]
+#[\core\attribute\tags('user', 'login')]
 class after_user_passed_mfa implements
-    described_hook,
-    \Psr\EventDispatcher\StoppableEventInterface {
+    \Psr\EventDispatcher\StoppableEventInterface
+{
     use stoppable_trait;
-
-    /**
-     * Describes the hook purpose.
-     *
-     * @return string
-     */
-    public static function get_hook_description(): string {
-        return 'Allow plugins to callback as soon possible after user has passed MFA.';
-    }
-
-    /**
-     * List of tags that describe this hook.
-     *
-     * @return string[]
-     */
-    public static function get_hook_tags(): array {
-        return ['login'];
-    }
 }

admin/tool/mfa/classes/local/form/verification_field.php

@@ -76,10 +76,11 @@ class verification_field extends \MoodleQuickForm_text {
         return parent::__construct($elementname, $elementlabel, $attributes);
     }
 
-    // @codingStandardsIgnoreStart
     /**
      * Returns HTML for this form element.
      *
+     * phpcs:disable moodle.NamingConventions.ValidFunctionName.LowercaseMethod
+     *
      * @return string
      */
     public function toHtml(): string {
@@ -101,7 +102,6 @@ class verification_field extends \MoodleQuickForm_text {
         }
         return $result;
     }
-    // @codingStandardsIgnoreEnd
 
     /**
      * Setup and return the script for autosubmission while inside the secure layout.

admin/tool/mfa/classes/manager.php

@@ -349,12 +349,10 @@ class manager {
             try {
                 // Clear locked user factors, they may now reauth with anything.
                 @$DB->set_field('tool_mfa', 'lockcounter', 0, ['userid' => $USER->id]);
-            // @codingStandardsIgnoreStart
+                // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedCatch
             } catch (\Exception $e) {
                 // This occurs when upgrade.php hasn't been run. Nothing to do here.
-                // Coding standards ignored, they break on empty catches.
             }
-            // @codingStandardsIgnoreEnd
 
             // Fire post pass state factor actions.
             $factors = factor::get_active_user_factor_types();

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

@@ -723,6 +723,7 @@ class renderer extends \plugin_renderer_base {
                 'hasadditionalfactors' => $hasadditionalfactors,
                 'additionalfactors' => $alladitionalfactors,
                 'authurl' => $authurl->out(),
+                'sesskey' => sesskey(),
                 'supportlink' => $this->get_support_link(),
                 'disablefactor' => $disablefactor
         ];

admin/tool/mfa/factor/admin/version.php

@@ -26,7 +26,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version      = 2023100900;      // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires     = 2023100400;   // Requires this Moodle version.
+$plugin->version      = 2024042200;      // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires     = 2024041600;   // Requires this Moodle version.
 $plugin->component    = 'factor_admin';  // Full name of the plugin (used for diagnostics).
 $plugin->maturity     = MATURITY_STABLE;

admin/tool/mfa/factor/auth/db/upgrade.php

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

admin/tool/mfa/factor/auth/version.php

@@ -26,7 +26,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version      = 2023100900;      // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires     = 2023100400;   // Requires this Moodle version.
+$plugin->version      = 2024042200;      // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires     = 2024041600;   // Requires this Moodle version.
 $plugin->component    = 'factor_auth';   // Full name of the plugin (used for diagnostics).
 $plugin->maturity     = MATURITY_STABLE;

admin/tool/mfa/factor/capability/version.php

@@ -26,7 +26,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version      = 2023100900;           // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires     = 2023100400;        // Requires this Moodle version.
+$plugin->version      = 2024042200;           // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires     = 2024041600;        // Requires this Moodle version.
 $plugin->component    = 'factor_capability';  // Full name of the plugin (used for diagnostics).
 $plugin->maturity     = MATURITY_STABLE;

admin/tool/mfa/factor/cohort/version.php

@@ -26,7 +26,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version      = 2023100900;      // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires     = 2023100400;   // Requires this Moodle version.
+$plugin->version      = 2024042200;      // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires     = 2024041600;   // Requires this Moodle version.
 $plugin->component    = 'factor_cohort'; // Full name of the plugin (used for diagnostics).
 $plugin->maturity     = MATURITY_STABLE;

admin/tool/mfa/factor/email/email.php

@@ -22,13 +22,14 @@
  * @copyright   Catalyst IT
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+
 // Ignore coding standards for login check, this page does not require login.
-// @codingStandardsIgnoreStart
+// phpcs:disable moodle.Files.RequireLogin.Missing
 require_once(__DIR__ . '/../../../../../config.php');
+
 $instanceid = required_param('instance', PARAM_INT);
 $pass = optional_param('pass', '0', PARAM_INT);
 $secret = optional_param('secret', 0, PARAM_INT);
-// @codingStandardsIgnoreEnds
 
 $context = context_system::instance();
 $PAGE->set_context($context);

admin/tool/mfa/factor/email/version.php

@@ -26,7 +26,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version      = 2023100900;      // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires     = 2023100400;   // Requires this Moodle version.
+$plugin->version      = 2024042200;      // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires     = 2024041600;   // Requires this Moodle version.
 $plugin->component    = 'factor_email';  // Full name of the plugin (used for diagnostics).
 $plugin->maturity     = MATURITY_STABLE;

admin/tool/mfa/factor/grace/version.php

@@ -26,7 +26,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version      = 2023100900;      // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires     = 2023100400;   // Requires this Moodle version.
+$plugin->version      = 2024042200;      // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires     = 2024041600;   // Requires this Moodle version.
 $plugin->component    = 'factor_grace';  // Full name of the plugin (used for diagnostics).
 $plugin->maturity     = MATURITY_STABLE;

admin/tool/mfa/factor/iprange/version.php

@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version      = 2023100900;       // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires     = 2023100400;    // Requires this Moodle version.
+$plugin->version      = 2024042200;       // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires     = 2024041600;    // Requires this Moodle version.
 $plugin->component    = 'factor_iprange'; // Full name of the plugin (used for diagnostics).
 $plugin->maturity     = MATURITY_STABLE;

admin/tool/mfa/factor/nosetup/version.php

@@ -26,7 +26,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version      = 2023100900;       // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires     = 2023100400;    // Requires this Moodle version.
+$plugin->version      = 2024042200;       // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires     = 2024041600;    // Requires this Moodle version.
 $plugin->component    = 'factor_nosetup'; // Full name of the plugin (used for diagnostics).
 $plugin->maturity     = MATURITY_STABLE;

admin/tool/mfa/factor/role/version.php

@@ -26,7 +26,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version      = 2023100900;      // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires     = 2023100400;   // Requires this Moodle version.
+$plugin->version      = 2024042200;      // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires     = 2024041600;   // Requires this Moodle version.
 $plugin->component    = 'factor_role';   // Full name of the plugin (used for diagnostics).
 $plugin->maturity     = MATURITY_STABLE;

admin/tool/mfa/factor/sms/lang/en/factor_sms.php

@@ -63,7 +63,7 @@ $string['settings:countrycode_help'] = 'The calling code without the leading + a
 See this link for a list of calling codes: {$a}';
 $string['settings:duration'] = 'Validity duration';
 $string['settings:duration_help'] = 'The period of time that the code is valid.';
-$string['settings:gateway'] = 'SMS Gateway';
+$string['settings:gateway'] = 'SMS gateway';
 $string['settings:gateway_help'] = 'The SMS provider you wish to send messages via';
 $string['setupfactor'] = 'Set up SMS';
 $string['setupfactorbutton'] = 'Set up';

admin/tool/mfa/factor/sms/version.php

@@ -26,7 +26,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version      = 2023121400;      // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires     = 2023042400.00;   // Requires this Moodle version.
+$plugin->version      = 2024042200;      // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires     = 2024041600;   // Requires this Moodle version.
 $plugin->component    = 'factor_sms';   // Full name of the plugin (used for diagnostics).
 $plugin->maturity     = MATURITY_STABLE;

admin/tool/mfa/factor/token/version.php

@@ -26,7 +26,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version      = 2023100900;      // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires     = 2023100400;   // Requires this Moodle version.
+$plugin->version      = 2024042200;      // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires     = 2024041600;   // Requires this Moodle version.
 $plugin->component    = 'factor_token';  // Full name of the plugin (used for diagnostics).
 $plugin->maturity     = MATURITY_STABLE;

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

@@ -26,7 +26,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version      = 2023100900;      // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires     = 2023100400;   // Requires this Moodle version.
+$plugin->version      = 2024042200;      // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires     = 2024041600;   // Requires this Moodle version.
 $plugin->component    = 'factor_totp';   // Full name of the plugin (used for diagnostics).
 $plugin->maturity     = MATURITY_STABLE;

admin/tool/mfa/factor/webauthn/version.php

@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version      = 2023100900;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires     = 2023100400;     // Requires this Moodle version.
+$plugin->version      = 2024042200;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires     = 2024041600;     // Requires this Moodle version.
 $plugin->component    = 'factor_webauthn'; // Full name of the plugin (used for diagnostics).
 $plugin->maturity     = MATURITY_STABLE;

admin/tool/mfa/index.php

@@ -31,8 +31,7 @@ require_once($CFG->libdir.'/tablelib.php');
 require_login(null, false);
 require_capability('moodle/site:config', context_system::instance());
 
-global $_SERVER;
-$returnurl = $_SERVER['HTTP_REFERER'];
+$returnurl = get_local_referer(false);
 
 $PAGE->set_url('/admin/tool/mfa/index.php');
 

admin/tool/mfa/templates/verification_form.mustache

@@ -83,6 +83,7 @@
     <div class="d-flex justify-content-center">
         <form id="cancelmfa" method="POST" action="{{{authurl}}}">
             <input type="hidden" id="{{uniqid}}-logout" name="logout" value="true">
+            <input type="hidden" name="sesskey" value="{{sesskey}}">
             <input type="submit" class="btn btn-secondary"
                    name="cancelmfa" id="cancelmfa_button"
                    value="{{#str}} cancellogin, tool_mfa {{/str}}">

admin/tool/mfa/version.php

@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2024030402;      // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400;   // Requires this Moodle version.
+$plugin->version   = 2024042200;      // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600;   // Requires this Moodle version.
 $plugin->component = 'tool_mfa';      // Full name of the plugin (used for diagnostics).
 $plugin->maturity  = MATURITY_STABLE;

admin/tool/mobile/classes/api.php

@@ -462,13 +462,13 @@ class api {
     public static function get_qrlogin_key(stdClass $mobilesettings) {
         global $USER;
         // Delete previous keys.
-        delete_user_key('tool_mobile', $USER->id);
+        delete_user_key('tool_mobile/qrlogin', $USER->id);
 
         // Create a new key.
         $iprestriction = !empty($mobilesettings->qrsameipcheck) ? getremoteaddr(null) : null;
         $qrkeyttl = !empty($mobilesettings->qrkeyttl) ? $mobilesettings->qrkeyttl : self::LOGIN_QR_KEY_TTL;
         $validuntil = time() + $qrkeyttl;
-        return create_user_key('tool_mobile', $USER->id, null, $iprestriction, $validuntil);
+        return create_user_key('tool_mobile/qrlogin', $USER->id, null, $iprestriction, $validuntil);
     }
 
     /**

admin/tool/mobile/classes/external.php

@@ -648,8 +648,8 @@ class external extends external_api {
         api::check_autologin_prerequisites($params['userid']);  // Checks https, avoid site admins using this...
 
         // Validate and delete the key.
-        $key = validate_user_key($params['qrloginkey'], 'tool_mobile', null);
-        delete_user_key('tool_mobile', $params['userid']);
+        $key = validate_user_key($params['qrloginkey'], 'tool_mobile/qrlogin', null);
+        delete_user_key('tool_mobile/qrlogin', $params['userid']);
 
         // Double check key belong to user.
         if ($key->userid != $params['userid']) {

admin/tool/mobile/classes/hook_callbacks.php

@@ -16,6 +16,7 @@
 
 namespace tool_mobile;
 
+use core\session\utility\cookie_helper;
 use html_writer;
 
 /**
@@ -78,4 +79,31 @@ class hook_callbacks {
             html_writer::link($url, get_string('getmoodleonyourmobile', 'tool_mobile'), ['class' => 'mobilelink']),
         );
     }
+
+    /**
+     * Callback to recover $SESSION->wantsurl.
+     *
+     * @param \core_user\hook\after_login_completed $hook
+     */
+    public static function after_login_completed(
+        \core_user\hook\after_login_completed $hook,
+    ): void {
+        global $SESSION, $CFG;
+
+        // Check if the user is doing a mobile app launch, if that's the case, ensure $SESSION->wantsurl is correctly set.
+        if (!NO_MOODLE_COOKIES && !empty($_COOKIE['tool_mobile_launch'])) {
+            if (empty($SESSION->wantsurl) || strpos($SESSION->wantsurl, '/tool/mobile/launch.php') === false) {
+                $params = json_decode($_COOKIE['tool_mobile_launch'], true);
+                $SESSION->wantsurl = (new \moodle_url("/$CFG->admin/tool/mobile/launch.php", $params))->out(false);
+            }
+        }
+
+        // Set Partitioned and Secure attributes to the MoodleSession cookie if the user is using the Moodle app.
+        if (\core_useragent::is_moodle_app()) {
+            cookie_helper::add_attributes_to_cookie_response_header(
+                'MoodleSession' . $CFG->sessioncookie,
+                ['Secure', 'Partitioned'],
+            );
+        }
+    }
 }

admin/tool/mobile/classes/local/hooks/user/after_complete_login.php

@@ -1,49 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-namespace tool_mobile\local\hooks\user;
-use core\session\utility\cookie_helper;
-
-/**
- * Handles mobile app launches when a third-party auth plugin did not properly set $SESSION->wantsurl.
- *
- * @package    tool_mobile
- * @copyright  2024 Juan Leyva
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class after_complete_login {
-    /**
-     * Callback to recover $SESSION->wantsurl.
-     *
-     * @param \core\hook\user\after_complete_login $hook
-     */
-    public static function callback(\core\hook\user\after_complete_login $hook): void {
-        global $SESSION, $CFG;
-
-        // Check if the user is doing a mobile app launch, if that's the case, ensure $SESSION->wantsurl is correctly set.
-        if (!NO_MOODLE_COOKIES && !empty($_COOKIE['tool_mobile_launch'])) {
-            if (empty($SESSION->wantsurl) || strpos($SESSION->wantsurl, '/tool/mobile/launch.php') === false) {
-                $params = json_decode($_COOKIE['tool_mobile_launch'], true);
-                $SESSION->wantsurl = (new \moodle_url("/$CFG->admin/tool/mobile/launch.php", $params))->out(false);
-            }
-        }
-
-        // Set Partitioned and Secure attributes to the MoodleSession cookie if the user is using the Moodle app.
-        if (\core_useragent::is_moodle_app()) {
-            cookie_helper::add_attributes_to_cookie_response_header('MoodleSession'.$CFG->sessioncookie, ['Secure', 'Partitioned']);
-        }
-    }
-}

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

@@ -66,7 +66,7 @@ class provider implements
                   FROM {user_private_key} k
                   JOIN {user} u ON k.userid = u.id
                   JOIN {context} ctx ON ctx.instanceid = u.id AND ctx.contextlevel = :contextlevel
-                 WHERE k.userid = :userid AND k.script = 'tool_mobile'";
+                 WHERE k.userid = :userid AND (k.script = 'tool_mobile' OR k.script = 'tool_mobile/qrlogin')";
         $params = ['userid' => $userid, 'contextlevel' => CONTEXT_USER];
         $contextlist = new contextlist();
         $contextlist->add_from_sql($sql, $params);
@@ -88,6 +88,7 @@ class provider implements
 
         // Add users based on userkey.
         \core_userkey\privacy\provider::get_user_contexts_with_script($userlist, $context, 'tool_mobile');
+        \core_userkey\privacy\provider::get_user_contexts_with_script($userlist, $context, 'tool_mobile/qrlogin');
     }
 
     /**
@@ -108,6 +109,7 @@ class provider implements
         }
         // Export associated userkeys.
         \core_userkey\privacy\provider::export_userkeys($context, [], 'tool_mobile');
+        \core_userkey\privacy\provider::export_userkeys($context, [], 'tool_mobile/qrlogin');
     }
     /**
      * Export all user preferences for the plugin.
@@ -138,6 +140,7 @@ class provider implements
         $userid = $context->instanceid;
         // Delete all the userkeys.
         \core_userkey\privacy\provider::delete_userkeys('tool_mobile', $userid);
+        \core_userkey\privacy\provider::delete_userkeys('tool_mobile/qrlogin', $userid);
     }
     /**
      * Delete all user data for the specified user, in the specified contexts.
@@ -158,6 +161,7 @@ class provider implements
         $userid = $context->instanceid;
         // Delete all the userkeys.
         \core_userkey\privacy\provider::delete_userkeys('tool_mobile', $userid);
+        \core_userkey\privacy\provider::delete_userkeys('tool_mobile/qrlogin', $userid);
     }
 
     /**
@@ -178,5 +182,6 @@ class provider implements
 
         // Delete all the userkeys.
         \core_userkey\privacy\provider::delete_userkeys('tool_mobile', $userid);
+        \core_userkey\privacy\provider::delete_userkeys('tool_mobile/qrlogin', $userid);
     }
 }

admin/tool/mobile/db/hooks.php

@@ -35,8 +35,8 @@ $callbacks = [
         'priority' => 0,
     ],
     [
-        'hook' => core\hook\user\after_complete_login::class,
-        'callback' => 'tool_mobile\local\hooks\user\after_complete_login::callback',
+        'hook' => \core_user\hook\after_login_completed::class,
+        'callback' => [\tool_mobile\hook_callbacks::class, 'after_login_completed'],
         'priority' => 500,
     ],
     [

admin/tool/mobile/db/upgrade.php

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

admin/tool/mobile/launch.php

@@ -75,6 +75,14 @@ if (empty($SESSION->justloggedin) &&
     throw new moodle_exception('pluginnotenabledorconfigured', 'tool_mobile');
 }
 
+// If the user is using the inapp (embedded) browser, we need to set the Secure and Partitioned attributes to the session cookie.
+if (\core_useragent::is_moodle_app()) {
+    \core\session\utility\cookie_helper::add_attributes_to_cookie_response_header(
+        "MoodleSession{$CFG->sessioncookie}",
+        ['Secure', 'Partitioned'],
+    );
+}
+
 require_login(0, false);
 
 // Require an active user: not guest, not suspended.

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

@@ -87,7 +87,8 @@ class provider_test extends \core_privacy\tests\provider_testcase {
         $context1 = \context_user::instance($user1->id);
         $context2 = \context_user::instance($user2->id);
         $key1 = get_user_key('tool_mobile', $user1->id);
-        $key2 = get_user_key('tool_mobile', $user2->id);
+        $key2 = get_user_key('tool_mobile/qrlogin', $user1->id);
+        $key3 = get_user_key('tool_mobile', $user2->id);
 
         // Ensure only user1 is found in context1.
         $userlist = new \core_privacy\local\request\userlist($context1, $component);
@@ -175,12 +176,15 @@ class provider_test extends \core_privacy\tests\provider_testcase {
         $context1 = \context_user::instance($user1->id);
         $context2 = \context_user::instance($user2->id);
         $keyvalue1 = get_user_key('tool_mobile', $user1->id);
-        $keyvalue2 = get_user_key('tool_mobile', $user2->id);
+        $keyvalue2 = get_user_key('tool_mobile/qrlogin', $user1->id);
+        $keyvalue3 = get_user_key('tool_mobile', $user2->id);
         $key1 = $DB->get_record('user_private_key', ['value' => $keyvalue1]);
 
-        // Before deletion, we should have 2 user_private_keys.
+        // Before deletion, we should have 2 user_private_keys for tool_mobile and one for tool_mobile/qrlogin.
         $count = $DB->count_records('user_private_key', ['script' => 'tool_mobile']);
         $this->assertEquals(2, $count);
+        $count = $DB->count_records('user_private_key', ['script' => 'tool_mobile/qrlogin']);
+        $this->assertEquals(1, $count);
 
         // Ensure deleting wrong user in the user context does nothing.
         $approveduserids = [$user2->id];
@@ -198,6 +202,8 @@ class provider_test extends \core_privacy\tests\provider_testcase {
         // Ensure only user1's data is deleted, user2's remains.
         $count = $DB->count_records('user_private_key', ['script' => 'tool_mobile']);
         $this->assertEquals(1, $count);
+        $count = $DB->count_records('user_private_key', ['script' => 'tool_mobile/qrlogin']);
+        $this->assertEquals(0, $count);
 
         $params = ['script' => $component];
         $userid = $DB->get_field_select('user_private_key', 'userid', 'script = :script', $params);

admin/tool/mobile/version.php

@@ -23,9 +23,9 @@
  */
 
 defined('MOODLE_INTERNAL') || die();
-$plugin->version   = 2024022600; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_mobile'; // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = [
-    'webservice_rest' => 2023100400,
+    'webservice_rest' => 2024041600,
 ];

admin/tool/monitor/db/upgrade.php

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

admin/tool/monitor/version.php

@@ -26,6 +26,6 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version   = 2023100900;     // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400;     // Requires this Moodle version.
+$plugin->version   = 2024042200;     // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600;     // Requires this Moodle version.
 $plugin->component = 'tool_monitor'; // Full name of the plugin (used for diagnostics).

admin/tool/moodlenet/db/upgrade.php

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

admin/tool/moodlenet/index.php

@@ -63,7 +63,7 @@ if ($cancel) {
     }
     redirect($url);
 } else if ($continue) {
-    confirm_sesskey();
+    require_sesskey();
 
     // Handle backups.
     if (strtolower($importinfo->get_resource()->get_extension()) == 'mbz') {

admin/tool/moodlenet/options.php

@@ -81,7 +81,7 @@ switch ($config->type) {
 }
 
 if ($import && $module) {
-    confirm_sesskey();
+    require_sesskey();
 
     $handlerinfo = $handlerregistry->get_resource_handler_for_mod_and_strategy($importinfo->get_resource(), $module, $strategy);
     if (is_null($handlerinfo)) {

admin/tool/moodlenet/version.php

@@ -25,6 +25,6 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component  = 'tool_moodlenet';
-$plugin->version    = 2023100900;
-$plugin->requires   = 2023100400;
+$plugin->version    = 2024042200;
+$plugin->requires   = 2024041600;
 $plugin->maturity   = MATURITY_ALPHA;

admin/tool/multilangupgrade/version.php

@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_multilangupgrade'; // Full name of the plugin (used for diagnostics)
 

admin/tool/oauth2/version.php

@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_oauth2'; // Full name of the plugin (used for diagnostics).
 

admin/tool/phpunit/version.php

@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_phpunit'; // Full name of the plugin (used for diagnostics)
 

admin/tool/policy/classes/api.php

@@ -1034,7 +1034,9 @@ class api {
             }
         }
 
-        if ($user->policyagreed != $allresponded) {
+        // MDL-80973: At this point, the policyagreed value in DB could be 0 but $user->policyagreed could be 1 (as it was copied from $USER).
+        // So we need to ensure that the value in DB is set true if all policies were responded.
+        if ($user->policyagreed != $allresponded || $allresponded) {
             $user->policyagreed = $allresponded;
             $DB->set_field('user', 'policyagreed', $allresponded, ['id' => $user->id]);
         }

admin/tool/policy/db/upgrade.php

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

admin/tool/policy/tests/api_test.php

@@ -579,7 +579,7 @@ class api_test extends \advanced_testcase {
      * Test that accepting policy updates 'policyagreed'
      */
     public function test_accept_policies() {
-        global $DB;
+        global $DB, $USER;
         $this->resetAfterTest();
         $this->setAdminUser();
 
@@ -623,6 +623,12 @@ class api_test extends \advanced_testcase {
 
         api::accept_policies([$policy3->id]);
         $this->assertEquals(1, $DB->get_field('user', 'policyagreed', ['id' => $user2->id]));
+
+        // Ensure policies are always accepted when all are responded regardless the $USER->policyagreed value.
+        $USER->policyagreed = 1;
+        $DB->set_field('user', 'policyagreed', 0, ['id' => $user2->id]);
+        api::accept_policies([$policy3->id]);
+        $this->assertEquals(1, $DB->get_field('user', 'policyagreed', ['id' => $user2->id]));
     }
 
     /**

admin/tool/policy/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2024022000;         // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400;         // Requires this Moodle version.
+$plugin->version   = 2024042200;         // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600;         // Requires this Moodle version.
 $plugin->component = 'tool_policy';      // Full name of the plugin (used for diagnostics).

admin/tool/profiling/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_profiling'; // Full name of the plugin (used for diagnostics)

admin/tool/recyclebin/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_recyclebin'; // Full name of the plugin (used for diagnostics).

admin/tool/replace/version.php

@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2023100400; // Requires this Moodle version.
+$plugin->version   = 2024042200; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2024041600; // Requires this Moodle version.
 $plugin->component = 'tool_replace'; // Full name of the plugin (used for diagnostics)

admin/tool/spamcleaner/version.php

@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023100900;
-$plugin->requires  = 2023100400;
+$plugin->version   = 2024042200;
+$plugin->requires  = 2024041600;
 $plugin->component = 'tool_spamcleaner'; // Full name of the plugin (used for diagnostics)