From df8e8ec9eee72743d0f14a8409aacf66c4a80d89 Mon Sep 17 00:00:00 2001 From: yllar <yllar.pajus@gmail.com> Date: Mon, 11 Dec 2006 12:09:34 -0500 Subject: [PATCH] updated da, de_DE, pt_BR, bs_BA, fr, pl, et_EE translations --- program/steps/addressbook/ldapsearchform.inc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/program/steps/addressbook/ldapsearchform.inc b/program/steps/addressbook/ldapsearchform.inc index 036ade6..a4e08dc 100644 --- a/program/steps/addressbook/ldapsearchform.inc +++ b/program/steps/addressbook/ldapsearchform.inc @@ -26,7 +26,7 @@ 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'); @@ -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"; @@ -105,8 +105,8 @@ { // store the search fields in a js array for each server $js = ''; - foreach ($server['search_fields'] as $k => $search_field) - $js .= "'$search_field', "; + foreach ($server['search_fields'] as $search_name => $search_value) + $js .= "['$search_name', '$search_value'], "; // store whether this server accepts fuzzy search as last item in array $js .= $server['fuzzy_search'] ? "'fuzzy'" : "'exact'"; @@ -255,7 +255,7 @@ $hiddenfields = new hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task'])); $hiddenfields->add(array('name' => '_action', 'value' => 'ldappublicsearch')); - if ($_GET['_framed'] || $_POST['_framed']) + if ($_framed) $hiddenfields->add(array('name' => '_framed', 'value' => 1)); $form_start .= !strlen($attrib['form']) ? '<form name="form" action="./" method="post">' : ''; -- Gitblit v1.9.1