Merge branch 'MDL-41729-master' of git://github.com/lameze/moodle

auth/shibboleth/auth.php

@@ -178,14 +178,33 @@ class auth_plugin_shibboleth extends auth_plugin_base {
     }
 
     /**
-     * Returns true if this authentication plugin can change the user's
+     * Whether shibboleth users can change their password or not.
-     * password.
      *
-     * @return bool
+     * Shibboleth auth requires password to be changed on shibboleth server directly.
+     * So it is required to have  password change url set.
+     *
+     * @return bool true if there's a password url or false otherwise.
      */
     function can_change_password() {
+        if (!empty($this->config->changepasswordurl)) {
+            return true;
+        } else {
             return false;
         }
+    }
+
+    /**
+     * Get password change url.
+     *
+     * @return moodle_url|null Returns URL to change password or null otherwise.
+     */
+    function change_password_url() {
+        if (!empty($this->config->changepasswordurl)) {
+            return new moodle_url($this->config->changepasswordurl);
+        } else {
+            return null;
+        }
+    }
 
      /**
      * Hook for login page