Some small HTML fixes/improvements

[squirrelmail.git] / src / webmail.php

diff --git a/src/webmail.php b/src/webmail.php
index 2ca66d47358b4dc95feb78c68eb968240dc7be98..d5f8c59363af44b7727b6903f09a13d0099ab8c7 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -33,21 +33,18 @@ $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'];
-}
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
+
+sqgetGlobalVar('right_frame', $right_frame, SQ_GET);
+
 if ( isset($_SESSION['session_expired_post']) ) {
     sqsession_unregister('session_expired_post');
 }
+if(!sqgetGlobalVar('mailto', $mailto)) {
+    $mailto = '';
+}
 
 is_logged_in();
 
@@ -126,19 +123,24 @@ if ($right_frame == 'right_main.php') {
     $right_frame_url = 'options.php';
 } elseif ($right_frame == 'folders.php') {
     $right_frame_url = 'folders.php';
+} elseif ($right_frame == 'compose.php') {
+    $right_frame_url = 'compose.php?' . $mailto;
 } else if ($right_frame == '') {
     $right_frame_url = 'right_main.php';
 } else {
     $right_frame_url =  $right_frame;
 }
 
+$left_frame  = '<frame src="left_main.php" name="left" frameborder="1" title="'.
+               _("Folder List") ."\" />\n";
+$right_frame = '<frame src="'.$right_frame_url.'" name="right" frameborder="1" title="'.
+               _("Message List") ."\" />\n";
+
 if ($location_of_bar == 'right') {
-    echo "<frame src=\"$right_frame_url\" name=\"right\" frameborder=\"1\" />\n" .
-         "<frame src=\"left_main.php\" name=\"left\" frameborder=\"1\" />\n";
+    echo $right_frame . $left_frame;
 }
 else {
-    echo "<frame src=\"left_main.php\" name=\"left\" frameborder=\"1\" />\n".
-         "<frame src=\"$right_frame_url\" name=\"right\" frameborder=\"1\" />\n";
+    echo $left_frame . $right_frame;
 }
 do_hook('webmail_bottom');
 ?>