diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-06-08 18:17:09 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-06-08 18:17:09 +0000 |
| commit | 2bfc9ba272040e6c0cf0c557963202fbe7bbbf66 (patch) | |
| tree | a73d74192cfde89cdc0463c75a0f86eef131ecc1 | |
| parent | 640151ec12ea796fe09648568934b04d589f3f7b (diff) | |
- option to disable autocompletion from selected LDAP address books (#1484922
git-svn-id: https://svn.roundcube.net/trunk@1493 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 4 | ||||
| -rw-r--r-- | roundcubemail/config/main.inc.php.dist | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/compose.inc | 9 |
3 files changed, 11 insertions, 3 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 40a538c76..63bf46cc1 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,10 @@ CHANGELOG RoundCube Webmail --------------------------- +2008/06/08 (alec) +---------- +- Added option to disable autocompletion from selected LDAP address books (#1484922) + 2008/06/07 (thomasb) ---------- - Cleaned up localization names. Now named with lang_COUNTRY according to ISO 639-1/3166-1 diff --git a/roundcubemail/config/main.inc.php.dist b/roundcubemail/config/main.inc.php.dist index 8d71d8fcd..0be6d478d 100644 --- a/roundcubemail/config/main.inc.php.dist +++ b/roundcubemail/config/main.inc.php.dist @@ -271,6 +271,7 @@ $rcmail_config['address_book_type'] = 'sql'; * '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 + * 'global_search' => true, // perform a global search for address auto-completion on compose * 'fuzzy_search' => true); // server allows wildcard search */ diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc index c56bbd576..855066b0c 100644 --- a/roundcubemail/program/steps/mail/compose.inc +++ b/roundcubemail/program/steps/mail/compose.inc @@ -829,10 +829,11 @@ if (isset($CONFIG['ldap_public'])) /* LDAP autocompletion */ foreach ($CONFIG['ldap_public'] as $ldapserv_config) { - if ($ldapserv_config['fuzzy_search'] != 1) + if ($ldapserv_config['fuzzy_search'] != 1 || + $ldapserv_config['global_search'] != 1) { continue; - } + } $LDAP = new rcube_ldap($ldapserv_config); $LDAP->connect(); @@ -856,6 +857,8 @@ if (isset($CONFIG['ldap_public'])) if ($a_contacts) { $OUTPUT->set_env('contacts', $a_contacts); - } + } + $OUTPUT->send('compose'); + ?> |