Merge from 2.2.x. Fixed MD5 password issue in the UI caused by the fact we were URLencoding the password before performing the MD5 sum.

This commit is contained in:
will 2011-02-08 14:26:38 -08:00
parent f16cb1caf2
commit b4731ae138
2 changed files with 4 additions and 4 deletions

View File

@ -170,7 +170,7 @@ function bindAddAccountButton() {
var username = $thisDialog.find("#add_user_username").val();
array1.push("&username="+todb(username));
var password = $.md5(encodeURIComponent($thisDialog.find("#add_user_password").val()));
var password = $.md5($thisDialog.find("#add_user_password").val());
array1.push("&password="+password);
var email = $thisDialog.find("#add_user_email").val();
@ -271,7 +271,7 @@ function bindAddUserButton() {
var username = $thisDialog.find("#add_user_username").val();
array1.push("&username="+todb(username));
var password = $.md5(encodeURIComponent($thisDialog.find("#add_user_password").val()));
var password = $.md5($thisDialog.find("#add_user_password").val());
array1.push("&password="+password);
var email = $thisDialog.find("#add_user_email").val();
@ -917,7 +917,7 @@ function doChangePassword($actionLink, $subgridItem) {
isValid &= validateString("Password", thisDialog.find("#change_password_password1"), thisDialog.find("#change_password_password1_errormsg"), false); //required
if (!isValid) return;
var password = $.md5(encodeURIComponent((thisDialog.find("#change_password_password1").val())));
var password = $.md5(thisDialog.find("#change_password_password1").val());
thisDialog.dialog("close");
$.ajax({

View File

@ -648,7 +648,7 @@ $(document).ready(function() {
var username = encodeURIComponent($("#account_username").val());
array1.push("&username="+username);
var password = encodeURIComponent($("#account_password").val());
var password = $("#account_password").val();
if (md5Hashed) {
password = $.md5(password);
}