X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=a7bc9586fd594d35eb1b34e2912032d60cc74d4f;hb=06783280842a90181b2e984bd8ea13e3b7466edb;hp=136415c11d163a7dde08f494ef2f71a5549bb4f0;hpb=47ccfad452e8d345542d09e59112cac317cffed8;p=squirrelmail.git
diff --git a/src/webmail.php b/src/webmail.php
index 136415c1..a7bc9586 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -14,27 +14,9 @@
*/
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-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(SM_PATH . 'functions/display_messages.php');
-}
-$base_uri = sqm_baseuri();
-
-sqsession_is_active();
+require('../include/init.php');
sqgetGlobalVar('username', $username, SQ_SESSION);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
@@ -61,43 +43,15 @@ if(!sqgetGlobalVar('mailto', $mailto)) {
$mailto = '';
}
-is_logged_in();
-
do_hook('webmail_top');
-/**
- * We'll need this to later have a noframes version
- *
- * Check if the user has a language preference, but no cookie.
- * Send him a cookie with his language preference, if there is
- * such discrepancy.
- */
-$my_language = getPref($data_dir, $username, 'language');
-if ($my_language != $squirrelmail_language) {
- sqsetcookie('squirrelmail_language', $my_language, time()+2592000, $base_uri);
-}
-
-$err=set_up_language(getPref($data_dir, $username, 'language'));
-
-$output = "\n".
+$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');
@@ -149,21 +103,33 @@ if (empty($right_frame) || (strpos(urldecode($right_frame), '//') !== false)) {
$right_frame = '';
}
-if ($right_frame == 'right_main.php') {
- $urlMailbox = urlencode($mailbox);
- $right_frame_url = "right_main.php?mailbox=$urlMailbox"
+if ( strpos($right_frame,'?') ) {
+ $right_frame_file = substr($right_frame,0,strpos($right_frame,'?'));
+} else {
+ $right_frame_file = $right_frame;
+}
+
+switch($right_frame) {
+ case 'right_main.php':
+ $right_frame_url = "right_main.php?mailbox=".urlencode($mailbox)
. (!empty($sort)?"&sort=$sort":'')
. (!empty($startMessage)?"&startMessage=$startMessage":'');
-} elseif ($right_frame == 'options.php') {
- $right_frame_url = 'options.php';
-} elseif ($right_frame == 'folders.php') {
- $right_frame_url = 'folders.php';
-} elseif ($right_frame == 'compose.php') {
- $right_frame_url = 'compose.php?' . $mailto;
-} else if ($right_frame == '') {
- $right_frame_url = 'right_main.php';
-} else {
- $right_frame_url = htmlspecialchars($right_frame);
+ break;
+ case 'options.php':
+ $right_frame_url = 'options.php';
+ break;
+ case 'folders.php':
+ $right_frame_url = 'folders.php';
+ break;
+ case 'compose.php':
+ $right_frame_url = 'compose.php?' . $mailto;
+ break;
+ case '':
+ $right_frame_url = 'right_main.php';
+ break;
+ default:
+ $right_frame_url = urlencode($right_frame);
+ break;
}
$left_frame = '