Removed more warnings

[squirrelmail.git] / src / webmail.php

diff --git a/src/webmail.php b/src/webmail.php
index ebd365b65de06b3fda9e84a92040691f0905fac1..dfca03d829cbc48c602f1633cc02eb5948423409 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -13,12 +13,12 @@
     **  $Id$
     **/
 
-   include ('../functions/i18n.php');
    include ('../functions/strings.php');
    include ('../config/config.php');
    include ('../functions/prefs.php');
    include ('../functions/imap.php');
    include ('../functions/plugin.php');
+   include ('../functions/i18n.php');
    include ('../functions/auth.php');
 
    session_start();
@@ -54,9 +54,9 @@
    
    if ($location_of_bar == 'right')
    {
-      echo "<FRAMESET COLS=\"*, $left_size\" NORESIZE=yes BORDER=0>";
+      echo "<FRAMESET COLS=\"*, $left_size\" BORDER=0>";
    } else {
-      echo "<FRAMESET COLS=\"$left_size, *\" NORESIZE BORDER=0>";
+      echo "<FRAMESET COLS=\"$left_size, *\" BORDER=0>";
    }
 
 /**
@@ -80,20 +80,21 @@
       $right_frame_url = 'options.php';
    } else if ($right_frame == 'folders.php') {
       $right_frame_url = 'folders.php';
+   } else if ($right_frame == 'compose.php') {
+      $right_frame_url = "compose.php?send_to=$rcptaddress";
    } else {
-      if (!isset($just_logged_in)) $just_logged_in = 0;
-      $right_frame_url = "right_main.php?just_logged_in=$just_logged_in";
+      $right_frame_url = "right_main.php";
    }
 
    if ($location_of_bar == 'right')
    {
-      echo "<FRAME SRC=\"$right_frame_url\" NAME=\"right\">";
-      echo '<FRAME SRC="left_main.php" NAME="left">';
+      echo "<FRAME SRC=\"$right_frame_url\" NORESIZE NAME=\"right\">";
+      echo '<FRAME SRC="left_main.php" NORESIZE NAME="left">';
    }
    else
    {
-      echo '<FRAME SRC="left_main.php" NAME="left">';
-      echo "<FRAME SRC=\"$right_frame_url\" NAME=\"right\">";
+      echo '<FRAME SRC="left_main.php" NORESIZE NAME="left">';
+      echo "<FRAME SRC=\"$right_frame_url\" NORESIZE NAME=\"right\">";
    }
 
 ?>