X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=5690cec02be350b8197efa052b10598d86002601;hb=8df4c9294fffc58cba49b68d1ee4954a3168d326;hp=9a1d4beb8d1589b188b9cd220b415e9cfc86a574;hpb=e1728a7ada03ba597fc2f8a800773cb427a711ce;p=squirrelmail.git
diff --git a/src/left_main.php b/src/left_main.php
index 9a1d4beb..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));
@@ -68,8 +68,8 @@ function formatMailboxName($imapConnection, $box_array) {
/* Create the link for this folder. */
if ($status !== false) {
- $line .= '';
+ $line .= '';
}
if ($special_color) {
$line .= "";
@@ -82,7 +82,7 @@ function formatMailboxName($imapConnection, $box_array) {
if ($special_color == TRUE)
$line .= '';
if ($status !== false) {
- $line .= '';
+ $line .= '';
}
/* If there are unseen message, close bolding. */
@@ -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'];;
}
@@ -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;
@@ -692,7 +692,7 @@ var vTreeSrc;
function hidechilds(img) {
id = img.id + ".0000";
form_id = "mbx[" + img.id +"F]";
- if (document.all) { //IE, Opera7
+ if (document.all) { //IE, Opera7
div = document.all[id];
if (div) {
if (div.style.display == "none") {
@@ -707,15 +707,15 @@ var vTreeSrc;
}
vTreeImg = img;
vTreeDiv = div;
- if (typeof vTreeDiv.readyState != "undefined") //IE
+ if (typeof vTreeDiv.readyState != "undefined") //IE
setTimeout("fTreeTimeout()",100);
- else //Non IE
+ else //Non IE
vTreeImg.src = vTreeSrc;
div.style.display = style;
document.all[form_id].value = value;
}
}
- else if (document.getElementById) { //Gecko
+ else if (document.getElementById) { //Gecko
div = document.getElementById(id);
if (div) {
if (div.style.display == "none") {
@@ -757,29 +757,29 @@ $xtra .= " left_size = \"$left_size\";\n";
$xtra .= <<\n";
-else
- echo "\n\n";
+if ($advanced_tree) {
+ echo "\n\n";
+} else {
+ echo "\n\n";
+}
do_hook('left_main_before');
if ($advanced_tree) {
@@ -967,7 +968,7 @@ if ($advanced_tree) {
echo "\n\n" . html_tag( 'table', '', 'left', '', 'border="0" cellspacing="0" cellpadding="0" width="99%"' ) .
html_tag( 'tr' ) .
html_tag( 'td', '', 'left' ) .
- html_tag( 'table', '', '', '', 'border="0" cellspacing="0" cellpadding="0"' ) .
+ html_tag( 'table', '', '', '', 'border="0" cellspacing="0" cellpadding="0" width="98%"' ) .
html_tag( 'tr' ) .
html_tag( 'td', '', 'center' ) .
''. _("Folders") . "
\n\n";
@@ -989,8 +990,8 @@ if ($date_format != 6) {
switch( $date_format ) {
case 0:
- $clk = date('Y-m-d '.$hr. ' T', time());
- break;
+ $clk = date('Y-m-d '.$hr. ' T', time());
+ break;
case 1:
$clk = date('m/d/y '.$hr, time());
break;
@@ -1006,13 +1007,13 @@ if ($date_format != 6) {
}
$clk = str_replace(' ',' ',$clk);
- echo '' . str_replace(' ',' ',_("Last Refresh")) .
- ": $clk
";
+ echo '' . str_replace(' ',' ',_("Last Refresh")) .
+ ":
$clk
";
}
/* Next, display the refresh button. */
-echo '['.
- _("Check mail") . ']
';
+echo '
';
/* Lastly, display the folder list. */
if ( $collapse_folders ) {