X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=ebbb24ac0d1157e72bf29dbd750ecfc6533cca44;hb=f11c804feb243ab98612595fba56fc737ae0b760;hp=3f9c11199a59b2ae9166f5b170ebfecfa8f2a146;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6;p=squirrelmail.git
diff --git a/src/webmail.php b/src/webmail.php
index 3f9c1119..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
@@ -13,20 +13,46 @@
* $Id$
*/
-require_once('../functions/strings.php');
-require_once('../config/config.php');
-require_once('../functions/prefs.php');
-require_once('../functions/imap.php');
-require_once('../functions/plugin.php');
-require_once('../functions/i18n.php');
-require_once('../functions/auth.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
-ereg( '(^.*/)[^/]+/[^/]+$', $PHP_SELF, $regs);
-$base_uri = $regs[1];
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'config/config.php');
+require_once(SM_PATH . 'functions/prefs.php');
+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');
+}
+$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');
+
/**
* We'll need this to later have a noframes version
*
@@ -41,16 +67,26 @@ if ($my_language != $squirrelmail_language) {
set_up_language(getPref($data_dir, $username, 'language'));
-echo "\n";
-echo '';
-echo $org_title;
-echo '';
-
+echo "\n".
+ "\n" .
+ "$org_title\n".
+ "";
+
$left_size = getPref($data_dir, $username, 'left_size');
$location_of_bar = getPref($data_dir, $username, 'location_of_bar');
+
+if (isset($languages[$squirrelmail_language]['DIR']) &&
+ strtolower($languages[$squirrelmail_language]['DIR']) == 'rtl') {
+ $temp_location_of_bar = 'right';
+} else {
+ $temp_location_of_bar = 'left';
+}
+
if ($location_of_bar == '') {
- $location_of_bar = 'left';
+ $location_of_bar = $temp_location_of_bar;
}
+$temp_location_of_bar = '';
+
if ($left_size == "") {
if (isset($default_left_size)) {
$left_size = $default_left_size;
@@ -58,13 +94,13 @@ if ($left_size == "") {
else {
$left_size = 200;
}
-}
-
+}
+
if ($location_of_bar == 'right') {
- echo "