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/04/06 19:25:20 UTC

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

gregor      2004/04/06 10:25:20

  Modified:    src/webapp/lenya/content/admin/users user-admin.js
  Log:
  fix ldap exception. was due to javascript being quite happy with arbitrary number of arguments.. grr
  
  WHERE IS MY GROOVY WHEN I NEED IT!!
  
  Revision  Changes    Path
  1.39      +3 -3      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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- user-admin.js	26 Mar 2004 18:50:07 -0000	1.38
  +++ user-admin.js	6 Apr 2004 17:25:20 -0000	1.39
  @@ -215,7 +215,7 @@
   	add_user(false);
   }
   
  -function validate(userManager, ldap, userId, email, password, confirmPassword, messages, ldapId, configDir) {
  +function validate(userManager, ldap, userId, email, password, confirmPassword, ldapId, configDir) {
       
   	messages = new Packages.java.util.ArrayList();
   	
  @@ -237,7 +237,6 @@
       }
       
   	if (ldap) {
  -	    configDir = new Packages.java.io.File(configDir);
   	    var ldapUser = new Packages.org.apache.lenya.ac.ldap.LDAPUser(configDir);
   	    if (!ldapUser.existsUser(ldapId)) {
   	    	messages.add("This LDAP user ID does not exist.");
  @@ -315,7 +314,8 @@
   			password = cocoon.request.get("new-password");
   			confirmPassword = cocoon.request.get("confirm-password");
   			
  -			var configDir = userManager.getConfigurationDirectory();
  +		    var configDir = userManager.getConfigurationDirectory();
  +
   			messages = validate(userManager, ldap, userId, email, password, confirmPassword, ldapId, configDir);
   			
   			if (messages.isEmpty()) {
  
  
  

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