X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=7deb64b4f0d3743048ebd2a5fe6301c9e1c32172;hb=eb7bd9b7b01e0cf97a14e81ca6b0f1725873699c;hp=85676fd5cdc2b65a020633acce113157c4a4a927;hpb=76911253eb850bacde3d86c8cb7b4af072e67ebe;p=squirrelmail.git
diff --git a/src/webmail.php b/src/webmail.php
index 85676fd5..7deb64b4 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -3,17 +3,20 @@
/**
* webmail.php -- Displays the main frameset
*
- * 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
* shown can be given as parameters. If the user is not logged in
* this file will verify username and password.
*
- * $Id$
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
@@ -31,19 +34,31 @@ if (!function_exists('sqm_baseuri')){
}
$base_uri = sqm_baseuri();
-session_start();
+sqsession_is_active();
-if (isset($_SESSION['username'])) {
- $username = $_SESSION['username'];
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
+
+if (sqgetGlobalVar('sort', $sort)) {
+ $sort = (int) $sort;
}
-if (isset($_SESSION['delimiter'])) {
- $delimiter = $_SESSION['delimiter'];
+
+if (sqgetGlobalVar('startMessage', $startMessage)) {
+ $startMessage = (int) $startMessage;
}
-if (isset($_SESSION['onetimepad'])) {
- $onetimepad = $_SESSION['onetimepad'];
+
+if (!sqgetGlobalVar('mailbox', $mailbox)) {
+ $mailbox = 'INBOX';
}
-if (isset($_GET['right_frame'])) {
- $right_frame = $_GET['right_frame'];
+
+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,15 +74,30 @@ do_hook('webmail_top');
*/
$my_language = getPref($data_dir, $username, 'language');
if ($my_language != $squirrelmail_language) {
- setcookie('squirrelmail_language', $my_language, time()+2592000, $base_uri);
+ sqsetcookie('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" .
+ "\n" .
+ "$org_title\n".
+ "";
+
+// Japanese translation used without mbstring support
+if ($err==2) {
+ echo $output.
+ "\n".
+ "You need to have PHP 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');
@@ -94,10 +124,10 @@ if ($left_size == "") {
}
if ($location_of_bar == 'right') {
- echo "