From fdc220a7d39d32fa4d64b7b2d7141551dabfd5ad Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 1 Mar 2011 11:39:52 -0800
Subject: [PATCH] bug 8774: when disabling password hash, we also disable it
 during account creation, user creation, password changing.

---
 ui/scripts/cloud.core.account.js | 15 ++++++++++++---
 ui/scripts/cloud.core.init.js    |  4 ++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/ui/scripts/cloud.core.account.js b/ui/scripts/cloud.core.account.js
index 90e41ea6784..6e40731ee20 100644
--- a/ui/scripts/cloud.core.account.js
+++ b/ui/scripts/cloud.core.account.js
@@ -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({
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index 9a71636ab25..91b5e02c427 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -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) {