etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 8774: when disabling password hash, we also disable it during account creation, user creation, password changing.

This commit is contained in:
Jessica Wang 2011-03-01 11:39:52 -08:00
parent dc7164e5e5
commit fdc220a7d3
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/scripts/cloud.core.account.js
View File

@ -210,7 +210,10 @@ function bindAddAccountButton() {
var username = $thisDialog.find("#add_user_username").val();
array1.push("&username="+todb(username));
var password = $.md5($thisDialog.find("#add_user_password").val());
var password = $thisDialog.find("#add_user_password").val();
if (md5Hashed) {
password = $.md5(password);
}
array1.push("&password="+password);
var email = $thisDialog.find("#add_user_email").val();
@ -313,7 +316,10 @@ function bindAddUserButton() {
var username = $thisDialog.find("#add_user_username").val();
array1.push("&username="+todb(username));
var password = $.md5($thisDialog.find("#add_user_password").val());
var password = $thisDialog.find("#add_user_password").val();
if (md5Hashed) {
password = $.md5(password);
}
array1.push("&password="+password);
var email = $thisDialog.find("#add_user_email").val();
@ -977,7 +983,10 @@ 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(thisDialog.find("#change_password_password1").val());
var password = thisDialog.find("#change_password_password1").val();
if (md5Hashed) {
password = $.md5(password);
}
thisDialog.dialog("close");
$.ajax({

4
ui/scripts/cloud.core.init.js
View File

@ -662,8 +662,8 @@ $(document).ready(function() {
// FUNCTION: logs the user in
function login() {
var array1 = [];
var username = encodeURIComponent($("#account_username").val());
array1.push("&username="+username);
var username = $("#account_username").val();
array1.push("&username="+encodeURIComponent(username));
var password = $("#account_password").val();
if (md5Hashed) {