From 1438d64a16dfa9f2ee7ab84110c2c5662fb7a19d Mon Sep 17 00:00:00 2001
From: "justdave%syndicomm.com" <>
Date: Wed, 20 Jun 2001 05:02:53 +0000
Subject: Fix for bug 45918: the old password field on the userprefs page is
 now used to log you back in if you try to change your password with cookies
 turned off, which avoids the confusing login screen after entering your new
 password in which you used to have to enter your old password one more time
 in order to let it set your new password (yes, it used to be as confusing as
 that just sounded :) r= tara@tequilarista.org

---
 userprefs.cgi | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'userprefs.cgi')

diff --git a/userprefs.cgi b/userprefs.cgi
index 5ad99cdbf..f880cf8e2 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -130,9 +130,10 @@ sub ShowAccount {
     my ($realname) = (FetchSQLData());
 
     $realname = value_quote($realname);
-    
+        
     EmitEntry("Old password",
-              qq{<input type=password name="oldpwd">});
+              qq|<input type=hidden name="Bugzilla_login" value="$::COOKIE{Bugzilla_login}">| .
+              qq|<input type=password name="Bugzilla_password">|);
     EmitEntry("New password",
               qq{<input type=password name="pwd1">});
     EmitEntry("Re-enter new password", 
@@ -142,9 +143,9 @@ sub ShowAccount {
 }
 
 sub SaveAccount {
-    if ($::FORM{'oldpwd'} ne ""
+    if ($::FORM{'Bugzilla_password'} ne ""
         || $::FORM{'pwd1'} ne "" || $::FORM{'pwd2'} ne "") {
-        my $old = SqlQuote($::FORM{'oldpwd'});
+        my $old = SqlQuote($::FORM{'Bugzilla_password'});
         my $pwd1 = SqlQuote($::FORM{'pwd1'});
         my $pwd2 = SqlQuote($::FORM{'pwd2'});
         SendSQL("SELECT cryptpassword = ENCRYPT($old, LEFT(cryptpassword, 2)) " .
-- 
cgit v1.2.3-24-g4f1b