When using the "manual" method, I've disabled the external method of

changing passwords, and enabled the internal "change password" button
just like "email" and "none".

Thanks to Danilo Massa for pointing out the inconsistency.

diff --git a/admin/auth.php b/admin/auth.php
index de0ef0825d963aa690f01744c639d6ac49e3381a..c6fafff09c8cf5de1a17047ca85c395c81ddde54 100644 (file)
--- a/admin/auth.php
+++ b/admin/auth.php
@@ -113,7 +113,7 @@
 
     require_once("$CFG->dirroot/auth/$auth/config.html");
 
-    if ($auth != "email" and $auth != "none") {
+    if ($auth != "email" and $auth != "none" and $auth != "manual") {
         echo "<tr valign=\"top\">";
            echo "<td align=right nowrap><p>";
         print_string("changepassword", "auth");

diff --git a/user/view.php b/user/view.php
index 1f8c2114c199dc6f8bb9a92a56b0c81c3a242a13..9e98fb4d54bf861db8cad8ef623e0042784d5ff6 100644 (file)
--- a/user/view.php
+++ b/user/view.php
@@ -131,15 +131,15 @@
     echo "</TD></TR></TABLE></TABLE>";
 
     $internalpassword = false;
-    if ($CFG->auth == "email" or $CFG->auth == "none") {
+    if ($CFG->auth == "email" or $CFG->auth == "none" or $CFG->auth == "manual") {
         $internalpassword = "$CFG->wwwroot/login/change_password.php";
     }
 
 //  Print other functions
     echo "<CENTER><TABLE ALIGN=CENTER><TR>";
     if ($currentuser and !isguest()) {
-        if ($CFG->auth == "email" or $CFG->auth == "none") {
-            echo "<TD NOWRAP><P><FORM ACTION=\"$CFG->wwwroot/login/change_password.php\" METHOD=GET>";
+        if ($internalpassword) {
+            echo "<TD NOWRAP><P><FORM ACTION=\"$internalpassword\" METHOD=GET>";
             echo "<INPUT type=hidden name=id value=\"$course->id\">";
             echo "<INPUT type=submit value=\"".get_string("changepassword")."\">";
             echo "</FORM></P></TD>";