diff options
| -rw-r--r-- | config/main.inc.php.dist | 2 | ||||
| -rw-r--r-- | program/steps/addressbook/ldapsearchform.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index e7ccc913d..14f6eaa29 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -138,7 +138,7 @@ $rcmail_config['ldap_public'] = false; $rcmail_config['ldap_public']['Verisign'] = array('hosts' => array('directory.verisign.com'), 'port' => 389, 'base_dn' => '', - 'search_fields' => array('mail', 'cn'), + 'search_fields' => array('Email' => 'mail', 'Name' => 'cn'), 'name_field' => 'cn', 'mail_field' => 'mail', 'scope' => 'sub', diff --git a/program/steps/addressbook/ldapsearchform.inc b/program/steps/addressbook/ldapsearchform.inc index 036ade6c8..763e9f3a9 100644 --- a/program/steps/addressbook/ldapsearchform.inc +++ b/program/steps/addressbook/ldapsearchform.inc @@ -78,7 +78,7 @@ function rcmail_ldap_public_search_form($attrib) $search_fields = new select(array('name' => $field_name, 'id' => $field_id)); - $search_fields->add($server['search_fields'], $server['search_fields']); + $search_fields->add(array_keys($server['search_fields']), array_values($server['search_fields'])); $out .= '<tr><td class="title"><label for="' . $field_id . '">' . rep_specialchars_output(rcube_label('ldappublicsearchfield')) . "</label></td><td>" . $search_fields->show() . "</td></tr>\n"; |