cvs commit: jahia/core/src/java/org/jahia/services/usermanager JahiaUserManagerLDAPProvider.java

[Thomas Draier]

tdraier     2005/02/04 15:36:56 CET

  Modified files:
    core/src/java/org/jahia/services/usermanager 
                                                 
JahiaUserManagerLDAPProvider.java 
  Log:
  changed user search filters
  
  Revision  Changes    Path
  1.10      +6 -5      
jahia/core/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java.diff?r1=1.9&r2=1.10&f=h
  
  
  
  Index: JahiaUserManagerLDAPProvider.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/usermanager/JahiaUserManagerLDAPProvider.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JahiaUserManagerLDAPProvider.java 4 Feb 2005 14:31:05 -0000       1.9
  +++ JahiaUserManagerLDAPProvider.java 4 Feb 2005 14:36:55 -0000       1.10
  @@ -1428,16 +1428,15 @@
   
               return getUsers(ctx, thisFilter, thisBase, intScope);
           } else {
  -            filters.setProperty("objectClass",
  -                    ldapProperties.getProperty(
  -                            USERS_OBJECTCLASS_ATTRIBUTE, "*"));
  +            filterString.append("(&(objectClass=" + 
ldapProperties.getProperty(
  +                            USERS_OBJECTCLASS_ATTRIBUTE, "*") + ")");
   
               // let's translate Jahia properties to LDAP properties
               mapJahiaPropertiesToLDAP(filters);
   
   
               if (filters.size() > 1) {
  -                filterString.append("(&");
  +                filterString.append("(|");
               }
   
               Enumeration filterKeys = filters.keys();
  @@ -1487,8 +1486,10 @@
               if (filters.size() > 1) {
                   filterString.append(")");
               }
  -            return getUsers(ctx, filterString.toString(), searchBase, scope);
   
  +            filterString.append(")");
  +
  +            return getUsers(ctx, filterString.toString(), searchBase, scope);
           }
       }