Merge branch 'MDL-74417-manage-sesskeys' of https://github.com/bwalkerl/moodle

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

@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 if ($hassiteconfig) {
-    $testurl = new moodle_url('/admin/tool/log/store/database/test_settings.php', array('sesskey' => sesskey()));
+    $testurl = new moodle_url('/admin/tool/log/store/database/test_settings.php');
     $test = new admin_externalpage('logstoredbtestsettings', get_string('testsettings', 'logstore_database'),
         $testurl, 'moodle/site:config', true);
     $ADMIN->add('logging', $test);

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

@@ -25,8 +25,6 @@
 require_once('../../../../../config.php');
 require_once($CFG->dirroot . '/lib/adminlib.php');
 
-require_sesskey();
-
 navigation_node::override_active_url(new moodle_url('/admin/settings.php', array('section' => 'logsettingdatabase')));
 admin_externalpage_setup('logstoredbtestsettings');
 

auth/test_settings.php

@@ -56,7 +56,7 @@ if (!$auth) {
 
     echo $OUTPUT->heading(get_string('testsettings', 'core_auth'));
 
-    $url = new moodle_url('/auth/test_settings.php', array('sesskey'=>sesskey()));
+    $url = new moodle_url('/auth/test_settings.php');
     echo $OUTPUT->single_select($url, 'auth', $options);
 
     echo $OUTPUT->footer();

auth/upgrade.txt

@@ -1,6 +1,10 @@
 This files describes API changes in /auth/* - plugins,
 information provided here is intended especially for developers.
 
+=== 4.4 ===
+
+* A sesskey is no longer passed to the auth/test_settings.php page so it can no longer be required in test_settings().
+
 === 4.2 ===
 * Support for configuration with the deprecated auth_config.php file has been removed.
 * The moodle-auth-passwordunmask YUI module has been removed. Any uses should be replaced with core_form/passwordunmask.

enrol/test_settings.php

@@ -56,7 +56,7 @@ if (!$enrol) {
 
     echo $OUTPUT->heading(get_string('testsettings', 'core_enrol'));
 
-    $url = new moodle_url('/enrol/test_settings.php', array('sesskey'=>sesskey()));
+    $url = new moodle_url('/enrol/test_settings.php');
     echo $OUTPUT->single_select($url, 'enrol', $options);
 
     echo $OUTPUT->footer();

enrol/upgrade.txt

@@ -10,6 +10,7 @@ information provided here is intended especially for developers.
  id in mod_lti_enrol table. Such plugins should not be supported in CSV course upload. The exception is self enrolment
  plugin since it is already supported in CSV course upload. For self enrolment plugin, find_instance() returns first
  available instance in the course.
+* A sesskey is no longer passed to the enrol/test_settings.php page so it can no longer be required in test_settings().
 
 === 4.3 ===
 

lib/adminlib.php

@@ -6845,7 +6845,7 @@ class admin_setting_manageenrols extends admin_setting {
 
             $test = '';
             if (!empty($enrols_available[$enrol]) and method_exists($enrols_available[$enrol], 'test_settings')) {
-                $testsettingsurl = new moodle_url('/enrol/test_settings.php', array('enrol'=>$enrol, 'sesskey'=>sesskey()));
+                $testsettingsurl = new moodle_url('/enrol/test_settings.php', ['enrol' => $enrol]);
                 $test = html_writer::link($testsettingsurl, $strtest);
             }
 
@@ -7384,7 +7384,7 @@ class admin_setting_manageauths extends admin_setting {
 
             $test = '';
             if (!empty($authplugins[$auth]) and method_exists($authplugins[$auth], 'test_settings')) {
-                $testurl = new moodle_url('/auth/test_settings.php', array('auth'=>$auth, 'sesskey'=>sesskey()));
+                $testurl = new moodle_url('/auth/test_settings.php', ['auth' => $auth]);
                 $test = html_writer::link($testurl, $txt->testsettings);
             }
 

lib/upgrade.txt

@@ -13,6 +13,7 @@ information provided here is intended especially for developers.
 * Behat generators can now implement the function finish_generate_ to detect when the whole list of elements have been generated.
 * New return value 'icon' has been added to the 'external_files' webservice structure. This return value represents the
   relative path to the relevant file type icon based on the file's mime type.
+* Removed the sesskey passed from manageauths and manageenrols to their respective test_settings.php pages.
 
 === 4.3 ===