X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=d17cd636daac87969def839fb7c805758db8b46f;hb=4445e6b3214d838e98104c5906f7fe27fa6048ea;hp=0df533a317f591d477be83330de8f97984da868d;hpb=f38b7cf06c3343a7fead417d90bd67d291f5dc29;p=squirrelmail.git
diff --git a/src/webmail.php b/src/webmail.php
index 0df533a3..d17cd636 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -3,17 +3,21 @@
/**
* 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
* shown can be given as parameters. If the user is not logged in
* this file will verify username and password.
*
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
@@ -31,7 +35,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);
@@ -42,6 +46,9 @@ 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();
@@ -59,12 +66,25 @@ if ($my_language != $squirrelmail_language) {
setcookie('squirrelmail_language', $my_language, time()+2592000, $base_uri);
}
-set_up_language(getPref($data_dir, $username, 'language'));
-
-echo "\n".
- "\n" .
- "$org_title\n".
- "";
+$err=set_up_language(getPref($data_dir, $username, 'language'));
+
+$output = "\n".
+ "\n" .
+ "$org_title\n".
+ "";
+
+// 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');
@@ -91,10 +111,10 @@ if ($left_size == "") {
}
if ($location_of_bar == 'right') {
- echo "