alecpl
2008-06-08 a0530a6ec0cb464ec6eaa63fd211c2ffbe6db9ad
- option to disable autocompletion from selected LDAP address books (#1484922


3 files modified
14 ■■■■ changed files
CHANGELOG 4 ●●●● patch | view | raw | blame | history
config/main.inc.php.dist 1 ●●●● patch | view | raw | blame | history
program/steps/mail/compose.inc 9 ●●●●● patch | view | raw | blame | history
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
config/main.inc.php.dist
@@ -271,6 +271,7 @@
 *  '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
 */
program/steps/mail/compose.inc
@@ -829,10 +829,11 @@
  /* 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 ($a_contacts) 
  { 
     $OUTPUT->set_env('contacts', $a_contacts); 
  }
  }
$OUTPUT->send('compose');
?>