X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=d2211729261ae7c644659305412dcaad0b4ec0b7;hb=40c6ff98b6619b90b4fdfb5150ecaf596a29bc32;hp=5690cec02be350b8197efa052b10598d86002601;hpb=045fd8dd2e0ed09fd696072352843b9ce059da20;p=squirrelmail.git
diff --git a/src/left_main.php b/src/left_main.php
index 5690cec0..d2211729 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -3,7 +3,7 @@
/**
* left_main.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This is the code for the left bar. The left bar shows the folders
@@ -35,11 +35,8 @@ define('SM_BOX_COLLAPSED', 1);
function formatMailboxName($imapConnection, $box_array) {
- global $folder_prefix, $trash_folder, $sent_folder,
- $color, $move_to_sent, $move_to_trash,
- $unseen_notify, $unseen_type, $collapse_folders,
- $draft_folder, $save_as_draft,
- $use_special_folder_color;
+ global $trash_folder, $color, $move_to_trash,
+ $unseen_notify, $unseen_type, $use_special_folder_color;
$real_box = $box_array['unformatted'];
$mailbox = str_replace(' ','',$box_array['formatted']);
$mailboxURL = urlencode($real_box);
@@ -93,18 +90,12 @@ function formatMailboxName($imapConnection, $box_array) {
$line .= " $unseen_string";
}
- /* If it's the trash folder, show a purge link when needed */
+ /* If it's the trash folder, show a purge link */
if (($move_to_trash) && ($real_box == $trash_folder)) {
- if (! isset($numMessages)) {
- $numMessages = sqimap_get_num_messages($imapConnection, $real_box);
- }
-
- if (($numMessages > 0) or ($box_array['parent'] == 1)) {
- $urlMailbox = urlencode($real_box);
- $line .= "\n\n" .
- ' ['._("Purge").']' .
- '';
- }
+ $urlMailbox = urlencode($real_box);
+ $line .= "\n\n" .
+ ' ['._("Purge").']' .
+ '';
}
@@ -173,7 +164,7 @@ function compute_folder_children(&$parbox, $boxcount) {
* currently appropriate.
*/
function create_collapse_link($boxnum) {
- global $boxes, $imapConnection, $unseen_notify, $color, $use_icons, $icon_theme;
+ global $boxes, $unseen_notify, $color, $use_icons, $icon_theme;
$mailbox = urlencode($boxes[$boxnum]['unformatted']);
/* Create the link for this collapse link. */
@@ -210,7 +201,7 @@ function create_collapse_link($boxnum) {
* @return array unseen message string (for display), unseen message count
*/
function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type) {
- global $boxes, $unseen_type, $color, $unseen_cum;
+ global $boxes, $color, $unseen_cum;
/* Initialize the return value. */
$result = array(0,0);
@@ -296,7 +287,7 @@ function is_parent_box($curbox_name, $parbox_name) {
}
function ListBoxes ($boxes, $j=0 ) {
- global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
+ global $data_dir, $username, $color, $unseen_notify, $unseen_type,
$move_to_trash, $trash_folder, $collapse_folders, $imapConnection,
$use_icons, $icon_theme, $use_special_folder_color;
@@ -381,10 +372,10 @@ function ListBoxes ($boxes, $j=0 ) {
$pre .= '';
}
$pre .= "";
+ $end .= '';
if ($unseen > 0) {
$end .= '';
}
- $end .= '';
if ($boxes->total > 0) {
if ($unseen > 0) {
$pre .= '';
@@ -397,20 +388,20 @@ function ListBoxes ($boxes, $j=0 ) {
if ($unseen_found) {
$end .= " $unseen_string";
}
- $end .= "\n\n" .
- ' ['._("Purge").']'.
- '';
}
+ $end .= "\n\n" .
+ ' ['._("Purge").']'.
+ '';
} else {
if (!$boxes->is_noselect) {
if ($unseen > 0) {
$pre .= '';
}
$pre .= "";
+ $end .= '';
if ($unseen > 0) {
$end .= '';
}
- $end .= '';
}
/* Print unseen information. */
if ($unseen_found) {
@@ -446,7 +437,7 @@ function ListBoxes ($boxes, $j=0 ) {
}
function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
- global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
+ global $data_dir, $username, $color, $unseen_notify, $unseen_type,
$move_to_trash, $trash_folder, $collapse_folders, $use_special_folder_color;
if (!isset($boxes) || empty($boxes))
@@ -516,17 +507,11 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
}
if (($move_to_trash) && ($mailbox == $trash_folder)) {
- if (! isset($numMessages)) {
- $numMessages = $boxes->total;
- }
$pre = "" . $pre;
$end .= '';
- if ($numMessages > 0) {
- $urlMailbox = urlencode($mailbox);
- $end .= "\n\n" .
- ' ['._("Purge").']'.
- '';
- }
+ $end .= "\n\n" .
+ ' ['._("Purge").']'.
+ '';
} else {
if (!$boxes->is_noselect) { /* \Noselect boxes can't be selected */
$pre = "" . $pre;
@@ -662,156 +647,139 @@ if (! isset($oldway) || $oldway=="" ) {
}
if ($advanced_tree) {
-$xtra .= <<
-
-
-
-
-
-ECHO;
+$xtra .= 'old_col = masterf.cols;'."\n".
+' colPat.exec(old_col);'."\n".
+' if (direction) {'."\n".
+' new_col_width = parseInt(RegExp.$1) + 25;'."\n".
+' } else {'."\n".
+' if (parseInt(RegExp.$1) > 35) {'."\n".
+' new_col_width = parseInt(RegExp.$1) - 25;'."\n".
+' }'."\n".
+' }'."\n".
+' masterf.cols = calc_col(new_col_width);'."\n".
+' }'."\n".
+'//-->'."\n".
+''."\n";
/* style definitions */
-$xtra .= <<
-
-
-
-
-ECHO;
-
+$xtra .= ''."\n";
}
displayHtmlHeader( 'SquirrelMail', $xtra );
@@ -933,10 +879,14 @@ if ($auto_create_special && !isset($auto_create_done)) {
if ( !sqimap_mailbox_exists($imapConnection, $folder)) {
sqimap_mailbox_create($imapConnection, $folder, '');
} else {
- //if (!sqimap_mailbox_is_subscribed($imapConnection, $folder)) {
- // check for subscription is useless and expensive just
- // surpress the NO response
- sqimap_subscribe($imapConnection, $folder, false);
+ // check for subscription is useless and expensive, just
+ // surpress the NO response. Unless we're on Mecury, which
+ // will just subscribe a folder again if it's already
+ // subscribed.
+ if ( strtolower($imap_server_type) != 'mercury32' ||
+ !sqimap_mailbox_is_subscribed($imapConnection, $folder) ) {
+ sqimap_subscribe($imapConnection, $folder, false);
+ }
}
}
}
@@ -976,7 +926,7 @@ echo "\n\n" . html_tag( 'table', '', 'left', '', 'border="0" cellspacing="0" cel
if ($date_format != 6) {
/* First, display the clock. */
if ($hour_format == 1) {
- $hr = 'G:i';
+ $hr = 'H:i';
if ($date_format == 4) {
$hr .= ':s';
}
@@ -1007,12 +957,13 @@ if ($date_format != 6) {
}
$clk = str_replace(' ',' ',$clk);
- echo '' . str_replace(' ',' ',_("Last Refresh")) .
- ":
$clk
";
+ echo ''
+ . str_replace(' ', ' ', _("Last Refresh"))
+ . ":
$clk
";
}
/* Next, display the refresh button. */
-echo '