Removed more warnings

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

index 2a0c307d1883cab23ca2dbf2d7814cee2cab312a..3d38e173f87a7952661bdc5e8b25c0af08035b76 100644 (file)
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -10,44 +10,31 @@
      **  $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/plugin.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();
  
+   if ($auto_create_special && ! isset($auto_create_done)) {
+         if (isset ($sent_folder) && $sent_folder != "none") {
+                if (!sqimap_mailbox_exists ($imapConnection, $sent_folder)) {
+                       sqimap_mailbox_create ($imapConnection, $sent_folder, "");
+                }
+         }
+         if (isset ($trash_folder) && $trash_folder != "none") {
+                if (!sqimap_mailbox_exists ($imapConnection, $trash_folder)) {
+                       sqimap_mailbox_create ($imapConnection, $trash_folder, "");
+                }
+         }
+         $auto_create_done = true;
+         session_register('auto_create_done');
+   }
+
     function formatMailboxName($imapConnection, $box_array, $delimeter) {
        global $folder_prefix, $trash_folder, $sent_folder;
        global $color, $move_to_sent, $move_to_trash;
@@ -58,10 +45,10 @@
        $mailboxURL = urlencode($real_box);
        
        $unseen = 0;
-      
+
        if (($unseen_notify == 2 && $real_box == "INBOX") ||
            $unseen_notify == 3) {
-         $unseen = sqimap_unseen_messages($imapConnection, $numUnseen, $real_box);
+         $unseen = sqimap_unseen_messages($imapConnection, $real_box);
           if ($unseen_type == 1 && $unseen > 0) {
              $unseen_string = "($unseen)";
              $unseen_found = true;
@@ -116,12 +103,12 @@
              $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;
@@ -179,14 +166,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 {