From f8176ed041823f59f429b0d885ad6a3f91622e60 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 9 Aug 2010 13:35:09 +0000
Subject: [PATCH] NIHVIVO-762 do server-side validation as well as client-side.
 Do MD5 encoding on the server side and not on the client side.

---
 webapp/web/templates/edit/specific/user_retry.jsp      | 3 ++-
 webapp/web/templates/edit/specific/user_retry_head.jsp | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/webapp/web/templates/edit/specific/user_retry.jsp b/webapp/web/templates/edit/specific/user_retry.jsp
index 7e907711b..a295ff85d 100644
--- a/webapp/web/templates/edit/specific/user_retry.jsp
+++ b/webapp/web/templates/edit/specific/user_retry.jsp
@@ -43,7 +43,8 @@
           <tr class="editformcell">
               <td valign="bottom" colspan="2">
                       <b>Confirm password</b><br/>
-                      <input type="password" name="passwordConfirmation" value="" size="64" maxlength="128"/>
+                      <input type="password" name="passwordConfirmation" value="${formValue['passwordConfirmation']}" size="64" maxlength="128"/>
+                      <span class="warning"><form:error name="passwordConfirmation"/></span>
               </td>
           </tr>
         </c:if>
diff --git a/webapp/web/templates/edit/specific/user_retry_head.jsp b/webapp/web/templates/edit/specific/user_retry_head.jsp
index a508b8c61..4b96c7b13 100644
--- a/webapp/web/templates/edit/specific/user_retry_head.jsp
+++ b/webapp/web/templates/edit/specific/user_retry_head.jsp
@@ -1,7 +1,5 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<script language="JavaScript" type="text/javascript" src="js/md5.js"></script>
-
 <script language="JavaScript" type="text/javascript">
 <!--
  
@@ -11,7 +9,7 @@
          return true;
      }
 
-     function hashPw(theForm) {
+     function validatePw(theForm) {
          if (theForm.Md5password.value != theForm.passwordConfirmation.value) {
              alert("The passwords do not match.");
              theForm.Md5password.focus();
@@ -22,8 +20,6 @@
              theForm.Md5password.focus();
              return false;
          } else {    
-             theForm.Md5password.value=calcMD5(theForm.Md5password.value);
-             theForm.passwordConfirmation.value=theForm.Md5password.value;
              return true;
          }
      }