* Got bored and copied all the validate.php and define() stuff to 1.1

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

index 8ca5aa8e787608eb9c9ad0ca330dbc0cb729b7ea..ebd365b65de06b3fda9e84a92040691f0905fac1 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -13,37 +13,27 @@
      **  $Id$
      **/
  
-   session_start();
-
-   if (!isset($i18n_php))
-      include ('../functions/i18n.php');
-
-   if(!isset($username)) {
-      set_up_language($squirrelmail_language);
-         include ('../themes/default_theme.php');
-         include ('../functions/display_messages.php');
-         printf('<html><BODY TEXT="%s" BGCOLOR="%s" LINK="%s" VLINK="%s" ALINK="%s">',
-                         $color[8], $color[4], $color[7], $color[7], $color[7]);
-         plain_error_message(_("You need a valid user and password to access this page!") 
-                             . "<br><a href=\"../src/login.php\">" 
-                                                 . _("Click here to log back in.") . "</a>.", $color);
-         echo '</body></html>';
-      exit;
-   }
-
-   if (!isset($strings_php))
-      include ('../functions/strings.php');
+   include ('../functions/i18n.php');
+   include ('../functions/strings.php');
     include ('../config/config.php');
     include ('../functions/prefs.php');
     include ('../functions/imap.php');
-   if (!isset($plugin_php))
-      include ('../functions/plugin.php');
-   if (!isset($auth_php))
-      include ('../functions/auth.php');
+   include ('../functions/plugin.php');
+   include ('../functions/auth.php');
  
-   include ('../src/load_prefs.php');
+   session_start();
+   is_logged_in();
+   checkForPrefs($data_dir, $username);
  
     // We'll need this to later have a noframes version
+   //
+   // Check if the user has a language preference, but no cookie.
+   // Send him a cookie with his language preference, if there is
+   // such discrepancy.
+   $my_language=getPref($data_dir, $username, "language");
+   if ($my_language != $squirrelmail_language)
+     setcookie('squirrelmail_language', $my_language, time()+2592000);
+
     set_up_language(getPref($data_dir, $username, 'language'));
  
     echo "<html><head>\n";
@@ -51,7 +41,16 @@
     echo $org_title;
     echo '</TITLE>';
     
-   $bar_size = $left_size;
+   $left_size = getPref($data_dir, $username, "left_size");
+   $location_of_bar = getPref($data_dir, $username, "location_of_bar");
+   if ($location_of_bar == '')
+       $location_of_bar = 'left';
+   if ($left_size == "") {
+      if (isset($default_left_size))
+         $left_size = $default_left_size;
+      else  
+         $left_size = 200;
+   }      
     
     if ($location_of_bar == 'right')
     {
@@ -72,6 +71,8 @@
      This was done to create a pure HTML way of refreshing the folder list since
      we would like to use as little Javascript as possible.
  **/
+   if (!isset($right_frame)) $right_frame = "";
+
     if ($right_frame == 'right_main.php') {
        $urlMailbox = urlencode($mailbox);
        $right_frame_url = "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage";