* Fixed the MOTD

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

index 5e7f9d052dafec8c7d7159530ab2d042675acd4a..c9ace436b789f0ab2edcebb0767c38c4214b5fda 100644 (file)
--- a/src/redirect.php
+++ b/src/redirect.php
@@ -13,7 +13,8 @@
      **  $Id$
      **/
  
-   include ('../functions/strings.php');
+   include('../functions/i18n.php');
+   include('../functions/strings.php');
     include('../config/config.php');
  
     // Before starting the session, the base URI must be known.
@@ -31,6 +32,10 @@
     session_unregister ('user_is_logged_in');
     session_register ('base_uri');
  
+   if (! isset($squirrelmail_language)) 
+      $squirrelmail_language = '';
+   set_up_language($squirrelmail_language, true);
+   
     if(!isset($login_username)) {
        echo "<html><body bgcolor=\"ffffff\">\n";
        echo "<br><br>";
@@ -52,7 +57,7 @@
     include ('../functions/imap.php');
     include ('../functions/plugin.php');
  
-   if (!session_is_registered('user_is_logged_in') || $logged_in != 1) {
+   if (!session_is_registered('user_is_logged_in')) {
        do_hook ('login_before');
  
        $onetimepad = OneTimePadCreate(strlen($secretkey));
@@ -76,12 +81,16 @@
  
        setcookie('username', $login_username, 0, $base_uri);
        setcookie('key', $key, 0, $base_uri);
-      setcookie('logged_in', 1, 0, $base_uri);
        do_hook ('login_verified');
     }
  
     $user_is_logged_in = true;
     session_register ('user_is_logged_in');
+   $just_logged_in = true;
+   session_register ('just_logged_in');
  
-   header("Location: webmail.php");
+   if(isset($rcptemail))
+      header("Location: webmail.php?right_frame=compose.php&rcptaddress=$rcptemail");
+   else
+      header("Location: webmail.php");
  ?>