Changeset 1704 in subversion

Timestamp:

Aug 29, 2008 9:41:48 AM (5 years ago)

Author:

thomasb

Message:

Little code cleanup

File:

• trunk/roundcubemail/program/include/main.inc (modified) (6 diffs)

trunk/roundcubemail/program/include/main.inc

@@ -885 +885 @@
 function rcmail_mailbox_list($attrib)
 {
-  global $IMAP, $OUTPUT;
+  global $RCMAIL;
   static $a_mailboxes;
   
@@ -901 +901 @@
 
   // get mailbox list
-  $mbox_name = $IMAP->get_mailbox_name();
+  $mbox_name = $RCMAIL->imap->get_mailbox_name();
   
   // build the folders tree
   if (empty($a_mailboxes)) {
     // get mailbox list
-    $a_folders = $IMAP->list_mailboxes();
-    $delimiter = $IMAP->get_hierarchy_delimiter();
+    $a_folders = $RCMAIL->imap->list_mailboxes();
+    $delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
     $a_mailboxes = array();
 
@@ -928 +928 @@
   }
 
-  if ($type=='ul')
-    $OUTPUT->add_gui_object('mailboxlist', $attrib['id']);
+  if ($type=='ul') {
+    $RCMAIL->output->add_gui_object('mailboxlist', $attrib['id']);
+    $RCMAIL->output->set_env('collapsed_folders', $RCMAIL->config->get('collapsed_folders'));
+  }
 
   return $out;
@@ -1001 +1003 @@
 function rcmail_render_folder_tree_html(&$arrFolders, &$mbox_name, $maxlength, $realnames=false, $nestLevel=0)
   {
-  global $COMM_PATH, $IMAP, $CONFIG, $OUTPUT, $RCMAIL;
+  global $RCMAIL, $CONFIG;
 
   $idx = 0;
@@ -1075 +1077 @@
     }
 
-  $OUTPUT->set_env('collapsed_folders', $RCMAIL->config->get('collapsed_folders'));
-
   return $out;
   }
@@ -1087 +1087 @@
 function rcmail_render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames=false, $nestLevel=0)
   {
-  global $IMAP, $OUTPUT;
-
   $idx = 0;
   $out = '';