From: moodler <moodler>
Date: Mon, 21 Jul 2003 15:20:58 +0000 (+0000)
Subject: When using the "manual" method, I've disabled the external method of
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=35d01c7f31b65a7c4d956ddc19262c467834ee69;p=moodle.git

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 de0ef0825d..c6fafff09c 100644
--- 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 1f8c2114c1..9e98fb4d54 100644
--- 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>";