X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=436deb338f609269a92e5ef979f986b4ec3af90f;hb=9ed801576fc2cfc3859e8bcbc3a5441be5610f74;hp=985de4b48afd6a2180898e77dcbbbb159a6a477f;hpb=f0537f93e4335480c6fc0f018247bac9cdda13ff;p=squirrelmail.git

diff --git a/src/left_main.php b/src/left_main.php
index 985de4b4..436deb33 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -3,16 +3,20 @@
 /**
  * left_main.php
  *
- * Copyright (c) 1999-2003 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. */
@@ -21,6 +25,7 @@ require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/page_header.php');
 require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/date.php');
 
 /* These constants are used for folder stuff. */
 define('SM_BOX_UNCOLLAPSED', 0);
@@ -28,405 +33,172 @@ 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;sort=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(' ','&nbsp;',$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>";
-        } else {
-	   $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.
+ * Recursive function to output a tree of folders.
+ * It is called on a list of boxes and iterates over that tree.
+ *
+ * @since 1.3.0
  */
-function compute_folder_children(&$parbox, $boxcount) {
-    global $boxes, $data_dir, $username, $collapse_folders;
-    $nextbox = $parbox + 1;
+function ListBoxes ($boxes, $j=0 ) {
+    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;
 
-    /* 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;
+    // stop condition
+    if (empty($boxes)) {
+        return;
     }
-    $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);
-    }
+    $pre = '<span style="white-space: nowrap;">';
+    $end = '';
+    $collapse = false;
+    $unseen_found = false;
+    $unseen = 0;
 
-    /* Set the parent box to the current next box. */
-    $parbox = $nextbox;
-}
+    $mailbox = $boxes->mailboxname_full;
+    $leader = str_repeat('&nbsp;&nbsp;',$j);
+    $mailboxURL = urlencode($mailbox);
 
-/**
- * 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;
-    $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) {
-        $link .= "unfold=$mailbox\">+";
-    } else {
-        $link .= "fold=$mailbox\">-";
-    }
-    $link .= '</a>';
+    /* get unseen/total messages information */
+    /* Only need to display info when option is set */
+    if (isset($unseen_notify) && ($unseen_notify > 1) &&
+        (($boxes->unseen !== false) || ($boxes->total !== false))) {
 
-    $hooklink = do_hook_function('create_collapse_link',$link);
-    if ($hooklink != '')
-        $link = $hooklink;
+        if ($boxes->unseen !== false)
+            $unseen = $boxes->unseen;
 
-    /* Return the finished product. */
-    return ($link);
-}
+        /*
+            Should only display unseen info if the folder is inbox
+            or you set the option for all folders
+        */
 
-/**
- * create_unseen_string:
- *
- * Create unseen and total message count for both this folder and
- * it's subfolders.
- *
- * @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[0] unseen message string (for display)
- * @return array[1] unseen message count
- */
-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'];
-    }
+        if ((strtolower($mailbox) == 'inbox') || ($unseen_notify == 3)) {
+            $unseen_string = $unseen;
 
-    /* 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;
+            /* If users requests, display message count too */
+            if (isset($unseen_type) && ($unseen_type == 2) && ($boxes->total !== false)) {
+                $unseen_string .= '/' . $boxes->total;
             }
-        }
-
-        /* 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,
-    $move_to_trash, $trash_folder, $collapse_folders, $imapConnection;
-    $pre = '<nobr>';
-    $end = '';
-    $collapse = false;
-    $unseen_type = 1;
-    $unseen_notify = 0;
-    $unseen = 0;
+            $unseen_string = "<font color=\"$color[11]\">($unseen_string)</font>";
 
-    /* Get unseen/total display prefs */
-    $unseen_type = getPref( $data_dir , $username , 'unseen_type' );
-    $unseen_notify = getPref( $data_dir , $username , 'unseen_notify' );
-
-    if (isset($boxes) && !empty($boxes)) {
-        $mailbox = $boxes->mailboxname_full;
-        $leader = '<tt>';
-        $leader .= str_repeat('&nbsp;&nbsp;',$j);
-        $mailboxURL = urlencode($mailbox);
-
-        /* get unseen/total messages information */
-        /* Only need to display info when option is set */
-        if (isset($unseen_notify) && ($unseen_notify > 1)) {
-                    
-            if ($boxes->unseen !== false) {
-                $unseen = $boxes->unseen; 
-            } else {        
-                $unseen = 0;
-            }   
-        
-            /* 
-                Should only display unseen info if the folder is inbox
-                or you set the option for all folders
+            /*
+                Finally allow the script to display the values by setting a boolean.
+                This can only occur if the unseen count is great than 0 (if you have
+                unseen count only), or you have the message count too.
             */
-
-            if ((strtolower($mailbox) == 'inbox') || ($unseen_notify == 3)) {
-                $unseen_string = $unseen;
-                        
-
-                /* If users requests, display message count too */
-                if (isset($unseen_type) && ($unseen_type == 2)) {
-                    $numMessages = $boxes->total;
-                    $unseen_string .= '/' . $numMessages;
-                }       
-                
-                $unseen_string = "<font color=\"$color[11]\">($unseen_string)</font>";
-            
-                /*
-                    Finally allow the script to display the values by setting a boolean.
-                    This can only occur if the unseen count is great than 0 (if you have
-                    unseen count only), or you have the message count too.
-                */
-                if (($unseen > 0) || (isset($unseen_type) && ($unseen_type ==2))) {
-                    $unseen_found = true;
-                }
-        
-            }   
-        
+            if (($unseen > 0) || (isset($unseen_type) && ($unseen_type ==2))) {
+                $unseen_found = true;
+            }
         }
+    }
 
-        if (isset($boxes->mbxs[0]) && $collapse_folders) {
-            $collapse = getPref($data_dir, $username, 'collapse_folder_' . $mailbox);
-            $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
+    if (isset($boxes->mbxs[0]) && $collapse_folders) {
+        $collapse = getPref($data_dir, $username, 'collapse_folder_' . $mailbox);
+        $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
 
-            $link = '<a target="left" style="text-decoration:none" ' .'href="left_main.php?';
-            if ($collapse) {
-                $link .= "unfold=$mailboxURL\">$leader+&nbsp;</tt>";
+        $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;';
             } else {
-                $link .= "fold=$mailboxURL\">$leader-&nbsp;</tt>";
+                $link .= "unfold=$mailboxURL\">$leader+&nbsp;";
             }
-            $link .= '</a>';
-            $pre .= $link;
         } else {
-            $pre.= $leader . '&nbsp;&nbsp;</tt>';
+            if ($use_icons && $icon_theme != 'none') {
+                $link .= "fold=$mailboxURL\">$leader<img src=\"" . SM_PATH . 'images/minus.png" border="0" height="7" width="7" />&nbsp;';
+            } else {
+                $link .= "fold=$mailboxURL\">$leader-&nbsp;";
+            }
         }
+        $link .= '</a>';
+        $pre .= $link;
+    } else {
+        $pre.= $leader . '&nbsp;&nbsp;';
+    }
+
+    /* If there are unseen message, bold the line. */
+    if (($move_to_trash) && ($mailbox == $trash_folder)) {
 
-        /* If there are unseen message, bold the line. */
-        if (($move_to_trash) && ($mailbox == $trash_folder)) {
-            if (! isset($boxes->total)) {
-                $boxes->total = sqimap_status_messages($imapConnection, $mailbox);
+        if ( !is_numeric($boxes->total) ) {
+            $result = sqimap_status_messages($imapConnection, $mailbox);
+            $boxes->total = $result['MESSAGES'];
+            $boxes->unseen = $result['UNSEEN'];
+        }
+        
+        $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) {
+            /* Print unseen information. */
+            if ($unseen_found) {
+                $end .= "&nbsp;<small>$unseen_string</small>";
             }
+            $end .= "\n<small>" .
+                 '&nbsp;&nbsp;[<a href="empty_trash.php">'._("Purge").'</a>]'.
+                 '</small>';
+        }
+    } else {
+        if (!$boxes->is_noselect) {
+            $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>';
-            }
-            $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;sort=0;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
-            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\">";
-                if ($unseen > 0) {
-                    $end .= '</b>';
-                }
-                $end .= "\n<small>\n" .
-                        "&nbsp;&nbsp;(<a href=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</a>)" .
-                        "</small>";
-            }
-        } else {
-            if (!$boxes->is_noselect || strtolower($boxes->mailboxname_full)=="inbox") {
-                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\">";
-                if ($unseen > 0) {
-                    $end .= '</b>';
-                }
-                $end .= '</a>';
-            }
         }
-
         /* Print unseen information. */
-        if (isset($unseen_found) && $unseen_found) {
+        if ($unseen_found) {
             $end .= "&nbsp;<small>$unseen_string</small>";
         }
 
-        $font = '';
-        $fontend = '';
-        if ($boxes->is_special) {
-            $font = "<font color=\"$color[11]\">";
-            $fontend = "</font>";
-        }
-        $end .= '</nobr>';
+    }
 
-        if (!$boxes->is_root) {
-            echo "" . $pre .$font. $boxes->mailboxname_sub .$fontend . $end. '<br />' . "\n";
-            $j++;
-        }
+    $font = '';
+    $fontend = '';
+    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>';
+    }
 
-        if (!$collapse || $boxes->is_root) {
-            for ($i = 0; $i <count($boxes->mbxs); $i++) {
-                listBoxes($boxes->mbxs[$i],$j);
-            }
+    // 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 .= '</span>';
+
+    if (!$boxes->is_root) {
+        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);
         }
     }
 }
 
 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 (empty($boxes)) {
+        return;
+    }
 
     /* use_folder_images only works if the images exist in ../images */
     $use_folder_images = true;
@@ -437,20 +209,18 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     $unseen_found = false;
     $unseen = 0;
 
-    if ($boxes) {
     $mailbox = $boxes->mailboxname_full;
     $mailboxURL = urlencode($mailbox);
 
+    /* get unseen/total messages information */
     /* Only need to display info when option is set */
-    if (isset($unseen_notify) && ($unseen_notify > 1)) {
+    if (isset($unseen_notify) && ($unseen_notify > 1) &&
+        (($boxes->unseen !== false) || ($boxes->total !== false))) {
 
-        if ($boxes->unseen !== false) {
+        if ($boxes->unseen !== false)
             $unseen = $boxes->unseen;
-        } else {
-            $unseen = 0;
-        }
 
-        /* 
+        /*
             Should only display unseen info if the folder is inbox
             or you set the option for all folders
         */
@@ -458,11 +228,9 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
         if ((strtolower($mailbox) == 'inbox') || ($unseen_notify == 3)) {
             $unseen_string = $unseen;
 
-
             /* If users requests, display message count too */
-            if (isset($unseen_type) && ($unseen_type == 2)) {
-                $numMessages = $boxes->total;
-                $unseen_string .= '/' . $numMessages;
+            if (isset($unseen_type) && ($unseen_type == 2) && ($boxes->total !== false)) {
+                $unseen_string .= '/' . $boxes->total;
             }
 
             $unseen_string = "<font color=\"$color[11]\">($unseen_string)</font>";
@@ -475,17 +243,15 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
             if (($unseen > 0) || (isset($unseen_type) && ($unseen_type ==2))) {
                 $unseen_found = true;
             }
-        
-        }   
-        
+        }
     }
 
     /* If there are unseen message, bold the line. */
     if ($unseen > 0) { $pre .= '<b>'; }
 
     /* color special boxes */
-    if ($boxes->is_special) {
-            $pre .= "<font color=\"$color[11]\">";
+    if ($use_special_folder_color && $boxes->is_special) {
+        $pre .= "<font color=\"$color[11]\">";
         $end .= '</font>';
     }
 
@@ -493,92 +259,94 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     if ($unseen > 0) { $end .= '</b>'; }
 
     /* Print unseen information. */
-    if (isset($unseen_found) && $unseen_found) {
-            $end .= "&nbsp;$unseen_string";
+    if ($unseen_found) {
+        $end .= "&nbsp;$unseen_string";
     }
 
     if (($move_to_trash) && ($mailbox == $trash_folder)) {
-            if (! isset($numMessages)) {
-            $numMessages = $boxes->total;
-            }
-            if ($numMessages > 0) {
-            $urlMailbox = urlencode($mailbox);
-            $pre .= "\n<small>\n" .
-                    "&nbsp;&nbsp;(<a class=\"mbx_link\" href=\"empty_trash.php\">"._("purge")."</a>)" .
-                    "</small>";
-            }
+        $pre = "<a class=\"mbx_link\" href=\"right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">" . $pre;
+        $end .= '</a>';
+        $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;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">";
-        $end .= '</a>';
+            $pre = "<a class=\"mbx_link\" href=\"right_main.php?PG_SHOWALL=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">" . $pre;
+            $end .= '</a>';
         }
     }
 
+    // let plugins fiddle with end of line
+    global $imapConnection;
+    $end .= concat_hook_function('left_main_after_each_folder',
+        array(isset($numMessages) ? $numMessages : '',
+              $boxes->mailboxname_full, $imapConnection));
+
     if (!$boxes->is_root) {
         if ($use_folder_images) {
-          if ($boxes->is_inbox) {
-        $folder_img = '../images/inbox.png';
-          } else if ($boxes->is_sent) {
-        $folder_img = '../images/senti.png';
-          } else if ($boxes->is_trash) {
-        $folder_img = '../images/delitem.png';
-          } else if ($boxes->is_draft) {
-        $folder_img = '../images/draft.png';
-          } else $folder_img = '../images/folder.png';
-          $folder_img = '&nbsp;<img src="'.$folder_img.'" height="15" valign="center" />&nbsp;';
-        } else $folder_img = '';
+            if ($boxes->is_inbox) {
+                $folder_img = '../images/inbox.png';
+            } else if ($boxes->is_sent) {
+                $folder_img = '../images/senti.png';
+            } else if ($boxes->is_trash) {
+                $folder_img = '../images/delitem.png';
+            } else if ($boxes->is_draft) {
+                $folder_img = '../images/draft.png';
+            } else if ($boxes->is_noinferiors) {
+                $folder_img = '../images/folder_noinf.png';
+            } else {
+                $folder_img = '../images/folder.png';
+            }
+            $folder_img = '&nbsp;<img src="'.$folder_img.'" height="15" />&nbsp;';
+        } else {
+            $folder_img = '';
+        }
         if (!isset($boxes->mbxs[0])) {
             echo '   ' . html_tag( 'div',
-                            $pre . $folder_img . $boxes->mailboxname_sub . $end ,
-                    'left', '', 'class="mbx_sub" id="' .$j. '"' )
-                . "\n";
+                            $pre . $folder_img .
+                                str_replace( array(' ','<','>'),
+                                             array('&nbsp;','&lt;','&gt;'),
+                                             $boxes->mailboxname_sub) .
+                                $end,
+                            'left', '', 'class="mbx_sub" id="' .$j. '"' ) . "\n";
         } else {
             /* get collapse information */
-        if ($collapse_folders) {
-            $link = '<a target="left" style="text-decoration:none" ' .'href="left_main.php?';
-            $form_entry = $j.'F';
-            if (isset($mbx) && isset($mbx[$form_entry])) {
-                $collapse = $mbx[$form_entry];
-            if ($collapse) {
-                    setPref($data_dir, $username, 'collapse_folder_'.$boxes->mailboxname_full , SM_BOX_COLLAPSED);
-            } else {
-                    setPref($data_dir, $username, 'collapse_folder_'.$boxes->mailboxname_full , SM_BOX_UNCOLLAPSED);
-            }
-            } else {
-            $collapse = getPref($data_dir, $username, 'collapse_folder_' . $mailbox);
-                $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
-            }
-            if ($collapse) {
-                $link = '<a href="javascript:void(0)">'." <img src=\"../images/plus.png\" border=\"1\" id=$j onclick=\"hidechilds(this)\" /></a>";
+            if ($collapse_folders) {
+                $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);
+                } 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>";
             } else {
-                $link = '<a href="javascript:void(0)">'."<img src=\"../images/minus.png\" border=\"1\" id=$j onclick=\"hidechilds(this)\" /></a>";
+                 $collapse_link='';
             }
-            $collapse_link = $link;
-        } else $collapse_link='';
             echo '   ' . html_tag( 'div',
                             $collapse_link . $pre . $folder_img . '&nbsp;'. $boxes->mailboxname_sub . $end ,
-                    'left', '', 'class="mbx_par" id="' .$j. 'P"' )
-                . "\n";
-        echo '   <input type="hidden" name="mbx['.$j. 'F]" value="'.$collapse.'" id="mbx['.$j.'F]" />'."\n";
+                            'left', '', 'class="mbx_par" id="' .$j. 'P"' ) . "\n";
+            echo '   <input type="hidden" name="mbx['.$j. 'F]" value="'.$collapse.'" id="mbx['.$j.'F]" />'."\n";
         }
     }
-    if ($collapse) {
-        $visible = ' style="display:none;"';
-    } else {
-        $visible = ' style="display:block;"';
-    }
 
+    $visible = ($collapse ? ' style="display:none"' : ' style="display:block"');
     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') {
-           $j = $j .'.0000';
+    if ($j !='ID.0000') {
+       $j = $j .'.0000';
     }
-        for ($i = 0; $i <count($boxes->mbxs); $i++) {
+    for ($i = 0; $i <count($boxes->mbxs); $i++) {
         $j++;
-            listAdvancedBoxes($boxes->mbxs[$i],$mbx,$j);
-        }
-    if (isset($boxes->mbxs[0]) && !$boxes->is_root ) echo '</div>'."\n\n";
+        ListAdvancedBoxes($boxes->mbxs[$i],$mbx,$j);
+    }
+    if (isset($boxes->mbxs[0]) && !$boxes->is_root) {
+        echo '</div>'."\n\n";
     }
 }
 
@@ -599,12 +367,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".
@@ -614,167 +383,171 @@ 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
- * javascript is experimental and doesn't support all browsers. It is tested on
- * IE6 an Konquerer 3.0.0-2.
+ * javascript is experimental and doesn't support all browsers.
+ * It has been tested on IE6 an Konquerer 3.0.0-2.
+ * It is now tested and working on: (please test and update this list)
+ * Windows: IE 5.5 SP2, IE 6 SP1, Gecko based (Mozilla, Firebird) and Opera7
+ * XWindow: ?
+ * Mac: ?
  * In the function ListAdvancedBoxes there is another var $use_folder_images.
  * 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
  **/
 
-$advanced_tree = false; /* set this to true if you want to see a nicer mailboxtree */
-$oldway = false;        /* default SM behaviour */
+/* set this to true if you want to see a nicer mailboxtree */
+if (empty($advanced_tree)) {
+    $advanced_tree=false;
+}
 
 if ($advanced_tree) {
-$xtra .= <<<ECHO
-<script language="Javascript" TYPE="text/javascript">
-
+$xtra .= <<<HEREDOC
+<script language="Javascript" type="text/javascript">
 <!--
-
-    function hidechilds(el) {
-        id = el.id+".0000";
-        form_id = "mbx[" + el.id +"F]";
-    if (document.all) {
-        ele = document.all[id];
-        if (ele) {
-           if(ele.style.display == "none") {
-                  ele.style.display = "block";
-              ele.style.visibility = "visible"
-                  el.src="../images/minus.png";
-                  document.all[form_id].value=0;
-               } else {
-                  ele.style.display = "none";
-              ele.style.visibility = "hidden"
-              el.src="../images/plus.png";
-              document.all[form_id].value=1;
+    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) {
-            ele = document.getElementById(id);
-        if (ele) {
-           if(ele.style.display == "none") {
-              ele.style.display = "block";
-              ele.style.visibility = "visible"
-              el.src="../images/minus.png";
-                  document.getElementById(form_id).value=0;
-           } else {
-              ele.style.display = "none";
-              ele.style.visibility = "hidden"
-              el.src="../images/plus.png";
-                  document.getElementById(form_id).value=1;
+      }
+      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 preload() {
-     if (!document.images) return;
-     var ar = new Array();
-     var arguments = preload.arguments;
-     for (var i = 0; i<arguments.length; i++) {
-        ar[i] = new Image();
-    ar[i].src = arguments[i];
-     }
-   }
-
    function buttonover(el,on) {
       if (!on) {
-         el.style.borderColor="blue";}
+         el.style.background="$color[0]";}
       else {
-         el.style.borderColor="orange";}
+         el.style.background="$color[9]";}
    }
-
    function buttonclick(el,on) {
       if (!on) {
-         el.style.border="groove"}
+         el.style.border="groove";}
       else {
          el.style.border="ridge";}
    }
-
    function hideframe(hide) {
-
-ECHO;
-$xtra .= "      left_size = \"$left_size\";\n";
-$xtra .= <<<ECHO
+      left_size = "$left_size";
       if (document.all) {
         masterf = window.parent.document.all["fs1"];
-    leftf = window.parent.document.all["left"];
-    leftcontent = document.all["leftframe"];
-    leftbutton = document.all["showf"];
+        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");
+        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';
+         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';
-
+         document.body.style.overflow="";
+         leftbutton.style.display="none";
+         leftcontent.style.display="block";
       }
    }
-
    function calc_col(c_w) {
-
-ECHO;
+HEREDOC;
    if ($location_of_bar == 'right') {
        $xtra .= '     right=true;';
    } else {
        $xtra .= '     right=false;';
    }
-   $xtra .= "\n";
-$xtra .= <<<ECHO
-     if (right) {
+$xtra .= <<<HEREDOC
+   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");
+        window.parent.document.getElementById("fs1");
      } else {
         return false;
      }
-
-ECHO;
+HEREDOC;
    if ($location_of_bar == 'right') {
        $xtra .= '  colPat=/^\*,(\d+)$/;';
    } else {
        $xtra .= '  colPat=/^(\d+),.*$/;';
    }
-   $xtra .= "\n";
-
-$xtra .= <<<ECHO
+$xtra .= <<<HEREDOC
      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;
@@ -782,60 +555,56 @@ $xtra .= <<<ECHO
      }
      masterf.cols = calc_col(new_col_width);
    }
-
 //-->
-
 </script>
 
-ECHO;
+HEREDOC;
 
 /* style definitions */
 
-$xtra .= <<<ECHO
-
+$xtra .= <<<HEREDOC
 <style type="text/css">
 <!--
   body {
      margin: 0px 0px 0px 0px;
      padding: 5px 5px 5px 5px;
   }
-
+  img {
+     vertical-align: middle;
+  }
   .button {
      border:outset;
-     border-color:blue;
-     background:white;
+     border-color: $color[9];
+     background:$color[0];
+     color:$color[6];
      width:99%;
      heigth:99%;
   }
-
   .mbx_par {
-     font-size:0.8em;
+     font-size:1.0em;
      margin-left:4px;
      margin-right:0px;
+     white-space: nowrap;
   }
-
   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.7em;
+     font-size:0.9em;
+     white-space: nowrap;
   }
-
   .par_area {
      margin-top:0px;
      margin-left:4px;
@@ -844,13 +613,12 @@ $xtra .= <<<ECHO
      padding-bottom:5px;
      border-left: solid;
      border-left-width:0.1em;
-     border-left-color:blue;
+     border-left-color:$color[9];
      border-bottom: solid;
      border-bottom-width:0.1em;
-     border-bottom-color:blue;
+     border-bottom-color:$color[9];
      display: block;
   }
-
   .mailboxes {
      padding-bottom:3px;
      margin-right:4px;
@@ -859,23 +627,18 @@ $xtra .= <<<ECHO
      padding-left:4px;
      border: groove;
      border-width:0.1em;
-     border-color:green;
+     border-color:$color[9];
      background: $color[0];
+     font-size: smaller;
   }
-
 -->
-
 </style>
 
-ECHO;
-
+HEREDOC;
 }
 
-
-
-
 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);
@@ -883,8 +646,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);
+                }
             }
         }
     }
@@ -894,28 +664,37 @@ if ($auto_create_special && !isset($auto_create_done)) {
     sqsession_register($auto_create_done, 'auto_create_done');
 }
 
-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"' ) .
+    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';
         }
@@ -928,6 +707,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;
@@ -939,19 +721,21 @@ if ($date_format != 6) {
         $clk = date($hr, time());
         break;
     default:
-        $clk = substr( getDayName( date( 'w', time() ) ), 0, 3 ) . date( ', ' . $hr, time() );
+        $clk = getDayAbrv( date( 'w', time() ) ) . date( ', ' . $hr, time() );
     }
     $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 />\n";
 }
 
 /* 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 />\n\n";
 
 /* Lastly, display the folder list. */
+
 if ( $collapse_folders ) {
     /* If directed, collapse or uncollapse a folder. */
     if (isset($fold)) {
@@ -961,82 +745,44 @@ if ( $collapse_folders ) {
     }
 }
 
-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);
-}
-
-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";
+/* Get unseen/total display prefs */
+$unseen_type = getPref( $data_dir , $username , 'unseen_type' );
+$unseen_notify = getPref( $data_dir , $username , 'unseen_notify' );
 
-        /* Output the line for this folder. */
-        echo $line;
+if (empty($unseen_type)) {
+    if (!empty($default_unseen_type)) {
+        $unseen_type = $default_unseen_type;
+    } else {
+        $unseen_type = 1;
     }
 }
-} 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><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";
-        if (!isset($mbx)) $mbx=NULL;
-        ListAdvancedBoxes($boxes, $mbx);
-        echo '</div></small>'."\n";
-        echo '</form>'."\n";
+
+if (empty($unseen_notify)) {
+    if (!empty($default_unseen_notify)) {
+        $unseen_notify = $default_unseen_notify;
     } else {
-        //sqimap_get_status_mbx_tree($imap_stream,$boxes)    
-        ListBoxes($boxes);
+        $unseen_notify = 0;
     }
-} /* if ($oldway) else ... */
+}
+
+$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 '<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 '</form>'."\n";
+} else {
+    ListBoxes($boxes);
+}
+
 do_hook('left_main_after');
 sqimap_logout($imapConnection);
 
-echo '</td></tr></table>' . "\n".
-    "</div></body></html>\n";
-
 ?>
+</td></tr></table>
+</body></html>