Permalink
Browse files

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

  • Loading branch information...
1 parent f3e1010 commit 93c01888547210f54bd593d0774f9f63ec38f7a7 @alecpl alecpl committed Apr 21, 2010
Showing with 8 additions and 2 deletions.
  1. +1 −0 CHANGELOG
  2. +4 −1 config/main.inc.php.dist
  3. +3 −1 program/include/rcube_ldap.php
View
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- 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)
- Add HTTP_X_REAL_IP and HTTP_X_FORWARDED_FOR to successful logins log (#1486441)
View
@@ -387,7 +387,10 @@ $rcmail_config['ldap_public']['Verisign'] = array(
'sort' => 'cn', // The field to sort the listing by.
'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.
+);
*/
// An ordered array of the ids of the addressbooks that should be searched
@@ -627,7 +627,9 @@ private function _exec_search()
$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;
} else

0 comments on commit 93c0188

Please sign in to comment.