X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=0adbd3a7cfc141adc4420c7f31ae7b018603be10;hb=235a65d5d176a14cfba2284cb2ce898596e5e8f1;hp=d6de4f84339266187a97f684ffa6093cd65ef4e0;hpb=99ab0367d42d25453cb02669658c141565a165cd;p=squirrelmail.git
diff --git a/src/left_main.php b/src/left_main.php
index d6de4f84..0adbd3a7 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -7,22 +7,30 @@
** This is the code for the left bar. The left bar shows the folders
** available, and has cookie information.
**
+ ** $Id$
**/
session_start();
+ if (!isset($i18n_php))
+ include ("../functions/i18n.php");
+
if(!isset($username)) {
- echo "You need a valid user and password to access this page!";
+ set_up_language($squirrelmail_language, true);
+ include ("../themes/default_theme.php");
+ printf('',
+ $color[8], $color[4], $color[7], $color[7], $color[7]);
+ echo "";
exit;
}
+ if (!isset($strings_php))
+ include("../functions/strings.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))
@@ -40,25 +48,20 @@
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;
+ 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);
-
- 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);
+
+ $unseen = 0;
+
+ if (($unseen_notify == 2 && $real_box == "INBOX") ||
+ $unseen_notify == 3) {
+ $unseen = sqimap_unseen_messages($imapConnection, $numUnseen, $real_box);
if ($unseen_type == 1 && $unseen > 0) {
$unseen_string = "($unseen)";
$unseen_found = true;
@@ -68,38 +71,50 @@
$unseen_found = true;
}
}
-
- $line .= "";
- if ($unseen > 0)
- $line .= "";
-
+
$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 > 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 ($unseen_found) {
+ if (isset($unseen_found) && $unseen_found) {
$line .= " $unseen_string";
}
if (($move_to_trash == true) && ($real_box == $trash_folder)) {
$urlMailbox = urlencode($real_box);
$line .= "\n\n";
- $line .= " ("._("purge").")";
+ $line .= " ("._("purge").")";
$line .= "\n\n";
}
$line .= "";
@@ -112,7 +127,7 @@
echo "\n";
}
- echo "\n\n\n";
+ echo "\n\n";
do_hook("left_main_before");
@@ -126,29 +141,67 @@
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(' ', ' ', $regs[1]);
+ if (isset($boxes[$i]['parent']))
+ $line .= FoldLink($boxes[$i]['unformatted'],
+ $boxes[$i]['parent']);
+ elseif ($collapse_folders)
+ $line .= ' ';
+ $line .= str_replace(' ', ' ', $regs[2]);
+ }
+ $line .= '';
} else {
- $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $boxes[$i]["unseen"]);
+ $line .= formatMailboxName($imapConnection, $boxes[$i], $delimeter);
}
- } else {
- $line .= formatMailboxName($imapConnection, $mailbox, $boxes[$i]["unformatted"], $delimeter, $boxes[$i]["unseen"]);
+ echo "$line
\n";
}
- echo "\n$line
\n";
}
sqimap_logout($imapConnection);
do_hook("left_main_after");
+
+ function FoldLink($mailbox, $folded) {
+ $mailbox = urlencode($mailbox);
+ echo '+";
+ else
+ echo "fold=$mailbox\">-";
+ echo ' ';
+ }
+
?>