X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fwebmail.php;h=1156b7589b32f7d6b638831be885441e9b55b42c;hp=8e9c76c09f626b0d03eb61463ee8b515cf469158;hb=caa592dc7d3d53777323707cc5731fb48d3dc1bc;hpb=544602600fd0bc1d74c14ceb5131bbb146989270
diff --git a/src/webmail.php b/src/webmail.php
index 8e9c76c0..1156b758 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -1,88 +1,47 @@
'.
- "
\n" .
- "$org_title";
+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;
@@ -92,13 +51,25 @@ if ($left_size == "") {
}
}
-if ($location_of_bar == 'right') {
- echo "