X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=112ad87b7aca3dc1a961b526acf28b002e0a17f4;hb=6b6381715922c24dc8664cc62464096814d6a291;hp=c8bc624aa7411bed2e8ed2e7e22318c46236c61b;hpb=4bbba0d8cf096277dc7375cfb54193be092b83e5;p=squirrelmail.git
diff --git a/src/left_main.php b/src/left_main.php
index c8bc624a..112ad87b 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -1,6 +1,8 @@
";
+ displayHtmlHeader();
function formatMailboxName($imapConnection, $mailbox, $real_box, $delimeter, $unseen) {
global $folder_prefix, $trash_folder, $sent_folder;
global $color, $move_to_sent, $move_to_trash;
+ global $unseen_notify, $unseen_type;
$mailboxURL = urlencode($real_box);
- if($real_box=="INBOX") {
+
+ if ($unseen_notify == 2 && $real_box == "INBOX") {
$unseen = sqimap_unseen_messages($imapConnection, $numUnseen, $real_box);
- }
+ if ($unseen_type == 1 && $unseen > 0) {
+ $unseen_string = "($unseen)";
+ $unseen_found = true;
+ } else if ($unseen_type == 2) {
+ $numMessages = sqimap_get_num_messages($imapConnection, $real_box);
+ $unseen_string = "($unseen/$numMessages)";
+ $unseen_found = true;
+ }
+ } else if ($unseen_notify == 3) {
+ $unseen = sqimap_unseen_messages($imapConnection, $numUnseen, $real_box);
+ if ($unseen_type == 1 && $unseen > 0) {
+ $unseen_string = "($unseen)";
+ $unseen_found = true;
+ } else if ($unseen_type == 2) {
+ $numMessages = sqimap_get_num_messages($imapConnection, $real_box);
+ $unseen_string = "($unseen/$numMessages)";
+ $unseen_found = true;
+ }
+ }
- echo "";
+ $line .= "";
if ($unseen > 0)
$line .= "";
@@ -56,24 +80,24 @@
} else {
$line .= "";
$line .= replace_spaces($mailbox);
- $line .= "";
+ $line .= "";
}
if ($unseen > 0)
$line .= "";
- if ($unseen > 0) {
- $line .= " ($unseen)";
+ if ($unseen_found) {
+ $line .= " $unseen_string";
}
if (($move_to_trash == true) && ($real_box == $trash_folder)) {
$urlMailbox = urlencode($real_box);
- $line .= "";
- $line .= " ("._("purge").")";
- $line .= "\n";
+ $line .= "\n\n";
+ $line .= " ("._("purge").")";
+ $line .= "\n\n";
}
+ $line .= "";
return $line;
- echo "";
}
// open a connection on the imap port (143)
@@ -83,17 +107,19 @@
include("../src/load_prefs.php");
if (isset($left_refresh) && ($left_refresh != "None") && ($left_refresh != "")) {
- echo "";
- echo "";
- echo "";
+ echo "\n";
+ echo "\n";
+ echo "\n";
}
- echo "";
+ echo "\n\n\n";
+
+ do_hook("left_main_before");
$boxes = sqimap_mailbox_list($imapConnection);
- echo "";
- echo _("Folders") . "
";
+ echo "";
+ echo _("Folders") . "
\n\n";
echo "(";
echo _("refresh folder list");
@@ -120,11 +146,9 @@
} else {
$line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $boxes[$i]["unseen"]);
}
- echo "$line
";
+ echo "\n$line
\n";
}
-
-
- fclose($imapConnection);
-
+ sqimap_logout($imapConnection);
+ do_hook("left_main_after");
?>