X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fleft_main.php;h=99121dee1aa027d4d51ca8d67c6e047655798250;hp=83175f63ae67eaf741072c6deb4ff675ddadea95;hb=b9f7585798177fd77a151ea644324b8833fef810;hpb=82d304a0501324b276cabab1870755d5352bd21c

diff --git a/src/left_main.php b/src/left_main.php
index 83175f63..99121dee 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -3,17 +3,20 @@
 /**
  * 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
  * available, and has cookie information.
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
  */
 
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
@@ -32,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);
@@ -49,10 +49,10 @@ function formatMailboxName($imapConnection, $box_array) {
     $status = array('','');
     if (($unseen_notify == 2 && $real_box == 'INBOX') ||
         $unseen_notify == 3) {
-    $tmp_status = create_unseen_string($real_box, $box_array, $imapConnection, $unseen_type );
-    if ($status !== false) {
-        $status = $tmp_status;
-    }
+            $tmp_status = create_unseen_string($real_box, $box_array, $imapConnection, $unseen_type );
+            if ($status !== false) {
+                $status = $tmp_status;
+            }
     }
     list($unseen_string, $unseen) = $status;
     $special_color = ($use_special_folder_color && isSpecialMailbox($real_box));
@@ -61,12 +61,12 @@ function formatMailboxName($imapConnection, $box_array) {
     $line = '';
 
     /* If there are unseen message, bold the line. */
-    if ($unseen > 0) { $line .= '<B>'; }
+    if ($unseen > 0) { $line .= '<b>'; }
 
     /* Create the link for this folder. */
     if ($status !== false) {
-    $line .= '<a href="right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox='.
-                $mailboxURL.'" TARGET="right" STYLE="text-decoration:none">';
+        $line .= '<a href="right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox='.
+                 $mailboxURL.'" target="right" style="text-decoration:none">';
     }
     if ($special_color) {
         $line .= "<font color=\"$color[11]\">";
@@ -74,20 +74,20 @@ function formatMailboxName($imapConnection, $box_array) {
     if ( $mailbox == 'INBOX' ) {
         $line .= _("INBOX");
     } else {
-        $line .= str_replace(' ','&nbsp;',$mailbox);
+        $line .= str_replace(array(' ','<','>'),array('&nbsp;','&lt;','&gt;'),$mailbox);
     }
     if ($special_color == TRUE)
         $line .= '</font>';
     if ($status !== false) {
-    $line .= '</a>';
+        $line .= '</a>';
     }
 
     /* If there are unseen message, close bolding. */
-    if ($unseen > 0) { $line .= "</B>"; }
+    if ($unseen > 0) { $line .= "</b>"; }
 
     /* Print unseen information. */
     if ($unseen_string != '') {
-        $line .= "&nbsp;<SMALL>$unseen_string</SMALL>";
+        $line .= "&nbsp;<small>$unseen_string</small>";
     }
 
     /* If it's the trash folder, show a purge link when needed */
@@ -99,8 +99,8 @@ function formatMailboxName($imapConnection, $box_array) {
         if (($numMessages > 0) or ($box_array['parent'] == 1)) {
             $urlMailbox = urlencode($real_box);
             $line .= "\n<small>\n" .
-                    "&nbsp;&nbsp;(<A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A>)" .
-                    "</small>";
+                    '&nbsp;&nbsp;[<a href="empty_trash.php">'._("Purge").'</a>]' .
+                    '</small>';
         }
     }
 
@@ -170,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. */
@@ -178,13 +178,13 @@ function create_collapse_link($boxnum) {
             'href="left_main.php?';
     if ($boxes[$boxnum]['collapse'] == SM_BOX_COLLAPSED) {
         if ($use_icons && $icon_theme != 'none') {
-            $link .= "unfold=$mailbox\"><IMG src=\"" . SM_PATH . "images/plus.png\" border=\"0\" height=\"7\" width=\"7\">";
+            $link .= "unfold=$mailbox\"><img src=\"" . SM_PATH . 'images/plus.png" border="0" height="7" width="7" />';
         } else {
             $link .= "unfold=$mailbox\">+";
         }
     } else {
         if ($use_icons && $icon_theme != 'none') {
-            $link .= "fold=$mailbox\"><IMG src=\"" . SM_PATH . "images/minus.png\" border=\"0\" height=\"7\" width=\"7\">";
+            $link .= "fold=$mailbox\"><img src=\"" . SM_PATH . 'images/minus.png" border="0" height="7" width="7" />';
         } else {
             $link .= "fold=$mailbox\">-";
         }
@@ -207,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);
@@ -222,7 +222,7 @@ function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type
     $status = sqimap_status_messages($imapConnection, $boxName);
     $boxUnseenCount = $status['UNSEEN'];
     if ($boxUnseenCount === false) {
-    return false;
+        return false;
     }
     if ($unseen_type == 2) {
         $boxMessageCount = $status['MESSAGES'];
@@ -242,10 +242,10 @@ function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type
 
             /* Collect the counts for this subfolder. */
             if (($boxName != $boxes[$i]['unformatted'])
-                   && (substr($boxes[$i]['unformatted'], 0, $curBoxLength) == $boxName)
-                   && !in_array('noselect', $boxes[$i]['flags'])) {
-        $status = sqimap_status_messages($imapConnection, $boxes[$i]['unformatted']);
-        $subUnseenCount = $status['UNSEEN'];
+                    && (substr($boxes[$i]['unformatted'], 0, $curBoxLength) == $boxName)
+                    && !in_array('noselect', $boxes[$i]['flags'])) {
+                $status = sqimap_status_messages($imapConnection, $boxes[$i]['unformatted']);
+                $subUnseenCount = $status['UNSEEN'];
                 if ($unseen_type == 2) {
                     $subMessageCount = $status['MESSAGES'];;
                 }
@@ -293,9 +293,9 @@ function is_parent_box($curbox_name, $parbox_name) {
 }
 
 function ListBoxes ($boxes, $j=0 ) {
-    global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
-           $move_to_trash, $trash_folder, $collapse_folders, $imapConnection, 
-           $use_icons, $icon_theme;
+    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;
 
     if (!isset($boxes) || empty($boxes))
         return;
@@ -352,13 +352,13 @@ function ListBoxes ($boxes, $j=0 ) {
         $link = '<a target="left" style="text-decoration:none" ' .'href="left_main.php?';
         if ($collapse) {
             if ($use_icons && $icon_theme != 'none') {
-                $link .= "unfold=$mailboxURL\">$leader<IMG src=\"" . SM_PATH . "images/plus.png\" border=\"0\" height=\"7\" width=\"7\">&nbsp;</tt>";
+                $link .= "unfold=$mailboxURL\">$leader<img src=\"" . SM_PATH . 'images/plus.png" border="0" height="7" width="7" />&nbsp;</tt>';
             } else {
                 $link .= "unfold=$mailboxURL\">$leader+&nbsp;</tt>";
             }
         } else {
             if ($use_icons && $icon_theme != 'none') {
-                $link .= "fold=$mailboxURL\">$leader<IMG src=\"" . SM_PATH . "images/minus.png\" border=\"0\" height=\"7\" width=\"7\">&nbsp;</tt>";
+                $link .= "fold=$mailboxURL\">$leader<img src=\"" . SM_PATH . 'images/minus.png" border="0" height="7" width="7" />&nbsp;</tt>';
             } else {
                 $link .= "fold=$mailboxURL\">$leader-&nbsp;</tt>";
             }
@@ -377,16 +377,16 @@ function ListBoxes ($boxes, $j=0 ) {
         if ($unseen > 0) {
             $pre .= '<b>';
         }
-        $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;sort=0;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
+        $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
+        $end .= '</a>';
         if ($unseen > 0) {
             $end .= '</b>';
         }
-        $end .= '</a>';
         if ($boxes->total > 0) {
             if ($unseen > 0) {
                 $pre .= '<b>';
             }
-            $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;sort=0;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
+            $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
             if ($unseen > 0) {
                 $end .= '</b>';
             }
@@ -395,19 +395,19 @@ function ListBoxes ($boxes, $j=0 ) {
                 $end .= "&nbsp;<small>$unseen_string</small>";
             }
             $end .= "\n<small>\n" .
-                    "&nbsp;&nbsp;(<a href=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</a>)" .
-                    "</small>";
+                    '&nbsp;&nbsp;[<a href="empty_trash.php">'._("Purge").'</a>]'.
+                    '</small>';
         }
     } else {
         if (!$boxes->is_noselect) {
             if ($unseen > 0) {
                 $pre .= '<b>';
             }
-            $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
+            $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
+            $end .= '</a>';
             if ($unseen > 0) {
                 $end .= '</b>';
             }
-            $end .= '</a>';
         }
         /* Print unseen information. */
         if ($unseen_found) {
@@ -418,20 +418,20 @@ function ListBoxes ($boxes, $j=0 ) {
 
     $font = '';
     $fontend = '';
-    if ($boxes->is_special) {
+    if ($use_special_folder_color && $boxes->is_special) {
         $font = "<font color=\"$color[11]\">";
         $fontend = "</font>";
     }
 
     // let plugins fiddle with end of line
     $end .= concat_hook_function('left_main_after_each_folder',
-        array(isset($numMessages) ? $numMessages : '', 
+        array(isset($numMessages) ? $numMessages : '',
               $boxes->mailboxname_full, $imapConnection));
 
     $end .= '</nobr>';
 
     if (!$boxes->is_root) {
-        echo "" . $pre .$font. $boxes->mailboxname_sub .$fontend . $end. '<br />' . "\n";
+        echo "" . $pre .$font. str_replace(array(' ','<','>'),array('&nbsp;','&lt;','&gt;'),$boxes->mailboxname_sub) .$fontend . $end. '<br />' . "\n";
         $j++;
     }
 
@@ -443,8 +443,8 @@ function ListBoxes ($boxes, $j=0 ) {
 }
 
 function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
-    global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
-           $move_to_trash, $trash_folder, $collapse_folders;
+    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))
         return;
@@ -499,7 +499,7 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     if ($unseen > 0) { $pre .= '<b>'; }
 
     /* color special boxes */
-    if ($boxes->is_special) {
+    if ($use_special_folder_color && $boxes->is_special) {
         $pre .= "<font color=\"$color[11]\">";
         $end .= '</font>';
     }
@@ -516,17 +516,16 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
         if (! isset($numMessages)) {
             $numMessages = $boxes->total;
         }
-        $pre = "<a class=\"mbx_link\" href=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">" . $pre;
+        $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>";
+                    '&nbsp;&nbsp;[<a class="mbx_link" href="empty_trash.php">'._("Purge").'</a>]'.
+                    '</small>';
         }
     } else {
         if (!$boxes->is_noselect) { /* \Noselect boxes can't be selected */
-            $pre = "<a class=\"mbx_link\" href=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">" . $pre;
+            $pre = "<a class=\"mbx_link\" href=\"right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">" . $pre;
             $end .= '</a>';
         }
     }
@@ -534,7 +533,7 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     // let plugins fiddle with end of line
     global $imapConnection;
     $end .= concat_hook_function('left_main_after_each_folder',
-        array(isset($numMessages) ? $numMessages : '', 
+        array(isset($numMessages) ? $numMessages : '',
               $boxes->mailboxname_full, $imapConnection));
 
     if (!$boxes->is_root) {
@@ -558,7 +557,7 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
         }
         if (!isset($boxes->mbxs[0])) {
             echo '   ' . html_tag( 'div',
-                            '<tt>'. $pre . $folder_img . '</tt>'. $boxes->mailboxname_sub . $end,
+                            '<tt>'. $pre . $folder_img . '</tt>'. str_replace(array(' ','<','>'),array('&nbsp;','&lt;','&gt;'),$boxes->mailboxname_sub) . $end,
                             'left', '', 'class="mbx_sub" id="' .$j. '"' ) . "\n";
         } else {
             /* get collapse information */
@@ -659,156 +658,139 @@ if (! isset($oldway) || $oldway=="" ) {
 }
 
 if ($advanced_tree) {
-$xtra .= <<<ECHO
-<script language="Javascript" TYPE="text/javascript">
-
-<!--
-
-    function preload() {
-      if (document.images) {
-        var treeImages = new Array;
-        var arguments = preload.arguments;
-        for (var i = 0; i<arguments.length; i++) {
-          treeImages[i] = new Image();
-          treeImages[i].src = arguments[i];
-        }
-      }
-    }
-
-var vTreeImg;
-var vTreeDiv;
-var vTreeSrc;
-
-    function fTreeTimeout() {
-      if (vTreeDiv.readyState == "complete")
-        vTreeImg.src = vTreeSrc;
-      else
-        setTimeout("fTreeTimeout()", 100);
-    }
-
-    function hidechilds(img) {
-      id = img.id + ".0000";
-      form_id = "mbx[" + img.id +"F]";
-      if (document.all) {	//IE, Opera7
-        div = document.all[id];
-        if (div) {
-           if (div.style.display == "none") {
-              vTreeSrc = "../images/minus.png";
-              style = "block";
-              value = 0;
-           }
-           else {
-              vTreeSrc = "../images/plus.png";
-              style = "none";
-              value = 1;
-           }
-           vTreeImg = img;
-           vTreeDiv = div;
-           if (typeof vTreeDiv.readyState != "undefined")	//IE
-              setTimeout("fTreeTimeout()",100);
-           else	//Non IE
-              vTreeImg.src = vTreeSrc;
-           div.style.display = style;
-           document.all[form_id].value = value;
-        }
-      }
-      else if (document.getElementById) {	//Gecko
-        div = document.getElementById(id);
-        if (div) {
-           if (div.style.display == "none") {
-              src = "../images/minus.png";
-              style = "block";
-              value = 0;
-           }
-           else {
-              src = "../images/plus.png";
-              style = "none";
-              value = 1;
-           }
-           div.style.display = style;
-           img.src = src;
-           document.getElementById(form_id).value = value;
-        }
-      }
-    }
-
-   function buttonover(el,on) {
-      if (!on) {
-//         el.style.borderColor="$color[9]";}
-         el.style.background="$color[0]";}
-      else {
-         el.style.background="$color[9]";}
-   }
-
-   function buttonclick(el,on) {
-      if (!on) {
-         el.style.border="groove";}
-      else {
-         el.style.border="ridge";}
-   }
+$xtra .= '<script language="Javascript" type="text/javascript">'."\n".
+'<!--'."\n".
+'    function preload() {'."\n".
+'      if (document.images) {'."\n".
+'        var treeImages = new Array;'."\n".
+'        var arguments = preload.arguments;'."\n".
+'        for (var i = 0; i<arguments.length; i++) {'."\n".
+'          treeImages[i] = new Image();'."\n".
+'          treeImages[i].src = arguments[i];'."\n".
+'        }'."\n".
+'      }'."\n".
+'    }'."\n".
+'var vTreeImg;'."\n".
+'var vTreeDiv;'."\n".
+'var vTreeSrc;'."\n".
+'    function fTreeTimeout() {'."\n".
+'      if (vTreeDiv.readyState == "complete")'."\n".
+'        vTreeImg.src = vTreeSrc;'."\n".
+'      else'."\n".
+'        setTimeout("fTreeTimeout()", 100);'."\n".
+'    }'."\n".
+'    function hidechilds(img) {'."\n".
+'      id = img.id + ".0000";'."\n".
+'      form_id = "mbx[" + img.id +"F]";'."\n".
+'      if (document.all) { //IE, Opera7'."\n".
+'        div = document.all[id];'."\n".
+'        if (div) {'."\n".
+'           if (div.style.display == "none") {'."\n".
+'              vTreeSrc = "../images/minus.png";'."\n".
+'              style = "block";'."\n".
+'              value = 0;'."\n".
+'           }'."\n".
+'           else {'."\n".
+'              vTreeSrc = "../images/plus.png";'."\n".
+'              style = "none";'."\n".
+'              value = 1;'."\n".
+'           }'."\n".
+'           vTreeImg = img;'."\n".
+'           vTreeDiv = div;'."\n".
+'           if (typeof vTreeDiv.readyState != "undefined") //IE'."\n".
+'              setTimeout("fTreeTimeout()",100);'."\n".
+'           else //Non IE'."\n".
+'              vTreeImg.src = vTreeSrc;'."\n".
+'           div.style.display = style;'."\n".
+'           document.all[form_id].value = value;'."\n".
+'        }'."\n".
+'      }'."\n".
+'      else if (document.getElementById) { //Gecko'."\n".
+'        div = document.getElementById(id);'."\n".
+'        if (div) {'."\n".
+'           if (div.style.display == "none") {'."\n".
+'              src = "../images/minus.png";'."\n".
+'              style = "block";'."\n".
+'              value = 0;'."\n".
+'           }'."\n".
+'           else {'."\n".
+'              src = "../images/plus.png";'."\n".
+'              style = "none";'."\n".
+'              value = 1;'."\n".
+'           }'."\n".
+'           div.style.display = style;'."\n".
+'           img.src = src;'."\n".
+'           document.getElementById(form_id).value = value;'."\n".
+'        }'."\n".
+'      }'."\n".
+'    }'."\n".
+'   function buttonover(el,on) {'."\n".
+'      if (!on) {'."\n".
+"//         el.style.borderColor=\"$color[9]\";}\n".
+"         el.style.background=\"$color[0]\";}\n".
+'      else {'."\n".
+"         el.style.background=\"$color[9]\";}\n".
+'   }'."\n".
+'   function buttonclick(el,on) {'."\n".
+'      if (!on) {'."\n".
+'         el.style.border="groove";}'."\n".
+'      else {'."\n".
+'         el.style.border="ridge";}'."\n".
+'   }'."\n".
+'   function hideframe(hide) {'."\n".
+'      left_size = "' . $left_size . '";'."\n".
+'      if (document.all) {'."\n".
+'        masterf = window.parent.document.all["fs1"];'."\n".
+'        leftf = window.parent.document.all["left"];'."\n".
+'        leftcontent = document.all["leftframe"];'."\n".
+'        leftbutton = document.all["showf"];'."\n".
+'      } else if (document.getElementById) {'."\n".
+'        masterf = window.parent.document.getElementById("fs1");'."\n".
+'        leftf = window.parent.document.getElementById("left");'."\n".
+'        leftcontent = document.getElementById("leftframe");'."\n".
+'        leftbutton = document.getElementById("showf");'."\n".
+'      } else {'."\n".
+'        return false;'."\n".
+'      }'."\n".
+'      if(hide) {'."\n".
+'         new_col = calc_col("20");'."\n".
+'         masterf.cols = new_col;'."\n".
+'         document.body.scrollLeft=0;'."\n".
+'         document.body.style.overflow="hidden";'."\n".
+'         leftcontent.style.display = "none";'."\n".
+'         leftbutton.style.display="block";'."\n".
+'      } else {'."\n".
+'         masterf.cols = calc_col(left_size);'."\n".
+'         document.body.style.overflow="";'."\n".
+'         leftbutton.style.display="none";'."\n".
+'         leftcontent.style.display="block";'."\n".
+'      }'."\n".
+'   }'."\n".
+'   function calc_col(c_w) {'."\n";
 
-   function hideframe(hide) {
-
-ECHO;
-$xtra .= "      left_size = \"$left_size\";\n";
-$xtra .= <<<ECHO
-      if (document.all) {
-        masterf = window.parent.document.all["fs1"];
-    leftf = window.parent.document.all["left"];
-    leftcontent = document.all["leftframe"];
-    leftbutton = document.all["showf"];
-      } else if (document.getElementById) {
-    masterf = window.parent.document.getElementById("fs1");
-    leftf = window.parent.document.getElementById("left");
-    leftcontent = document.getElementById("leftframe");
-    leftbutton = document.getElementById("showf");
-      } else {
-        return false;
-      }
-      if(hide) {
-         new_col = calc_col("20");
-         masterf.cols = new_col;
-     document.body.scrollLeft=0;
-     document.body.style.overflow='hidden';
-     leftcontent.style.display = 'none';
-     leftbutton.style.display='block';
-      } else {
-         masterf.cols = calc_col(left_size);
-     document.body.style.overflow='';
-     leftbutton.style.display='none';
-     leftcontent.style.display='block';
-
-      }
-   }
-
-   function calc_col(c_w) {
-
-ECHO;
    if ($location_of_bar == 'right') {
        $xtra .= '     right=true;';
    } else {
        $xtra .= '     right=false;';
    }
    $xtra .= "\n";
-$xtra .= <<<ECHO
-     if (right) {
-         new_col = '*,'+c_w;
-     } else {
-         new_col = c_w+',*';
-     }
-     return new_col;
-   }
 
-   function resizeframe(direction) {
-     if (document.all) {
-        masterf = window.parent.document.all["fs1"];
-     } else if (document.getElementById) {
-    window.parent.document.getElementById("fs1");
-     } else {
-        return false;
-     }
+$xtra .= 'if (right) {'."\n".
+"         new_col = '*,'+c_w;"."\n".
+'     } else {'."\n".
+"         new_col = c_w+',*';"."\n".
+'     }'."\n".
+'     return new_col;'."\n".
+'   }'."\n".
+'   function resizeframe(direction) {'."\n".
+'     if (document.all) {'."\n".
+'        masterf = window.parent.document.all["fs1"];'."\n".
+'     } else if (document.getElementById) {'."\n".
+'        window.parent.document.getElementById("fs1");'."\n".
+'     } else {'."\n".
+'        return false;'."\n".
+'     }'."\n";
 
-ECHO;
    if ($location_of_bar == 'right') {
        $xtra .= '  colPat=/^\*,(\d+)$/;';
    } else {
@@ -816,112 +798,90 @@ ECHO;
    }
    $xtra .= "\n";
 
-$xtra .= <<<ECHO
-     old_col = masterf.cols;
-     colPat.exec(old_col);
-
-     if (direction) {
-        new_col_width = parseInt(RegExp.$1) + 25;
-
-     } else {
-        if (parseInt(RegExp.$1) > 35) {
-           new_col_width = parseInt(RegExp.$1) - 25;
-        }
-     }
-     masterf.cols = calc_col(new_col_width);
-   }
-
-//-->
-
-</script>
-
-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".
+'</script>'."\n";
 
 /* style definitions */
 
-$xtra .= <<<ECHO
-
-<style type="text/css">
-<!--
-  body {
-     margin: 0px 0px 0px 0px;
-     padding: 5px 5px 5px 5px;
-  }
-
-  .button {
-     border:outset;
-     border-color: $color[9];
-     background:$color[0];
-     color:$color[6];
-     width:99%;
-     heigth:99%;
-  }
-
-  .mbx_par {
-     font-size:1.0em;
-     margin-left:4px;
-     margin-right:0px;
-  }
-
-  a.mbx_link {
-      text-decoration: none;
-      background-color: $color[0];
-      display: inline;
-  }
-
-  a:hover.mbx_link {
-      background-color: $color[9];
-  }
-
-  a.mbx_link img {
-      border-style: none;
-  }
-
-  .mbx_sub {
-     padding-left:5px;
-     padding-right:0px;
-     margin-left:4px;
-     margin-right:0px;
-     font-size:0.9em;
-  }
-
-  .par_area {
-     margin-top:0px;
-     margin-left:4px;
-     margin-right:0px;
-     padding-left:10px;
-     padding-bottom:5px;
-     border-left: solid;
-     border-left-width:0.1em;
-     border-left-color:$color[9];
-     border-bottom: solid;
-     border-bottom-width:0.1em;
-     border-bottom-color:$color[9];
-     display: block;
-  }
-
-  .mailboxes {
-     padding-bottom:3px;
-     margin-right:4px;
-     padding-right:4px;
-     margin-left:4px;
-     padding-left:4px;
-     border: groove;
-     border-width:0.1em;
-     border-color:$color[9];
-     background: $color[0];
-  }
-
--->
-
-</style>
-
-ECHO;
-
+$xtra .= '<style type="text/css">'."\n".
+'<!--'."\n".
+'  body {'."\n".
+'     margin: 0px 0px 0px 0px;'."\n".
+'     padding: 5px 5px 5px 5px;'."\n".
+'  }'."\n".
+'  .button {'."\n".
+'     border:outset;'."\n".
+"     border-color: $color[9];\n".
+"     background:$color[0];\n".
+"     color:$color[6];\n".
+'     width:99%;'."\n".
+'     heigth:99%;'."\n".
+'  }'."\n".
+'  .mbx_par {'."\n".
+'     font-size:1.0em;'."\n".
+'     margin-left:4px;'."\n".
+'     margin-right:0px;'."\n".
+'  }'."\n".
+'  a.mbx_link {'."\n".
+'      text-decoration: none;'."\n".
+"      background-color: $color[0];\n".
+'      display: inline;'."\n".
+'  }'."\n".
+'  a:hover.mbx_link {'."\n".
+"      background-color: $color[9];\n".
+'  }'."\n".
+'  a.mbx_link img {'."\n".
+'      border-style: none;'."\n".
+'  }'."\n".
+'  .mbx_sub {'."\n".
+'     padding-left:5px;'."\n".
+'     padding-right:0px;'."\n".
+'     margin-left:4px;'."\n".
+'     margin-right:0px;'."\n".
+'     font-size:0.9em;'."\n".
+'  }'."\n".
+'  .par_area {'."\n".
+'     margin-top:0px;'."\n".
+'     margin-left:4px;'."\n".
+'     margin-right:0px;'."\n".
+'     padding-left:10px;'."\n".
+'     padding-bottom:5px;'."\n".
+'     border-left: solid;'."\n".
+'     border-left-width:0.1em;'."\n".
+"     border-left-color:$color[9];\n".
+'     border-bottom: solid;'."\n".
+'     border-bottom-width:0.1em;'."\n".
+"     border-bottom-color:$color[9];\n".
+'     display: block;'."\n".
+'  }'."\n".
+'  .mailboxes {'."\n".
+'     padding-bottom:3px;'."\n".
+'     margin-right:4px;'."\n".
+'     padding-right:4px;'."\n".
+'     margin-left:4px;'."\n".
+'     padding-left:4px;'."\n".
+'     border: groove;'."\n".
+'     border-width:0.1em;'."\n".
+"     border-color:$color[9];\n".
+"     background: $color[0];\n".
+'  }'."\n".
+'-->'."\n".
+'</style>'."\n";
 }
 
 displayHtmlHeader( 'SquirrelMail', $xtra );
-
+sqgetGlobalVar('auto_create_done',$auto_create_done,SQ_SESSION);
 /* If requested and not yet complete, attempt to autocreate folders. */
 if ($auto_create_special && !isset($auto_create_done)) {
     $autocreate = array($sent_folder, $trash_folder, $draft_folder);
@@ -929,8 +889,15 @@ if ($auto_create_special && !isset($auto_create_done)) {
         if (($folder != '') && ($folder != 'none')) {
             if ( !sqimap_mailbox_exists($imapConnection, $folder)) {
                 sqimap_mailbox_create($imapConnection, $folder, '');
-            } else if (!sqimap_mailbox_is_subscribed($imapConnection, $folder)) {
-                sqimap_subscribe($imapConnection, $folder);
+            } else {
+                // 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);
+                }
             }
         }
     }
@@ -940,33 +907,37 @@ if ($auto_create_special && !isset($auto_create_done)) {
     sqsession_register($auto_create_done, 'auto_create_done');
 }
 
-if ($advanced_tree)
-  echo "\n<body" .
-	' onload="preload(\'../images/minus.png\',\'../images/plus.png\')"' .
-  " bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
-else
-  echo "\n<body bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
+if ($advanced_tree) {
+    echo "\n<body" .
+            ' onload="preload(\'../images/minus.png\',\'../images/plus.png\')"' .
+            " bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
+} else {
+    echo "\n<body bgcolor=\"$color[3]\" text=\"$color[6]\" link=\"$color[6]\" vlink=\"$color[6]\" alink=\"$color[6]\">\n";
+}
 
 do_hook('left_main_before');
 if ($advanced_tree) {
    /* nice future feature, needs layout !! volunteers?   */
    $right_pos = $left_size - 20;
-/*   echo '<div style="position:absolute;top:0;border=solid;border-width:0.1em;border-color:blue;"><div ID="hidef" style="width=20;font-size:12"><A HREF="javascript:hideframe(true)"><b><<</b></a></div>';
-   echo '<div ID="showf" style="width=20;font-size:12;display:none;"><a href="javascript:hideframe(false)"><b>>></b></a></div>';
-   echo '<div ID="incrf" style="width=20;font-size:12"><a href="javascript:resizeframe(true)"><b>></b></a></div>';
-   echo '<div ID="decrf" style="width=20;font-size:12"><a href="javascript:resizeframe(false)"><b><</b></a></div></div>';
-   echo '<div ID="leftframe"><br /><br />';*/
+/*   echo '<div style="position:absolute;top:0;border=solid;border-width:0.1em;border-color:blue;"><div id="hidef" style="width=20;font-size:12"><a href="javascript:hideframe(true)"><b>&lt;&lt;</b></a></div>';
+   echo '<div id="showf" style="width=20;font-size:12;display:none;"><a href="javascript:hideframe(false)"><b>&gt;&gt;</b></a></div>';
+   echo '<div id="incrf" style="width=20;font-size:12"><a href="javascript:resizeframe(true)"><b>&gt;</b></a></div>';
+   echo '<div id="decrf" style="width=20;font-size:12"><a href="javascript:resizeframe(false)"><b>&lt;</b></a></div></div>';
+   echo '<div id="leftframe"><br /><br />';*/
 }
 
 echo "\n\n" . html_tag( 'table', '', 'left', '', 'border="0" cellspacing="0" cellpadding="0" width="99%"' ) .
     html_tag( 'tr' ) .
     html_tag( 'td', '', 'left' ) .
-    '<center><font size="4"><b>'. _("Folders") . "</b><br /></font>\n\n";
+    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";
 
 if ($date_format != 6) {
     /* First, display the clock. */
     if ($hour_format == 1) {
-        $hr = 'G:i';
+        $hr = 'H:i';
         if ($date_format == 4) {
             $hr .= ':s';
         }
@@ -979,6 +950,9 @@ if ($date_format != 6) {
     }
 
     switch( $date_format ) {
+    case 0:
+        $clk = date('Y-m-d '.$hr. ' T', time());
+        break;
     case 1:
         $clk = date('m/d/y '.$hr, time());
         break;
@@ -994,13 +968,14 @@ if ($date_format != 6) {
     }
     $clk = str_replace(' ','&nbsp;',$clk);
 
-    echo '<center><small>' . str_replace(' ','&nbsp;',_("Last Refresh")) .
-         ": $clk</small></center>";
+    echo '<small><span style="white-space: nowrap;">' 
+       . str_replace(' ', '&nbsp;', _("Last Refresh")) 
+       . ":</span><br /><span style=\"white-space: nowrap;\">$clk</span></small><br />";
 }
 
 /* Next, display the refresh button. */
-echo '<small>(<a href="../src/left_main.php" target="left">'.
-     _("refresh folder list") . '</a>)</small></center><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 ) {
@@ -1082,7 +1057,7 @@ for ($i = 0; $i < count($boxes); $i++) {
         }
 
         /* Put the final touches on our folder line. */
-        $line .= "</nobr><br>\n";
+        $line .= "</nobr><br />\n";
 
         /* Output the line for this folder. */
         echo $line;
@@ -1103,14 +1078,13 @@ for ($i = 0; $i < count($boxes); $i++) {
         echo '</small>';
         echo '</form>'."\n";
     } else {
-        //sqimap_get_status_mbx_tree($imap_stream,$boxes)    
+        //sqimap_get_status_mbx_tree($imap_stream,$boxes)
         ListBoxes($boxes);
     }
 } /* if ($oldway) else ... */
 do_hook('left_main_after');
 sqimap_logout($imapConnection);
 
-echo '</td></tr></table>' . "\n".
-    "</div></body></html>\n";
-
 ?>
+</td></tr></table>
+</body></html>