Changeset 578 in subversion

Timestamp:

May 18, 2007 9:06:01 AM (6 years ago)

Author:

thomasb

Message:

Always populate the address source list

File:

• branches/release-0.1-rc1/program/steps/addressbook/func.inc (modified) (4 diffs)

branches/release-0.1-rc1/program/steps/addressbook/func.inc

@@ -48 +48 @@
 $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)
@@ -65 +71 @@
     "</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";
@@ -100 +104 @@
       $js_id,
       !empty($prop['name']) ? Q($prop['name']) : Q($id));
-      
-    $js_list[$id] = array('id' => $id, 'readonly' => !$prop['writeable']);
   }
   
@@ -107 +109 @@
 
   $OUTPUT->add_gui_object('folderlist', $attrib['id']);
-  $OUTPUT->set_env('address_sources', $js_list);
   
   return $out;