X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fleft_main.php;h=f6165b9ef665377529441e518a1646abd71aba58;hb=45fc8f479f66cf4df6e73a70f899ef46e4b88754;hp=af9b6c2dd77209612b7a909cbbc5aeed7cc549bf;hpb=ffb1a3d96da4a1eccc508de577268eefea16d557;p=squirrelmail.git

diff --git a/src/left_main.php b/src/left_main.php
index af9b6c2d..f6165b9e 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -3,7 +3,7 @@
 /**
  * left_main.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * 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
@@ -12,12 +12,15 @@
  * $Id$
  */
 
-require_once('../src/validate.php');
-require_once('../functions/array.php');
-require_once('../functions/imap.php');
-require_once('../functions/plugin.php');
-require_once('../functions/page_header.php');
-require_once('../functions/html.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_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');
 
 /* These constants are used for folder stuff. */
 define('SM_BOX_UNCOLLAPSED', 0);
@@ -32,7 +35,6 @@ function formatMailboxName($imapConnection, $box_array) {
            $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);
@@ -41,8 +43,16 @@ function formatMailboxName($imapConnection, $box_array) {
     if (ereg("^( *)([^ ]*)$", $mailbox, $regs)) {
         $mailbox = $regs[2];
     }
-
-    list($unseen_string, $unseen) = create_unseen_string($real_box, $box_array, $imapConnection);
+    $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. */
@@ -52,9 +62,10 @@ function formatMailboxName($imapConnection, $box_array) {
     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">';
-
+                $mailboxURL.'" TARGET="right" STYLE="text-decoration:none">';
+    }
     if ($special_color) {
         $line .= "<font color=\"$color[11]\">";
     }
@@ -65,7 +76,9 @@ function formatMailboxName($imapConnection, $box_array) {
     }
     if ($special_color == TRUE)
         $line .= '</font>';
+    if ($status !== false) {
     $line .= '</a>';
+    }
 
     /* If there are unseen message, close bolding. */
     if ($unseen > 0) { $line .= "</B>"; }
@@ -75,16 +88,20 @@ function formatMailboxName($imapConnection, $box_array) {
         $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) {
+        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));
         }
     }
 
@@ -150,7 +167,7 @@ function compute_folder_children(&$parbox, $boxcount) {
 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?';
@@ -177,11 +194,11 @@ function create_collapse_link($boxnum) {
  * @return array[0] unseen message string (for display)
  * @return array[1] unseen message count
  */
-function create_unseen_string($boxName, $boxArray, $imapConnection) {
-    global $boxes, $unseen_type, $color;
+function create_unseen_string($boxName, $boxArray, $imapConnection, $unseen_type) {
+    global $boxes, $unseen_type, $color, $unseen_cum;
 
     /* Initialize the return value. */
-    $result = array();
+    $result = array(0,0);
 
     /* Initialize the counts for this folder. */
     $boxUnseenCount = 0;
@@ -190,15 +207,22 @@ function create_unseen_string($boxName, $boxArray, $imapConnection) {
     $totalMessageCount = 0;
 
     /* Collect the counts for this box alone. */
-    $boxUnseenCount = sqimap_unseen_messages($imapConnection, $boxName);
+    $status = sqimap_status_messages($imapConnection, $boxName);
+    $boxUnseenCount = $status['UNSEEN'];
+    if ($boxUnseenCount === false) {
+    return false;
+    }
     if ($unseen_type == 2) {
-        $boxMessageCount = sqimap_get_num_messages($imapConnection, $boxName);
+        $boxMessageCount = $status['MESSAGES'];
     }
 
-    if ($boxArray['collapse'] == SM_BOX_COLLAPSED) {
+    /* 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;
@@ -208,42 +232,33 @@ function create_unseen_string($boxName, $boxArray, $imapConnection) {
             if (($boxName != $boxes[$i]['unformatted'])
                    && (substr($boxes[$i]['unformatted'], 0, $curBoxLength) == $boxName)
                    && !in_array('noselect', $boxes[$i]['flags'])) {
-                $subUnseenCount = sqimap_unseen_messages($imapConnection, $boxes[$i]['unformatted']);
+        $status = sqimap_status_messages($imapConnection, $boxes[$i]['unformatted']);
+        $subUnseenCount = $status['UNSEEN'];
                 if ($unseen_type == 2) {
-                    $subMessageCount = sqimap_get_num_messages($imapConnection, $boxes[$i]['unformatted']);
+                    $subMessageCount = $status['MESSAGES'];;
                 }
+                /* Add the counts for this subfolder to the total. */
+                $totalUnseenCount += $subUnseenCount;
+                $totalMessageCount += $subMessageCount;
             }
-
-            /* 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)) {
-        if ($totalUnseenCount == 0) {
-            $result[0] = "($boxUnseenCount)";
-        } else {
-            $result[0] = "($boxUnseenCount:$totalUnseenCount)";
-        }
+        $result[0] = "($boxUnseenCount)";
     } else if ($unseen_type == 2) {
-        if ($totalMessageCount == 0) {
-            $result[0] = "($boxUnseenCount/$boxMessageCount)";
-        } else {
-            $result[0] = "($boxUnseenCount/$boxMessageCount"
-                       . '&nbsp;:&nbsp;'
-                       . "$totalUnseenCount/$totalMessageCount)";
-        }
+        $result[0] = "($boxUnseenCount/$boxMessageCount)";
         $result[0] = "<font color=\"$color[11]\">$result[0]</font>";
     }
 
-    /* Decide on an unseen count to return to the outside world. */
+    /* Set the unseen count to return to the outside world. */
     $result[1] = $boxUnseenCount;
-    if ($boxArray['collapse'] == SM_BOX_COLLAPSED) {
-        $result[1] += $totalUnseenCount;
-    }
 
     /* Return our happy result. */
     return ($result);
@@ -267,94 +282,121 @@ function is_parent_box($curbox_name, $parbox_name) {
 
 function listBoxes ($boxes, $j=0 ) {
     global $data_dir, $username, $startmessage, $color, $unseen_notify, $unseen_type,
-    $move_to_trash, $trash_folder, $collapse_folders;
-    $pre = '';
+    $move_to_trash, $trash_folder, $collapse_folders, $imapConnection;
+    $pre = '<nobr>';
     $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)) {
-        	$numMessages = sqimap_get_num_messages($imapConnection, $mailbox);
-    	    }
-
-    	    if ($numMessages > 0) {
-        	$urlMailbox = urlencode($mailbox);
-        	$pre .= "\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>';
-	    $j++;
-	}
-	if (!$collapse || $boxes->is_root) {
-    	    for ($i = 0; $i <count($boxes->mbxs); $i++) {
-    		listBoxes($boxes->mbxs[$i],$j);
-    	    }
-	}    
-	
+    $unseen_type = 1;
+    $unseen_notify = 0;
+
+    /* 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 */
+        if ($boxes->unseen !== false || $boxes->total !== 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;
+                }
+                $unseen_string .= ')';
+                $unseen_string = $unseen_before . $unseen_string . $unseen_after;
+            }
+        } 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;</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 .= "\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) {
+            $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++;
+        }
+
+        if (!$collapse || $boxes->is_root) {
+            for ($i = 0; $i <count($boxes->mbxs); $i++) {
+                listBoxes($boxes->mbxs[$i],$j);
+            }
+        }
     }
 }
 
@@ -368,121 +410,121 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
     $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";
+    $mailbox = $boxes->mailboxname_full;
+    $mailboxURL = urlencode($mailbox);
+
+    /* get unseen/total messages information */
+    if ($boxes->unseen !== false) {
+        $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";
     }
 }
 
@@ -491,7 +533,16 @@ function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0000' ) {
 
 /* -------------------- MAIN ------------------------ */
 
-global $delimiter, $default_folder_prefix, $left_size;
+/* get globals */
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+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
@@ -500,33 +551,33 @@ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1
  * Using stristr since older preferences may contain "None" and "none".
  */
 if (isset($left_refresh) && ($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".
-             "<META HTTP-EQUIV=\"REFRESH\" CONTENT=\"$left_refresh;URL=left_main.php\">\n";
+    !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".
+             "<meta http-equiv=\"REFRESH\" content=\"$left_refresh;URL=left_main.php\" />\n";
 } else {
     $xtra = '';
 }
 
 /**
- * $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 
+ * $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 
+ * 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 
+ * 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 = true; /* default SM behaviour */
+$oldway = false;        /* default SM behaviour */
 
 if ($advanced_tree) {
 $xtra .= <<<ECHO
@@ -535,51 +586,51 @@ $xtra .= <<<ECHO
 <!--
 
     function hidechilds(el) {
-    	id = el.id+".0000";
+        id = el.id+".0000";
         form_id = "mbx[" + el.id +"F]";
-	if (document.all) {
-	    ele = document.all[id];
-	    if (ele) {
-	       if(ele.style.display == "none") {
+    if (document.all) {
+        ele = document.all[id];
+        if (ele) {
+           if(ele.style.display == "none") {
                   ele.style.display = "block";
-	          ele.style.visibility = "visible"
+              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.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";
+        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";
+           } 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];
+    ar[i].src = arguments[i];
      }
-   }        
-	    	  
+   }
+
    function buttonover(el,on) {
       if (!on) {
          el.style.borderColor="blue";}
@@ -588,52 +639,52 @@ $xtra .= <<<ECHO
    }
 
    function buttonclick(el,on) {
-      if (!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"];
+        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");
+    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;
    if ($location_of_bar == 'right') {
        $xtra .= '     right=true;';
-   } else {    
+   } else {
        $xtra .= '     right=false;';
    }
    $xtra .= "\n";
@@ -644,42 +695,42 @@ $xtra .= <<<ECHO
          new_col = c_w+',*';
      }
      return new_col;
-   }	 
-         
+   }
+
    function resizeframe(direction) {
      if (document.all) {
-    	masterf = window.parent.document.all["fs1"];
+        masterf = window.parent.document.all["fs1"];
      } else if (document.getElementById) {
-	window.parent.document.getElementById("fs1");
+    window.parent.document.getElementById("fs1");
      } else {
         return false;
      }
-     
+
 ECHO;
    if ($location_of_bar == 'right') {
        $xtra .= '  colPat=/^\*,(\d+)$/;';
-   } else {    
+   } 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);	
+     masterf.cols = calc_col(new_col_width);
    }
 
 //-->
-   
+
 </script>
 
 ECHO;
@@ -688,7 +739,7 @@ ECHO;
 
 $xtra .= <<<ECHO
 
-<STYLE TYPE="text/css">
+<style type="text/css">
 <!--
   body {
      margin: 0px 0px 0px 0px;
@@ -760,7 +811,7 @@ $xtra .= <<<ECHO
 
 -->
 
-</STYLE>
+</style>
 
 ECHO;
 
@@ -786,26 +837,26 @@ if ($auto_create_special && !isset($auto_create_done)) {
 
     /* Let the world know that autocreation is complete! Hurrah! */
     $auto_create_done = TRUE;
-    session_register('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";
+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?   */  
+   /* 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 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', '', '', '', 'border="0" cellspacing="0" cellpadding="0" width="100%"' ) . 
-    html_tag( 'tr' ) . 
-    html_tag( 'td', '', 'left' ) . 
-    '<center><font size="4"><b>'. _("Folders") . "</b><br></font>\n\n";
+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";
 
 if ($date_format != 6) {
     /* First, display the clock. */
@@ -844,7 +895,7 @@ if ($date_format != 6) {
 
 /* Next, display the refresh button. */
 echo '<small>(<a href="../src/left_main.php" target="left">'.
-     _("refresh folder list") . '</a>)</small></center><br>';
+     _("refresh folder list") . '</a>)</small></center><br />';
 
 /* Lastly, display the folder list. */
 if ( $collapse_folders ) {
@@ -857,7 +908,7 @@ if ( $collapse_folders ) {
 }
 
 if ($oldway) {  /* normal behaviour SM */
- 
+
 $boxes = sqimap_mailbox_list($imapConnection);
 /* Prepare do do out collapsedness and visibility computation. */
 $curbox = 0;
@@ -870,7 +921,6 @@ while ($curbox < $boxcount) {
     compute_folder_children($curbox, $boxcount);
 }
 
-
 for ($i = 0; $i < count($boxes); $i++) {
     if ( $boxes[$i]['visible'] ) {
         $mailbox = $boxes[$i]['formatted'];
@@ -884,7 +934,7 @@ for ($i = 0; $i < count($boxes); $i++) {
         } else {
             $prefix = str_replace(' ','&nbsp;',$prefix);
         }
-        $line = "<NOBR><TT>$prefix</TT>";
+        $line = "<nobr><tt>$prefix</tt>";
 
         /* Add the folder name and link. */
         if (! isset($color[15])) {
@@ -893,39 +943,40 @@ for ($i = 0; $i < count($boxes); $i++) {
 
         if (in_array('noselect', $boxes[$i]['flags'])) {
             if( isSpecialMailbox( $boxes[$i]['unformatted']) ) {
-                $line .= "<FONT COLOR=\"$color[11]\">";
+                $line .= "<font color=\"$color[11]\">";
             } else {
-                $line .= "<FONT COLOR=\"$color[15]\">";
+                $line .= "<font color=\"$color[15]\">";
             }
             if (ereg("^( *)([^ ]*)", $mailbox, $regs)) {
                 $mailbox = str_replace('&nbsp;','',$mailbox);
                 $line .= str_replace(' ', '&nbsp;', $mailbox);
             }
-            $line .= '</FONT>';
+            $line .= '</font>';
         } else {
             $line .= formatMailboxName($imapConnection, $boxes[$i]);
         }
 
         /* Put the final touches on our folder line. */
-        $line .= "</NOBR><BR>\n";
+        $line .= "</nobr><br>\n";
 
         /* Output the line for this folder. */
         echo $line;
     }
 }
-} else {  /* expiremental code */ 
+} 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";
+        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);
+        //sqimap_get_status_mbx_tree($imap_stream,$boxes)    
+        ListBoxes($boxes);
     }
 } /* if ($oldway) else ... */
 do_hook('left_main_after');