X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=4e383aaf5a2168620d1bc67871d05654f77b4658;hb=4e1347dfe9a0fc4cffe4c0b64a3a2dafc56fe9ee;hp=1f1362da1bed1515a528215e0b4083d3bfb3034b;hpb=b82a6bba738f2f8e6bb04bb5e56ebe166dab6346;p=squirrelmail.git
diff --git a/src/webmail.php b/src/webmail.php
index 1f1362da..4e383aaf 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-2004 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
@@ -11,24 +11,46 @@
* this file will verify username and password.
*
* $Id$
+ * @package squirrelmail
*/
-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();
+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 = '';
+}
+
is_logged_in();
+do_hook('webmail_top');
+
/**
* We'll need this to later have a noframes version
*
@@ -41,10 +63,25 @@ if ($my_language != $squirrelmail_language) {
setcookie('squirrelmail_language', $my_language, time()+2592000, $base_uri);
}
-set_up_language(getPref($data_dir, $username, 'language'));
+$err=set_up_language(getPref($data_dir, $username, 'language'));
+
+$output = "\n".
+ "\n" .
+ "$org_title\n".
+ "";
-echo "\n" .
- "$org_title";
+// Japanese translation used without mbstring support
+if ($err==2) {
+ echo $output.
+ "\n".
+ "You need to have php4 installed with the multibyte string function \n".
+ "enabled (using configure option --enable-mbstring).
\n".
+ "System assumed that you accidently switched to Japanese translation \n".
+ "and reverted your language preference to English.
\n".
+ "Please refresh this page in order to use webmail.
\n".
+ "";
+ return;
+}
$left_size = getPref($data_dir, $username, 'left_size');
$location_of_bar = getPref($data_dir, $username, 'location_of_bar');
@@ -71,10 +108,10 @@ if ($left_size == "") {
}
if ($location_of_bar == 'right') {
- echo "