Changeset 9b33118 in github

Timestamp:

Nov 25, 2011 8:43:40 AM (18 months ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.8

Children:

e0960f6

Parents:

d0924d4

Message:

• Add some debug and error handling around vlv_search

File:

• program/include/rcube_ldap.php (modified) (2 diffs)

program/include/rcube_ldap.php

@@ -538 +538 @@
 
     /**
-    * Get all members of the given group
-    *
-    * @param string Group DN
-    * @param array  Group entries (if called recursively)
-    * @return array Accumulated group members
+     * Get all members of the given group
+     *
+     * @param string Group DN
+     * @param array  Group entries (if called recursively)
+     * @return array Accumulated group members
      */
     function list_group_members($dn, $count = false, $entries = null)
@@ -743 +743 @@
                 array_values($this->fieldmap), 0, (int)$this->prop['sizelimit'], (int)$this->prop['timelimit']);
 
+            $this->result = new rcube_result_set(0);
+
+            if (!$this->ldap_result) {
+                $this->_debug("S: ".ldap_error($this->conn));
+                return $this->result;
+            }
+
+            $this->_debug("S: ".ldap_count_entries($this->conn, $this->ldap_result)." record(s)");
+
             // get all entries of this page and post-filter those that really match the query
             $search = mb_strtolower($value);
-            $this->result = new rcube_result_set(0);
             $entries = ldap_get_entries($this->conn, $this->ldap_result);