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

release-0.6
alecpl 15 years ago
parent f3e1010090
commit 93c0188854

@ -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)

@ -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 @@ class rcube_ldap extends rcube_addressbook
$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

Loading…
Cancel
Save