X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=ebbb24ac0d1157e72bf29dbd750ecfc6533cca44;hb=f11c804feb243ab98612595fba56fc737ae0b760;hp=6498291fa3277824d2d38c16cb862fc6ba944205;hpb=8672576304f4da444b9b1e0e4ca81505af0267ec;p=squirrelmail.git
diff --git a/src/webmail.php b/src/webmail.php
index 6498291f..ebbb24ac 100644
--- 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
@@ -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,23 @@ 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'];
+}
+if ( isset($_SESSION['session_expired_post']) ) {
+ sqsession_unregister('session_expired_post');
+}
+
is_logged_in();
do_hook('webmail_top');
@@ -49,8 +67,10 @@ if ($my_language != $squirrelmail_language) {
set_up_language(getPref($data_dir, $username, 'language'));
-echo "\n" .
- "$org_title";
+echo "\n".
+ "\n" .
+ "$org_title\n".
+ "";
$left_size = getPref($data_dir, $username, 'left_size');
$location_of_bar = getPref($data_dir, $username, 'location_of_bar');
@@ -77,10 +97,10 @@ if ($left_size == "") {
}
if ($location_of_bar == 'right') {
- echo "