From 1495ac7913095ae8284c3501b7d4e6dd31a484ec Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 14 Apr 2012 07:15:28 -0400
Subject: [PATCH] - More public methods, code cleanup

---
 program/include/rcube_ui.php |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/program/include/rcube_ui.php b/program/include/rcube_ui.php
index 2625710..833a1df 100644
--- a/program/include/rcube_ui.php
+++ b/program/include/rcube_ui.php
@@ -769,7 +769,7 @@
     /**
      * Create a hierarchical array of the mailbox list
      */
-    private static function build_folder_tree(&$arrFolders, $folder, $delm = '/', $path = '')
+    public static function build_folder_tree(&$arrFolders, $folder, $delm = '/', $path = '')
     {
         global $RCMAIL;
 
@@ -829,7 +829,7 @@
     /**
      * Return html for a structured list &lt;ul&gt; for the mailbox tree
      */
-    private static function render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $attrib, $nestLevel = 0)
+    public static function render_folder_tree_html(&$arrFolders, &$mbox_name, &$jslist, $attrib, $nestLevel = 0)
     {
         global $RCMAIL;
 
@@ -842,7 +842,7 @@
         foreach ($arrFolders as $key => $folder) {
             $title        = null;
             $folder_class = self::folder_classname($folder['id']);
-            $collapsed    = strpos($collapsed, '&'.rawurlencode($folder['id']).'&') !== false;
+            $is_collapsed = strpos($collapsed, '&'.rawurlencode($folder['id']).'&') !== false;
             $unread       = $msgcounts ? intval($msgcounts[$folder['id']]['UNSEEN']) : 0;
 
             if ($folder_class && !$realnames) {
@@ -896,7 +896,7 @@
                 'noclose' => true),
                 html::a($link_attrib, $html_name) .
                 (!empty($folder['folders']) ? html::div(array(
-                    'class' => ($collapsed ? 'collapsed' : 'expanded'),
+                    'class' => ($is_collapsed ? 'collapsed' : 'expanded'),
                     'style' => "position:absolute",
                     'onclick' => sprintf("%s.command('collapse-folder', '%s')", JS_OBJECT_NAME, $js_name)
                 ), '&nbsp;') : ''));
@@ -908,7 +908,7 @@
             );
 
             if (!empty($folder['folders'])) {
-                $out .= html::tag('ul', array('style' => ($collapsed ? "display:none;" : null)),
+                $out .= html::tag('ul', array('style' => ($is_collapsed ? "display:none;" : null)),
                     self::render_folder_tree_html($folder['folders'], $mbox_name, $jslist, $attrib, $nestLevel+1));
             }
 
@@ -922,7 +922,7 @@
     /**
      * Return html for a flat list <select> for the mailbox tree
      */
-    private static function render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames = false, $nestLevel = 0, $opts = array())
+    public static function render_folder_tree_select(&$arrFolders, &$mbox_name, $maxlength, &$select, $realnames = false, $nestLevel = 0, $opts = array())
     {
         global $RCMAIL;
 
@@ -969,7 +969,7 @@
     /**
      * Return internal name for the given folder if it matches the configured special folders
      */
-    private static function folder_classname($folder_id)
+    public static function folder_classname($folder_id)
     {
         global $CONFIG;
 

--
Gitblit v1.9.1