X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fwebmail.php;h=565c5c079e9db88c9f2d8f50755fcbb5ffc4a2c0;hp=d3bc90ce6fc5a93b8db043b1f9cb72ac6ba4208e;hb=748ba6c04d400a0433b06dd90d4d6042d86478e2;hpb=a507a781aacfd78bc8292aa7b706dc98f491e152
diff --git a/src/webmail.php b/src/webmail.php
index d3bc90ce..565c5c07 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,43 @@
* $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();
+
+sqsession_is_active();
+
+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 = '';
+}
-session_start();
is_logged_in();
+do_hook('webmail_top');
+
/**
* We'll need this to later have a noframes version
*
@@ -41,14 +64,26 @@ 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');
+
+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;
@@ -59,10 +94,10 @@ if ($left_size == "") {
}
if ($location_of_bar == 'right') {
- echo "