diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-04-21 13:44:14 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-04-21 13:44:14 +0000 |
| commit | 5dfde34254217204bcdec42a2c4165e57a4dfebd (patch) | |
| tree | 5880669c27d6c60892598790f93fd82ca90608e9 /roundcubemail | |
| parent | 23f1e54909306679f8aae903e7422a4f63646c34 (diff) | |
- Add sizelimit and timelimit variables in LDAP config (#1486544)
git-svn-id: https://svn.roundcube.net/trunk@3520 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail')
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/config/main.inc.php.dist | 5 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_ldap.php | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 46224faae..f22025fb8 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -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) diff --git a/roundcubemail/config/main.inc.php.dist b/roundcubemail/config/main.inc.php.dist index 062a0c9b4..07f18730e 100644 --- a/roundcubemail/config/main.inc.php.dist +++ b/roundcubemail/config/main.inc.php.dist @@ -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 diff --git a/roundcubemail/program/include/rcube_ldap.php b/roundcubemail/program/include/rcube_ldap.php index 4cacd5232..04ccd6cb2 100644 --- a/roundcubemail/program/include/rcube_ldap.php +++ b/roundcubemail/program/include/rcube_ldap.php @@ -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 |