Moodle release 3.3rc2

WS get_attempts_overview was failing when there weren’t attempts in the
given assignment.

.eslintignore

@@ -9,7 +9,6 @@ auth/cas/CAS/
 auth/fc/fcFPP.php
 enrol/lti/ims-blti/
 filter/algebra/AlgParser.pm
-filter/mathjaxloader/contrib/a11y/
 filter/tex/mimetex.*
 lib/editor/atto/yui/src/rangy/js/*.*
 lib/editor/tinymce/plugins/pdw/tinymce/

.stylelintignore

@@ -10,7 +10,6 @@ auth/cas/CAS/
 auth/fc/fcFPP.php
 enrol/lti/ims-blti/
 filter/algebra/AlgParser.pm
-filter/mathjaxloader/contrib/a11y/
 filter/tex/mimetex.*
 lib/editor/atto/yui/src/rangy/js/*.*
 lib/editor/tinymce/plugins/pdw/tinymce/

admin/environment.xml

@@ -2004,6 +2004,7 @@
       <PHP_EXTENSION name="json" level="required">
       </PHP_EXTENSION>
       <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
     </PHP_EXTENSIONS>
     <PHP_SETTINGS>
       <PHP_SETTING name="memory_limit" value="96M" level="required">

admin/registration/forms.php

@@ -422,12 +422,12 @@ class site_registration_form extends moodleform {
             $mform->addElement('checkbox', 'badges', '',
                     " " . get_string('badgesnumber', 'hub', $badges));
             $mform->setDefault('badges', $badgesnumber != -1);
-            $mform->setType('resources', PARAM_INT);
+            $mform->setType('badges', PARAM_INT);
 
             $mform->addElement('checkbox', 'issuedbadges', '',
                     " " . get_string('issuedbadgesnumber', 'hub', $issuedbadges));
             $mform->setDefault('issuedbadges', $issuedbadgesnumber != -1);
-            $mform->setType('resources', PARAM_INT);
+            $mform->setType('issuedbadges', PARAM_INT);
 
             $mform->addElement('checkbox', 'participantnumberaverage', '',
                     " " . get_string('participantnumberaverage', 'hub', $participantnumberaverage));

admin/tool/assignmentupgrade/version.php

@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2016120500;
-$plugin->requires  = 2016112900;
+$plugin->version   = 2017051500;
+$plugin->requires  = 2017050500;
 $plugin->component = 'tool_assignmentupgrade';
-$plugin->dependencies = array('mod_assign' => 2016112900);
+$plugin->dependencies = array('mod_assign' => 2017050500);

admin/tool/availabilityconditions/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2016120500;
-$plugin->requires = 2016112900;
+$plugin->version = 2017051500;
+$plugin->requires = 2017050500;
 $plugin->component = 'tool_availabilityconditions';

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

@@ -58,30 +58,51 @@ Feature: Verify that all form fields values can be get and set
     # Select (multi-select) - Checking "I set the field".
     And I navigate to "Edit settings" in current page administration
     And I expand all fieldsets
-    # Checkbox - Checking "I set the field".
-    And I set the field "Display description on course page" to "1"
-    # Checkbox - Checking "I set the following fields to these values:".
-    And I set the following fields to these values:
-      | Force format | 1 |
-    # Checkbox - Checking "the field matches value" and "the field does not match value".
-    And the field "Display description on course page" matches value "1"
-    And the field "Display description on course page" does not match value ""
+    # Checkbox - Checking "I set the field" and "The field matches value" ticked.
+    And I set the field "Force format" to "1"
     And I press "Save and return to course"
     And I should see "Test this one"
     And I follow "Test this one"
     And I navigate to "Edit settings" in current page administration
-    # Checkbox - Checking "the field matches value" and "the following fields match these values".
-    And the following fields match these values:
-      | Display description on course page | 1 |
-      | Default format | HTML |
-      | Wiki name | Test this one |
+    And I expand all fieldsets
     And the field "Force format" matches value "1"
+    And the field "Force format" does not match value ""
+    # Checkbox - Checking "I set the field" and "The field matches value" unticked.
+    And I set the field "Force format" to ""
+    And I press "Save and return to course"
+    And I should see "Test this one"
+    And I follow "Test this one"
+    And I navigate to "Edit settings" in current page administration
+    And I expand all fieldsets
+    And the field "Force format" matches value ""
+    And the field "Force format" does not match value "1"
+    # Checkbox - Checking "I set the following fields to these values:" and "The following fields match these values" ticked.
+    And I set the following fields to these values:
+      | Force format | 1 |
+    And I press "Save and return to course"
+    And I should see "Test this one"
+    And I follow "Test this one"
+    And I navigate to "Edit settings" in current page administration
+    And I expand all fieldsets
+    And the following fields match these values:
+      | Force format | 1 |
+    And the following fields do not match these values:
+      | Force format | |
+    # Checkbox - Checking "I set the following fields to these values:" and "The following fields match these values" unticked.
+    And I set the following fields to these values:
+      | Force format | |
+    And I press "Save and return to course"
+    And I should see "Test this one"
+    And I follow "Test this one"
+    And I navigate to "Edit settings" in current page administration
+    And I expand all fieldsets
+    And the following fields match these values:
+      | Force format | |
+    And the following fields do not match these values:
+      | Force format | 1 |
     # Select (simple) - Checking "I set the following fields to these values:".
     And I set the following fields to these values:
       | Default format | NWiki |
-      | Display description on course page | |
-    # Checkbox - Checking "I set the field" to uncheck.
-    And I set the field "Force format" to ""
     # Select (simple) - Checking "I set the field".
     And I set the field "Group mode" to "Separate groups"
     And I press "Save and display"
@@ -89,13 +110,10 @@ Feature: Verify that all form fields values can be get and set
     And the following fields match these values:
       | Default format | NWiki |
       | Group mode | Separate groups |
-      | Display description on course page | |
-      | Force format | |
     # All fields - Checking "the following fields do not match these values".
     And the following fields do not match these values:
       | Wiki name | Test this one baby |
       | Default format | HTML |
-      | Force format | 1 |
     And I press "Cancel"
     And I am on "Course 1" course homepage
     # Radio - Checking "I set the field" and "the field matches value".
@@ -154,3 +172,45 @@ Feature: Verify that all form fields values can be get and set
     And the "available[day]" "field" should be enabled
     And the field "deadline[enabled]" matches value "1"
     And I press "Cancel"
+    # Advanced checkbox requires real browser to allow uncheck to work. MDL-58681. MDL-55386.
+    # Advanced checkbox - Checking "I set the field" and "The field matches value" ticked.
+    And I am on "Course 1" course homepage
+    And I follow "Test this one"
+    And I navigate to "Edit settings" in current page administration
+    And I set the field "Display description on course page" to "1"
+    And I press "Save and return to course"
+    And I should see "Test this one"
+    And I follow "Test this one"
+    And I navigate to "Edit settings" in current page administration
+    And the field "Display description on course page" matches value "1"
+    And the field "Display description on course page" does not match value ""
+    # Advanced checkbox - Checking "I set the field" and "The field matches value" unticked.
+    And I set the field "Display description on course page" to ""
+    And I press "Save and return to course"
+    And I should see "Test this one"
+    And I follow "Test this one"
+    And I navigate to "Edit settings" in current page administration
+    And the field "Display description on course page" matches value ""
+    And the field "Display description on course page" does not match value "1"
+    # Advanced checkbox - Checking "I set the following fields to these values:" and "The following fields match these values" ticked.
+    And I set the following fields to these values:
+      | Display description on course page | 1 |
+    And I press "Save and return to course"
+    And I should see "Test this one"
+    And I follow "Test this one"
+    And I navigate to "Edit settings" in current page administration
+    And the following fields match these values:
+      | Display description on course page | 1 |
+    And the following fields do not match these values:
+      | Display description on course page | |
+    # Advanced checkbox - Checking "I set the following fields to these values:" and "The following fields match these values" unticked.
+    And I set the following fields to these values:
+      | Display description on course page | |
+    And I press "Save and return to course"
+    And I should see "Test this one"
+    And I follow "Test this one"
+    And I navigate to "Edit settings" in current page administration
+    And the following fields match these values:
+      | Display description on course page | |
+    And the following fields do not match these values:
+      | Display description on course page | 1 |

admin/tool/behat/version.php

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

admin/tool/capability/version.php

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

admin/tool/cohortroles/version.php

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

admin/tool/customlang/version.php

@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2016120500;
-$plugin->requires  = 2016112900;
+$plugin->version   = 2017051500;
+$plugin->requires  = 2017050500;
 $plugin->component = 'tool_customlang'; // Full name of the plugin (used for diagnostics)

admin/tool/dbtransfer/version.php

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

admin/tool/generator/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2016120500;
-$plugin->requires = 2016112900;
+$plugin->version = 2017051500;
+$plugin->requires = 2017050500;
 $plugin->component = 'tool_generator';

admin/tool/health/version.php

@@ -25,8 +25,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2016120500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2016112900; // Requires this Moodle version
+$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017050500; // Requires this Moodle version
 $plugin->component = 'tool_health'; // Full name of the plugin (used for diagnostics)
 
 $plugin->maturity  = MATURITY_ALPHA; // this version's maturity level

admin/tool/innodb/version.php

@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2016120500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2016112900; // Requires this Moodle version
+$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017050500; // 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    = 2016120500;
-$plugin->requires   = 2016112900;
+$plugin->version    = 2017051500;
+$plugin->requires   = 2017050500;
 $plugin->maturity   = MATURITY_STABLE;

admin/tool/langimport/version.php

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

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

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

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

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

admin/tool/lp/templates/comment_area.mustache

@@ -30,7 +30,7 @@
     * autostart
     * canpost
     * cid
-    * collapsediconurl
+    * collapsediconkey
     * commentarea
     * component
     * contextid

admin/tool/lp/version.php

@@ -25,6 +25,6 @@
 defined('MOODLE_INTERNAL') || die();
 
 
-$plugin->version   = 2016120500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2016112900; // Requires this Moodle version.
+$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017050500; // 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   = 2016120500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2016112900; // Requires this Moodle version.
+$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017050500; // Requires this Moodle version.
 $plugin->component = 'tool_lpimportcsv'; // Full name of the plugin (used for diagnostics).
-$plugin->dependencies = array('tool_lp' => 2016112900);
+$plugin->dependencies = array('tool_lp' => 2017050500);
 

admin/tool/lpmigrate/version.php

@@ -24,8 +24,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2016120500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2016112900; // Requires this Moodle version.
+$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017050500; // 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   = 2016120500;
-$plugin->requires  = 2016112900;
+$plugin->version   = 2017051500;
+$plugin->requires  = 2017050500;
 $plugin->component = 'tool_messageinbound';

admin/tool/mobile/classes/api.php

@@ -149,12 +149,8 @@ class api {
         // Check if the user can sign-up to return the launch URL in that case.
         $cansignup = signup_is_enabled();
 
-        if ($typeoflogin == self::LOGIN_VIA_BROWSER or
-                $typeoflogin == self::LOGIN_VIA_EMBEDDED_BROWSER or
-                $cansignup) {
-            $url = new moodle_url("/$CFG->admin/tool/mobile/launch.php");
-            $settings['launchurl'] = $url->out(false);
-        }
+        $url = new moodle_url("/$CFG->admin/tool/mobile/launch.php");
+        $settings['launchurl'] = $url->out(false);
 
         if ($logourl = $OUTPUT->get_logo_url()) {
             $settings['logourl'] = $logourl->out(false);

admin/tool/mobile/classes/external.php

@@ -147,7 +147,7 @@ class external extends external_api {
                 'logourl' => new external_value(PARAM_URL, 'The site logo URL', VALUE_OPTIONAL),
                 'compactlogourl' => new external_value(PARAM_URL, 'The site compact logo URL', VALUE_OPTIONAL),
                 'typeoflogin' => new external_value(PARAM_INT, 'The type of login. 1 for app, 2 for browser, 3 for embedded.'),
-                'launchurl' => new external_value(PARAM_URL, 'SSO login launch URL. Empty if it won\'t be used.', VALUE_OPTIONAL),
+                'launchurl' => new external_value(PARAM_URL, 'SSO login launch URL.', VALUE_OPTIONAL),
                 'mobilecssurl' => new external_value(PARAM_URL, 'Mobile custom CSS theme', VALUE_OPTIONAL),
                 'tool_mobile_disabledfeatures' => new external_value(PARAM_RAW, 'Disabled features in the app', VALUE_OPTIONAL),
                 'identityproviders' => new external_multiple_structure(

admin/tool/mobile/tests/externallib_test.php

@@ -85,6 +85,7 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase {
             'typeoflogin' => api::LOGIN_VIA_APP,
             'mobilecssurl' => '',
             'tool_mobile_disabledfeatures' => '',
+            'launchurl' => "$CFG->wwwroot/$CFG->admin/tool/mobile/launch.php",
             'warnings' => array()
         );
         $this->assertEquals($expected, $result);
@@ -101,7 +102,6 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase {
         $expected['registerauth'] = 'email';
         $expected['authinstructions'] = $authinstructions;
         $expected['typeoflogin'] = api::LOGIN_VIA_BROWSER;
-        $expected['launchurl'] = "$CFG->wwwroot/$CFG->admin/tool/mobile/launch.php";
 
         if ($logourl = $OUTPUT->get_logo_url()) {
             $expected['logourl'] = $logourl->out(false);

admin/tool/mobile/version.php

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

admin/tool/monitor/version.php

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

admin/tool/multilangupgrade/version.php

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

admin/tool/oauth2/lang/en/tool_oauth2.php

@@ -29,7 +29,7 @@ $string['configured'] = 'Configured';
 $string['configuredstatus'] = 'Configured';
 $string['connectsystemaccount'] = 'Connect to a system account';
 $string['createfromtemplate'] = 'Create an OAuth 2 service from a template';
-$string['createfromtemplatedesc'] = 'Choose one of the OAuth 2 service template below to create an OAuth service with a valid configuration for one of the known service types. This will create the OAuth 2 service, with all the correct end points and parameters required for authentication, but you will still need to enter the client ID and secret for the new service before it can be used.';
+$string['createfromtemplatedesc'] = 'Choose one of the OAuth 2 service templates below to create an OAuth service with a valid configuration for one of the known service types. This will create the OAuth 2 service, with all the correct end points and parameters required for authentication, though you will still need to enter the client ID and secret for the new service before it can be used.';
 $string['createnewendpoint'] = 'Create new endpoint for issuer "{$a}"';
 $string['createnewfacebookissuer'] = 'Create new Facebook service';
 $string['createnewgoogleissuer'] = 'Create new Google service';
@@ -39,7 +39,7 @@ $string['createnewuserfieldmapping'] = 'Create new user field mapping for issuer
 $string['deleteconfirm'] = 'Are you sure you want to delete the identity issuer "{$a}"? Any plugins relying on this issuer will stop working.';
 $string['deleteendpointconfirm'] = 'Are you sure you want to delete the endpoint "{$a->endpoint}" for issuer "{$a->issuer}"? Any plugins relying on this endpoint will stop working.';
 $string['deleteuserfieldmappingconfirm'] = 'Are you sure you want to delete the user field mapping for issuer "{$a}"?';
-$string['discovered_help'] = 'Discovery means that the OAuth2 endpoints could be automatically determined from the base url for the OAuth service. Not all services are required to be "discovered", but if they are not, then the endpoints and user mapping information will need to be entered manually.';
+$string['discovered_help'] = 'Discovery means that the OAuth 2 endpoints could be automatically determined from the base URL for the OAuth service. Not all services are required to be "discovered", but if they are not, then the endpoints and user mapping information will need to be entered manually.';
 $string['discovered'] = 'Service discovery successful';
 $string['discoverystatus'] = 'Discovery';
 $string['editendpoint'] = 'Edit endpoint: {$a->endpoint} for issuer {$a->issuer}';
@@ -52,25 +52,25 @@ $string['endpointname_help'] = 'Key used to search for this endpoint. Must end w
 $string['endpointname'] = 'Name';
 $string['endpointsforissuer'] = 'Endpoints for issuer: {$a}';
 $string['endpointurl_help'] = 'URL for this endpoint. Must use https:// protocol.';
-$string['endpointurl'] = 'Url';
-$string['issuersetup'] = 'Detailed instructions on configuring the common OAuth 2 Services';
+$string['endpointurl'] = 'URL';
+$string['issuersetup'] = 'Detailed instructions on configuring the common OAuth 2 services';
 $string['issuersetuptype'] = 'Detailed instructions on setting up the {$a} OAuth 2 provider';
 $string['issueralloweddomains_help'] = 'If set, this setting is a comma separated list of domains that logins will be restricted to when using this provider.';
 $string['issueralloweddomains_link'] = 'OAuth_2_login_domains';
 $string['issueralloweddomains'] = 'Login domains';
-$string['issuerbaseurl_help'] = 'Base url used to access the service.';
-$string['issuerbaseurl'] = 'Service base url';
-$string['issuerclientid'] = 'Client Id';
+$string['issuerbaseurl_help'] = 'Base URL used to access the service.';
+$string['issuerbaseurl'] = 'Service base URL';
+$string['issuerclientid'] = 'Client ID';
 $string['issuerclientid_help'] = 'The OAuth client ID for this issuer.';
-$string['issuerclientsecret'] = 'Client Secret';
+$string['issuerclientsecret'] = 'Client secret';
 $string['issuerclientsecret_help'] = 'The OAuth client secret for this issuer.';
 $string['issuerdeleted'] = 'Identity issuer deleted';
 $string['issuerdisabled'] = 'Identity issuer disabled';
 $string['issuerenabled'] = 'Identity issuer enabled';
-$string['issuerimage_help'] = 'An image url used to show a logo for this issuer. May be displayed on login page.';
+$string['issuerimage_help'] = 'An image URL used to show a logo for this issuer. May be displayed on login page.';
 $string['issuerimage'] = 'Logo URL';
 $string['issuerloginparams'] = 'Additional parameters included in a login request.';
-$string['issuerloginparams_help'] = 'Some systems require additional parameters for a login request in order to read the users basic profile.';
+$string['issuerloginparams_help'] = 'Some systems require additional parameters for a login request in order to read the user\'s basic profile.';
 $string['issuerloginparamsoffline'] = 'Additional parameters included in a login request for offline access.';
 $string['issuerloginparamsoffline_help'] = 'Each OAuth system defines a different way to request offline access. E.g. Google requires the additional params: "access_type=offline&prompt=consent" these parameters should be in url query parameter format.';
 $string['issuerloginscopes_help'] = 'Some systems require additional scopes for a login request in order to read the users basic profile. The standard scopes for an OpenID Connect compliant system are "openid profile email".';
@@ -79,14 +79,14 @@ $string['issuerloginscopesoffline'] = 'Scopes included in a login request for of
 $string['issuerloginscopes'] = 'Scopes included in a login request.';
 $string['issuername_help'] = 'Name of the identity issuer. May be displayed on login page.';
 $string['issuername'] = 'Name';
-$string['issuershowonloginpage_help'] = 'If the OpenID Connect Authentication plugin is enabled, this login issuer will be listed on the login page to allow users to login with accounts from this issuer.';
+$string['issuershowonloginpage_help'] = 'If the OpenID Connect Authentication plugin is enabled, this login issuer will be listed on the login page to allow users to log in with accounts from this issuer.';
 $string['issuershowonloginpage'] = 'Show on login page.';
 $string['issuers'] = 'Issuers';
 $string['loginissuer'] = 'Allow login';
 $string['notconfigured'] = 'Not configured';
 $string['notdiscovered'] = 'Service discovery not successful';
 $string['notloginissuer'] = 'Do not allow login';
-$string['pluginname'] = 'OAuth 2 Services';
+$string['pluginname'] = 'OAuth 2 services';
 $string['savechanges'] = 'Save changes';
 $string['serviceshelp'] = 'Service provider setup instructions.';
 $string['systemaccountconnected_help'] = 'System accounts are used to provide advanced functionality for plugins. They are not required for login functionality only, but other plugins using the OAuth service may offer a reduced set of features if the system account has not been connected. For example repositories cannot support "controlled links" without a system account to perform file operations.';

admin/tool/oauth2/version.php

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

admin/tool/profiling/version.php

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

admin/tool/replace/version.php

@@ -25,8 +25,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2016120500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2016112900; // Requires this Moodle version
+$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017050500; // Requires this Moodle version
 $plugin->component = 'tool_replace'; // Full name of the plugin (used for diagnostics)
 
 $plugin->maturity  = MATURITY_ALPHA; // this version's maturity level

admin/tool/spamcleaner/version.php

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

admin/tool/uploadcourse/tests/course_test.php

@@ -246,7 +246,7 @@ class tool_uploadcourse_course_testcase extends advanced_testcase {
             'visible' => '0',
             'idnumber' => '123abc',
             'summary' => 'Summary',
-            'format' => 'weeks',
+            'format' => 'topics',
             'theme' => 'afterburner',
             'lang' => 'en',
             'newsitems' => '7',
@@ -457,7 +457,7 @@ class tool_uploadcourse_course_testcase extends advanced_testcase {
             'enddate' => 645667200,
             'idnumber' => '123abc',
             'summary' => 'Summary',
-            'format' => 'weeks',
+            'format' => 'topics',
             'theme' => 'afterburner',
             'lang' => 'en',
             'newsitems' => '7',

admin/tool/uploadcourse/version.php

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

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

@@ -140,7 +140,7 @@ $string['tour_resetforall'] = 'The state of the tour has been reset. It will be
 
 // Boost - administrator tour.
 $string['tour1_title_welcome'] = 'Welcome';
-$string['tour1_content_welcome'] = 'Welcome to the Boost theme for Moodle 3.2. If you\'ve used Moodle before you might find some things look a bit different.';
+$string['tour1_content_welcome'] = 'Welcome to the Boost theme. If you\'ve upgraded from an earlier version, you might find some things look a bit different with this theme.';
 $string['tour1_title_navigation'] = 'Navigation';
 $string['tour1_content_navigation'] = 'Major navigation is now through this nav drawer. The contents update depending on where you are in the site. Use the button at the top to hide or show it.';
 $string['tour1_title_customisation'] = 'Customisation';
@@ -150,11 +150,11 @@ $string['tour1_content_blockregion'] = 'There is still a block region over here.
 $string['tour1_title_addingblocks'] = 'Adding blocks';
 $string['tour1_content_addingblocks'] = 'In fact, think carefully about including any blocks on your pages. Blocks are not shown on the Moodle Mobile app, so as a general rule it\'s much better to make sure your site works well without any blocks.';
 $string['tour1_title_end'] = 'End of tour';
-$string['tour1_content_end'] = 'This has been a user tour, a new feature in Moodle 3.2. It won\'t show again unless you reset it using the link in the footer. As an admin you can also create your own tours like this!';
+$string['tour1_content_end'] = 'This is the end of your user tour. It won\'t show again unless you reset it using the link in the footer. As an admin you can also create your own tours like this!';
 
 // Boost - course view tour.
 $string['tour2_title_welcome'] = 'Welcome';
-$string['tour2_content_welcome'] = 'Welcome to the Boost theme for Moodle 3.2. If you\'ve used Moodle before you might find things look a bit different here on the course page.';
+$string['tour2_content_welcome'] = 'Welcome to the Boost theme. If your site has been upgraded from an earlier version, you might find things look a bit different here on the course page.';
 $string['tour2_title_customisation'] = 'Customisation';
 $string['tour2_content_customisation'] = 'To change any course settings, use the settings menu in the corner of this header. You will find a similar settings menu on the home page of every activity, too. Try turning editing on right now.';
 $string['tour2_title_navigation'] = 'Navigation';
@@ -168,4 +168,4 @@ $string['tour2_content_addblock'] = 'If you turn editing on you can add blocks f
 $string['tour2_title_addingblocks'] = 'Adding blocks';
 $string['tour2_content_addingblocks'] = 'You can add blocks to this page using this button. However, think carefully about including any blocks on your pages. Blocks are not shown on the Moodle Mobile app, so for the best user experience it is better to make sure your course works well without any blocks.';
 $string['tour2_title_end'] = 'End of tour';
-$string['tour2_content_end'] = 'This has been a user tour, a new feature in Moodle 3.2. It won\'t show again unless you reset it using the link in the footer. The site admin can also create further tours for this site if required.';
+$string['tour2_content_end'] = 'This is the end of your user tour. It won\'t show again unless you reset it using the link in the footer. The site admin can also create further tours for this site if required.';

admin/tool/usertours/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2016120501;            // The current module version (Date: YYYYMMDDXX).
-$plugin->requires  = 2016112900;            // Requires this Moodle version.
+$plugin->version   = 2017051500;            // The current module version (Date: YYYYMMDDXX).
+$plugin->requires  = 2017050500;            // 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   = 2016120500; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2016112900; // Requires this Moodle version
+$plugin->version   = 2017051500; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017050500; // Requires this Moodle version
 $plugin->component = 'tool_xmldb'; // Full name of the plugin (used for diagnostics)
 

auth/cas/db/upgrade.php

@@ -61,7 +61,8 @@ function xmldb_auth_cas_upgrade($oldversion) {
 
     if ($oldversion < 2017020700) {
         // Convert info in config plugins from auth/cas to auth_cas.
-        $DB->set_field('config_plugins', 'plugin', 'auth_cas', array('plugin' => 'auth/cas'));
+        upgrade_fix_config_auth_plugin_names('cas');
+        upgrade_fix_config_auth_plugin_defaults('cas');
         upgrade_plugin_savepoint(true, 2017020700, 'auth', 'cas');
     }
 

auth/cas/settings.php

@@ -264,7 +264,7 @@ if ($ADMIN->fulltree) {
     }
 
     // Display locking / mapping of profile fields.
-    $authplugin = get_auth_plugin($this->name);
+    $authplugin = get_auth_plugin('cas');
     $help  = get_string('auth_ldapextrafields', 'auth_ldap');
     $help .= get_string('auth_updatelocal_expl', 'auth');
     $help .= get_string('auth_fieldlock_expl', 'auth');

auth/cas/version.php

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

auth/db/db/upgrade.php

@@ -37,7 +37,8 @@ function xmldb_auth_db_upgrade($oldversion) {
 
     if ($oldversion < 2017032800) {
         // Convert info in config plugins from auth/db to auth_db
-        $DB->set_field('config_plugins', 'plugin', 'auth_db', array('plugin' => 'auth/db'));
+        upgrade_fix_config_auth_plugin_names('db');
+        upgrade_fix_config_auth_plugin_defaults('db');
         upgrade_plugin_savepoint(true, 2017032800, 'auth', 'db');
     }
 

auth/db/settings.php

@@ -135,7 +135,7 @@ if ($ADMIN->fulltree) {
         new lang_string('auth_dbupdateusers_description', 'auth_db'), 0, $yesno));
 
     // Display locking / mapping of profile fields.
-    $authplugin = get_auth_plugin($this->name);
+    $authplugin = get_auth_plugin('db');
     display_auth_lock_options($settings, $authplugin->authtype, $authplugin->userfields,
             get_string('auth_dbextrafields', 'auth_db'),
             true, true, $authplugin->get_custom_user_profile_fields());

auth/db/version.php

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

auth/email/db/upgrade.php

@@ -37,10 +37,10 @@ function xmldb_auth_email_upgrade($oldversion) {
 
     if ($oldversion < 2017020700) {
         // Convert info in config plugins from auth/email to auth_email.
-        $DB->set_field('config_plugins', 'plugin', 'auth_email', array('plugin' => 'auth/email'));
+        upgrade_fix_config_auth_plugin_names('email');
+        upgrade_fix_config_auth_plugin_defaults('email');
         upgrade_plugin_savepoint(true, 2017020700, 'auth', 'email');
     }
 
     return true;
 }
-

auth/email/settings.php

@@ -40,7 +40,7 @@ if ($ADMIN->fulltree) {
         new lang_string('auth_emailrecaptcha', 'auth_email'), 0, $options));
 
     // Display locking / mapping of profile fields.
-    $authplugin = get_auth_plugin($this->name);
+    $authplugin = get_auth_plugin('email');
     display_auth_lock_options($settings, $authplugin->authtype, $authplugin->userfields,
             get_string('auth_fieldlocks_help', 'auth'), false, false);
 }

auth/email/version.php

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

auth/fc/db/upgrade.php

@@ -37,7 +37,8 @@ function xmldb_auth_fc_upgrade($oldversion) {
 
     if ($oldversion < 2017020700) {
         // Convert info in config plugins from auth/fc to auth_fc.
-        $DB->set_field('config_plugins', 'plugin', 'auth_fc', array('plugin' => 'auth/fc'));
+        upgrade_fix_config_auth_plugin_names('fc');
+        upgrade_fix_config_auth_plugin_defaults('fc');
         upgrade_plugin_savepoint(true, 2017020700, 'auth', 'fc');
     }
 

auth/fc/settings.php

@@ -55,7 +55,7 @@ if ($ADMIN->fulltree) {
             get_string('changepasswordhelp', 'auth'), '', PARAM_URL));
 
     // Display locking / mapping of profile fields.
-    $authplugin = get_auth_plugin($this->name);
+    $authplugin = get_auth_plugin('fc');
     display_auth_lock_options($settings, $authplugin->authtype, $authplugin->userfields,
             get_string('auth_fieldlocks_help', 'auth'), false, false);
 }

auth/fc/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2017020700;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2016112900;        // Requires this Moodle version
+$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017050500;        // Requires this Moodle version
 $plugin->component = 'auth_fc';         // Full name of the plugin (used for diagnostics)

auth/imap/db/upgrade.php

@@ -37,10 +37,10 @@ function xmldb_auth_imap_upgrade($oldversion) {
 
     if ($oldversion < 2017020700) {
         // Convert info in config plugins from auth/imap to auth_imap.
-        $DB->set_field('config_plugins', 'plugin', 'auth_imap', array('plugin' => 'auth/imap'));
+        upgrade_fix_config_auth_plugin_names('imap');
+        upgrade_fix_config_auth_plugin_defaults('imap');
         upgrade_plugin_savepoint(true, 2017020700, 'auth', 'imap');
     }
 
     return true;
 }
-

auth/imap/settings.php

@@ -55,7 +55,7 @@ if ($ADMIN->fulltree) {
             get_string('changepasswordhelp', 'auth'), '', PARAM_URL));
 
     // Display locking / mapping of profile fields.
-    $authplugin = get_auth_plugin($this->name);
+    $authplugin = get_auth_plugin('imap');
     display_auth_lock_options($settings, $authplugin->authtype, $authplugin->userfields,
             get_string('auth_fieldlocks_help', 'auth'), false, false);
 

auth/imap/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2017020700;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2016112900;        // Requires this Moodle version
+$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017050500;        // Requires this Moodle version
 $plugin->component = 'auth_imap';       // Full name of the plugin (used for diagnostics)

auth/ldap/db/upgrade.php

@@ -61,7 +61,8 @@ function xmldb_auth_ldap_upgrade($oldversion) {
 
     if ($oldversion < 2017020700) {
         // Convert info in config plugins from auth/ldap to auth_ldap.
-        $DB->set_field('config_plugins', 'plugin', 'auth_ldap', array('plugin' => 'auth/ldap'));
+        upgrade_fix_config_auth_plugin_names('ldap');
+        upgrade_fix_config_auth_plugin_defaults('ldap');
         upgrade_plugin_savepoint(true, 2017020700, 'auth', 'ldap');
     }
 

auth/ldap/lang/en/auth_ldap.php

@@ -79,7 +79,7 @@ $string['auth_ldap_passtype'] = 'Specify the format of new or changed passwords
 $string['auth_ldap_passtype_key'] = 'Password format';
 $string['auth_ldap_passwdexpire_settings'] = 'LDAP password expiration settings';
 $string['auth_ldap_preventpassindb'] = 'Select yes to prevent passwords from being stored in Moodle\'s DB.';
-$string['auth_ldap_preventpassindb_key'] = 'Don\'t cache passwords';
+$string['auth_ldap_preventpassindb_key'] = 'Prevent password caching';
 $string['auth_ldap_search_sub'] = 'Search users from subcontexts.';
 $string['auth_ldap_search_sub_key'] = 'Search subcontexts';
 $string['auth_ldap_server_settings'] = 'LDAP server settings';

auth/ldap/settings.php

@@ -295,7 +295,7 @@ if ($ADMIN->fulltree) {
     }
 
     // Display locking / mapping of profile fields.
-    $authplugin = get_auth_plugin($this->name);
+    $authplugin = get_auth_plugin('ldap');
     $help  = get_string('auth_ldapextrafields', 'auth_ldap');
     $help .= get_string('auth_updatelocal_expl', 'auth');
     $help .= get_string('auth_fieldlock_expl', 'auth');

auth/ldap/version.php

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

auth/lti/version.php

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

auth/manual/db/upgrade.php

@@ -49,7 +49,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
 
     if ($oldversion < 2017020700) {
         // Convert info in config plugins from auth/manual to auth_manual.
-        $DB->set_field('config_plugins', 'plugin', 'auth_manual', array('plugin' => 'auth/manual'));
+        upgrade_fix_config_auth_plugin_names('manual');
+        upgrade_fix_config_auth_plugin_defaults('manual');
         upgrade_plugin_savepoint(true, 2017020700, 'auth', 'manual');
     }
 

auth/manual/settings.php

@@ -72,7 +72,7 @@ if ($ADMIN->fulltree) {
         new lang_string('expiration_warning_desc', 'auth_manual'), 0, $expirationwarningoptions));
 
     // Display locking / mapping of profile fields.
-    $authplugin = get_auth_plugin($this->name);
+    $authplugin = get_auth_plugin('manual');
     display_auth_lock_options($settings, $authplugin->authtype,
         $authplugin->userfields, get_string('auth_fieldlocks_help', 'auth'), false, false);
 }

auth/manual/version.php

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

auth/mnet/db/upgrade.php

@@ -48,7 +48,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
     // Put any upgrade step following this.
     if ($oldversion < 2017020700) {
         // Convert info in config plugins from auth/mnet to auth_mnet.
-        $DB->set_field('config_plugins', 'plugin', 'auth_mnet', array('plugin' => 'auth/mnet'));
+        upgrade_fix_config_auth_plugin_names('mnet');
+        upgrade_fix_config_auth_plugin_defaults('mnet');
         upgrade_plugin_savepoint(true, 2017020700, 'auth', 'mnet');
     }
 

auth/mnet/version.php

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

auth/nntp/db/upgrade.php

@@ -37,7 +37,8 @@ function xmldb_auth_nntp_upgrade($oldversion) {
 
     if ($oldversion < 2017020700) {
         // Convert info in config plugins from auth/nntp to auth_nntp.
-        $DB->set_field('config_plugins', 'plugin', 'auth_nntp', array('plugin' => 'auth/nntp'));
+        upgrade_fix_config_auth_plugin_names('nntp');
+        upgrade_fix_config_auth_plugin_defaults('nntp');
         upgrade_plugin_savepoint(true, 2017020700, 'auth', 'nntp');
     }
 

auth/nntp/settings.php

@@ -44,7 +44,7 @@ if ($ADMIN->fulltree) {
             get_string('changepasswordhelp', 'auth'), '', PARAM_URL));
 
     // Display locking / mapping of profile fields.
-    $authplugin = get_auth_plugin($this->name);
+    $authplugin = get_auth_plugin('nntp');
     display_auth_lock_options($settings, $authplugin->authtype, $authplugin->userfields,
             get_string('auth_fieldlocks_help', 'auth'), false, false);
 }

auth/nntp/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2017020700;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2016112900;        // Requires this Moodle version
+$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017050500;        // Requires this Moodle version
 $plugin->component = 'auth_nntp';       // Full name of the plugin (used for diagnostics)

auth/nologin/version.php

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

auth/none/db/upgrade.php

@@ -37,10 +37,10 @@ function xmldb_auth_none_upgrade($oldversion) {
 
     if ($oldversion < 2017020700) {
         // Convert info in config plugins from auth/none to auth_none.
-        $DB->set_field('config_plugins', 'plugin', 'auth_none', array('plugin' => 'auth/none'));
+        upgrade_fix_config_auth_plugin_names('none');
+        upgrade_fix_config_auth_plugin_defaults('none');
         upgrade_plugin_savepoint(true, 2017020700, 'auth', 'none');
     }
 
     return true;
 }
-

auth/none/settings.php

@@ -31,7 +31,7 @@ if ($ADMIN->fulltree) {
         new lang_string('auth_nonedescription', 'auth_none')));
 
     // Display locking / mapping of profile fields.
-    $authplugin = get_auth_plugin($this->name);
+    $authplugin = get_auth_plugin('none');
     display_auth_lock_options($settings, $authplugin->authtype, $authplugin->userfields,
         get_string('auth_fieldlocks_help', 'auth'), false, false);
 }

auth/none/version.php

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

auth/oauth2/lang/en/auth_oauth2.php

@@ -22,7 +22,7 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-$string['accountexists'] = 'A user already exists on this site with this username. If this is your account, login manually and link this link from your preferences page.';
+$string['accountexists'] = 'A user already exists on this site with this username. If this is your account, log in by entering your username and password and add it as a linked login via your preferences page.';
 $string['auth_oauth2description'] = 'OAuth 2 standards based authentication';
 $string['auth_oauth2settings'] = 'OAuth 2 authentication settings.';
 $string['confirmaccountemail'] = 'Hi {$a->fullname},
@@ -65,14 +65,14 @@ $string['createaccountswarning'] = 'This authentication plugin allows users to c
 $string['createnewlinkedlogin'] = 'Link a new account ({$a})';
 $string['emailconfirmlink'] = 'Link your accounts';
 $string['emailconfirmlinksent'] = '<p>An existing account was found with this email address but it is not linked yet.</p>
-   <p>The accounts must be linked before you can login.</p>
-   <p>An email should have been sent to your address at <b>{$a}</b></p>
+   <p>The accounts must be linked before you can log in.</p>
+   <p>An email should have been sent to your address at <b>{$a}</b>.</p>
    <p>It contains easy instructions to link your accounts.</p>
-   <p>If you continue to have difficulty, contact the site administrator.</p>';
+   <p>If you have any difficulty, contact the site administrator.</p>';
 $string['info'] = 'External account';
 $string['issuer'] = 'OAuth 2 Service';
 $string['linkedlogins'] = 'Linked logins';
-$string['linkedloginshelp'] = 'Help with linked logins.';
+$string['linkedloginshelp'] = 'Help with linked logins';
 $string['loginerror_userincomplete'] = 'The user information returned did not contain a username and email address. The OAuth 2 service may be configured incorrectly.';
 $string['loginerror_nouserinfo'] = 'No user information was returned. The OAuth 2 service may be configured incorrectly.';
 $string['loginerror_invaliddomain'] = 'The email address is not allowed at this site.';
@@ -81,5 +81,5 @@ $string['loginerror_cannotcreateaccounts'] = 'The account does not exist and thi
 $string['notloggedindebug'] = 'The login attempt failed. Reason: {$a}';
 $string['notwhileloggedinas'] = 'Linked logins cannot be managed while logged in as another user.';
 $string['oauth2:managelinkedlogins'] = 'Manage own linked login accounts';
-$string['plugindescription'] = 'This authentication plugin displays a list of the configured identity providers on the moodle login page. Selecting an identity provider allows users to login with their credentials from an OAuth 2 provider.';
+$string['plugindescription'] = 'This authentication plugin displays a list of the configured identity providers on the login page. Selecting an identity provider allows users to login with their credentials from an OAuth 2 provider.';
 $string['pluginname'] = 'OAuth 2';

auth/oauth2/settings.php

@@ -29,7 +29,7 @@ if ($ADMIN->fulltree) {
     $warning = $OUTPUT->notification(get_string('createaccountswarning', 'auth_oauth2'), 'warning');
     $settings->add(new admin_setting_heading('auth_oauth2/pluginname', '', $warning));
 
-    $authplugin = get_auth_plugin($this->name);
+    $authplugin = get_auth_plugin('oauth2');
     display_auth_lock_options($settings, $authplugin->authtype, $authplugin->userfields,
             get_string('auth_fieldlocks_help', 'auth'), false, false);
 }

auth/oauth2/version.php

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

auth/pam/db/upgrade.php

@@ -37,7 +37,8 @@ function xmldb_auth_pam_upgrade($oldversion) {
 
     if ($oldversion < 2017020700) {
         // Convert info in config plugins from auth/pam to auth_pam.
-        $DB->set_field('config_plugins', 'plugin', 'auth_pam', array('plugin' => 'auth/pam'));
+        upgrade_fix_config_auth_plugin_names('pam');
+        upgrade_fix_config_auth_plugin_defaults('pam');
         upgrade_plugin_savepoint(true, 2017020700, 'auth', 'pam');
     }
 

auth/pam/settings.php

@@ -31,7 +31,7 @@ if ($ADMIN->fulltree) {
         new lang_string('auth_pamdescription', 'auth_pam')));
 
     // Display locking / mapping of profile fields.
-    $authplugin = get_auth_plugin($this->name);
+    $authplugin = get_auth_plugin('pam');
     display_auth_lock_options($settings, $authplugin->authtype, $authplugin->userfields,
         get_string('auth_fieldlocks_help', 'auth'), false, false);
 }

auth/pam/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2017020700;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2016112900;        // Requires this Moodle version
+$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017050500;        // Requires this Moodle version
 $plugin->component = 'auth_pam';       // Full name of the plugin (used for diagnostics)

auth/pop3/db/upgrade.php

@@ -37,7 +37,8 @@ function xmldb_auth_pop3_upgrade($oldversion) {
 
     if ($oldversion < 2017020700) {
         // Convert info in config plugins from auth/pop3 to auth_pop3.
-        $DB->set_field('config_plugins', 'plugin', 'auth_pop3', array('plugin' => 'auth/pop3'));
+        upgrade_fix_config_auth_plugin_names('pop3');
+        upgrade_fix_config_auth_plugin_defaults('pop3');
         upgrade_plugin_savepoint(true, 2017020700, 'auth', 'pop3');
     }
 

auth/pop3/settings.php

@@ -59,7 +59,7 @@ if ($ADMIN->fulltree) {
             get_string('changepasswordhelp', 'auth'), '', PARAM_URL));
 
     // Display locking / mapping of profile fields.
-    $authplugin = get_auth_plugin($this->name);
+    $authplugin = get_auth_plugin('pop3');
     display_auth_lock_options($settings, $authplugin->authtype, $authplugin->userfields,
             get_string('auth_fieldlocks_help', 'auth'), false, false);
 }

auth/pop3/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2017020700;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2016112900;        // Requires this Moodle version
+$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017050500;        // Requires this Moodle version
 $plugin->component = 'auth_pop3';       // Full name of the plugin (used for diagnostics)

auth/shibboleth/db/upgrade.php

@@ -37,7 +37,8 @@ function xmldb_auth_shibboleth_upgrade($oldversion) {
 
     if ($oldversion < 2017020700) {
         // Convert info in config plugins from auth/shibboleth to auth_shibboleth.
-        $DB->set_field('config_plugins', 'plugin', 'auth_shibboleth', array('plugin' => 'auth/shibboleth'));
+        upgrade_fix_config_auth_plugin_names('shibboleth');
+        upgrade_fix_config_auth_plugin_defaults('shibboleth');
         upgrade_plugin_savepoint(true, 2017020700, 'auth', 'shibboleth');
     }
 

auth/shibboleth/settings.php

@@ -75,7 +75,7 @@ if ($ADMIN->fulltree) {
             get_string('changepasswordhelp', 'auth'), '', PARAM_URL));
 
     // Display locking / mapping of profile fields.
-    $authplugin = get_auth_plugin($this->name);
+    $authplugin = get_auth_plugin('shibboleth');
     display_auth_lock_options($settings, $authplugin->authtype, $authplugin->userfields,
             '', true, false, $authplugin->get_custom_user_profile_fields());
 

auth/shibboleth/version.php

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

auth/upgrade.txt

@@ -3,8 +3,11 @@ information provided here is intended especially for developers.
 
 === 3.3 ===
 
-* Authentication plugins have been migrated to use the admin settings API.
-  Plugins should use a settings.php file to manage configurations rather than using the config.html files.
+* Authentication plugins have been migrated to use the admin settings API.  Plugins should use a settings.php file to
+  manage configurations rather than using the old config.html files. See how the helper function
+  upgrade_fix_config_auth_plugin_names() can be used to convert the legacy settings to the new ones. Another helper
+  function upgrade_fix_config_auth_plugin_defaults() can be used to populate the settings with default values so that
+  they are not falsely reported as newly added ones.
 * The function 'print_auth_lock_options' has been replaced by 'display_auth_lock_options' which uses the admin settings API.
   See auth_manual as an exmple of how it can be used.  More information can be found in MDL-12689.
 * The list of supported identity providers (SSO IdP) returned by the 'loginpage_idp_list' method (used to render the

auth/webservice/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2016120500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2016112900;        // Requires this Moodle version
+$plugin->version   = 2017051500;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2017050500;        // 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 = 2016120500;
-$plugin->requires = 2016112900;
+$plugin->version = 2017051500;
+$plugin->requires = 2017050500;
 $plugin->component = 'availability_completion';

availability/condition/date/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2016120500;
-$plugin->requires = 2016112900;
+$plugin->version = 2017051500;
+$plugin->requires = 2017050500;
 $plugin->component = 'availability_date';

availability/condition/grade/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2016120500;
-$plugin->requires = 2016112900;
+$plugin->version = 2017051500;
+$plugin->requires = 2017050500;
 $plugin->component = 'availability_grade';

availability/condition/group/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2016120500;
-$plugin->requires = 2016112900;
+$plugin->version = 2017051500;
+$plugin->requires = 2017050500;
 $plugin->component = 'availability_group';

availability/condition/grouping/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2016120500;
-$plugin->requires = 2016112900;
+$plugin->version = 2017051500;
+$plugin->requires = 2017050500;
 $plugin->component = 'availability_grouping';