-fix for Bug 112604

[squirrelmail.git] / src / webmail.php

diff --git a/src/webmail.php b/src/webmail.php
index ee37c639bc3585edac470e70ec5f4f6c4a4b2370..1bb83b533f722c1d7c9544091cd725f09427872a 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -28,10 +28,6 @@
       exit;
    }
 
-   setcookie("username", $username, 0, $base_uri);
-   setcookie("key", $key, 0, $base_uri);
-   setcookie("logged_in", 1, 0, $base_uri);
-   
    // Refresh the language cookie.
    if (isset($squirrelmail_language)) {
       setcookie("squirrelmail_language", $squirrelmail_language, time()+2592000);
@@ -44,11 +40,23 @@
       include ("../functions/plugin.php");
    if (!isset($auth_php))
       include ("../functions/auth.php");
+   if (!isset($strings_php))
+      include ("../functions/strings.php");
 
    if (!session_is_registered("user_is_logged_in") || $logged_in != 1) {
       do_hook ("login_before");
+
+      $onetimepad = OneTimePadCreate(strlen($secretkey));
+      $key = OneTimePadEncrypt($secretkey, $onetimepad);
+      session_register("onetimepad");
       // verify that username and password are correct
       $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+      sqimap_logout($imapConnection);
+
+      setcookie("username", $username, 0, $base_uri);
+      setcookie("key", $key, 0, $base_uri);
+      setcookie("logged_in", 1, 0, $base_uri);
+   
       do_hook ("login_verified");
    }
 
@@ -63,21 +71,19 @@
    echo "</TITLE>";
    $ishelp = substr(getenv(REQUEST_URI),-8);                   // If calling help, set left frame to 300
    if ($ishelp == "help.php") {                        
-      echo "<FRAMESET COLS=\"300, *\" NORESIZE BORDER=0>";
+      echo "<FRAMESET COLS=\"300, *\" NORESIZE=yes BORDER=0>";
    } else {
       echo "<FRAMESET COLS=\"$left_size, *\" NORESIZE BORDER=0>";
    }
 
 /**
-    There are four ways to call webmail.php
+    There are three ways to call webmail.php
     1.  webmail.php
          - This just loads the default entry screen.
     2.  webmail.php?right_frame=right_main.php&sort=X&startMessage=X&mailbox=XXXX
          - This loads the frames starting at the given values.
     3.  webmail.php?right_frame=folders.php
          - Loads the frames with the Folder options in the right frame.
-    4.  webmail.php?right_frame=help.php
-        - Lets the left frame set up different menu for help and calls the right frame.
 
     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.
@@ -93,12 +99,10 @@
       $urlMailbox = urlencode($mailbox);
       echo "<FRAME SRC=\"left_main.php\" NAME=\"left\">";
       echo "<FRAME SRC=\"folders.php\" NAME=\"right\">";
-   } else if ($right_frame == "help.php") {
-      echo "<FRAME SRC=\"left_help.php\" NAME=\"left\">";
-      echo "<FRAME SRC=\"help.php\" NAME=\"right\">";
    } else {
       echo "<FRAME SRC=\"left_main.php\" NAME=\"left\">";
-      echo "<FRAME SRC=\"right_main.php\" NAME=\"right\">";
+      if (!isset($just_logged_in)) $just_logged_in = 0;
+      echo "<FRAME SRC=\"right_main.php?just_logged_in=$just_logged_in\" NAME=\"right\">";
    }
 
 ?>