diff options
| author | Thomas B. <thomas@roundcube.net> | 2012-10-27 05:29:00 -0700 |
|---|---|---|
| committer | Thomas B. <thomas@roundcube.net> | 2012-10-27 05:29:00 -0700 |
| commit | f2d3fc1b5d66013c265d82891b8526389303eff3 (patch) | |
| tree | cd62c6aa0325effa5251a0978de972b970fe7966 | |
| parent | 8fa22e9c2f3a38985464252045e57b6be4eb76ae (diff) | |
| parent | 5526f98dca39121504e911baa806175a50e6901e (diff) | |
Merge pull request #38 from dupondje/master
Option to hide SQL addressbook
| -rw-r--r-- | config/main.inc.php.dist | 4 | ||||
| -rw-r--r-- | program/include/rcmail.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 018cea639..2ee4ccd27 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -518,10 +518,12 @@ $rcmail_config['undo_timeout'] = 0; // ---------------------------------- // This indicates which type of address book to use. Possible choises: -// 'sql' (default) and 'ldap'. +// 'sql' (default), 'ldap' and ''. // If set to 'ldap' then it will look at using the first writable LDAP // address book as the primary address book and it will not display the // SQL address book in the 'Address Book' view. +// If set to '' then no address book will be displayed or only the +// addressbook which is created by a plugin (like CardDAV). $rcmail_config['address_book_type'] = 'sql'; // In order to enable public ldap search, configure an array like the Verisign diff --git a/program/include/rcmail.php b/program/include/rcmail.php index 7a49095f7..c2f76b388 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -258,8 +258,8 @@ class rcmail extends rcube $autocomplete = (array) $this->config->get('autocomplete_addressbooks'); $list = array(); - // We are using the DB address book - if ($abook_type != 'ldap') { + // We are using the DB address book or a plugin address book + if ($abook_type != 'ldap' && $abook_type != '') { if (!isset($this->address_books['0'])) $this->address_books['0'] = new rcube_contacts($this->db, $this->get_user_id()); $list['0'] = array( |