Replace all session_start() calls with sqsession_is_active(). The latter

[squirrelmail.git] / src / webmail.php

diff --git a/src/webmail.php b/src/webmail.php
index c74f5fa9c50c81c890d25350b4a46e7e69875c23..565c5c079e9db88c9f2d8f50755fcbb5ffc4a2c0 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -3,7 +3,7 @@
 /**
  * webmail.php -- Displays the main frameset
  *
- * Copyright (c) 1999-2002 The SquirrelMail development team
+ * Copyright (c) 1999-2003 The SquirrelMail development team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This file generates the main frameset. The files that are
@@ -31,19 +31,19 @@ if (!function_exists('sqm_baseuri')){
 }
 $base_uri = sqm_baseuri();
 
-session_start();
+sqsession_is_active();
 
-if (isset($_SESSION['username'])) {
-    $username = $_SESSION['username'];
-}
-if (isset($_SESSION['delimiter'])) {
-    $delimiter = $_SESSION['delimiter'];
-}
-if (isset($_SESSION['onetimepad'])) {
-    $onetimepad = $_SESSION['onetimepad'];
+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 (isset($_GET['right_frame'])) {
-    $right_frame = $_GET['right_frame'];
+if(!sqgetGlobalVar('mailto', $mailto)) {
+    $mailto = '';
 }
 
 is_logged_in();
@@ -123,21 +123,26 @@ 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 =  urldecode($right_frame);
+    $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');
 ?>
-</FRAMESET>
-</HTML>
+</frameset>
+</html>