X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fwebmail.php;h=c44e9461c5aba7335412f93bc909b65888cdfeb3;hp=4e383aaf5a2168620d1bc67871d05654f77b4658;hb=d72549cb90b0473f1d7a99e796ede80dac1b1ec3;hpb=0e3b9a5a28f98305251f2ac392924b6bc1021cbc
diff --git a/src/webmail.php b/src/webmail.php
index 4e383aaf..c44e9461 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -1,103 +1,47 @@
\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;
+if (!sqgetGlobalVar('mailbox', $mailbox)) {
+ $mailbox = 'INBOX';
}
-$left_size = getPref($data_dir, $username, 'left_size');
-$location_of_bar = getPref($data_dir, $username, 'location_of_bar');
+sqgetGlobalVar('right_frame', $right_frame, SQ_GET);
-if (isset($languages[$squirrelmail_language]['DIR']) &&
- strtolower($languages[$squirrelmail_language]['DIR']) == 'rtl') {
- $temp_location_of_bar = 'right';
+if (sqgetGlobalVar('mailtodata', $mailtodata)) {
+ $mailtourl = 'mailtodata='.urlencode($mailtodata);
} else {
- $temp_location_of_bar = 'left';
+ $mailtourl = '';
}
-if ($location_of_bar == '') {
- $location_of_bar = $temp_location_of_bar;
-}
-$temp_location_of_bar = '';
-
+// Determine the size of the left frame
+$left_size = getPref($data_dir, $username, 'left_size');
if ($left_size == "") {
if (isset($default_left_size)) {
$left_size = $default_left_size;
@@ -107,13 +51,25 @@ if ($left_size == "") {
}
}
-if ($location_of_bar == 'right') {
- $output .= "