Replacing tabs with spaces, trimming white space at EOL and newline at EOF

[squirrelmail.git] / src / left_main.php

diff --git a/src/left_main.php b/src/left_main.php
index f7a8ecfc429ba37973a51ee59c18770f71f1c212..031cc486f4caeae1625647cea3dcd80dba117f3b 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -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);
@@ -173,7 +170,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 +207,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 +293,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;
 
@@ -446,7 +443,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))
@@ -522,7 +519,6 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
         $pre = "<a class=\"mbx_link\" href=\"right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">" . $pre;
         $end .= '</a>';
         if ($numMessages > 0) {
-            $urlMailbox = urlencode($mailbox);
             $end .= "\n<small>\n" .
                     '&nbsp;&nbsp;[<a class="mbx_link" href="empty_trash.php">'._("Purge").'</a>]'.
                     '</small>';
@@ -968,7 +964,7 @@ if ($advanced_tree) {
 echo "\n\n" . html_tag( 'table', '', 'left', '', 'border="0" cellspacing="0" cellpadding="0" width="99%"' ) .
     html_tag( 'tr' ) .
     html_tag( 'td', '', 'left' ) .
-    html_tag( 'table', '', '', '', 'border="0" cellspacing="0" cellpadding="0"' ) .
+    html_tag( 'table', '', '', '', 'border="0" cellspacing="0" cellpadding="0" width="98%"' ) .
     html_tag( 'tr' ) .
     html_tag( 'td', '', 'center' ) .
     '<font size="4"><b>'. _("Folders") . "</b><br /></font>\n\n";
@@ -1007,13 +1003,13 @@ if ($date_format != 6) {
     }
     $clk = str_replace(' ','&nbsp;',$clk);
 
-    echo '<nobr><small>' . str_replace(' ','&nbsp;',_("Last Refresh")) .
-         ": $clk</small></nobr><br />";
+    echo '<small>' . str_replace(' ','&nbsp;',_("Last Refresh")) .
+         ":<br />$clk</small><br />";
 }
 
 /* Next, display the refresh button. */
-echo '<nobr><small>[<a href="../src/left_main.php" target="left">'.
-     _("Check mail") . '</a>]</small></nobr></td></tr></table><br />';
+echo '<div style="white-space:nowrap"><small>[<a href="../src/left_main.php" target="left">'.
+     _("Check mail") . '</a>]</small></div></td></tr></table><br />';
 
 /* Lastly, display the folder list. */
 if ( $collapse_folders ) {
@@ -1125,4 +1121,4 @@ sqimap_logout($imapConnection);
 
 ?>
 </td></tr></table>
-</div></body></html>
+</div></body></html>
\ No newline at end of file