X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fwebmail.php;h=6115f80e596500553e2a1f8a8f702f82de467b99;hp=d3bc90ce6fc5a93b8db043b1f9cb72ac6ba4208e;hb=353d074afac6827c90f4bb03e846c5e453d3b5b1;hpb=a507a781aacfd78bc8292aa7b706dc98f491e152
diff --git a/src/webmail.php b/src/webmail.php
index d3bc90ce..6115f80e 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -1,54 +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');
-if ($location_of_bar == '') {
- $location_of_bar = 'left';
+sqgetGlobalVar('right_frame', $right_frame, SQ_GET);
+
+if (sqgetGlobalVar('mailtodata', $mailtodata)) {
+ $mailtourl = 'mailtodata='.urlencode($mailtodata);
+} else {
+ $mailtourl = '';
}
+
+// 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;
@@ -58,13 +51,25 @@ if ($left_size == "") {
}
}
-if ($location_of_bar == 'right') {
- echo "