From 51ea258bc4a6cd5b1457b1b0cac5e6c5735ac603 Mon Sep 17 00:00:00 2001 From: alex-brainstorm Date: Thu, 31 Jul 2003 15:27:29 +0000 Subject: [PATCH] advanced_tree: work around for IE bug, message count removed if false, preload plus and minus git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5486 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/left_main.php | 86 +++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/src/left_main.php b/src/left_main.php index f5e911f1..c34f9bc7 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -443,13 +443,10 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) { $mailboxURL = urlencode($mailbox); /* Only need to display info when option is set */ - if (isset($unseen_notify) && ($unseen_notify > 1)) { + if (isset($unseen_notify) && ($unseen_notify > 1) && (($boxes->unseen !== false) || ($boxes->total !== false))) { - if ($boxes->unseen !== false) { + if ($boxes->unseen !== false) $unseen = $boxes->unseen; - } else { - $unseen = 0; - } /* Should only display unseen info if the folder is inbox @@ -459,12 +456,9 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) { if ((strtolower($mailbox) == 'inbox') || ($unseen_notify == 3)) { $unseen_string = $unseen; - /* If users requests, display message count too */ - if (isset($unseen_type) && ($unseen_type == 2)) { - $numMessages = $boxes->total; - $unseen_string .= '/' . $numMessages; - } + if (isset($unseen_type) && ($unseen_type == 2) && ($boxes->total !== false)) + $unseen_string .= '/' . $boxes->total; $unseen_string = "($unseen_string)"; @@ -644,51 +638,52 @@ $xtra .= <<\n"; +if ($advanced_tree) + echo "\n\n"; +else + echo "\n\n"; do_hook('left_main_before'); if ($advanced_tree) { @@ -1028,7 +1028,7 @@ for ($i = 0; $i < count($boxes); $i++) { echo '
'; -/* echo '

';*/ +/* echo '

';*/ echo '
'."\n\n"; if (!isset($mbx)) $mbx=NULL; ListAdvancedBoxes($boxes, $mbx); -- 2.25.1