Moodle release 4.0.1

Adds new parameter in get_module_types_names() to optionally reset
the $modnames static cache.

.gitignore

@@ -54,3 +54,4 @@ moodle-plugin-ci.phar
 /admin/tool/componentlibrary/docs
 /admin/tool/componentlibrary/hugo/site/data/my-index.json
 .hugo_build.lock
+.phpcs.xml

.grunt/tasks/ignorefiles.js

@@ -21,6 +21,43 @@
  */
 
 module.exports = grunt => {
+
+    /**
+     * Generate the PHPCS configuration.
+     *
+     * @param {Object} thirdPartyPaths
+     */
+    const phpcsIgnore = (thirdPartyPaths) => {
+        const {toXML} = require('jstoxml');
+
+        const config = {
+            _name: 'ruleset',
+            _attrs: {
+                name: "MoodleCore",
+            },
+            _content: [
+                {
+                    rule: {
+                        _attrs: {
+                            ref: './.phpcs.xml.dist',
+                        },
+                    },
+                },
+            ],
+        };
+
+        thirdPartyPaths.forEach(library => {
+            config._content.push({
+                'exclude-pattern': library,
+            });
+        });
+
+        grunt.file.write('.phpcs.xml', toXML(config, {
+            header: true,
+            indent: '  ',
+        }) + "\n");
+    };
+
     /**
      * Generate ignore files (utilising thirdpartylibs.xml data)
      */
@@ -53,6 +90,8 @@ module.exports = grunt => {
             'admin/tool/componentlibrary/hugo/dist/css/docs.css',
         ].concat(thirdPartyPaths);
         grunt.file.write('.stylelintignore', stylelintIgnores.join('\n') + '\n');
+
+        phpcsIgnore(thirdPartyPaths);
     };
 
     grunt.registerTask('ignorefiles', 'Generate ignore files for linters', handler);

.phpcs.xml.dist

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset name="MoodleCore">
+  <rule ref="moodle"/>
+</ruleset>

.travis.yml

@@ -221,7 +221,7 @@ before_script:
         # We need the official upstream for comparison
         git remote add upstream https://github.com/moodle/moodle.git;
 
-        git fetch upstream master;
+        git fetch upstream MOODLE_400_STABLE;
         export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`";
         export GIT_COMMIT="$TRAVIS_COMMIT";
         export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD`

admin/index.php

@@ -53,6 +53,12 @@ if (!extension_loaded('xml')) {
     die();
 }
 
+// Make sure mbstring extension is available.
+if (!extension_loaded('mbstring')) {
+    echo 'Moodle requires the mbstring PHP extension. Please install or enable the mbstring extension.';
+    die();
+}
+
 define('NO_OUTPUT_BUFFERING', true);
 
 if (isset($_POST['upgradekey'])) {

admin/modules.php

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

admin/settings.php

@@ -33,8 +33,16 @@ if (!($settingspage->check_access())) {
     die;
 }
 
-$hassiteconfig = has_capability('moodle/site:config', $PAGE->context);
-if ($hassiteconfig) {
+// If the context in the admin_settingpage object is explicitly defined and it is not system, reset the current
+// page context and use that one instead. This ensures that the proper navigation is displayed and highlighted.
+if ($settingspage->context && !$settingspage->context instanceof \context_system) {
+    $PAGE->set_context($settingspage->context);
+}
+
+$hassiteconfig = has_capability('moodle/site:config', context_system::instance());
+// Display the admin search input element in the page header if the user has the capability to change the site
+// configuration and the current page context is system.
+if ($hassiteconfig && $PAGE->context instanceof \context_system) {
     $PAGE->add_header_action($OUTPUT->render_from_template('core_admin/header_search_input', [
         'action' => new moodle_url('/admin/search.php'),
     ]));
@@ -125,13 +133,6 @@ if (empty($SITE->fullname)) {
 
     $PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
     $PAGE->set_heading($SITE->fullname);
-    if ($section === 'frontpagesettings') {
-        $frontpagenode = $PAGE->settingsnav->find('frontpage', navigation_node::TYPE_SETTING);
-        $frontpagenode->make_active();
-        $PAGE->navbar->add(get_string('frontpage', 'admin'),
-            new moodle_url('/admin/category.php', ['category' => 'frontpage']));
-        $PAGE->navbar->add(get_string('frontpagesettings', 'admin'), $PAGE->url);
-    }
     echo $OUTPUT->header();
 
     if ($errormsg !== '') {

admin/settings/courses.php

@@ -88,6 +88,15 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $downloadcontentsitedefault->add_dependent_on('downloadcoursecontentallowed');
     $temp->add($downloadcontentsitedefault);
 
+    $temp->add(
+            new admin_setting_configtext(
+                'moodlecourse/participantsperpage',
+                new lang_string('participants:perpage', 'course'),
+                new lang_string('participants:perpage_help', 'course'),
+                20
+            )
+        );
+
     // Course format.
     $temp->add(new admin_setting_heading('courseformathdr', new lang_string('type_format', 'plugin'), ''));
 

admin/settings/security.php

@@ -151,7 +151,8 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $sensiblesettingsdefault .= 'dbpass@@enrol_database, bind_pw@@enrol_ldap, ';
     $sensiblesettingsdefault .= 'server_password@@search_solr, ssl_keypassword@@search_solr, ';
     $sensiblesettingsdefault .= 'alternateserver_password@@search_solr, alternatessl_keypassword@@search_solr, ';
-    $sensiblesettingsdefault .= 'test_password@@cachestore_redis, password@@mlbackend_python';
+    $sensiblesettingsdefault .= 'test_password@@cachestore_redis, password@@mlbackend_python, ';
+    $sensiblesettingsdefault .= 'badges_badgesalt@@none, calendar_exportsalt@@none';
     $temp->add(new admin_setting_configtextarea('adminpresets/sensiblesettings',
             get_string('sensiblesettings', 'core_adminpresets'),
             get_string('sensiblesettingstext', 'core_adminpresets'),

admin/tests/behat/filter_users.feature

@@ -18,6 +18,10 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
     And the following "cohorts" exist:
       | name | idnumber |
       | Cohort 1 | CH1 |
+    And the following "cohort members" exist:
+      | user  | cohort |
+      | user2 | CH1    |
+      | user3 | CH1    |
     And the following "courses" exist:
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
@@ -27,8 +31,6 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
       | user2 | C1 | student |
       | user3 | C1 | student |
     And I log in as "admin"
-    And I add "User Two (two@example.com)" user to "CH1" cohort members
-    And I add "User Three (three@example.com)" user to "CH1" cohort members
     And I navigate to "Users > Accounts > Browse list of users" in site administration
 
   Scenario: Filter user accounts by role and cohort

admin/tool/admin_presets/version.php

@@ -26,5 +26,5 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'tool_admin_presets';
-$plugin->version = 2021111100;
-$plugin->requires = 2021080500;
+$plugin->version = 2022041900;
+$plugin->requires = 2022041200;

admin/tool/analytics/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // 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 = 2021052500;
-$plugin->requires = 2021052500;
+$plugin->version = 2022041900;
+$plugin->requires = 2022041200;
 $plugin->component = 'tool_availabilityconditions';

admin/tool/behat/version.php

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

admin/tool/brickfield/lang/en/tool_brickfield.php

@@ -248,7 +248,7 @@ $string['printable:toolname'] = 'Summary report';
 $string['printable:toolshortname'] = 'Summary report';
 $string['printable:downloadpdf'] = 'Download PDF';
 $string['printable:printreport'] = 'Printable report';
-$string['error:nocoursespecified'] = 'This summary report requires a valid course id. Please access the accessibility toolkit from within a course, via the actions menu, which will then supply this required course id.';
+$string['error:nocoursespecified'] = 'The summary report requires a valid course ID. Please access the accessibility toolkit from within a course.';
 $string['pdf:filename'] = 'Brickfield_Summaryreport_CourseID-{$a}';
 
 // Advanced page.

admin/tool/brickfield/version.php

@@ -25,5 +25,5 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'tool_brickfield';
-$plugin->version = 2021052500;
-$plugin->requires = 2021042000;
+$plugin->version = 2022041900;
+$plugin->requires = 2022041200;

admin/tool/capability/version.php

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

admin/tool/cohortroles/db/upgrade.php

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

admin/tool/cohortroles/version.php

@@ -25,8 +25,8 @@
 defined('MOODLE_INTERNAL') || die();
 
 
-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_cohortroles'; // Full name of the plugin (used for diagnostics).
 
 $plugin->dependencies = array(

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   = 2021052501; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_componentlibrary';

admin/tool/customlang/db/upgrade.php

@@ -41,5 +41,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.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   = 2021052502;
-$plugin->requires  = 2021052500;
+$plugin->version   = 2022041900;
+$plugin->requires  = 2022041200;
 $plugin->component = 'tool_customlang'; // Full name of the plugin (used for diagnostics)

admin/tool/dataprivacy/db/upgrade.php

@@ -78,5 +78,8 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2020061501, 'tool', 'dataprivacy');
     }
 
+    // Automatically generated Moodle v4.0.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   = 2021052500;
-$plugin->requires  = 2021052500;
+$plugin->version   = 2022041900;
+$plugin->requires  = 2022041200;
 $plugin->component = 'tool_dataprivacy';

admin/tool/dbtransfer/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // 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 = 2021052500;
-$plugin->requires = 2021052500;
+$plugin->version = 2022041900;
+$plugin->requires = 2022041200;
 $plugin->component = 'tool_filetypes';

admin/tool/generator/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2021052500;
-$plugin->requires = 2021052500;
+$plugin->version = 2022041900;
+$plugin->requires = 2022041200;
 $plugin->component = 'tool_generator';

admin/tool/httpsreplace/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // 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   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // 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    = 2021052500;
-$plugin->requires   = 2021052500;
+$plugin->version    = 2022041900;
+$plugin->requires   = 2022041200;
 $plugin->maturity   = MATURITY_STABLE;

admin/tool/langimport/version.php

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

admin/tool/licensemanager/version.php

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

admin/tool/log/db/upgrade.php

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

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

@@ -46,5 +46,8 @@ function xmldb_logstore_database_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.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 = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2021052500; // Requires this Moodle version.
+$plugin->version = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2022041200; // Requires this Moodle version.
 $plugin->component = 'logstore_database'; // Full name of the plugin (used for diagnostics).

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

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

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

@@ -46,5 +46,8 @@ function xmldb_logstore_standard_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.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 = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2021052500; // Requires this Moodle version.
+$plugin->version = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2022041200; // 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 = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2021052500; // Requires this Moodle version.
+$plugin->version = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2022041200; // 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   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // 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   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_lpimportcsv'; // Full name of the plugin (used for diagnostics).
-$plugin->dependencies = array('tool_lp' => 2021052500);
+$plugin->dependencies = array('tool_lp' => 2022041200);
 

admin/tool/lpmigrate/version.php

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

admin/tool/messageinbound/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021052500;
-$plugin->requires  = 2021052500;
+$plugin->version   = 2022041900;
+$plugin->requires  = 2022041200;
 $plugin->component = 'tool_messageinbound';

admin/tool/mobile/db/upgrade.php

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

admin/tool/mobile/version.php

@@ -23,9 +23,9 @@
  */
 
 defined('MOODLE_INTERNAL') || die();
-$plugin->version   = 2021052501; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_mobile'; // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
-    'webservice_rest' => 2021052500
+    'webservice_rest' => 2022041200
 );

admin/tool/monitor/db/upgrade.php

@@ -45,5 +45,8 @@ function xmldb_tool_monitor_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.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   = 2021052500;     // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500;     // Requires this Moodle version.
+$plugin->version   = 2022041900;     // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200;     // Requires this Moodle version.
 $plugin->component = 'tool_monitor'; // Full name of the plugin (used for diagnostics).

admin/tool/moodlenet/db/upgrade.php

@@ -164,5 +164,8 @@ function xmldb_tool_moodlenet_upgrade(int $oldversion) {
         upgrade_plugin_savepoint(true, 2022021601, 'tool', 'moodlenet');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

admin/tool/moodlenet/lang/en/tool_moodlenet.php

@@ -58,9 +58,8 @@ $string['mnetprofiledesc'] = '<p>Enter your MoodleNet profile details here to be
 $string['moodlenetsettings'] = 'MoodleNet settings';
 $string['moodlenetnotenabled'] = 'The MoodleNet integration must be enabled in Site administration / MoodleNet before resource imports can be processed.';
 $string['notification'] = 'You are about to import the content "{$a->name} ({$a->type})" into your site. Select the course in which it should be added, or <a href="{$a->cancellink}">cancel</a>.';
-$string['removedmnetprofilenotification'] = '<p>Due to some recent changes on the MoodleNet platform, users that have previously saved their MoodleNet profile on the site can no longer use this data to authenticate on the MoodleNet platform. The related data has now been removed as it is no longer useful.</p>
-<p>The users will need to reset this information on the site by linking their MoodleNet profile ID which can be found on their MoodleNet profile.</p>';
-$string['removedmnetprofilenotification_subject'] = 'Linked MoodleNet profiles removed.';
+$string['removedmnetprofilenotification'] = 'Due to recent changes on the MoodleNet platform, any users who previously saved their MoodleNet profile ID on the site will need to enter a MoodleNet profile ID in the new format in order to authenticate on the MoodleNet platform.';
+$string['removedmnetprofilenotification_subject'] = 'MoodleNet profile ID format change';
 $string['searchcourses'] = "Search courses";
 $string['selectpagetitle'] = 'Select page';
 $string['pluginname'] = 'MoodleNet';

admin/tool/moodlenet/version.php

@@ -25,6 +25,6 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component  = 'tool_moodlenet';
-$plugin->version    = 2022021601;
-$plugin->requires   = 2021052500;
+$plugin->version    = 2022041900;
+$plugin->requires   = 2022041200;
 $plugin->maturity   = MATURITY_ALPHA;

admin/tool/multilangupgrade/version.php

@@ -25,7 +25,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // 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   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // 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   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_phpunit'; // Full name of the plugin (used for diagnostics)
 

admin/tool/policy/db/upgrade.php

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

admin/tool/policy/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021052500;         // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500;         // Requires this Moodle version.
+$plugin->version   = 2022041900;         // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200;         // 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   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // 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   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // 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   = 2021081600; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // 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   = 2021052500;
-$plugin->requires  = 2021052500;
+$plugin->version   = 2022041900;
+$plugin->requires  = 2022041200;
 $plugin->component = 'tool_spamcleaner'; // Full name of the plugin (used for diagnostics)
 

admin/tool/task/version.php

@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021052501; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_task'; // Full name of the plugin (used for diagnostics)
 

admin/tool/templatelibrary/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   = 2021052500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500; // Requires this Moodle version.
+$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_templatelibrary'; // Full name of the plugin (used for diagnostics).

admin/tool/unsuproles/version.php

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

admin/tool/uploadcourse/classes/course.php

@@ -44,6 +44,12 @@ class tool_uploadcourse_course {
     /** Outcome of the process: deleting the course */
     const DO_DELETE = 3;
 
+    /** @var array assignable roles. */
+    protected $assignableroles = [];
+
+    /** @var array Roles context levels. */
+    protected $contextlevels = [];
+
     /** @var array final import data. */
     protected $data = array();
 
@@ -794,16 +800,15 @@ class tool_uploadcourse_course {
 
         // Get enrolment data. Where the course already exists, we can also perform validation.
         $this->enrolmentdata = tool_uploadcourse_helper::get_enrolment_data($this->rawdata);
-        if ($exists) {
-            $errors = $this->validate_enrolment_data($coursedata['id'], $this->enrolmentdata);
+        $courseid = $coursedata['id'] ?? 0;
+        $errors = $this->validate_enrolment_data($courseid, $this->enrolmentdata);
 
-            if (!empty($errors)) {
-                foreach ($errors as $key => $message) {
-                    $this->error($key, $message);
-                }
-
-                return false;
+        if (!empty($errors)) {
+            foreach ($errors as $key => $message) {
+                $this->error($key, $message);
             }
+
+            return false;
         }
 
         if (isset($this->rawdata['tags']) && strval($this->rawdata['tags']) !== '') {
@@ -913,6 +918,8 @@ class tool_uploadcourse_course {
      * @return lang_string[] Errors keyed on error code
      */
     protected function validate_enrolment_data(int $courseid, array $enrolmentdata): array {
+        global $DB;
+
         // Nothing to validate.
         if (empty($enrolmentdata)) {
             return [];
@@ -924,46 +931,67 @@ class tool_uploadcourse_course {
         $instances = enrol_get_instances($courseid, false);
 
         foreach ($enrolmentdata as $method => $options) {
-            $plugin = $enrolmentplugins[$method];
 
-            // Find matching instances by enrolment method.
-            $methodinstances = array_filter($instances, static function(stdClass $instance) use ($method) {
-                return (strcmp($instance->enrol, $method) == 0);
-            });
+            if (isset($options['role'])) {
+                $role = $options['role'];
+                if ($courseid) {
+                    if (!$this->validate_role_context($courseid, $role)) {
+                        $errors['contextrolenotallowed'] = new lang_string('contextrolenotallowed', 'core_role', $role);
 
-            if (!empty($options['delete'])) {
-                // Ensure user is able to delete the instances.
-                foreach ($methodinstances as $methodinstance) {
-                    if (!$plugin->can_delete_instance($methodinstance)) {
-                        $errors['errorcannotdeleteenrolment'] = new lang_string('errorcannotdeleteenrolment', 'tool_uploadcourse',
-                            $plugin->get_instance_name($methodinstance));
+                        break;
+                    }
+                } else {
+                    // We can at least check that context level is correct while actual context not exist.
+                    $roleid = $DB->get_field('role', 'id', ['shortname' => $role], MUST_EXIST);
+                    if (!$this->validate_role_context_level($roleid)) {
+                        $errors['contextrolenotallowed'] = new lang_string('contextrolenotallowed', 'core_role', $role);
 
                         break;
                     }
                 }
-            } else if (!empty($options['disable'])) {
-                // Ensure user is able to toggle instance statuses.
-                foreach ($methodinstances as $methodinstance) {
-                    if (!$plugin->can_hide_show_instance($methodinstance)) {
-                        $errors['errorcannotdisableenrolment'] =
-                            new lang_string('errorcannotdisableenrolment', 'tool_uploadcourse',
+            }
+
+            if ($courseid) {
+                $plugin = $enrolmentplugins[$method];
+
+                // Find matching instances by enrolment method.
+                $methodinstances = array_filter($instances, static function (stdClass $instance) use ($method) {
+                    return (strcmp($instance->enrol, $method) == 0);
+                });
+
+                if (!empty($options['delete'])) {
+                    // Ensure user is able to delete the instances.
+                    foreach ($methodinstances as $methodinstance) {
+                        if (!$plugin->can_delete_instance($methodinstance)) {
+                            $errors['errorcannotdeleteenrolment'] = new lang_string('errorcannotdeleteenrolment',
+                                'tool_uploadcourse', $plugin->get_instance_name($methodinstance));
+                            break;
+                        }
+                    }
+                } else if (!empty($options['disable'])) {
+                    // Ensure user is able to toggle instance statuses.
+                    foreach ($methodinstances as $methodinstance) {
+                        if (!$plugin->can_hide_show_instance($methodinstance)) {
+                            $errors['errorcannotdisableenrolment'] =
+                                new lang_string('errorcannotdisableenrolment', 'tool_uploadcourse',
+                                    $plugin->get_instance_name($methodinstance));
+
+                            break;
+                        }
+                    }
+                } else {
+                    // Ensure user is able to create/update instance.
+                    $methodinstance = empty($methodinstances) ? null : reset($methodinstances);
+                    if ((empty($methodinstance) && !$plugin->can_add_instance($courseid)) ||
+                        (!empty($methodinstance) && !$plugin->can_edit_instance($methodinstance))) {
+
+                        $errors['errorcannotcreateorupdateenrolment'] =
+                            new lang_string('errorcannotcreateorupdateenrolment', 'tool_uploadcourse',
                                 $plugin->get_instance_name($methodinstance));
 
                         break;
                     }
                 }
-            } else {
-                // Ensure user is able to create/update instance.
-                $methodinstance = empty($methodinstances) ? null : reset($methodinstances);
-                if ((empty($methodinstance) && !$plugin->can_add_instance($courseid)) ||
-                        (!empty($methodinstance) && !$plugin->can_edit_instance($methodinstance))) {
-
-                    $errors['errorcannotcreateorupdateenrolment'] =
-                        new lang_string('errorcannotcreateorupdateenrolment', 'tool_uploadcourse',
-                            $plugin->get_instance_name($methodinstance));
-
-                    break;
-                }
             }
         }
 
@@ -1079,8 +1107,15 @@ class tool_uploadcourse_course {
                     $instance->enrolenddate = $instance->enrolstartdate;
                 }
 
-                // Sort out the given role. This does not filter the roles allowed in the course.
+                // Sort out the given role.
                 if (isset($method['role'])) {
+                    $role = $method['role'];
+                    if (!$this->validate_role_context($course->id, $role)) {
+                        $this->error('contextrolenotallowed',
+                            new lang_string('contextrolenotallowed', 'core_role', $role));
+                        break;
+                    }
+
                     $roleids = tool_uploadcourse_helper::get_role_ids();
                     if (isset($roleids[$method['role']])) {
                         $instance->roleid = $roleids[$method['role']];
@@ -1093,6 +1128,41 @@ class tool_uploadcourse_course {
         }
     }
 
+    /**
+     * Check if role is allowed in course context
+     *
+     * @param int $courseid course context.
+     * @param string $role Role.
+     * @return bool
+     */
+    protected function validate_role_context(int $courseid, string $role) : bool {
+        if (empty($this->assignableroles[$courseid])) {
+            $coursecontext = \context_course::instance($courseid);
+            $this->assignableroles[$courseid] = get_assignable_roles($coursecontext, ROLENAME_SHORT);
+        }
+        if (!in_array($role, $this->assignableroles[$courseid])) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Check if role is allowed at this context level.
+     *
+     * @param int $roleid Role ID.
+     * @return bool
+     */
+    protected function validate_role_context_level(int $roleid) : bool {
+        if (empty($this->contextlevels[$roleid])) {
+            $this->contextlevels[$roleid] = get_role_contextlevels($roleid);
+        }
+
+        if (!in_array(CONTEXT_COURSE, $this->contextlevels[$roleid])) {
+            return false;
+        }
+        return true;
+    }
+
     /**
      * Reset the current course.
      *

admin/tool/uploadcourse/classes/helper.php

@@ -325,6 +325,11 @@ class tool_uploadcourse_helper {
                     continue;
                 }
                 $rolenames['role_' . $rolesids[$matches[1]]] = $value;
+            } else if (preg_match('/^(.+)?_role$/', $field, $matches)) {
+                if (!isset($rolesids[$value])) {
+                    $invalidroles[] = $value;
+                    break;
+                }
             }
 
         }

admin/tool/uploadcourse/classes/processor.php

@@ -219,6 +219,10 @@ class tool_uploadcourse_processor {
 
                 $data = array_merge($data, $course->get_data(), array('id' => $course->get_id()));
                 $tracker->output($this->linenb, true, $status, $data);
+                if ($course->has_errors()) {
+                    $errors++;
+                    $tracker->output($this->linenb, false, $course->get_errors(), $data);
+                }
             } else {
                 $errors++;
                 $tracker->output($this->linenb, false, $course->get_errors(), $data);

admin/tool/uploadcourse/tests/behat/create.feature

@@ -105,3 +105,28 @@ Feature: An admin can create courses using a CSV file
     And I should see "Field 3: b"
     And I should see "Field 4: Hello"
     And I should see "Field 5: Some text"
+
+  @javascript
+  Scenario: Validation of role for uploaded courses
+    Given I navigate to "Users > Permissions > Define roles" in site administration
+    And I click on "Add a new role" "button"
+    And I click on "Continue" "button"
+    And I set the following fields to these values:
+      | Short name | notallowed |
+      | Custom full name | notallowed |
+      | contextlevel80 | 1 |
+    And I click on "Create this role" "button"
+    And I navigate to "Courses > Upload courses" in site administration
+    And I upload "admin/tool/uploadcourse/tests/fixtures/enrolment_role.csv" file to "File" filemanager
+    And I click on "Preview" "button"
+    And I should see "Invalid role names: notexist"
+    And I should see "Role notallowed not allowed in this context."
+    When I click on "Upload courses" "button"
+    And I should see "Course created"
+    And I should see "Courses total: 3"
+    And I should see "Courses created: 1"
+    And I should see "Courses errors: 2"
+    And I should see "Invalid role names: notexist"
+    And I should see "Role notallowed not allowed in this context."
+    And I am on site homepage
+    And I should see "coursez"

admin/tool/uploadcourse/tests/course_test.php

@@ -1561,6 +1561,94 @@ class course_test extends \advanced_testcase {
         $this->assertArrayHasKey('cannotrenameshortnamealreadyinuse', $co->get_errors());
     }
 
+    /**
+     * Test when role doesn't exist.
+     *
+     * @covers \tool_uploadcourse_course::prepare
+     */
+    public function test_role_not_exist() {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        $mode = tool_uploadcourse_processor::MODE_CREATE_NEW;
+        $updatemode = tool_uploadcourse_processor::UPDATE_NOTHING;
+
+        $upload = new tool_uploadcourse_course($mode, $updatemode, [
+            'category' => 1,
+            'fullname' => 'Testing',
+            'shortname' => 'T101',
+            'enrolment_1' => 'manual',
+            'enrolment_1_role' => 'notexist'
+        ]);
+
+        $this->assertFalse($upload->prepare());
+        $this->assertArrayHasKey('invalidroles', $upload->get_errors());
+    }
+
+    /**
+     * Test when role not allowed in course context.
+     *
+     * @covers \tool_uploadcourse_course::proceed
+     */
+    public function test_role_not_allowed() {
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        $roleid = create_role('New student role', 'student2', 'New student description', 'student');
+        set_role_contextlevels($roleid, [CONTEXT_BLOCK]);
+
+        $mode = tool_uploadcourse_processor::MODE_CREATE_NEW;
+        $updatemode = tool_uploadcourse_processor::UPDATE_NOTHING;
+
+        $upload = new tool_uploadcourse_course($mode, $updatemode, [
+            'category' => 1,
+            'fullname' => 'Testing',
+            'shortname' => 'T101',
+            'enrolment_1' => 'manual',
+            'enrolment_1_role' => 'student2'
+        ]);
+
+        $this->assertFalse($upload->prepare());
+        $this->assertArrayHasKey('contextrolenotallowed', $upload->get_errors());
+    }
+
+    /**
+     * Test when role is allowed.
+     *
+     * @covers \tool_uploadcourse_course::proceed
+     */
+    public function test_role_allowed() {
+        global $DB;
+
+        $this->resetAfterTest();
+        $this->setAdminUser();
+
+        $mode = tool_uploadcourse_processor::MODE_UPDATE_ONLY;
+        $updatemode = tool_uploadcourse_processor::UPDATE_MISSING_WITH_DATA_OR_DEFAUTLS;
+
+        $course = $this->getDataGenerator()->create_course([
+            'shortname' => 'c1',
+        ]);
+
+        $instances = enrol_get_instances($course->id, true);
+        $studentrole = $DB->get_record('role', ['shortname' => 'student']);
+        $teacherrole = $DB->get_record('role', ['shortname' => 'teacher']);
+        $instance = reset($instances);
+        $this->assertEquals($studentrole->id, $instance->roleid);
+
+        $upload = new tool_uploadcourse_course($mode, $updatemode, [
+            'shortname' => 'c1',
+            'enrolment_1' => 'manual',
+            'enrolment_1_role' => 'teacher'
+        ]);
+
+        $this->assertTrue($upload->prepare());
+        $upload->proceed();
+        $instances = enrol_get_instances($course->id, true);
+        $instance = reset($instances);
+        $this->assertEquals($teacherrole->id, $instance->roleid);
+    }
+
     /**
      * Get custom field plugin generator
      *

admin/tool/uploadcourse/tests/fixtures/enrolment_role.csv

@@ -0,0 +1,4 @@
+shortname,fullname,category,enrolment_1,enrolment_1_role
+CX,coursex,1,manual,notexist
+CY,coursey,1,manual,notallowed
+CZ,coursez,1,manual,student

admin/tool/uploadcourse/version.php

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

admin/tool/uploaduser/version.php

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

admin/tool/usertours/db/upgrade.php

@@ -129,5 +129,8 @@ function xmldb_tool_usertours_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2022040602, 'tool', 'usertours');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

admin/tool/usertours/styles.css

@@ -31,6 +31,7 @@ body div[data-flexitour="step-background-fader"],
 body div[data-flexitour="step-background"] {
     position: absolute;
     background: inherit;
+    background-image: none;
 }
 
 div[data-flexitour="step-background-fader"],

admin/tool/usertours/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2022040602;            // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500;            // Requires this Moodle version.
+$plugin->version   = 2022041900;            // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200;            // Requires this Moodle version.
 $plugin->component = 'tool_usertours';      // Full name of the plugin (used for diagnostics).

admin/tool/xmldb/version.php

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

admin/upgrade.txt

@@ -1,5 +1,12 @@
 This files describes API changes in /admin/*.
 
+=== 4.0.1 ===
+
+* A new callback xxx_pre_enable_plugin_actions has been added in admin/modules.php. Plugins can use this callback to
+  force additional actions (e.g. displaying notifications, modals, etc.) before enabling the plugin. The expected
+  return value (bool) from the plugin callback method specifies whether the process of enabling the plugin should
+  continue after the added actions or not.
+
 === 3.11 ===
 
 * New admin setting admin_setting_encryptedpassword allows passwords in admin settings to be

auth/cas/db/upgrade.php

@@ -52,5 +52,8 @@ function xmldb_auth_cas_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2021052501, 'auth', 'cas');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

auth/cas/version.php

@@ -26,8 +26,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021052501;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500;        // Requires this Moodle version.
+$plugin->version   = 2022041900;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200;        // Requires this Moodle version.
 $plugin->component = 'auth_cas';        // Full name of the plugin (used for diagnostics)
 
-$plugin->dependencies = array('auth_ldap' => 2021052500);
+$plugin->dependencies = array('auth_ldap' => 2022041200);

auth/db/db/upgrade.php

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

auth/db/version.php

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

auth/email/db/upgrade.php

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

auth/email/version.php

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

auth/ldap/db/upgrade.php

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

auth/ldap/version.php

@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021052501;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500;        // Requires this Moodle version.
+$plugin->version   = 2022041900;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200;        // Requires this Moodle version.
 $plugin->component = 'auth_ldap';       // Full name of the plugin (used for diagnostics)

auth/lti/db/upgrade.php

@@ -85,5 +85,8 @@ function xmldb_auth_lti_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2022030900, 'auth', 'lti');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

auth/lti/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2022030900; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2021052500; // Requires this Moodle version.
+$plugin->version = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2022041200; // Requires this Moodle version.
 $plugin->component = 'auth_lti'; // Full name of the plugin (used for diagnostics).

auth/manual/db/upgrade.php

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

auth/manual/version.php

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

auth/mnet/db/upgrade.php

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

auth/mnet/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021071200;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500;        // Requires this Moodle version.
+$plugin->version   = 2022041900;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200;        // Requires this Moodle version.
 $plugin->component = 'auth_mnet';       // Full name of the plugin (used for diagnostics)

auth/nologin/version.php

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

auth/none/db/upgrade.php

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

auth/none/version.php

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

auth/oauth2/db/upgrade.php

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

auth/oauth2/version.php

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

auth/shibboleth/db/upgrade.php

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

auth/shibboleth/version.php

@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021052501;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2021052500;        // Requires this Moodle version.
+$plugin->version   = 2022041900;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2022041200;        // Requires this Moodle version.
 $plugin->component = 'auth_shibboleth'; // Full name of the plugin (used for diagnostics)

auth/tests/behat/loginform.feature

@@ -17,7 +17,8 @@ Feature: Test if the login form provides the correct feedback
     Then I should see "Invalid login, please try again"
 
   Scenario: Test login language selector
-    Given I log in as "admin"
+    Given remote langimport tests are enabled
+    And I log in as "admin"
     And I navigate to "Language > Language packs" in site administration
     And I set the field "Available language packs" to "nl,es"
     And I press "Install selected language pack(s)"

auth/webservice/version.php

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

availability/condition/completion/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2021052500;
-$plugin->requires = 2021052500;
+$plugin->version = 2022041900;
+$plugin->requires = 2022041200;
 $plugin->component = 'availability_completion';

availability/condition/date/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2021052500;
-$plugin->requires = 2021052500;
+$plugin->version = 2022041900;
+$plugin->requires = 2022041200;
 $plugin->component = 'availability_date';