X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fwebmail.php;h=42e2b83dc875749767a73f9110e413dafd5d4f82;hp=ac2bac75bfdb7bbd1b254aa600707496bc9c9391;hb=fd181f534c2c598516e6f5f50fa7acb636225244;hpb=c67e4479e74125ff1afe3177f27399e76787442c
diff --git a/src/webmail.php b/src/webmail.php
index ac2bac75..42e2b83d 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -3,7 +3,7 @@
/**
* webmail.php -- Displays the main frameset
*
- * Copyright (c) 1999-2003 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,9 +11,10 @@
* this file will verify username and password.
*
* $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
define('SM_PATH','../');
/* SquirrelMail required files. */
@@ -31,7 +32,7 @@ if (!function_exists('sqm_baseuri')){
}
$base_uri = sqm_baseuri();
-session_start();
+sqsession_is_active();
sqgetGlobalVar('username', $username, SQ_SESSION);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
@@ -62,13 +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'));
echo "\n".
"\n" .
"$org_title\n".
"";
+// Japanese translation used without mbstring support
+if ($err==2) {
+ echo "\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');
@@ -131,13 +144,16 @@ if ($right_frame == 'right_main.php') {
$right_frame_url = $right_frame;
}
+$left_frame = '\n";
+$right_frame = '\n";
+
if ($location_of_bar == 'right') {
- echo "\n" .
- "\n";
+ echo $right_frame . $left_frame;
}
else {
- echo "\n".
- "\n";
+ echo $left_frame . $right_frame;
}
do_hook('webmail_bottom');
?>