/**
* 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
session_start();
-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();
set_up_language(getPref($data_dir, $username, 'language'));
-echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN">'.
+echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\">\n".
"<html><head>\n" .
- "<title>$org_title</title>";
+ "<title>$org_title</title>\n".
+ "</head>";
$left_size = getPref($data_dir, $username, 'left_size');
$location_of_bar = getPref($data_dir, $username, 'location_of_bar');
}
if ($location_of_bar == 'right') {
- echo "<frameset cols=\"*, $left_size\" border=\"0\" id=\"fs1\">";
+ echo "<frameset cols=\"*, $left_size\" id=\"fs1\">\n";
}
else {
- echo "<frameset cols=\"$left_size, *\" border=\"0\" id=\"fs1\">";
+ echo "<frameset cols=\"$left_size, *\" id=\"fs1\">\n";
}
/*
$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;
}
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=\"1\" />\n" .
+ "<frame src=\"left_main.php\" name=\"left\" frameborder=\"1\" />\n";
}
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=\"1\" />\n".
+ "<frame src=\"$right_frame_url\" name=\"right\" frameborder=\"1\" />\n";
}
do_hook('webmail_bottom');
?>
-</FRAMESET>
-</HEAD></HTML>
+</frameset>
+</html>