X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=112ad87b7aca3dc1a961b526acf28b002e0a17f4;hb=a37f3771b11544a29ebd521a69599381c90e7df2;hp=a674eaaf75f793a1bbc545f825bd3deaeb3244fd;hpb=813eba2f5f4695bd30b895cd148658f3b90bf120;p=squirrelmail.git
diff --git a/src/left_main.php b/src/left_main.php
index a674eaaf..112ad87b 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -1,92 +1,129 @@
-
+
-
-
- include("../config/config.php");
- include("../functions/array.php");
- include("../functions/strings.php");
- include("../functions/imap.php");
- function formatMailboxName($imapConnection, $mailbox, $real_box, $delimeter, $color, $move_to_trash) {
- require ("../config/config.php");
+
+ if (!isset($config_php))
+ include("../config/config.php");
+ if (!isset($array_php))
+ include("../functions/array.php");
+ if (!isset($strings_php))
+ include("../functions/strings.php");
+ if (!isset($imap_php))
+ include("../functions/imap.php");
+ if (!isset($page_header_php))
+ include("../functions/page_header.php");
+ if (!isset($i18n_php))
+ include("../functions/i18n.php");
+ if (!isset($plugin_php))
+ include("../functions/plugin.php");
+
+ 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);
- 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 .= "";
+ $line .= "";
$line .= replace_spaces($mailbox);
$line .= "";
} else {
- $line .= "";
+ $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 .= " (empty me)";
- $line .= "\n";
+ $line .= "\n\n";
+ $line .= " ("._("purge").")";
+ $line .= "\n\n";
}
-
- echo "";
+ $line .= "";
return $line;
}
// open a connection on the imap port (143)
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, 10); // the 10 is to hide the output
+ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output
/** If it was a successful login, lets load their preferences **/
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 "";
+ echo "\n\n\n";
+
+ do_hook("left_main_before");
$boxes = sqimap_mailbox_list($imapConnection);
- echo "";
- echo _("Folders") . "
";
+ echo "";
+ echo _("Folders") . "
\n\n";
- echo "(";
+ echo "(";
echo _("refresh folder list");
- echo ")
";
- echo "\n";
+ echo ")
";
$delimeter = sqimap_get_delimiter($imapConnection);
for ($i = 0;$i < count($boxes); $i++) {
@@ -100,21 +137,18 @@
$noselect = true;
}
if ($noselect == true) {
- $line .= "";
+ $line .= "";
$line .= replace_spaces(readShortMailboxName($mailbox, $delimeter));
- $line .= "";
+ $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";
}
-
- echo "";
-
- fclose($imapConnection);
-
+ sqimap_logout($imapConnection);
+ do_hook("left_main_after");
?>
-
+