Changeset a0530a6 in github

Timestamp:

Jun 8, 2008 2:17:09 PM (5 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

32b7092

Parents:

7e78b2e

Message:

• option to disable autocompletion from selected LDAP address books (#1484922

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• program/steps/mail/compose.inc (modified) (2 diffs)

CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/06/08 (alec)
+----------
+- Added option to disable autocompletion from selected LDAP address books (#1484922)
 
 2008/06/07 (thomasb)

config/main.inc.php.dist

@@ -272 +272 @@
  *  '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
  */

program/steps/mail/compose.inc

@@ -830 +830 @@
   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); 
@@ -857 +858 @@
   { 
         $OUTPUT->set_env('contacts', $a_contacts); 
-  } 
+  }
+
 $OUTPUT->send('compose');
+
 ?>