X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fleft_main.php;h=cdb23354fdb8bc4cf53f1c3d9d241548b1f81f6e;hb=f2ae196fabc8b3f6270685dad4ce0a8f8f40182f;hp=71fb702868f5373e4f11e46d59a4257c064fd489;hpb=c3ccfa1912b4ca47279d259bb587ceb293ce5d83;p=squirrelmail.git diff --git a/src/left_main.php b/src/left_main.php index 71fb7028..cdb23354 100644 --- a/src/left_main.php +++ b/src/left_main.php @@ -301,8 +301,8 @@ function listBoxes ($boxes, $j=0 ) { /* get unseen/total messages information */ if ($boxes->unseen !== false || $boxes->total !== false) { $unseen = $boxes->unseen; - $unseen_string = "($unseen)"; - if ($unseen>0||$boxes->total>0) { + if ($unseen>0 || $boxes->total>0) { + $unseen_string = "($unseen)"; $unseen_found = TRUE; } $unseen_before = ''; @@ -362,7 +362,7 @@ function listBoxes ($boxes, $j=0 ) { ""; } } else { - if (!$boxes->is_noselect) { + if (!$boxes->is_noselect || strtolower($boxes->mailboxname_full)=="inbox") { if ($unseen > 0) { $pre .= ''; } @@ -375,7 +375,7 @@ function listBoxes ($boxes, $j=0 ) { } /* Print unseen information. */ - if (isset($unseen_found) && $unseen_found) { + if (isset($unseen_found) && $unseen_found && ($unseen > 0)) { $end .= " $unseen_string"; } @@ -418,8 +418,10 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) { /* get unseen/total messages information */ if ($boxes->unseen !== false) { $unseen = $boxes->unseen; - $unseen_string = "($unseen)"; - if ($unseen>0) $unseen_found = TRUE; + if ($unseen>0) { + $unseen_found = TRUE; + $unseen_string = "($unseen)"; + } if ($boxes->total) { $numMessages = $boxes->total; $unseen_string = "($unseen/$numMessages)"; @@ -439,7 +441,7 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) { if ($unseen > 0) { $end .= ''; } /* Print unseen information. */ - if (isset($unseen_found) && $unseen_found) { + if (isset($unseen_found) && $unseen_found && ($unseen > 0)) { $end .= " $unseen_string"; }