X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=5690cec02be350b8197efa052b10598d86002601;hb=8df4c9294fffc58cba49b68d1ee4954a3168d326;hp=fcac1e3eef1550967ee981d7a2c0a2803e8a7abc;hpb=1d74a07ac7213a4e7ed3eaf09e47b2773e9c5ee2;p=squirrelmail.git
diff --git a/src/left_main.php b/src/left_main.php
index fcac1e3e..5690cec0 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -52,10 +52,10 @@ function formatMailboxName($imapConnection, $box_array) {
$status = array('','');
if (($unseen_notify == 2 && $real_box == 'INBOX') ||
$unseen_notify == 3) {
- $tmp_status = create_unseen_string($real_box, $box_array, $imapConnection, $unseen_type );
- if ($status !== false) {
- $status = $tmp_status;
- }
+ $tmp_status = create_unseen_string($real_box, $box_array, $imapConnection, $unseen_type );
+ if ($status !== false) {
+ $status = $tmp_status;
+ }
}
list($unseen_string, $unseen) = $status;
$special_color = ($use_special_folder_color && isSpecialMailbox($real_box));
@@ -64,12 +64,12 @@ function formatMailboxName($imapConnection, $box_array) {
$line = '';
/* If there are unseen message, bold the line. */
- if ($unseen > 0) { $line .= ''; }
+ if ($unseen > 0) { $line .= ''; }
/* Create the link for this folder. */
if ($status !== false) {
- $line .= '';
+ $line .= '';
}
if ($special_color) {
$line .= "";
@@ -82,15 +82,15 @@ function formatMailboxName($imapConnection, $box_array) {
if ($special_color == TRUE)
$line .= '';
if ($status !== false) {
- $line .= '';
+ $line .= '';
}
/* If there are unseen message, close bolding. */
- if ($unseen > 0) { $line .= ""; }
+ if ($unseen > 0) { $line .= ""; }
/* Print unseen information. */
if ($unseen_string != '') {
- $line .= " $unseen_string";
+ $line .= " $unseen_string";
}
/* If it's the trash folder, show a purge link when needed */
@@ -181,13 +181,13 @@ function create_collapse_link($boxnum) {
'href="left_main.php?';
if ($boxes[$boxnum]['collapse'] == SM_BOX_COLLAPSED) {
if ($use_icons && $icon_theme != 'none') {
- $link .= "unfold=$mailbox\">";
+ $link .= "unfold=$mailbox\">';
} else {
$link .= "unfold=$mailbox\">+";
}
} else {
if ($use_icons && $icon_theme != 'none') {
- $link .= "fold=$mailbox\">";
+ $link .= "fold=$mailbox\">';
} else {
$link .= "fold=$mailbox\">-";
}
@@ -225,7 +225,7 @@ function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type
$status = sqimap_status_messages($imapConnection, $boxName);
$boxUnseenCount = $status['UNSEEN'];
if ($boxUnseenCount === false) {
- return false;
+ return false;
}
if ($unseen_type == 2) {
$boxMessageCount = $status['MESSAGES'];
@@ -245,10 +245,10 @@ function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type
/* Collect the counts for this subfolder. */
if (($boxName != $boxes[$i]['unformatted'])
- && (substr($boxes[$i]['unformatted'], 0, $curBoxLength) == $boxName)
- && !in_array('noselect', $boxes[$i]['flags'])) {
- $status = sqimap_status_messages($imapConnection, $boxes[$i]['unformatted']);
- $subUnseenCount = $status['UNSEEN'];
+ && (substr($boxes[$i]['unformatted'], 0, $curBoxLength) == $boxName)
+ && !in_array('noselect', $boxes[$i]['flags'])) {
+ $status = sqimap_status_messages($imapConnection, $boxes[$i]['unformatted']);
+ $subUnseenCount = $status['UNSEEN'];
if ($unseen_type == 2) {
$subMessageCount = $status['MESSAGES'];;
}
@@ -355,13 +355,13 @@ function ListBoxes ($boxes, $j=0 ) {
$link = '$leader ";
+ $link .= "unfold=$mailboxURL\">$leader ';
} else {
$link .= "unfold=$mailboxURL\">$leader+ ";
}
} else {
if ($use_icons && $icon_theme != 'none') {
- $link .= "fold=$mailboxURL\">$leader ";
+ $link .= "fold=$mailboxURL\">$leader ';
} else {
$link .= "fold=$mailboxURL\">$leader- ";
}
@@ -447,7 +447,7 @@ function ListBoxes ($boxes, $j=0 ) {
function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
- $move_to_trash, $trash_folder, $collapse_folders, $use_special_folder_color;
+ $move_to_trash, $trash_folder, $collapse_folders, $use_special_folder_color;
if (!isset($boxes) || empty($boxes))
return;
@@ -663,7 +663,7 @@ if (! isset($oldway) || $oldway=="" ) {
if ($advanced_tree) {
$xtra .= <<
+