From 6d671aa173c54d4ec3a8de86f46e89d4ccc03f70 Mon Sep 17 00:00:00 2001 From: stevetruckstuff Date: Wed, 22 Feb 2006 23:39:13 +0000 Subject: [PATCH] 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 --- src/left_main.php | 1 - templates/util_left_main.php | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/left_main.php b/src/left_main.php index 262a9717..d0ab3361 100644 --- 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 aa63b45d..943cddd5 100644 --- 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; -- 2.25.1