Adding folder icon support to basic template

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10811 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/left_main.php b/src/left_main.php
index 262a97175823828a5fe6d2117d84e69fcb5e2f86..d0ab3361ae236901adbbb89beef1663998762e7b 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -415,7 +415,6 @@ $oTemplate->assign('collapsable_folders_enabled', $collapse_folders==1);
 $oTemplate->assign('icon_theme_path', $icon_theme_path);
 $oTemplate->assign('use_special_folder_color', $use_special_folder_color);
 $oTemplate->assign('message_recycling_enabled', $move_to_trash);
-$oTemplate->assign('trash_folder_name', $trash_folder);
 
 if (isset($advanced_tree) && $advanced_tree)    {
     $oTemplate->display('left_main_advanced.tpl');

diff --git a/templates/util_left_main.php b/templates/util_left_main.php
index aa63b45d80710be92f497db6225ebcc1c72d89b4..943cddd54343ad9d3a44a2956ba6de8505bc5f06 100644 (file)
--- a/templates/util_left_main.php
+++ b/templates/util_left_main.php
@@ -21,8 +21,7 @@
  * @author Steve Brown
  * @since 1.5.2
  */
-function getMessageCount ($boxes, $type='total')
-{
+function getMessageCount ($boxes, $type='total') {
     // The Trash folder isn't counted...
     if ($boxes->mailboxname_full == $GLOBALS['trash_folder'])
         return 0;
@@ -49,8 +48,7 @@ function getMessageCount ($boxes, $type='total')
  * @author Steve Brown
  * @since 1.5.2
  */
-function getBoxStructure ($boxes)
-{
+function getBoxStructure ($boxes) {
     global $data_dir, $username, $icon_theme_path;
         
     // Stop condition   
@@ -80,6 +78,12 @@ function getBoxStructure ($boxes)
     $box['IsRoot'] =  isset($boxes->is_root) && $boxes->is_root;
     $box['IsNoSelect'] = isset($boxes->is_noselect) && $boxes->is_noselect;
 
+    $box['IsInbox'] = isset($boxes->is_inbox) && $boxes->is_inbox;
+    $box['IsSent'] = isset($boxes->is_sent) && $boxes->is_sent;
+    $box['IsTrash'] = isset($boxes->is_trash) && $boxes->is_trash;
+    $box['IsDraft'] = isset($boxes->is_draft) && $boxes->is_draft;
+    $box['IsNoInferiors'] = isset($boxes->is_noinferiors) && $boxes->is_noinferiors;
+
     $collapse = getPref($data_dir, $username, 'collapse_folder_' . $mailbox);
     $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
     $collapse = (int)$collapse == SM_BOX_COLLAPSED;