valign=top for message rows

[squirrelmail.git] / src / webmail.php

diff --git a/src/webmail.php b/src/webmail.php
index dda16fca0e28610c7dfb7c9928cd8aec2148b283..8e9c76c09f626b0d03eb61463ee8b515cf469158 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -24,6 +24,7 @@ require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/plugin.php');
 require_once(SM_PATH . 'functions/i18n.php');
 require_once(SM_PATH . 'functions/auth.php');
+require_once(SM_PATH . 'functions/global.php');
 
 if (!function_exists('sqm_baseuri')){
     require_once(SM_PATH . 'functions/display_messages.php');
@@ -31,6 +32,20 @@ if (!function_exists('sqm_baseuri')){
 $base_uri = sqm_baseuri();
 
 session_start();
+
+if (isset($_SESSION['username'])) {
+    $username = $_SESSION['username'];
+}
+if (isset($_SESSION['delimiter'])) {
+    $delimiter = $_SESSION['delimiter'];
+}
+if (isset($_SESSION['onetimepad'])) {
+    $onetimepad = $_SESSION['onetimepad'];
+}
+if (isset($_GET['right_frame'])) {
+    $right_frame = $_GET['right_frame'];
+}
+
 is_logged_in();
 
 do_hook('webmail_top');
@@ -78,10 +93,10 @@ if ($left_size == "") {
 }
 
 if ($location_of_bar == 'right') {
-    echo "<frameset cols=\"*, $left_size\" border=\"0\" id=\"fs1\">";
+    echo "<frameset cols=\"*, $left_size\" frameborder=\"1\" id=\"fs1\">";
 }
 else {
-    echo "<frameset cols=\"$left_size, *\" border=\"0\" id=\"fs1\">";
+    echo "<frameset cols=\"$left_size, *\" frameborder=\"1\" id=\"fs1\">";
 }
 
 /*
@@ -114,12 +129,12 @@ if ($right_frame == 'right_main.php') {
 }
 
 if ($location_of_bar == 'right') {
-    echo "<FRAME SRC=\"$right_frame_url\" NORESIZE NAME=\"right\">" .
-         '<FRAME SRC="left_main.php" NORESIZE NAME="left">';
+    echo "<FRAME SRC=\"$right_frame_url\"  NAME=\"right\" frameborder=\"0\">" .
+         '<FRAME SRC="left_main.php"  NAME="left" frameborder="0">';
 }
 else {
-    echo '<FRAME SRC="left_main.php" NORESIZE NAME="left">'.
-         "<FRAME SRC=\"$right_frame_url\" NORESIZE NAME=\"right\">";
+    echo '<FRAME SRC="left_main.php"  NAME="left" frameborder="0">'.
+         "<FRAME SRC=\"$right_frame_url\"  NAME=\"right\" frameborder=\"0\">";
 }
 do_hook('webmail_bottom');
 ?>