From c4a6214e93ce13202ef6fe7add90ae4c2d1f2deb Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Tue, 10 Jan 2006 19:38:08 -0500
Subject: [PATCH] implemented making the search fields drop down names nice
---
config/main.inc.php.dist | 2 +-
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 e7ccc91..14f6eaa 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -138,7 +138,7 @@
$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 036ade6..763e9f3 100644
--- a/program/steps/addressbook/ldapsearchform.inc
+++ b/program/steps/addressbook/ldapsearchform.inc
@@ -78,7 +78,7 @@
$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";
--
Gitblit v1.9.1