From 597c09cf972ffb3c4e86adfcd79aa86b0258d3a8 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 18 May 2007 10:38:11 -0400
Subject: [PATCH] Always populate the address source list
---
program/steps/addressbook/func.inc | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 397b0a1..574ef87 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -47,6 +47,12 @@
$OUTPUT->set_env('source', $source ? $source : '0');
$OUTPUT->set_env('readonly', $CONTACTS->readonly, false);
+// add list of address sources to client env
+$js_list = array("0" => array('id' => 0, 'readonly' => false));
+foreach ((array)$CONFIG['ldap_public'] as $id => $prop)
+ $js_list[$id] = array('id' => $id, 'readonly' => !$prop['writeable']);
+$OUTPUT->set_env('address_sources', $js_list);
+
function rcmail_directory_list($attrib)
{
@@ -64,8 +70,6 @@
' onmouseup="return %s.folder_mouse_up(\'%s\')">%s'.
"</a></li>\n";
- $js_list = array("$local_id" => array('id' => $local_id, 'readonly' => false));
-
// allow the following attributes to be added to the <ul> tag
$out = '<ul' . create_attrib_string($attrib, array('style', 'class', 'id')) . ">\n";
$out .= sprintf($line_templ,
@@ -99,14 +103,11 @@
JS_OBJECT_NAME,
$js_id,
!empty($prop['name']) ? Q($prop['name']) : Q($id));
-
- $js_list[$id] = array('id' => $id, 'readonly' => !$prop['writeable']);
}
$out .= '</ul>';
$OUTPUT->add_gui_object('folderlist', $attrib['id']);
- $OUTPUT->set_env('address_sources', $js_list);
return $out;
}
--
Gitblit v1.9.1