X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=8e9c76c09f626b0d03eb61463ee8b515cf469158;hb=6c766fd5dccb5a7f87a97b7a0c2e0f5598ee1c8d;hp=34008cff68fbce9bc68ccd84dd25bd2e7ebac2e6;hpb=fab3baa6746c2a20c9477b38dfd7f3e4aeeeeef7;p=squirrelmail.git
diff --git a/src/webmail.php b/src/webmail.php
index 34008cff..8e9c76c0 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -13,22 +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','../');
+
+/* 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('../functions/display_messages.php');
+ 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'];
+}
+
is_logged_in();
+do_hook('webmail_top');
+
/**
* We'll need this to later have a noframes version
*
@@ -43,13 +64,15 @@ if ($my_language != $squirrelmail_language) {
set_up_language(getPref($data_dir, $username, 'language'));
-echo "\n" .
+echo ''.
+ "\n" .
"$org_title";
$left_size = getPref($data_dir, $username, 'left_size');
$location_of_bar = getPref($data_dir, $username, 'location_of_bar');
-if (strtolower($languages[$squirrelmail_language]['DIR']) == 'rtl') {
+if (isset($languages[$squirrelmail_language]['DIR']) &&
+ strtolower($languages[$squirrelmail_language]['DIR']) == 'rtl') {
$temp_location_of_bar = 'right';
} else {
$temp_location_of_bar = 'left';
@@ -70,10 +93,10 @@ if ($left_size == "") {
}
if ($location_of_bar == 'right') {
- echo "