X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fwebmail.php;h=cdd66223fd5247f0a91258a673b4bea1ecfdb6b4;hp=2da1f5a69af82c8c7c4c11f54de02f47eec5730c;hb=fdf58ef92a0b69f93bd08e22be831aa8172bfe62;hpb=906f7e9fa070f6df07bd4ba8c72a9c7908039761

diff --git a/src/webmail.php b/src/webmail.php
index 2da1f5a6..cdd66223 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * webmail.php -- Displays the main frameset
  *
@@ -7,7 +6,7 @@
  * shown can be given as parameters. If the user is not logged in
  * this file will verify username and password.
  *
- * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -32,24 +31,91 @@ if (!sqgetGlobalVar('mailbox', $mailbox)) {
 
 sqgetGlobalVar('right_frame', $right_frame, SQ_GET);
 
-if(!sqgetGlobalVar('mailto', $mailto)) {
-    $mailto = '';
+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;
+    }
+    else {
+        $left_size = 200;
+    }
+}
+
+// Determine where the navigation frame should be
+$location_of_bar = getPref($data_dir, $username, 'location_of_bar');
+if (isset($languages[$squirrelmail_language]['DIR']) &&
+    strtolower($languages[$squirrelmail_language]['DIR']) == 'rtl') {
+    $temp_location_of_bar = 'right';
+} else {
+    $temp_location_of_bar = 'left';
+}
+if ($location_of_bar == '') {
+    $location_of_bar = $temp_location_of_bar;
 }
 
-do_hook('webmail_top');
+// Determine the main frame URL
+/*
+ * There are three ways to call webmail.php
+ * 1.  webmail.php
+ *      - This just loads the default entry screen.
+ * 2.  webmail.php?right_frame=right_main.php&sort=X&startMessage=X&mailbox=XXXX
+ *      - This loads the frames starting at the given values.
+ * 3.  webmail.php?right_frame=folders.php
+ *      - Loads the frames with the Folder options in the right frame.
+ *
+ * This was done to create a pure HTML way of refreshing the folder list since
+ * we would like to use as little Javascript as possible.
+ *
+ * The test for // should catch any attempt to include off-site webpages into
+ * our frameset.
+ */
+if (empty($right_frame) || (strpos(urldecode($right_frame), '//') !== false)) {
+    $right_frame = '';
+}
+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)?"&amp;sort=$sort":'')
+                       . (!empty($startMessage)?"&amp;startMessage=$startMessage":'');
+        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?' . $mailtourl;
+        break;
+    case '':
+        $right_frame_url = 'right_main.php';
+        break;
+    default:
+        $right_frame_url =  urlencode($right_frame);
+        break;
+}
+
+$oErrorHandler->setDelayedErrors(true);
+
+$oTemplate->assign('nav_size', $left_size);
+$oTemplate->assign('nav_on_left', $location_of_bar=='left');
+$oTemplate->assign('right_frame_url', $right_frame_url);
+
+do_hook('webmail_top', $null);
 
-$oTemplate->assign('org_title',$org_title);
-$oTemplate->assign('mailto',$mailto);
-$oTemplate->assign('startMessage',$startMessage);
-$oTemplate->assign('mailbox',$mailbox);
-$oTemplate->assign('sort',$sort);
-$oTemplate->assign('username',$username);
-$oTemplate->assign('delimiter',$delimiter);
-$oTemplate->assign('onetimepad',$onetimepad);
-$oTemplate->assign('languages',$languages);
-$oTemplate->assign('default_left_size',$default_left_size);
-$oTemplate->assign('right_frame',$right_frame);
+displayHtmlHeader($org_title, '', false, true);
 
 $oTemplate->display('webmail.tpl');
 
-$oTemplate->display('footer.tpl');