diff options
| author | svncommit <devs@roundcube.net> | 2006-01-18 11:51:26 +0000 |
|---|---|---|
| committer | svncommit <devs@roundcube.net> | 2006-01-18 11:51:26 +0000 |
| commit | eea43f7c99d9b0884229996d7fb9b1e3d98df177 (patch) | |
| tree | 2771b3224a5ffb64a08efd9af23488925c828a1e | |
| parent | 39ecb7d0c26c6b72b4e938b2616f6e8ef5efe3f4 (diff) | |
better explanation of ldap_public in config file. changed check for ldap public config to isset
| -rw-r--r-- | config/main.inc.php.dist | 28 | ||||
| -rw-r--r-- | program/steps/addressbook/ldapsearchform.inc | 2 |
2 files changed, 16 insertions, 14 deletions
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index 14f6eaa29..ac60e4840 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -131,19 +131,21 @@ $rcmail_config['generic_message_footer'] = ''; // this string is used as a delimiter for message headers when sending $rcmail_config['mail_header_delimiter'] = "\r\n"; -// public ldap servers to search for contacts -$rcmail_config['ldap_public'] = false; - -/** example config for Verisign directory -$rcmail_config['ldap_public']['Verisign'] = array('hosts' => array('directory.verisign.com'), - 'port' => 389, - 'base_dn' => '', - 'search_fields' => array('Email' => 'mail', 'Name' => 'cn'), - 'name_field' => 'cn', - 'mail_field' => 'mail', - 'scope' => 'sub', - 'fuzzy_search' => 0); -**/ +// in order to enable public ldap search, create a config array +// like the Verisign example below. if you would like to test, +// simply uncomment the Verisign example. +/** + * example config for Verisign directory + * + * $rcmail_config['ldap_public']['Verisign'] = array('hosts' => array('directory.verisign.com'), + * 'port' => 389, + * 'base_dn' => '', + * 'search_fields' => array('Email' => 'mail', 'Name' => 'cn'), + * 'name_field' => 'cn', + * 'mail_field' => 'mail', + * 'scope' => 'sub', + * 'fuzzy_search' => 0); + */ /***** these settings can be overwritten by user's preferences *****/ diff --git a/program/steps/addressbook/ldapsearchform.inc b/program/steps/addressbook/ldapsearchform.inc index 5e414ba3e..5c04406c5 100644 --- a/program/steps/addressbook/ldapsearchform.inc +++ b/program/steps/addressbook/ldapsearchform.inc @@ -26,7 +26,7 @@ require_once 'include/rcube_ldap.inc'; function rcmail_ldap_public_search_form($attrib) { global $CONFIG, $JS_OBJECT_NAME, $OUTPUT; - if (!$CONFIG['ldap_public']) + if (!isset($CONFIG['ldap_public'])) { // no ldap servers to search show_message('noldapserver', 'warning'); |