* Looks good to me in Netscape and IE

[squirrelmail.git] / src / left_main.php
diff --git a/src/left_main.php b/src/left_main.php

index 0adbd3a7cfc141adc4420c7f31ae7b018603be10..96ef4500fa0e3acfd06a3c0df11d280f91ba64c0 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -10,42 +10,16 @@
      **  $Id$
      **/
  
-   session_start();
-
-   if (!isset($i18n_php))
-      include ("../functions/i18n.php");
-
-   if(!isset($username)) {
-      set_up_language($squirrelmail_language, true);
-          include ("../themes/default_theme.php");
-          printf('<html><BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
-                          $color[8], $color[4], $color[7], $color[7], $color[7]);
-          echo "</body></html>";
-      exit;
-   }
-
-
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($array_php))
-      include("../functions/array.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($i18n_php))
-      include("../functions/i18n.php");
-   if (!isset($plugin_php))
-      include("../functions/plugin.php");
+   include('../src/validate.php');
+   include("../functions/array.php");
+   include("../functions/imap.php");
+   include("../functions/page_header.php");
+   include("../functions/plugin.php");
+   include("../src/load_prefs.php");
  
     // open a connection on the imap port (143)
     $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10); // the 10 is to hide the output
  
-   /** If it was a successful login, lets load their preferences **/
-   include("../src/load_prefs.php");
-
     displayHtmlHeader();
  
     function formatMailboxName($imapConnection, $box_array, $delimeter) {
@@ -112,10 +86,16 @@
        }
  
        if (($move_to_trash == true) && ($real_box == $trash_folder)) {
-         $urlMailbox = urlencode($real_box);
-         $line .= "\n<small>\n";
-         $line .= " &nbsp; (<B><A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A></B>)";
-         $line .= "\n</small>\n";
+         if (! isset($numMessages))
+            $numMessages = sqimap_get_num_messages($imapConnection, $real_box);
+
+         if ($numMessages > 0)
+         {
+            $urlMailbox = urlencode($real_box);
+            $line .= "\n<small>\n";
+            $line .= " &nbsp; (<B><A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A></B>)";
+            $line .= "\n</small>\n";
+         }
        }
        $line .= "</NOBR>";
        return $line;
@@ -173,14 +153,12 @@
  
           if (in_array('noselect', $boxes[$i]['flags'])) {
              $line .= "<FONT COLOR=\"$color[10]\">";
-            if (ereg("^( *)([^ ]*)$", $mailbox, $regs)) {
-                $line .= str_replace(' ', '&nbsp;', $regs[1]);
+            if (ereg("^( *)([^ ]*)", $mailbox, $regs)) {
+                $line .= str_replace(' ', '&nbsp;', $mailbox);
                  if (isset($boxes[$i]['parent']))
-                    $line .= FoldLink($boxes[$i]['unformatted'], 
-                        $boxes[$i]['parent']);
+                    $line .= FoldLink($boxes[$i]['unformatted'], $boxes[$i]['parent']);
                  elseif ($collapse_folders)
                      $line .= '<tt>&nbsp;</tt>&nbsp;';
-                $line .= str_replace(' ', '&nbsp;', $regs[2]);
              }
              $line .= '</FONT>';
           } else {