Changeset 2893 in subversion

Timestamp:

Aug 29, 2009 4:24:03 PM (4 years ago)

Author:

alec

Message:

• allow empty LDAP 'filter' (#1485184)

File:

• trunk/roundcubemail/program/include/rcube_ldap.php (modified) (3 diffs)

trunk/roundcubemail/program/include/rcube_ldap.php

@@ -245 +245 @@
       $this->set_search_set($filter);
     }
-    
+
     // exec LDAP search if no result resource is stored
     if ($this->conn && !$this->ldap_result)
@@ -382 +382 @@
     if ($this->conn && $dn)
     {
-      $this->ldap_result = ldap_read($this->conn, base64_decode($dn), "(objectclass=*)", array_values($this->fieldmap));
+      $this->ldap_result = ldap_read($this->conn, base64_decode($dn), '(objectclass=*)', array_values($this->fieldmap));
       $entry = @ldap_first_entry($this->conn, $this->ldap_result);
 
@@ -555 +555 @@
   function _exec_search()
   {
-    if ($this->ready && $this->filter)
-    {
+    if ($this->ready)
+    {
+      $filter = $this->filter ? $this->filter : '(objectclass=*)';
       $function = $this->prop['scope'] == 'sub' ? 'ldap_search' : ($this->prop['scope'] == 'base' ? 'ldap_read' : 'ldap_list');
-      $this->ldap_result = $function($this->conn, $this->prop['base_dn'], $this->filter, array_values($this->fieldmap), 0, 0);
+      $this->ldap_result = $function($this->conn, $this->prop['base_dn'], $filter, array_values($this->fieldmap), 0, 0);
       return true;
     }