X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=3d38e173f87a7952661bdc5e8b25c0af08035b76;hb=541506f3bbe3cfc966221c55c35e50e9bda6f181;hp=8ec84d578b0accf939a5833ad36b05a3ddc78549;hpb=1e0628fbfe24eeea183f77b653eb282dafccb48d;p=squirrelmail.git
diff --git a/src/left_main.php b/src/left_main.php
index 8ec84d57..3d38e173 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -1,130 +1,198 @@
";
-
- function formatMailboxName($imapConnection, $mailbox, $real_box, $delimeter, $color) {
- global $folder_prefix, $trash_folder, $sent_folder;
- global $color, $move_to_sent, $move_to_trash;
+ function formatMailboxName($imapConnection, $box_array, $delimeter) {
+ global $folder_prefix, $trash_folder, $sent_folder;
+ global $color, $move_to_sent, $move_to_trash;
+ global $unseen_notify, $unseen_type, $collapse_folders;
+ $real_box = $box_array['unformatted'];
+ $mailbox = $box_array['formatted'];
$mailboxURL = urlencode($real_box);
- sqimap_mailbox_select ($imapConnection, $real_box);
- $unseen = sqimap_unseen_messages($imapConnection, $numUnseen);
-
- echo "";
- if ($unseen)
- $line .= "";
-
+
+ $unseen = 0;
+
+ if (($unseen_notify == 2 && $real_box == "INBOX") ||
+ $unseen_notify == 3) {
+ $unseen = sqimap_unseen_messages($imapConnection, $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;
+ }
+ }
+
$special_color = false;
- 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 .= replace_spaces($mailbox);
- $line .= "";
- } else {
- $line .= "";
- $line .= replace_spaces($mailbox);
- $line .= "";
+ if ((strtolower($real_box) == "inbox") ||
+ (($real_box == $trash_folder) && ($move_to_trash)) ||
+ (($real_box == $sent_folder) && ($move_to_sent)))
+ $special_color = true;
+
+ $spaces = '';
+ $line = "";
+ if (ereg("^( *)([^ ]*)$", $mailbox, $regs)) {
+ $spaces = $regs[1];
+ $mailbox = $regs[2];
}
-
- if ($unseen)
+
+ if ($unseen > 0)
+ $line .= "";
+ $line .= str_replace(' ', ' ', $spaces);
+
+ if ($collapse_folders) {
+ if (isset($box_array['parent']))
+ $line .= FoldLink($box_array['unformatted'], $box_array['parent']);
+ else
+ $line .= ' ';
+ }
+
+ $line .= "";
+ if ($special_color == true)
+ $line .= "";
+ $line .= str_replace(' ', ' ', $mailbox);
+ if ($special_color == true)
+ $line .= "";
+ $line .= "";
+
+ if ($unseen > 0)
$line .= "";
- if ($numUnseen > 0) {
- $line .= " ($numUnseen)";
+ if (isset($unseen_found) && $unseen_found) {
+ $line .= " $unseen_string";
}
if (($move_to_trash == true) && ($real_box == $trash_folder)) {
- $urlMailbox = urlencode($real_box);
- $line .= "";
- $line .= " ("._("purge").")";
- $line .= "\n";
+ if (! isset($numMessages))
+ $numMessages = sqimap_get_num_messages($imapConnection, $real_box);
+
+ if ($numMessages > 0)
+ {
+ $urlMailbox = urlencode($real_box);
+ $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, $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 "\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");
echo ")
";
$delimeter = sqimap_get_delimiter($imapConnection);
+ if (isset($collapse_folders) && $collapse_folders) {
+ if (isset($fold))
+ setPref($data_dir, $username, 'collapse_folder_' . $fold, 1);
+ if (isset($unfold))
+ setPref($data_dir, $username, 'collapse_folder_' . $unfold, 0);
+ $IAmAParent = array();
+ for ($i = 0; $i < count($boxes); $i ++) {
+ $parts = explode($delimeter, $boxes[$i]['unformatted']);
+ $box_name = array_pop($parts);
+ $box_parent = implode($delimeter, $parts);
+ $hidden = 0;
+ if (isset($box_parent)) {
+ $hidden = getPref($data_dir, $username,
+ 'collapse_folder_' . $box_parent);
+ $IAmAParent[$box_parent] = $hidden;
+ }
+ $boxes[$i]['folded'] = $hidden;
+ }
+ }
+
for ($i = 0;$i < count($boxes); $i++) {
- $line = "";
- $mailbox = $boxes[$i]["formatted"];
-
- if ($boxes[$i]["flags"]) {
- $noselect = false;
- for ($h = 0; $h < count($boxes[$i]["flags"]); $h++) {
- if (strtolower($boxes[$i]["flags"][$h]) == "noselect")
- $noselect = true;
+ if (! isset($boxes[$i]['folded']) || ! $boxes[$i]['folded'])
+ {
+ $line = "";
+ $mailbox = $boxes[$i]["formatted"];
+
+ if (isset($collapse_folders) && $collapse_folders && isset($IAmAParent[$boxes[$i]['unformatted']])) {
+ $boxes[$i]['parent'] = $IAmAParent[$boxes[$i]['unformatted']];
}
- if ($noselect == true) {
+
+ if (in_array('noselect', $boxes[$i]['flags'])) {
$line .= "";
- $line .= replace_spaces(readShortMailboxName($mailbox, $delimeter));
- $line .= "";
+ if (ereg("^( *)([^ ]*)", $mailbox, $regs)) {
+ $line .= str_replace(' ', ' ', $mailbox);
+ if (isset($boxes[$i]['parent']))
+ $line .= FoldLink($boxes[$i]['unformatted'], $boxes[$i]['parent']);
+ elseif ($collapse_folders)
+ $line .= ' ';
+ }
+ $line .= '';
} else {
- $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $color);
+ $line .= formatMailboxName($imapConnection, $boxes[$i], $delimeter);
}
- } else {
- $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $color);
+ echo "$line
\n";
}
- echo "$line
";
}
-
-
- fclose($imapConnection);
-
+ sqimap_logout($imapConnection);
+ do_hook("left_main_after");
+
+ function FoldLink($mailbox, $folded) {
+ $mailbox = urlencode($mailbox);
+ echo '+";
+ else
+ echo "fold=$mailbox\">-";
+ echo ' ';
+ }
+
?>