summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjustdave%syndicomm.com <>2001-06-20 07:02:53 +0200
committerjustdave%syndicomm.com <>2001-06-20 07:02:53 +0200
commit1438d64a16dfa9f2ee7ab84110c2c5662fb7a19d (patch)
tree362e7fd98c277a421d806c1041db7879c3256e21
parentaa7b4750a7c84e2807cdaa66d304fa42615a6f6e (diff)
downloadbugzilla-1438d64a16dfa9f2ee7ab84110c2c5662fb7a19d.tar.gz
bugzilla-1438d64a16dfa9f2ee7ab84110c2c5662fb7a19d.tar.xz
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
-rwxr-xr-xuserprefs.cgi9
1 files changed, 5 insertions, 4 deletions
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)) " .