X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fwebmail.php;h=c8af2939e7ca39334a479b6cdc98874fa787ebb1;hb=b28e73038621072dea0b1e73e39c3faa206011cd;hp=8a53880cca6736f1750217c43ab5ff5fab09d892;hpb=c6f28eb1fd0a7e7de3eb16ba8e786e04d75ca6d1;p=squirrelmail.git

diff --git a/src/webmail.php b/src/webmail.php
index 8a53880c..c8af2939 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * webmail.php -- Displays the main frameset
  *
@@ -18,10 +17,6 @@
  */
 require('../include/init.php');
 
-sqgetGlobalVar('username', $username, SQ_SESSION);
-sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
-sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
-
 if (sqgetGlobalVar('sort', $sort)) {
     $sort = (int) $sort;
 }
@@ -40,20 +35,85 @@ if(!sqgetGlobalVar('mailto', $mailto)) {
     $mailto = '';
 }
 
+// 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;
+}
+
+// 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?' . $mailto;
+        break;
+    case '':
+        $right_frame_url = 'right_main.php';
+        break;
+    default:
+        $right_frame_url =  urlencode($right_frame);
+        break;
+}
+
+displayHtmlHeader($org_title, '', false, true);
+$oErrorHandler->setDelayedErrors(true);
+
 do_hook('webmail_top');
 
-$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);
+$oTemplate->assign('nav_size', $left_size);
+$oTemplate->assign('nav_on_left', $location_of_bar=='left');
+$oTemplate->assign('right_frame_url', $right_frame_url);
 
 $oTemplate->display('webmail.tpl');
 
-$oTemplate->display('footer.tpl');
+$oTemplate->display('footer.tpl');
\ No newline at end of file