From 269eed644889fd1548361d6bd7b54b7f7f865c48 Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Thu, 17 Oct 2002 12:21:55 +0000
Subject: [PATCH] Changed headers so that it works seamlessly when called from
 user page.

---
 login/change_password.php       | 39 ++++++++++++++++++++++++++++-----
 login/change_password_form.html |  9 ++++----
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/login/change_password.php b/login/change_password.php
index 95703f716d..d4fbe96192 100644
--- a/login/change_password.php
+++ b/login/change_password.php
@@ -2,6 +2,13 @@
 
 	include("../config.php");
 
+    optional_variable($id);
+
+    if ($id) {
+        if (!$course = get_record("course", "id", $id)) {
+            error("No such course!");
+        }
+    }
 
 	if (match_referer() && isset($HTTP_POST_VARS)) {
 
@@ -36,9 +43,19 @@
 
 			reset_login_count();
 
-            $passwordchanged = get_string("passwordchanged");
-			print_header($passwordchanged, $passwordchanged, $passwordchanged, "");
-			notice($passwordchanged, "$CFG->wwwroot/course/");
+            $strpasswordchanged = get_string("passwordchanged");
+
+            if ($course->id) {
+	            print_header($strpasswordchanged, $strpasswordchanged,
+                             "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> ->
+                              <A HREF=\"$CFG->wwwroot/user/index.php?id=$course->id\">".get_string("participants")."</A> ->
+                              <A HREF=\"$CFG->wwwroot/user/view.php?id=$USER->id&course=$course->id\">$USER->firstname $USER->lastname</A> -> $strpasswordchanged", $focus);
+			    notice($strpasswordchanged, "$CFG->wwwroot/user/view.php?id=$USER->id&course=$id");
+            } else {
+			    print_header($strpasswordchanged, $strpasswordchanged, $strpasswordchanged, "");
+			    notice($strpasswordchanged, "$CFG->wwwroot");
+            }
+
 			print_footer();
 			exit;
 		}
@@ -46,6 +63,10 @@
 
 
 
+    if ($course->id) {
+        $frm->id = $id;
+    }
+
 	if (!$frm->username)
     	$frm->username = get_moodle_cookie();
 
@@ -55,8 +76,16 @@
     	$focus = "form.username";
 	}
 
-    $changepassword = get_string("changepassword");
-	print_header($changepassword, $changepassword, $changepassword, $focus);
+    $strchangepassword = get_string("changepassword");
+    if ($course->id) {
+	    print_header($strchangepassword, $strchangepassword,
+                     "<A HREF=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</A> ->
+                      <A HREF=\"$CFG->wwwroot/user/index.php?id=$course->id\">".get_string("participants")."</A> ->
+                      <A HREF=\"$CFG->wwwroot/user/view.php?id=$USER->id&course=$course->id\">$USER->firstname $USER->lastname</A> -> $strchangepassword", $focus);
+    } else {
+	    print_header($strchangepassword, $strchangepassword, $strchangepassword, $focus);
+    }
+
     print_simple_box_start("center", "", $THEME->cellheading);
 	include("change_password_form.html");
     print_simple_box_end();
diff --git a/login/change_password_form.html b/login/change_password_form.html
index cf52bd918f..279e6cb163 100644
--- a/login/change_password_form.html
+++ b/login/change_password_form.html
@@ -10,24 +10,25 @@
 </tr>
 <tr valign=top>
 	<td><P><? print_string("password") ?>:</P></td>
-	<td><input type="text" name="password" size=25 value="<? p($frm->password) ?>">
+	<td><input type="password" name="password" size=25 value="<? p($frm->password) ?>">
 	<? formerr($err->password) ?>
 	</td>
 </tr>
 <tr valign=top>
 	<td><P><? print_string("newpassword") ?>:</P></td>
-	<td><input type="text" name="newpassword1" size=25 value="<? p($frm->newpassword1) ?>">
+	<td><input type="password" name="newpassword1" size=25 value="<? p($frm->newpassword1) ?>">
 	<? formerr($err->newpassword1) ?>
 	</td>
 </tr>
 <tr valign=top>
 	<td><P><? print_string("newpassword") ?> (<? print_string("again") ?>):</P></td>
-	<td><input type="text" name="newpassword2" size=25 value="<? p($frm->newpassword2) ?>">
+	<td><input type="password" name="newpassword2" size=25 value="<? p($frm->newpassword2) ?>">
 	<? formerr($err->newpassword2) ?>
 	</td>
 </tr>
 <tr>
 	<td></td>
-	<td><input type="submit" value="<? print_string("changepassword") ?>"></td>
+    <td><input type="hidden" name="id" value="<?=$frm->id?>">
+	<input type="submit" value="<? print_string("changepassword") ?>"></td>
 </table>
 </form>
-- 
2.39.5