X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fleft_main.php;h=13eb9055d4900f5a5b2b063e9708e6392947786e;hp=f2106085ba41827c3178e1cf3c359f7665aadf47;hb=6373ad1237c82a561fec8264457e3a3a845f7e87;hpb=a6172cd5e018245cb6886c239b2a4dcf55c87538

diff --git a/src/left_main.php b/src/left_main.php
index f2106085..13eb9055 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -3,509 +3,37 @@
 /**
  * left_main.php
  *
- * Copyright (c) 1999-2003 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$
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
  */
 
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
 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');
+
+/** add required includes */
+include_once(SM_PATH . 'templates/util_global.php');
+include_once(SM_PATH . 'templates/util_left_main.php');
 
 /* These constants are used for folder stuff. */
 define('SM_BOX_UNCOLLAPSED', 0);
 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>";
-        }
-    }
-
-    /* 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;
-    $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>';
-
-    /* Return the finished product. */
-    return ($link);
-}
-
-/**
- * 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'];
-    }
-
-    /* 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,
-    $move_to_trash, $trash_folder, $collapse_folders, $imapConnection;
-    $pre = '';
-    $end = '';
-    $collapse = false;
-    if ($boxes) {
-    $mailbox = $boxes->mailboxname_full;
-    $leader = '';
-    for ($k = 0; $k < $j; $k++) {
-        $leader.= '&nbsp;&nbsp;&nbsp;';
-    }
-    $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>";
-        }
-    } else $unseen = 0;
-
-
-
-    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;";
-        } else {
-            $link .= "fold=$mailboxURL\">$leader -&nbsp;";
-        }
-        $link .= '</a>';
-        $pre .= $link;
-    } else {
-        $pre.= $leader . '&nbsp;&nbsp;&nbsp;';
-    }
-
-
-    /* If there are unseen message, bold the line. */
-    if ($unseen > 0) { $pre .= '<B>'; }
-
-    if (($move_to_trash) && ($mailbox == $trash_folder)) {
-            if (! isset($numMessages)) {
-                $status = sqimap_status_messages($imapConnection, $mailbox);
-                $numMessages = $status['MESSAGES'];
-            }
-
-            $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;sort=0;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">";
-            $end .= '</a>';
-            if ($numMessages > 0) {
-                $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;sort=0;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">";
-                $end .= "\n<small>\n" .
-                        "&nbsp;&nbsp;(<a href=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</a>)" .
-                        "</small>";
-            }
-    } else {
-        if (!$boxes->is_noselect) {
-        $pre .= "<a href=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" target=\"right\">";
-        $end .= '</a>';
-        }
-    }
-
-    /* If there are unseen message, close bolding. */
-    if ($unseen > 0) { $end .= "</b>"; }
-
-    /* Print unseen information. */
-    if (isset($unseen_found) && $unseen_found) {
-            $end .= "&nbsp;<small>$unseen_string</small>";
-    }
-
-    $font = '';
-    $fontend = '';
-    if ($boxes->is_special) {
-            $font = "<font color=\"$color[11]\">";
-        $fontend = "</font>";
-    }
-
-    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;
-
-    /* use_folder_images only works if the images exist in ../images */
-    $use_folder_images = true;
-
-    $pre = '';
-    $end = '';
-    $collapse = false;
-
-    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>";
-        }
-    } 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]\">";
-        $end .= '</font>';
-    }
-
-    /* If there are unseen message, close bolding. */
-    if ($unseen > 0) { $end .= '</b>'; }
-
-    /* Print unseen information. */
-    if (isset($unseen_found) && $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>";
-            }
-    } 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>';
-        }
-    }
-
-    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 (!isset($boxes->mbxs[0])) {
-            echo '   ' . html_tag( 'div',
-                            $pre . $folder_img . $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>";
-            } else {
-                $link = '<a href="javascript:void(0)">'."<img src=\"../images/minus.gif\" border=\"1\" id=$j onclick=\"hidechilds(this)\" /></a>";
-            }
-            $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";
-        }
-    }
-    if ($collapse) {
-        $visible = ' style="display:none;"';
-    } else {
-        $visible = ' 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++) {
-        $j++;
-            listAdvancedBoxes($boxes->mbxs[$i],$mbx,$j);
-        }
-    if (isset($boxes->mbxs[0]) && !$boxes->is_root ) echo '</div>'."\n\n";
-    }
-}
-
-
-
-
-/* -------------------- MAIN ------------------------ */
-
 /* get globals */
 sqgetGlobalVar('username', $username, SQ_SESSION);
 sqgetGlobalVar('key', $key, SQ_COOKIE);
@@ -514,16 +42,16 @@ sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
 
 sqgetGlobalVar('fold', $fold, SQ_GET);
 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".
@@ -533,277 +61,39 @@ 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
- * 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.
- * 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 */
-
-if ($advanced_tree) {
-$xtra .= <<<ECHO
-<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.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;
-           }
-        }
-    } 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;
-           }
-        }
-    }
-   }
-
-   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";}
-      else {
-         el.style.borderColor="orange";}
-   }
-
-   function buttonclick(el,on) {
-      if (!on) {
-         el.style.border="groove"}
-      else {
-         el.style.border="ridge";}
-   }
-
-   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;
-     }
-
-ECHO;
-   if ($location_of_bar == 'right') {
-       $xtra .= '  colPat=/^\*,(\d+)$/;';
-   } else {
-       $xtra .= '  colPat=/^(\d+),.*$/;';
-   }
-   $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;
-
-/* style definitions */
-
-$xtra .= <<<ECHO
-
-<style type="text/css">
-<!--
-  body {
-     margin: 0px 0px 0px 0px;
-     padding: 5px 5px 5px 5px;
-  }
-
-  .button {
-     border:outset;
-     border-color:blue;
-     background:white;
-     width:99%;
-     heigth:99%;
-  }
-
-  .mbx_par {
-     font-size:0.8em;
-     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.7em;
-  }
-
-  .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:blue;
-     border-bottom: solid;
-     border-bottom-width:0.1em;
-     border-bottom-color:blue;
-     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:green;
-     background: $color[0];
-  }
-
--->
-
-</style>
-
-ECHO;
-
+ * Include extra javascript files needed by template
+ */
+$js_includes = $oTemplate->getJavascriptIncludes();
+foreach ($js_includes as $js_file) {
+    $xtra .= '<script src="'.$js_file.'" type="text/javascript"></script>' ."\n";
 }
-
-
-
+ 
+// get mailbox list and cache it
+$mailboxes=sqimap_get_mailboxes($imapConnection,false,$show_only_subscribed_folders);
 
 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);
+    $folders_created = false;
     foreach( $autocreate as $folder ) {
         if (($folder != '') && ($folder != 'none')) {
-            if ( !sqimap_mailbox_exists($imapConnection, $folder)) {
+            // use $mailboxes array for checking if mailbox exists
+            if ( !sqimap_mailbox_exists($imapConnection, $folder, $mailboxes)) {
                 sqimap_mailbox_create($imapConnection, $folder, '');
-            } else if (!sqimap_mailbox_is_subscribed($imapConnection, $folder)) {
-                sqimap_subscribe($imapConnection, $folder);
+                $folders_created = true;
+            } 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);
+                    $folders_created = true;
+                }
             }
         }
     }
@@ -811,30 +101,16 @@ if ($auto_create_special && !isset($auto_create_done)) {
     /* Let the world know that autocreation is complete! Hurrah! */
     $auto_create_done = TRUE;
     sqsession_register($auto_create_done, 'auto_create_done');
+    // reload mailbox list
+    if ($folders_created)
+        $mailboxes=sqimap_get_mailboxes($imapConnection,true,$show_only_subscribed_folders);
 }
 
-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 "\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";
-
+$clock = '';
 if ($date_format != 6) {
     /* First, display the clock. */
     if ($hour_format == 1) {
-        $hr = 'G:i';
+        $hr = 'H:i';
         if ($date_format == 4) {
             $hr .= ':s';
         }
@@ -847,6 +123,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;
@@ -858,19 +137,15 @@ 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>";
+    $clock = '<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 />';
-
-/* Lastly, display the folder list. */
 if ( $collapse_folders ) {
     /* If directed, collapse or uncollapse a folder. */
     if (isset($fold)) {
@@ -880,81 +155,55 @@ if ( $collapse_folders ) {
     }
 }
 
-if ($oldway) {  /* normal behaviour SM */
+/* Get unseen/total display prefs */
+$unseen_type = getPref( $data_dir , $username , 'unseen_type' );
+$unseen_notify = getPref( $data_dir , $username , 'unseen_notify' );
 
-$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);
+if (empty($unseen_type)) {
+    if (!empty($default_unseen_type)) {
+        $unseen_type = $default_unseen_type;
+    } else {
+        $unseen_type = 1;
+    }
 }
 
-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>";
+if (empty($unseen_notify)) {
+    if (!empty($default_unseen_notify)) {
+        $unseen_notify = $default_unseen_notify;
+    } else {
+        $unseen_notify = 0;
+    }
+}
 
-        /* Add the folder name and link. */
-        if (! isset($color[15])) {
-            $color[15] = $color[6];
-        }
+/**
+ * pass $mailboxes now instead of $imapconnection - sqimap_get_mailboxes() has been separated from
+ * sqimap_mailbox_tree() so that the cached mailbox list can be used elsewhere in left_main and beyond
+ */
+$boxes = sqimap_mailbox_tree($imapConnection,$mailboxes,$show_only_subscribed_folders);
+$mailbox_structure = getBoxStructure($boxes);
 
-        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]);
-        }
+$oTemplate->assign('clock', $clock);
+$oTemplate->assign('mailboxes', $mailbox_structure);
 
-        /* Put the final touches on our folder line. */
-        $line .= "</nobr><br>\n";
+/*
+ * Build an array to pass user prefs to the template in order to avoid using
+ * globals, which are dirty, filthy things in templates. :)
+ */
+$settings = array();
+$settings['imapConnection'] = $imapConnection;
+$settings['iconThemePath'] = $icon_theme_path;
+$settings['templateDirectory'] = $sTplDir;
+$settings['unreadNotificationEnabled'] = $unseen_notify!=1;
+$settings['unreadNotificationAllFolders'] = $unseen_notify == 3;
+$settings['unreadNotificationDisplayTotal'] = $unseen_type == 2;
+$settings['unreadNotificationCummulative'] = $unseen_cum==1;
+$settings['useSpecialFolderColor'] = $use_special_folder_color;
+$settings['messageRecyclingEnabled'] = $move_to_trash;
+$settings['collapsableFoldersEnabled'] = $collapse_folders==1;
+$oTemplate->assign('settings', $settings);
+
+$oTemplate->display('left_main.tpl');
 
-        /* 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><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";
-    } else {
-    ListBoxes($boxes);
-    }
-} /* if ($oldway) else ... */
-do_hook('left_main_after');
 sqimap_logout($imapConnection);
-
-echo '</td></tr></table>' . "\n".
-    "</div></body></html>\n";
-
-?>
+$oTemplate->display('footer.tpl');
+?>
\ No newline at end of file