X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=dda2b3c7221c5a338e92c6eff79499ea21f225b1;hb=df7b27c12af4da5af86c63fccc6b5adf2dbf33ff;hp=7b0ad989e171f4e3b3c19263a059c76aad852d42;hpb=e164659022d8fa13d368b99ef81dbd632edc4381;p=squirrelmail.git

diff --git a/src/left_main.php b/src/left_main.php
index 7b0ad989..dda2b3c7 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -10,9 +10,10 @@
  * available, and has cookie information.
  *
  * $Id$
+ * @package squirrelmail
  */
 
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
@@ -21,6 +22,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);
@@ -99,11 +101,10 @@ function formatMailboxName($imapConnection, $box_array) {
             $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));
         }
-    } else {
-        $line .= concat_hook_function('left_main_after_each_folder',
-                                      array(isset($numMessages) ? $numMessages : '',
-                                            $real_box, $imapConnection));
     }
 
     /* Return the final product. */
@@ -179,6 +180,10 @@ function create_collapse_link($boxnum) {
     }
     $link .= '</a>';
 
+    $hooklink = do_hook_function('create_collapse_link',$link);
+    if ($hooklink != '')
+        $link = $hooklink;
+
     /* Return the finished product. */
     return ($link);
 }
@@ -192,8 +197,7 @@ function create_collapse_link($boxnum) {
  * @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
+ * @return array unseen message string (for display), unseen message count
  */
 function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type) {
     global $boxes, $unseen_type, $color, $unseen_cum;
@@ -281,140 +285,147 @@ function is_parent_box($curbox_name, $parbox_name) {
     return ($parbox_name == $actual_parname);
 }
 
-function listBoxes ($boxes, $j=0 ) {
+function ListBoxes ($boxes, $j=0 ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
-    $move_to_trash, $trash_folder, $collapse_folders, $imapConnection;
+           $move_to_trash, $trash_folder, $collapse_folders, $imapConnection;
+
+    if (!isset($boxes) || empty($boxes))
+        return;
+
     $pre = '<nobr>';
     $end = '';
     $collapse = false;
-    $unseen_type = 1;
-    $unseen_notify = 0;
+    $unseen_found = false;
+    $unseen = 0;
 
-    /* Get unseen/total display prefs */
-    $unseen_type = getPref( $data_dir , $username , 'unseen_type' );
-    $unseen_notify = getPref( $data_dir , $username , 'unseen_notify' );
+    $mailbox = $boxes->mailboxname_full;
+    $leader = '<tt>';
+    $leader .= str_repeat('&nbsp;&nbsp;',$j);
+    $mailboxURL = urlencode($mailbox);
 
-    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) &&
+        (($boxes->unseen !== false) || ($boxes->total !== false))) {
 
-        /* get unseen/total messages information */
-        if ($boxes->unseen||$boxes->total) {
+        if ($boxes->unseen !== false)
             $unseen = $boxes->unseen;
-            $unseen_string = "($unseen)";
-            if ($unseen>0||$boxes->total>0) {
-                $unseen_found = TRUE;
-            }
 
-            $unseen_before = '<font color="' . $color[11] . '">';
-            $unseen_after = '</font>';
-
-            if ((($unseen_notify == 2) && (strtolower($mailbox) == 'inbox')) || ($unseen_notify == 3)) {
-                $unseen_string = '(' . $unseen;
-                
-                if ($unseen_type > 1) {
-                    $unseen_string .= '/' . $boxes->total;
-                }
+        /*
+            Should only display unseen info if the folder is inbox
+            or you set the option for all folders
+        */
 
-                $unseen_string .= ')';
+        if ((strtolower($mailbox) == 'inbox') || ($unseen_notify == 3)) {
+            $unseen_string = $unseen;
 
-                $unseen_string = $unseen_before . $unseen_string . $unseen_after;
+            /* If users requests, display message count too */
+            if (isset($unseen_type) && ($unseen_type == 2) && ($boxes->total !== false)) {
+                $unseen_string .= '/' . $boxes->total;
             }
-        } else {
-            $unseen = 0;
-        }
 
-        if (isset($boxes->mbxs[0]) && $collapse_folders) {
-            $collapse = getPref($data_dir, $username, 'collapse_folder_' . $mailbox);
-            $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
+            $unseen_string = "<font color=\"$color[11]\">($unseen_string)</font>";
 
-            $link = '<a target="left" style="text-decoration:none" ' .'href="left_main.php?';
-            if ($collapse) {
-                $link .= "unfold=$mailboxURL\">$leader+&nbsp;</tt>";
-            } else {
-                $link .= "fold=$mailboxURL\">$leader-&nbsp;</tt>";
+            /*
+                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;
             }
-            $link .= '</a>';
-            $pre .= $link;
-        } else {
-            $pre.= $leader . '&nbsp;&nbsp;</tt>';
         }
+    }
 
-        /* If there are unseen message, bold the line. */
+    if (isset($boxes->mbxs[0]) && $collapse_folders) {
+        $collapse = getPref($data_dir, $username, 'collapse_folder_' . $mailbox);
+        $collapse = ($collapse == '' ? SM_BOX_UNCOLLAPSED : $collapse);
 
-        if (($move_to_trash) && ($mailbox == $trash_folder)) {
-            if (! isset($numMessages)) {
-                $status = sqimap_status_messages($imapConnection, $mailbox);
-                $numMessages = $status['MESSAGES'];
-            }
+        $link = '<a target="left" style="text-decoration:none" ' .'href="left_main.php?';
+        if ($collapse) {
+            $link .= "unfold=$mailboxURL\">$leader+&nbsp;</tt>";
+        } else {
+            $link .= "fold=$mailboxURL\">$leader-&nbsp;</tt>";
+        }
+        $link .= '</a>';
+        $pre .= $link;
+    } else {
+        $pre.= $leader . '&nbsp;&nbsp;</tt>';
+    }
 
+    /* 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 ($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 .= '</a>';
-            if ($numMessages > 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>";
+            /* Print unseen information. */
+            if ($unseen_found) {
+                $end .= "&nbsp;<small>$unseen_string</small>";
             }
-        } else {
-            if (!$boxes->is_noselect) {
-                if ($unseen > 0) {
-                    $pre .= '<b>';
-                }
-                $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
-                if ($unseen > 0) {
-                    $end .= '</b>';
-                }
-                $end .= '</a>';
+            $end .= "\n<small>\n" .
+                    "&nbsp;&nbsp;(<a href=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</a>)" .
+                    "</small>";
+        }
+    } else {
+        if (!$boxes->is_noselect) {
+            if ($unseen > 0) {
+                $pre .= '<b>';
+            }
+            $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\" style=\"text-decoration:none\">";
+            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 ($boxes->is_special) {
+        $font = "<font color=\"$color[11]\">";
+        $fontend = "</font>";
+    }
+    $end .= '</nobr>';
 
-        if (!$collapse || $boxes->is_root) {
-            for ($i = 0; $i <count($boxes->mbxs); $i++) {
-                listBoxes($boxes->mbxs[$i],$j);
-            }
+    if (!$boxes->is_root) {
+        echo "" . $pre .$font. $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;
+           $move_to_trash, $trash_folder, $collapse_folders;
+
+    if (!isset($boxes) || empty($boxes))
+        return;
 
     /* use_folder_images only works if the images exist in ../images */
     $use_folder_images = true;
@@ -422,28 +433,52 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     $pre = '';
     $end = '';
     $collapse = false;
+    $unseen_found = false;
+    $unseen = 0;
 
-    if ($boxes) {
     $mailbox = $boxes->mailboxname_full;
     $mailboxURL = urlencode($mailbox);
 
     /* get unseen/total messages information */
-        if ($boxes->unseen) {
-        $unseen = $boxes->unseen;
-            $unseen_string = "($unseen)";
-        if ($unseen>0) $unseen_found = TRUE;
-            if ($boxes->total) {
-        $numMessages = $boxes->total;
-            $unseen_string = "<font color=\"$color[11]\">($unseen/$numMessages)</font>";
+    /* Only need to display info when option is set */
+    if (isset($unseen_notify) && ($unseen_notify > 1) &&
+        (($boxes->unseen !== false) || ($boxes->total !== false))) {
+
+        if ($boxes->unseen !== false)
+            $unseen = $boxes->unseen;
+
+        /*
+            Should only display unseen info if the folder is inbox
+            or you set the option for all folders
+        */
+
+        if ((strtolower($mailbox) == 'inbox') || ($unseen_notify == 3)) {
+            $unseen_string = $unseen;
+
+            /* If users requests, display message count too */
+            if (isset($unseen_type) && ($unseen_type == 2) && ($boxes->total !== false)) {
+                $unseen_string .= '/' . $boxes->total;
+            }
+
+            $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;
+            }
         }
-    } else $unseen = 0;
+    }
 
     /* 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]\">";
+        $pre .= "<font color=\"$color[11]\">";
         $end .= '</font>';
     }
 
@@ -451,93 +486,87 @@ 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)) {
+        if (! isset($numMessages)) {
             $numMessages = $boxes->total;
-            }
-            if ($numMessages > 0) {
+        }
+        $pre = "<a class=\"mbx_link\" href=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">" . $pre;
+        $end .= '</a>';
+        if ($numMessages > 0) {
             $urlMailbox = urlencode($mailbox);
-            $pre .= "\n<small>\n" .
+            $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;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">" . $pre;
+            $end .= '</a>';
         }
     }
 
     if (!$boxes->is_root) {
         if ($use_folder_images) {
-          if ($boxes->is_inbox) {
-        $folder_img = '../images/inbox.gif';
-          } else if ($boxes->is_sent) {
-        $folder_img = '../images/senti.gif';
-          } else if ($boxes->is_trash) {
-        $folder_img = '../images/delitem.gif';
-          } else if ($boxes->is_draft) {
-        $folder_img = '../images/draft.gif';
-          } else $folder_img = '../images/folder.gif';
-          $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" valign="center" />&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";
+                            '<tt>'. $pre . $folder_img . '</tt>'. $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.gif\" 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.gif\" 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';
-    }
-        for ($i = 0; $i <count($boxes->mbxs); $i++) {
+    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 ) echo '</div>'."\n\n";
+        ListAdvancedBoxes($boxes->mbxs[$i],$mbx,$j);
     }
+    if (isset($boxes->mbxs[0]) && !$boxes->is_root)
+        echo '</div>'."\n\n";
 }
 
 
@@ -574,13 +603,17 @@ if (isset($left_refresh) && ($left_refresh != '') &&
 /**
  * $advanced_tree and $oldway are boolean vars which are default set to default
  * SM behaviour.
- * Setting $oldway to false causes left_main.php to use the new  experimental
+ * 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.
  *
@@ -588,8 +621,14 @@ if (isset($left_refresh) && ($left_refresh != '') &&
  * 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 (! isset($advanced_tree) || $advanced_tree=="" ) {
+    $advanced_tree=false;
+}
+/* default SM behaviour */
+if (! isset($oldway) || $oldway=="" ) {
+    $oldway=false;
+}
 
 if ($advanced_tree) {
 $xtra .= <<<ECHO
@@ -597,62 +636,85 @@ $xtra .= <<<ECHO
 
 <!--
 
-    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.gif";
-                  document.all[form_id].value=0;
-               } else {
-                  ele.style.display = "none";
-              ele.style.visibility = "hidden"
-              el.src="../images/plus.gif";
-              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.gif";
-                  document.getElementById(form_id).value=0;
-           } else {
-              ele.style.display = "none";
-              ele.style.visibility = "hidden"
-              el.src="../images/plus.gif";
-                  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.borderColor="$color[9]";}
+         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";}
    }
@@ -760,14 +822,15 @@ $xtra .= <<<ECHO
 
   .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;
   }
@@ -791,7 +854,7 @@ $xtra .= <<<ECHO
      padding-right:0px;
      margin-left:4px;
      margin-right:0px;
-     font-size:0.7em;
+     font-size:0.9em;
   }
 
   .par_area {
@@ -802,10 +865,10 @@ $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;
   }
 
@@ -817,7 +880,7 @@ $xtra .= <<<ECHO
      padding-left:4px;
      border: groove;
      border-width:0.1em;
-     border-color:green;
+     border-color:$color[9];
      background: $color[0];
   }
 
@@ -829,9 +892,6 @@ ECHO;
 
 }
 
-
-
-
 displayHtmlHeader( 'SquirrelMail', $xtra );
 
 /* If requested and not yet complete, attempt to autocreate folders. */
@@ -852,17 +912,22 @@ 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 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 ID="leftframe"><br /><br />';*/
 }
 
 echo "\n\n" . html_tag( 'table', '', 'left', '', 'border="0" cellspacing="0" cellpadding="0" width="99%"' ) .
@@ -897,7 +962,7 @@ 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);
 
@@ -919,6 +984,26 @@ if ( $collapse_folders ) {
     }
 }
 
+/* Get unseen/total display prefs */
+$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)) {
+        $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)) {
+        $unseen_notify = $default_unseen_notify;
+    } else {
+        $unseen_notify = 0;
+    }
+}
+
 if ($oldway) {  /* normal behaviour SM */
 
 $boxes = sqimap_mailbox_list($imapConnection);
@@ -980,13 +1065,17 @@ for ($i = 0; $i < count($boxes); $i++) {
     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 '<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></small>'."\n";
+        echo '</div>';
+        echo '</small>';
         echo '</form>'."\n";
     } else {
+        //sqimap_get_status_mbx_tree($imap_stream,$boxes)    
         ListBoxes($boxes);
     }
 } /* if ($oldway) else ... */