X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fleft_main.php;h=361e017a651bea07c67b901e0a4d91853c2789ec;hp=729460ebde622357beadab1b9cadeb8421d272f4;hb=26a425f5b596dd84259471f4eb6deacc7c88a113;hpb=6d37d943432223effc3b7b95e9f77c05ab507cda
diff --git a/src/left_main.php b/src/left_main.php
index 729460eb..361e017a 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -1,58 +1,82 @@
0) {
@@ -66,139 +90,260 @@
}
$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;
-
- $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 .= ' ';
+ if ($use_special_folder_color) {
+ if ((strtolower($real_box) == 'inbox')
+ || (($real_box == $trash_folder) && ($move_to_trash))
+ || (($real_box == $sent_folder) && ($move_to_sent))
+ || (($real_box == $draft_folder) && ($save_as_draft))) {
+ $special_color = true;
+ }
}
-
- $line .= "";
+
+ /* Start off with a blank line. */
+ $line = '';
+
+ /* If there are unseen message, bold the line. */
+ if ($unseen > 0) { $line .= ''; }
+
+ /* Crate the link for this folder. */
+ $line .= "";
if ($special_color == true)
$line .= "";
- $line .= str_replace(' ', ' ', $mailbox);
+ $line .= str_replace(' ',' ',$mailbox);
if ($special_color == true)
- $line .= "";
- $line .= "";
+ $line .= "";
+ $line .= '';
- if ($unseen > 0)
- $line .= "";
+ /* If there are unseen message, close bolding. */
+ if ($unseen > 0) { $line .= ""; }
+ /* Print unseen information. */
if (isset($unseen_found) && $unseen_found) {
- $line .= " $unseen_string";
+ $line .= " $unseen_string";
}
if (($move_to_trash == true) && ($real_box == $trash_folder)) {
- if (! isset($numMessages))
+ if (! isset($numMessages)) {
$numMessages = sqimap_get_num_messages($imapConnection, $real_box);
+ }
- if ($numMessages > 0)
- {
+ if ($numMessages > 0) {
$urlMailbox = urlencode($real_box);
$line .= "\n\n";
- $line .= " ("._("purge").")";
+ $line .= " ("._("empty").")";
$line .= "\n\n";
}
}
- $line .= "";
- return $line;
- }
- if (isset($left_refresh) && ($left_refresh != "None") && ($left_refresh != "")) {
- echo "\n";
- echo "\n";
- echo "\n";
+ /* Return the final product. */
+ return ($line);
}
+
+ /**********************************/
+ /* END OF FUNCTION - BACK TO MAIN */
+ /**********************************/
+
+ if (isset($left_refresh) && ($left_refresh != 'None') && ($left_refresh != '')) {
+ echo "\n";
+ echo "\n";
+ echo "\n";
+ }
- echo "\n\n";
-
- do_hook("left_main_before");
-
- $boxes = sqimap_mailbox_list($imapConnection);
-
- 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;
+ echo "\n\n";
+
+ do_hook("left_main_before");
+
+ $boxes = sqimap_mailbox_list($imapConnection);
+
+ echo '';
+ echo _("Folders") . "
\n\n";
+
+ if ($date_format != 6) {
+ /* First, display the clock. */
+ if ($hour_format == 1) {
+ if ($date_format == 4) {
+ $hr = "G:i:s";
+ } else {
+ $hr = "G:i";
}
- $boxes[$i]['folded'] = $hidden;
- }
- }
+ } else {
+ if ($date_format == 4) {
+ $hr = "g:i:s a";
+ } else {
+ $hr = "g:i a";
+ }
+ }
+
+ switch( $date_format ) {
+ case 1:
+ $clk = date("m/d/y ".$hr, time());
+ break;
+ case 2:
+ $clk = date("d/m/y ".$hr, time());
+ break;
+ case 4:
+ case 5:
+ $clk = date($hr, time());
+ break;
+ default:
+ $clk = date("D, ".$hr, time());
+ }
+ $clk = str_replace(' ',' ',$clk);
- for ($i = 0;$i < count($boxes); $i++) {
- if (! isset($boxes[$i]['folded']) || ! $boxes[$i]['folded'])
- {
- $line = "";
- $mailbox = $boxes[$i]["formatted"];
+ echo '' . str_replace(' ',' ',_("Last Refresh"))
+ . ": $clk";
+ }
- if (isset($collapse_folders) && $collapse_folders && isset($IAmAParent[$boxes[$i]['unformatted']])) {
- $boxes[$i]['parent'] = $IAmAParent[$boxes[$i]['unformatted']];
- }
+ /* Next, display the refresh button. */
+ echo '(';
+ echo _("refresh folder list");
+ echo ')
';
+ $delimeter = sqimap_get_delimiter($imapConnection);
+
+ /* Lastly, display the folder list. */
+ if (isset($collapse_folders) && $collapse_folders) {
+ /* If directed, collapse or uncollapse a folder. */
+ if (isset($fold)) {
+ setPref($data_dir, $username, 'collapse_folder_' . $fold, SM_BOX_COLLAPSED);
+ } else if (isset($unfold)) {
+ setPref($data_dir, $username, 'collapse_folder_' . $unfold, $SM_BOX_UNCOLLAPSED);
+ }
+ }
+
+ /* Prepare do do out collapsedness and visibility computation. */
+ $curbox = 0;
+ $boxcount = count($boxes);
- if (in_array('noselect', $boxes[$i]['flags'])) {
- $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 .= ' ';
+ /* Compute the collapsedness and visibility of each box. */
+ while ($curbox < $boxcount) {
+ $boxes[$curbox]['visible'] = true;
+ compute_folder_children($curbox, $boxcount);
+ }
+
+ for ($i = 0;$i < count($boxes); $i++) {
+ if ($boxes[$i]['visible'] == true) {
+ $mailbox = $boxes[$i]['formatted'];
+ $mblevel = substr_count($boxes[$i]['unformatted'], $delimeter) + 1;
+
+ /* Create the prefix for the folder name and link. */
+ $prefix = str_repeat(' ',$mblevel);
+ if (isset($collapse_folders) && $collapse_folders && $boxes[$i]['parent']) {
+ $prefix = str_replace(' ',' ',substr($prefix,0,strlen($prefix)-2));
+ $prefix .= create_collapse_link($i) . ' ';
+ } else {
+ $prefix = str_replace(' ',' ',$prefix);
}
- $line .= '';
- } else {
- $line .= formatMailboxName($imapConnection, $boxes[$i], $delimeter);
- }
- echo "$line
\n";
- }
- }
- sqimap_logout($imapConnection);
- do_hook("left_main_after");
-
- function FoldLink($mailbox, $folded) {
- $mailbox = urlencode($mailbox);
- echo '+";
- else
- echo "fold=$mailbox\">-";
- echo ' ';
- }
+ $line = "$prefix";
+
+ /* Add the folder name and link. */
+ if (in_array('noselect', $boxes[$i]['flags'])) {
+ $line .= "";
+ if (ereg("^( *)([^ ]*)", $mailbox, $regs)) {
+ $mailbox = str_replace(' ','',$mailbox);
+ $line .= str_replace(' ', ' ', $mailbox);
+ }
+ $line .= '';
+ } else {
+ $line .= formatMailboxName($imapConnection, $boxes[$i], $delimeter);
+ }
+
+ /* Put the final touches on our folder line. */
+ $line .= "
\n";
+
+ /* Output the line for this folder. */
+ echo $line;
+ }
+ }
+ sqimap_logout($imapConnection);
+ do_hook("left_main_after");
+
+ /**
+ * Create the link for a parent folder that will allow that
+ * parent folder to either be collapsed or expaned, as is
+ * currently appropriate.
+ */
+ function create_collapse_link($boxnum) {
+ global $boxes;
+ $mailbox = urlencode($boxes[$boxnum]['unformatted']);
+
+ /* Create the link for this collapse link. */
+ $link = '+";
+ } else {
+ $link .= "fold=$mailbox\">-";
+ }
+ $link .= '';
+
+ /* Return the finished product. */
+ return ($link);
+ }
+ /**
+ * This simple function checks if a box is another box's parent.
+ */
+ function is_parent_box($curbox_name, $parbox_name) {
+ global $delimeter;
+
+ /* Extract the name of the parent of the current box. */
+ $curparts = explode($delimeter, $curbox_name);
+ $curname = array_pop($curparts);
+ $actual_parname = implode($delimeter, $curparts);
+ $actual_parname = substr($actual_parname,0,strlen($parbox_name));
+
+ /* Compare the actual with the given parent name. */
+ return ($parbox_name == $actual_parname);
+ }
+
+ /**
+ * Recursive function that computes the collapsed status and parent
+ * (or not parent) status of this box, and the visiblity and collapsed
+ * status and parent (or not parent) status for all children boxes.
+ */
+ function compute_folder_children(&$parbox, $boxcount) {
+ global $boxes, $data_dir, $username;
+ $nextbox = $parbox + 1;
+
+ /* Retreive the name for the parent box. */
+ $parbox_name = $boxes[$parbox]['unformatted'];
+
+ /* 'Initialize' this parent box to childless. */
+ $boxes[$parbox]['parent'] = false;
+
+ /* Compute the collapse status for this box. */
+ $collapse = 0;
+ $collapse = getPref($data_dir, $username, 'collapse_folder_' . $parbox_name);
+ $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
+ $boxes[$parbox]['collapse'] = $collapse;
+
+ /* Otherwise, get the name of the next box. */
+ if (isset($boxes[$nextbox]['unformatted']))
+ $nextbox_name = $boxes[$nextbox]['unformatted'];
+ else
+ $nextbox_name = '';
+
+ /* Compute any children boxes for this box. */
+ while (($nextbox < $boxcount) &&
+ (is_parent_box($boxes[$nextbox]['unformatted'], $parbox_name))) {
+
+ /* Note that this 'parent' box has at least one child. */
+ $boxes[$parbox]['parent'] = true;
+
+ /* Compute the visiblity of this box. */
+ if ($boxes[$parbox]['visible'] &&
+ ($boxes[$parbox]['collapse'] != SM_BOX_COLLAPSED)) {
+ $boxes[$nextbox]['visible'] = true;
+ } else {
+ $boxes[$nextbox]['visible'] = false;
+ }
+
+ /* Compute the visibility of any child boxes. */
+ compute_folder_children($nextbox, $boxcount);
+ }
+
+ /* Set the parent box to the current next box. */
+ $parbox = $nextbox;
+ }
+ echo "\n";
?>
-