Changeset 4852 in subversion

Timestamp:

Jun 15, 2011 7:04:06 AM (2 years ago)

Author:

alec

Message:

• Fixed initial directory selection

File:

• trunk/roundcubemail/program/steps/addressbook/func.inc (modified) (3 diffs)

trunk/roundcubemail/program/steps/addressbook/func.inc

@@ -63 +63 @@
     $js_list = $RCMAIL->get_address_sources();
 
+    $source = get_input_value('_source', RCUBE_INPUT_GPC);
+
     // use first directory by default
-    $source = $js_list[key($js_list)]['id'];
+    if (!strlen($source) || !isset($js_list[$source]))
+        $source = $js_list[key($js_list)]['id'];
 
     // find writeable source
@@ -156 +159 @@
     $local_id = '0';
     $jsdata = array();
-    $current = get_input_value('_source', RCUBE_INPUT_GPC);
+
     $line_templ = html::tag('li', array(
         'id' => 'rcmli%s', 'class' => 'addressbook %s'),
@@ -163 +166 @@
             'onclick' => "return ".JS_OBJECT_NAME.".command('list','%s',this)"), '%s'));
 
-    // currently selected is the first address source in the list
-    if (!isset($current))
-        $current = strval(key((array)$OUTPUT->env['address_sources']));
-
-    foreach ((array)$OUTPUT->env['address_sources'] as $j => $source) {
+    $sources = (array) $OUTPUT->env['address_sources'];
+    reset($sources);
+
+    // currently selected source
+    $current = get_input_value('_source', RCUBE_INPUT_GPC);
+    if (!strlen($current) || !isset($sources[$source]))
+        $current = strval(key($sources));
+
+    foreach ($sources as $j => $source) {
         $id = strval($source['id'] ? $source['id'] : $j);
         $js_id = JQ($id);