X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fleft_main.php;h=0a768061a57b8030e90a457ce21d8bbc31585001;hp=c9b1c217b6d0a5e98ac2b10ce02e3fd3b6c78b66;hb=24d1619523e7005477feb74d9a54da6a0efc58a6;hpb=f43c35f8ff81bb002c0ed2b1610bd3866a604338

diff --git a/src/left_main.php b/src/left_main.php
index c9b1c217..0a768061 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -17,6 +17,7 @@ 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');
 
 /* These constants are used for folder stuff. */
 define('SM_BOX_UNCOLLAPSED', 0);
@@ -65,9 +66,9 @@ function formatMailboxName($imapConnection, $box_array) {
     if ($unseen > 0) { $line .= '<B>'; }
 
     /* Crate the link for this folder. */
-    $line .= "<A HREF=\"right_main.php?sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" TARGET=\"right\" STYLE=\"text-decoration:none\">";
+    $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]\">";
+        $line .= "<font color=\"$color[11]\">";
     }
     if ( $mailbox == 'INBOX' ) {
         $line .= _("INBOX");
@@ -75,8 +76,8 @@ function formatMailboxName($imapConnection, $box_array) {
         $line .= str_replace(' ','&nbsp;',$mailbox);
     }
     if ($special_color == TRUE)
-        $line .= "</FONT>";
-    $line .= '</A>';
+        $line .= '</font>';
+    $line .= '</a>';
 
     /* If there are unseen message, close bolding. */
     if ($unseen > 0) { $line .= "</B>"; }
@@ -94,7 +95,7 @@ function formatMailboxName($imapConnection, $box_array) {
         if ($numMessages > 0) {
             $urlMailbox = urlencode($real_box);
             $line .= "\n<small>\n" .
-                    "&nbsp;&nbsp;(<A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("empty")."</A>)" .
+                    "&nbsp;&nbsp;(<A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A>)" .
                     "</small>";
         }
     }
@@ -192,10 +193,236 @@ function is_parent_box($curbox_name, $parbox_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;
+    $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)) {
+        	$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\" STYLE=\"text-decoration:none\">";
+		$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);
+    	    }
+	}    
+	
+    }
+}
+
+function ListAdvancedBoxes ($boxes, $mbx, $j='ID.0' ) {
+    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 = false;
+
+    $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>'; }
+
+	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 HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A>)" .
+                	"</small>";
+    	    }
+	} else {
+	    if (!$boxes->is_noselect) { /* \Noselect boxes can't be selected */
+		$pre .= "<A HREF=\"right_main.php?PG_SHOWALL=0&amp;sort=0&amp;startMessage=1&amp;mailbox=$mailboxURL\" TARGET=\"right\" STYLE=\"text-decoration:none\">";
+		$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 = '';
+
+	/* color special boxes */
+	if ($boxes->is_special) {
+    	    $font = "<FONT COLOR=\"$color[11]\">";
+	    $fontend = "</FONT>";    
+	}
+	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.'" heigth="15" valign="center">&nbsp';
+	    } else $folder_img = '';
+	    if (!isset($boxes->mbxs[0])) {
+	        echo '   ' . html_tag( 'div',
+	                        $folder_img .$pre .$font. $boxes->mailboxname_sub .$fontend . $end ,
+	                'left', '', 'class="mbx_sub" id="' .$j. '" onmouseover="changerowcolor(this,true)" onmouseout="changerowcolor(this,false)"' )
+		        . "\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 . $folder_img .$pre.  $font. '&nbsp '. $boxes->mailboxname_sub .$fontend . $end ,
+	                'left', '', 'class="mbx_par" id="' .$j. 'P" onmouseover="changerowcolor(this,true)" onmouseout="changerowcolor(this,false)"' )
+		        . "\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.'.0 '. $visible ) . "\n";
+
+	    if ($j !='ID.0') {
+	       $j = $j .'.0';
+	}
+    	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 ------------------------ */
 
-global $delimiter, $default_folder_prefix;
+global $delimiter, $default_folder_prefix, $left_size;
 
 // open a connection on the imap port (143)
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output
@@ -212,6 +439,282 @@ if (isset($left_refresh) && ($left_refresh != '') &&
     $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 
+ * 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 = true; /* default SM behaviour */
+
+if ($advanced_tree) {
+$xtra .= <<<ECHO
+<script language="Javascript" TYPE="text/javascript">
+
+<!--
+
+    function hidechilds(el) {
+    	id = el.id +".0";
+        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"
+                  document.all[el.id].src="../images/minus.gif";
+                  document.all[form_id].value=0;
+               } else {
+                  ele.style.display = "none";
+	          ele.style.visibility = "hidden"
+	          document.all[el.id].src="../images/plus.gif";
+	          document.all[form_id].value=1;
+	       }
+	    }
+	} else if (document.getElementById) {
+	    id = el.id+".0";
+            ele = document.getElementById(id);
+	    img_ele = document.getElementById(el.id);
+	    if (ele) {
+	       if(ele.style.display == "none") {
+	          ele.style.display = "block";
+	          ele.style.visibility = "visible"
+	          img_ele.src="../images/minus.gif";
+                  document.getElementById(form_id).value=0;
+	       } else {
+	          ele.style.display = "none";
+	          ele.style.visibility = "hidden"
+	          img_ele.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 changerowcolor(el,on) {
+      id = el.id;
+ECHO;
+$xtra.= "\nvar color1 = \"$color[0]\";\n".
+        "var color2 = \"$color[9]\";\n";
+$xtra .= <<<ECHO
+      if (document.all) {
+         if(!on) {
+             document.all[id].style.background = color1;
+	  } else {
+             document.all[id].style.background = color2;
+	  }
+       } else if (document.getElementById) {
+         if (!on) {  
+	    document.getElementById(id).style.background=color1; 
+	 } else {  
+	    document.getElementById(id).style.background=color2; 
+
+	 }
+      }
+   }
+
+   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>
+<!--
+  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;
+
+  }
+
+  .mbx_sub {
+     voice-family: "\"}\"";
+     voice-family: inherit;
+     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;
+     
+ECHO;
+$xtra .=  "     background:$color[0];";
+$xtra .= <<<ECHO
+  }
+
+-->
+
+</STYLE>
+
+ECHO;
+
+}
+
+
+
+
 displayHtmlHeader( 'SquirrelMail', $xtra );
 
 /* If requested and not yet complete, attempt to autocreate folders. */
@@ -235,10 +738,20 @@ if ($auto_create_special && !isset($auto_create_done)) {
 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>';
+}
 
-$boxes = sqimap_mailbox_list($imapConnection);
-
-echo '<CENTER><FONT SIZE=4><B>'. _("Folders") . "</B><BR></FONT>\n\n";
+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";
 
 if ($date_format != 6) {
     /* First, display the clock. */
@@ -271,13 +784,13 @@ if ($date_format != 6) {
     }
     $clk = str_replace(' ','&nbsp;',$clk);
 
-    echo '<CENTER><SMALL>' . str_replace(' ','&nbsp;',_("Last Refresh")) .
-         ": $clk</SMALL></CENTER>";
+    echo '<center><small>' . str_replace(' ','&nbsp;',_("Last Refresh")) .
+         ": $clk</small></center>";
 }
 
 /* Next, display the refresh button. */
-echo '<SMALL>(<A HREF="../src/left_main.php" TARGET="left">'.
-     _("refresh folder list") . '</A>)</SMALL></CENTER><BR>';
+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 ) {
@@ -289,6 +802,9 @@ if ( $collapse_folders ) {
     }
 }
 
+if ($oldway) {  /* normal behaviour SM */
+ 
+$boxes = sqimap_mailbox_list($imapConnection);
 /* Prepare do do out collapsedness and visibility computation. */
 $curbox = 0;
 $boxcount = count($boxes);
@@ -343,10 +859,25 @@ for ($i = 0; $i < count($boxes); $i++) {
         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 "</BODY></HTML>\n";
+echo '</td></tr></table>' . "\n".
+    "</div></body></html>\n";
 
 ?>