You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/01/15 11:47:50 UTC

cvs commit: cocoon-lenya/src/webapp/lenya/content/admin/users user-admin.js

gregor      2004/01/15 02:47:50

  Modified:    src/webapp/lenya/content/admin/users user-admin.js
  Log:
  make sure admins cannot set empty passwords
  
  Revision  Changes    Path
  1.30      +6 -2      cocoon-lenya/src/webapp/lenya/content/admin/users/user-admin.js
  
  Index: user-admin.js
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/admin/users/user-admin.js,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- user-admin.js	13 Nov 2003 16:19:22 -0000	1.29
  +++ user-admin.js	15 Jan 2004 10:47:50 -0000	1.30
  @@ -100,13 +100,17 @@
   			if (cocoon.request.get("submit")) {	    
   			    oldPassword = cocoon.request.get("old-password");
   			    newPassword = cocoon.request.get("new-password");
  +                password = new Packages.java.lang.String(newPassword);
   			    confirmPassword = cocoon.request.get("confirm-password");
   			    
   			    if (checkPassword && !user.authenticate(oldPassword)) {
  -			    	message = "Wrong password!";
  +			    	message = "You entered a wrong password.";
  +			    }
  +	            else if (password.length() == 0) {
  +			    	message = "New password cannot be empty.";
   			    }
   	            else if (!newPassword.equals(confirmPassword)) {
  -			    	message = "New password and confirmed password are not equal!";
  +			    	message = "New password and confirmed password are not equal.";
   			    }
   			    else {
   		        	user.setPassword(newPassword);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org