summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-06-08 18:17:09 +0000
committeralecpl <alec@alec.pl>2008-06-08 18:17:09 +0000
commita0530a6ec0cb464ec6eaa63fd211c2ffbe6db9ad (patch)
tree91e3a144a914acd5eb77a1481c6fab4837174526 /program/steps/mail
parent7e78b2ec373f4596f986bb75a0e6c33bd67a82b4 (diff)
- option to disable autocompletion from selected LDAP address books (#1484922
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/compose.inc9
1 files changed, 6 insertions, 3 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index c56bbd576..855066b0c 100644
--- a/program/steps/mail/compose.inc
+++ b/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');
+
?>