X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fleft_main.php;h=79aa3da2290ababf3140ba4e6b5a095b897eda43;hp=c02855008e1689dff0b4d1fccbe0c5e40be2425b;hb=d3018c7beb7d7638f775ee4ff006ec107c645418;hpb=2f174eff269644043331f63b9083ebf339762ebc

diff --git a/src/left_main.php b/src/left_main.php
index c0285500..79aa3da2 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
@@ -33,277 +33,24 @@ define('SM_BOX_COLLAPSED',   1);
 
 /* --------------------- FUNCTIONS ------------------------- */
 
-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;
-    $real_box = $box_array['unformatted'];
-    $mailbox = str_replace(' ','',$box_array['formatted']);
-    $mailboxURL = urlencode($real_box);
-
-    /* Strip down the mailbox name. */
-    if (ereg("^( *)([^ ]*)$", $mailbox, $regs)) {
-        $mailbox = $regs[2];
-    }
-    $unseen = 0;
-    $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;
-    }
-    }
-    list($unseen_string, $unseen) = $status;
-    $special_color = ($use_special_folder_color && isSpecialMailbox($real_box));
-
-    /* Start off with a blank line. */
-    $line = '';
-
-    /* If there are unseen message, bold the line. */
-    if ($unseen > 0) { $line .= '<B>'; }
-
-    /* Create the link for this folder. */
-    if ($status !== false) {
-    $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]\">";
-    }
-    if ( $mailbox == 'INBOX' ) {
-        $line .= _("INBOX");
-    } else {
-        $line .= str_replace(array(' ','<','>'),array('&nbsp;','&lt;','&gt;'),$mailbox);
-    }
-    if ($special_color == TRUE)
-        $line .= '</font>';
-    if ($status !== false) {
-    $line .= '</a>';
-    }
-
-    /* If there are unseen message, close bolding. */
-    if ($unseen > 0) { $line .= "</B>"; }
-
-    /* Print unseen information. */
-    if ($unseen_string != '') {
-        $line .= "&nbsp;<SMALL>$unseen_string</SMALL>";
-    }
-
-    /* If it's the trash folder, show a purge link when needed */
-    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<small>\n" .
-                    '&nbsp;&nbsp;[<a href="empty_trash.php" style="text-decoration:none">'._("purge").'</a>]' .
-                    '</small>';
-        }
-    }
-
-
-    // let plugins fiddle with end of line
-    $line .= concat_hook_function('left_main_after_each_folder',
-        array(isset($numMessages) ? $numMessages : '', $real_box, $imapConnection));
-
-
-    /* Return the final product. */
-    return ($line);
-}
 
 /**
- * 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, $collapse_folders;
-    $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. */
-    if( isset($collapse_folders) && $collapse_folders ) {
-        $collapse = getPref($data_dir, $username, 'collapse_folder_' . $parbox_name);
-        $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
-    } else {
-        $collapse = SM_BOX_UNCOLLAPSED;
-    }
-    $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. */
-        $boxes[$nextbox]['visible'] = ($boxes[$parbox]['visible'] &&
-                                       ($boxes[$parbox]['collapse'] != SM_BOX_COLLAPSED));
-
-        /* Compute the visibility of any child boxes. */
-        compute_folder_children($nextbox, $boxcount);
-    }
-
-    /* Set the parent box to the current next box. */
-    $parbox = $nextbox;
-}
-
-/**
- * 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, $imapConnection, $unseen_notify, $color, $use_icons, $icon_theme;
-    $mailbox = urlencode($boxes[$boxnum]['unformatted']);
-
-    /* Create the link for this collapse link. */
-    $link = '<a target="left" style="text-decoration:none" ' .
-            '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\">";
-        } 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\">";
-        } else {
-            $link .= "fold=$mailbox\">-";
-        }
-    }
-    $link .= '</a>';
-
-    /* Return the finished product. */
-    return ($link);
-}
-
-/**
- * create_unseen_string:
- *
- * Create unseen and total message count for both this folder and
- * it's subfolders.
+ * Recursive function to output a tree of folders.
+ * It is called on a list of boxes and iterates over that tree.
  *
- * @param string $boxName name of the current mailbox
- * @param array $boxArray array for the current mailbox
- * @param $imapConnection current imap connection in use
- * @return array unseen message string (for display), unseen message count
+ * @since 1.3.0
  */
-function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type) {
-    global $boxes, $unseen_type, $color, $unseen_cum;
-
-    /* Initialize the return value. */
-    $result = array(0,0);
-
-    /* Initialize the counts for this folder. */
-    $boxUnseenCount = 0;
-    $boxMessageCount = 0;
-    $totalUnseenCount = 0;
-    $totalMessageCount = 0;
-
-    /* Collect the counts for this box alone. */
-    $status = sqimap_status_messages($imapConnection, $boxName);
-    $boxUnseenCount = $status['UNSEEN'];
-    if ($boxUnseenCount === false) {
-    return false;
-    }
-    if ($unseen_type == 2) {
-        $boxMessageCount = $status['MESSAGES'];
-    }
-
-    /* Initialize the total counts. */
-
-    if ($boxArray['collapse'] == SM_BOX_COLLAPSED && $unseen_cum) {
-        /* Collect the counts for this boxes subfolders. */
-        $curBoxLength = strlen($boxName);
-        $boxCount = count($boxes);
-
-        for ($i = 0; $i < $boxCount; ++$i) {
-            /* Initialize the counts for this subfolder. */
-            $subUnseenCount = 0;
-            $subMessageCount = 0;
-
-            /* 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'];
-                if ($unseen_type == 2) {
-                    $subMessageCount = $status['MESSAGES'];;
-                }
-                /* Add the counts for this subfolder to the total. */
-                $totalUnseenCount += $subUnseenCount;
-                $totalMessageCount += $subMessageCount;
-            }
-        }
-
-        /* Add the counts for all subfolders to that of the box. */
-        $boxUnseenCount += $totalUnseenCount;
-        $boxMessageCount += $totalMessageCount;
-    }
-
-    /* And create the magic unseen count string.     */
-    /* Really a lot more then just the unseen count. */
-    if (($unseen_type == 1) && ($boxUnseenCount > 0)) {
-        $result[0] = "($boxUnseenCount)";
-    } else if ($unseen_type == 2) {
-        $result[0] = "($boxUnseenCount/$boxMessageCount)";
-        $result[0] = "<font color=\"$color[11]\">$result[0]</font>";
-    }
-
-    /* Set the unseen count to return to the outside world. */
-    $result[1] = $boxUnseenCount;
-
-    /* Return our happy result. */
-    return ($result);
-}
-
-/**
- * This simple function checks if a box is another box's parent.
- */
-function is_parent_box($curbox_name, $parbox_name) {
-    global $delimiter;
-
-    /* Extract the name of the parent of the current box. */
-    $curparts = explode($delimiter, $curbox_name);
-    $curname = array_pop($curparts);
-    $actual_parname = implode($delimiter, $curparts);
-    $actual_parname = substr($actual_parname,0,strlen($parbox_name));
-
-    /* Compare the actual with the given parent name. */
-    return ($parbox_name == $actual_parname);
-}
-
 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;
 
-    if (!isset($boxes) || empty($boxes))
+    // stop condition
+    if (empty($boxes)) {
         return;
+    }
 
-    $pre = '<nobr>';
+    $pre = '<span style="white-space: nowrap;">';
     $end = '';
     $collapse = false;
     $unseen_found = false;
@@ -355,13 +102,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,37 +124,26 @@ function ListBoxes ($boxes, $j=0 ) {
         if (! isset($boxes->total)) {
             $boxes->total = sqimap_status_messages($imapConnection, $mailbox);
         }
-        if ($unseen > 0) {
-            $pre .= '<b>';
-        }
         $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
         if ($unseen > 0) {
+            $pre .= '<b>';
             $end .= '</b>';
         }
         $end .= '</a>';
         if ($boxes->total > 0) {
-            if ($unseen > 0) {
-                $pre .= '<b>';
-            }
-            $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>';
-            }
             /* Print unseen information. */
             if ($unseen_found) {
                 $end .= "&nbsp;<small>$unseen_string</small>";
             }
-            $end .= "\n<small>\n" .
-                    '&nbsp;&nbsp;[<a href="empty_trash.php" style="text-decoration:none">'._("purge").'</a>]'.
-                    '</small>';
+            $end .= "\n\t<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;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
             if ($unseen > 0) {
+                $pre .= '<b>';
                 $end .= '</b>';
             }
             $end .= '</a>';
@@ -424,33 +160,42 @@ function ListBoxes ($boxes, $j=0 ) {
     if ($use_special_folder_color && $boxes->is_special) {
         $font = "<font color=\"$color[11]\">";
         $fontend = "</font>";
+    } elseif ( $boxes->is_noselect ) {
+        $font = "<font color=\"$color[15]\">";
+        $fontend = '</font>';
     }
-
+        
     // let plugins fiddle with end of line
     $end .= concat_hook_function('left_main_after_each_folder',
         array(isset($numMessages) ? $numMessages : '',
               $boxes->mailboxname_full, $imapConnection));
 
-    $end .= '</nobr>';
+    $end .= '</span>';
 
     if (!$boxes->is_root) {
-        echo "" . $pre .$font. str_replace(array(' ','<','>'),array('&nbsp;','&lt;','&gt;'),$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++;
     }
 
     if (!$collapse || $boxes->is_root) {
         for ($i = 0; $i <count($boxes->mbxs); $i++) {
-            listBoxes($boxes->mbxs[$i],$j);
+            ListBoxes($boxes->mbxs[$i],$j);
         }
     }
 }
 
 function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
-    global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
-           $move_to_trash, $trash_folder, $collapse_folders, $use_special_folder_color;
+    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))
+    if (empty($boxes)) {
         return;
+    }
 
     /* use_folder_images only works if the images exist in ../images */
     $use_folder_images = true;
@@ -516,17 +261,11 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     }
 
     if (($move_to_trash) && ($mailbox == $trash_folder)) {
-        if (! isset($numMessages)) {
-            $numMessages = $boxes->total;
-        }
         $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>';
-        }
+        $end .= "\n<small>\n" .
+                '&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;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">" . $pre;
@@ -561,7 +300,11 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
         }
         if (!isset($boxes->mbxs[0])) {
             echo '   ' . html_tag( 'div',
-                            '<tt>'. $pre . $folder_img . '</tt>'. str_replace(array(' ','<','>'),array('&nbsp;','&lt;','&gt;'),$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 */
@@ -569,13 +312,15 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
                 $form_entry = $j.'F';
                 if (isset($mbx) && isset($mbx[$form_entry])) {
                     $collapse = $mbx[$form_entry];
-                    setPref($data_dir, $username, 'collapse_folder_'.$boxes->mailboxname_full , $collapse ? SM_BOX_COLLAPSED : SM_BOX_UNCOLLAPSED);
+                    setPref($data_dir, $username, 'collapse_folder_'.$boxes->mailboxname_full ,
+                        $collapse ? SM_BOX_COLLAPSED : SM_BOX_UNCOLLAPSED);
                 } else {
                     $collapse = getPref($data_dir, $username, 'collapse_folder_' . $mailbox);
                     $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
                 }
                 $img_src = ($collapse ? '../images/plus.png' : '../images/minus.png');
-                $collapse_link = '<a href="javascript:void(0)">'." <img src=\"$img_src\" border=\"1\" id=$j onclick=\"hidechilds(this)\" style=\"cursor:hand\" /></a>";
+                $collapse_link = '<a href="javascript:void(0)">' .
+                    " <img src=\"$img_src\" border=\"1\" id=$j onclick=\"hidechilds(this)\" style=\"cursor:hand\" /></a>";
             } else {
                  $collapse_link='';
             }
@@ -590,14 +335,16 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     if (isset($boxes->mbxs[0]) && !$boxes->is_root) /* mailbox contains childs */
         echo html_tag( 'div', '', 'left', '', 'class="par_area" id='.$j.'.0000 '. $visible ) . "\n";
 
-    if ($j !='ID.0000')
+    if ($j !='ID.0000') {
        $j = $j .'.0000';
+    }
     for ($i = 0; $i <count($boxes->mbxs); $i++) {
         $j++;
         ListAdvancedBoxes($boxes->mbxs[$i],$mbx,$j);
     }
-    if (isset($boxes->mbxs[0]) && !$boxes->is_root)
+    if (isset($boxes->mbxs[0]) && !$boxes->is_root) {
         echo '</div>'."\n\n";
+    }
 }
 
 
@@ -617,12 +364,13 @@ sqgetGlobalVar('unfold', $unfold, SQ_GET);
 /* end globals */
 
 // open a connection on the imap port (143)
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output
+// why hide the output?
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, true);
 
 /**
- * Using stristr since older preferences may contain "None" and "none".
+ * Using stristr since very old preferences may contain "None" and "none".
  */
-if (isset($left_refresh) && ($left_refresh != '') &&
+if (!empty($left_refresh) &&
     !stristr($left_refresh, 'none')){
     $xtra =  "\n<meta http-equiv=\"Expires\" content=\"Thu, 01 Dec 1994 16:00:00 GMT\" />\n" .
              "<meta http-equiv=\"Pragma\" content=\"no-cache\" />\n".
@@ -632,10 +380,8 @@ if (isset($left_refresh) && ($left_refresh != '') &&
 }
 
 /**
- * $advanced_tree and $oldway are boolean vars which are default set to default
+ * $advanced_tree and is a boolean var which is default set to default
  * SM behaviour.
- * Setting $oldway to false causes left_main.php to use the new experimental
- * way of getting the mailbox-tree.
  * Setting $advanced tree to true causes SM to display a experimental
  * mailbox-tree with dhtml behaviour.
  * It only works on browsers which supports css and javascript. The used
@@ -649,169 +395,147 @@ if (isset($left_refresh) && ($left_refresh != '') &&
  * setting this to true is only usefull if the images exists in ../images.
  *
  * Feel free to experiment with the code and report bugs and enhancements
- * to marc@its-projects.nl
  **/
 
 /* set this to true if you want to see a nicer mailboxtree */
-if (! isset($advanced_tree) || $advanced_tree=="" ) {
+if (empty($advanced_tree)) {
     $advanced_tree=false;
 }
-/* default SM behaviour */
-if (! isset($oldway) || $oldway=="" ) {
-    $oldway=false;
-}
 
 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 {
@@ -819,108 +543,86 @@ 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 );
@@ -933,10 +635,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);
+                }
             }
         }
     }
@@ -946,36 +652,32 @@ 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' ) .
-    html_tag( 'table', '', '', '', 'border="0" cellspacing="0" cellpadding="0"' ) .
-    html_tag( 'tr' ) .
-    html_tag( 'td', '', 'center' ) .
-    '<font size="4"><b>'. _("Folders") . "</b><br /></font>\n\n";
+echo "\n\n" . 
+    '<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';
         }
@@ -989,8 +691,8 @@ if ($date_format != 6) {
 
     switch( $date_format ) {
     case 0:
-	$clk = date('Y-m-d '.$hr. ' T', time());
-	break;
+        $clk = date('Y-m-d '.$hr. ' T', time());
+        break;
     case 1:
         $clk = date('m/d/y '.$hr, time());
         break;
@@ -1006,13 +708,14 @@ if ($date_format != 6) {
     }
     $clk = str_replace(' ','&nbsp;',$clk);
 
-    echo '<nobr><small>' . str_replace(' ','&nbsp;',_("Last Refresh")) .
-         ": $clk</small></nobr><br />";
+    echo '<small><span style="white-space: nowrap;">' 
+       . str_replace(' ', '&nbsp;', _("Last Refresh")) 
+       . ":</span><br /><span style=\"white-space: nowrap;\">$clk</span></small><br />\n";
 }
 
 /* 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></center><br />\n\n";
 
 /* Lastly, display the folder list. */
 if ( $collapse_folders ) {
@@ -1028,101 +731,41 @@ if ( $collapse_folders ) {
 $unseen_type = getPref( $data_dir , $username , 'unseen_type' );
 $unseen_notify = getPref( $data_dir , $username , 'unseen_notify' );
 
-if (!isset($unseen_type) || empty($unseen_type)) {
-    if (isset($default_unseen_type) && !empty($default_unseen_type)) {
+if (empty($unseen_type)) {
+    if (!empty($default_unseen_type)) {
         $unseen_type = $default_unseen_type;
     } else {
         $unseen_type = 1;
     }
 }
 
-if (!isset($unseen_notify) || empty($unseen_notify)) {
-    if (isset($default_unseen_notify) && !empty($default_unseen_notify)) {
+if (empty($unseen_notify)) {
+    if (!empty($default_unseen_notify)) {
         $unseen_notify = $default_unseen_notify;
     } else {
         $unseen_notify = 0;
     }
 }
 
-if ($oldway) {  /* normal behaviour SM */
-
-$boxes = sqimap_mailbox_list($imapConnection);
-/* Prepare do do out collapsedness and visibility computation. */
-$curbox = 0;
-$boxcount = count($boxes);
-
-/* Compute the collapsedness and visibility of each box. */
-
-while ($curbox < $boxcount) {
-    $boxes[$curbox]['visible'] = TRUE;
-    compute_folder_children($curbox, $boxcount);
+$boxes = sqimap_mailbox_tree($imapConnection);
+if (isset($advanced_tree) && $advanced_tree) {
+    echo '<form name="collapse" action="left_main.php" method="post" ' .
+         'enctype="multipart/form-data"'."\n";
+    echo '<small>';
+    echo '<button type="submit" class="button" onmouseover="buttonover(this,true)" onmouseout="buttonover(this,false)" onmousedown="buttonclick(this,true)" onmouseup="buttonclick(this,false)">'. _("Save folder tree") .'</button><br /><br />';
+    echo '<div id="mailboxes" class="mailboxes">'."\n\n";
+    sqgetGlobalVar('mbx', $mbx, SQ_POST);
+    if (!isset($mbx)) $mbx=NULL;
+    ListAdvancedBoxes($boxes, $mbx);
+    echo '</div>';
+    echo '</small>';
+    echo '</form>'."\n";
+} else {
+    ListBoxes($boxes);
 }
 
-for ($i = 0; $i < count($boxes); $i++) {
-    if ( $boxes[$i]['visible'] ) {
-        $mailbox = $boxes[$i]['formatted'];
-        $mblevel = substr_count($boxes[$i]['unformatted'], $delimiter) + 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(' ','&nbsp;',substr($prefix,0,strlen($prefix)-2)).
-                      create_collapse_link($i) . '&nbsp;';
-        } else {
-            $prefix = str_replace(' ','&nbsp;',$prefix);
-        }
-        $line = "<nobr><tt>$prefix</tt>";
-
-        /* Add the folder name and link. */
-        if (! isset($color[15])) {
-            $color[15] = $color[6];
-        }
-
-        if (in_array('noselect', $boxes[$i]['flags'])) {
-            if( isSpecialMailbox( $boxes[$i]['unformatted']) ) {
-                $line .= "<font color=\"$color[11]\">";
-            } else {
-                $line .= "<font color=\"$color[15]\">";
-            }
-            if (ereg("^( *)([^ ]*)", $mailbox, $regs)) {
-                $mailbox = str_replace('&nbsp;','',$mailbox);
-                $line .= str_replace(' ', '&nbsp;', $mailbox);
-            }
-            $line .= '</font>';
-        } else {
-            $line .= formatMailboxName($imapConnection, $boxes[$i]);
-        }
-
-        /* Put the final touches on our folder line. */
-        $line .= "</nobr><br>\n";
-
-        /* Output the line for this folder. */
-        echo $line;
-    }
-}
-} else {  /* expiremental code */
-    $boxes = sqimap_mailbox_tree($imapConnection);
-    if (isset($advanced_tree) && $advanced_tree) {
-        echo '<form name="collapse" action="left_main.php" method="post" ' .
-             'enctype="multipart/form-data"'."\n";
-        echo '<small>';
-        echo '<button type="submit" class="button" onmouseover="buttonover(this,true)" onmouseout="buttonover(this,false)" onmousedown="buttonclick(this,true)" onmouseup="buttonclick(this,false)">'. _("Save folder tree") .'</button><br /><br />';
-        echo '<div id="mailboxes" class="mailboxes">'."\n\n";
-        sqgetGlobalVar('mbx', $mbx, SQ_POST);
-        if (!isset($mbx)) $mbx=NULL;
-        ListAdvancedBoxes($boxes, $mbx);
-        echo '</div>';
-        echo '</small>';
-        echo '</form>'."\n";
-    } else {
-        //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";
-
-?>
\ No newline at end of file
+?>
+</body></html>