Changeset 93c01888 in github

Timestamp:

Apr 21, 2010 9:44:14 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

9ef5fa5

Parents:

f3e1010

Message:

• Add sizelimit and timelimit variables in LDAP config (#1486544)

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/include/rcube_ldap.php (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Add sizelimit and timelimit variables in LDAP config (#1486544)
 - Hide IMAP host dropdown when single host is defined (#1486326)
 - Add images pre-loading on login page (#1451160)

config/main.inc.php.dist

@@ -388 +388 @@
   'scope'         => 'sub',   // search mode: sub|base|list
   'filter'        => '',      // used for basic listing (if not empty) and will be &'d with search queries. example: status=act
-  'fuzzy_search'  => true);   // server allows wildcard search
+  'fuzzy_search'  => true     // server allows wildcard search
+  'sizelimit'     => '0',     // Enables you to limit the count of entries fetched. Setting this to 0 means no limit. 
+  'timelimit'     => '0',     // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit. 
+);
 */
 

program/include/rcube_ldap.php

@@ -628 +628 @@
       $this->_debug("C: Search [".$filter."]");
 
-      if ($this->ldap_result = @$function($this->conn, $this->prop['base_dn'], $filter, array_values($this->fieldmap), 0, 0)) {
+      if ($this->ldap_result = @$function($this->conn, $this->prop['base_dn'], $filter,
+          array_values($this->fieldmap), 0, (int) $this->prop['sizelimit'], (int) $this->prop['timelimit'])
+      ) {
         $this->_debug("S: ".ldap_count_entries($this->conn, $this->ldap_result)." record(s)");
         return true;