X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=112ad87b7aca3dc1a961b526acf28b002e0a17f4;hb=a37f3771b11544a29ebd521a69599381c90e7df2;hp=f1244e4e807bf5ac8c6881ce90e1e8dea9743598;hpb=9f2215a1f40978a370a7538229ca2f55f55026ee;p=squirrelmail.git
diff --git a/src/left_main.php b/src/left_main.php
index f1244e4e..112ad87b 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -1,6 +1,8 @@
";
-
- function formatMailboxName($imapConnection, $mailbox, $real_box, $delimeter, $color, $move_to_trash) {
- require ("../config/config.php");
+ 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);
- sqimap_mailbox_select ($imapConnection, $real_box);
- $unseen = sqimap_unseen_messages($imapConnection, $numUnseen);
- echo "";
- if ($unseen)
+ 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;
+ }
+ }
+
+ $line .= "";
+ if ($unseen > 0)
$line .= "";
$special_color = false;
- for ($i = 0; $i < count($special_folders); $i++) {
- if (($special_folders[$i] == $real_box) && ($use_special_folder_color == true))
- $special_color = true;
- }
+ if ((strtolower($real_box) == "inbox") ||
+ (($real_box == $trash_folder) && ($move_to_trash)) ||
+ (($real_box == $sent_folder) && ($move_to_sent)))
+ $special_color = true;
if ($special_color == true) {
$line .= "";
@@ -54,24 +80,23 @@
} else {
$line .= "";
$line .= replace_spaces($mailbox);
- $line .= "";
+ $line .= "";
}
- if ($unseen)
+ if ($unseen > 0)
$line .= "";
- if ($numUnseen > 0) {
- $line .= " ($numUnseen)";
+ if ($unseen_found) {
+ $line .= " $unseen_string";
}
- if (($move_to_trash == true) && (trim($real_box) == $trash_folder)) {
+ 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";
}
-
- echo "";
+ $line .= "";
return $line;
}
@@ -82,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");
@@ -114,16 +141,14 @@
$line .= replace_spaces(readShortMailboxName($mailbox, $delimeter));
$line .= "";
} else {
- $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $color, $move_to_trash);
+ $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $boxes[$i]["unseen"]);
}
} else {
- $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $color, $move_to_trash);
+ $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");
?>