From a4467cd7d059ed50b9e58a021cb3703290df6330 Mon Sep 17 00:00:00 2001
From: stevetruckstuff <stevetruckstuff@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Thu, 10 Aug 2006 22:34:54 +0000
Subject: [PATCH] Clean up webmail.tpl.  Also implement delayed errors.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11512 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 src/webmail.php               |  90 ++++++++++++++++++++++++----
 templates/default/webmail.tpl | 110 ++++++----------------------------
 2 files changed, 94 insertions(+), 106 deletions(-)

diff --git a/src/webmail.php b/src/webmail.php
index 2da1f5a6..c8af2939 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * webmail.php -- Displays the main frameset
  *
@@ -36,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
diff --git a/templates/default/webmail.tpl b/templates/default/webmail.tpl
index d8e0ecdb..c3a8d3fa 100644
--- a/templates/default/webmail.tpl
+++ b/templates/default/webmail.tpl
@@ -1,9 +1,13 @@
 <?php
-
 /**
  * webmail.tpl
  *
  * Template for rendering the main squirrelmail window
+ * 
+ * The following variables are available in this template:
+ *      $nav_size - integer width of the navigation frame
+ *      $nav_on_left - boolean TRUE if the mavigation from should be on the
+ *                      left side of the page.  FALSE if it is on the right.
  *
  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@ -17,108 +21,28 @@
 
 /** extract variables */
 extract($t);
-$output = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\"\n".
-          "  \"http://www.w3.org/TR/1999/REC-html401-19991224/frameset.dtd\">\n".
-          "<html><head>\n" .
-          "<meta name=\"robots\" content=\"noindex,nofollow\">\n" .
-          "<title>$org_title</title>\n".
-          "</head>";
-
-$left_size = getPref($data_dir, $username, 'left_size');
-$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;
-}
-$temp_location_of_bar = '';
 
-if ($left_size == "") {
-    if (isset($default_left_size)) {
-         $left_size = $default_left_size;
-    }
-    else {
-        $left_size = 200;
-    }
-}
-
-if ($location_of_bar == 'right') {
-    $output .= "<frameset cols=\"*, $left_size\" id=\"fs1\">\n";
+$output = '';
+if ($nav_on_left) {
+    $output .= "<frameset cols=\"$nav_size, *\" id=\"fs1\">\n";
 }
 else {
-    $output .= "<frameset cols=\"$left_size, *\" id=\"fs1\">\n";
+    $output .= "<frameset cols=\"*, $nav_size\" id=\"fs1\">\n";
 }
 
-/*
- * 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.
- */
+$left_frame  = '<frame src="left_main.php" name="left" frameborder="1" title="'. _("Folder List") .'" />'."\n";
+$right_frame = '<frame src="'.$right_frame_url.'" name="right" frameborder="1" title="'. _("Message List") .'" />'."\n";
 
-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,'?'));
+if ($nav_on_left) {
+    $output .= $left_frame . $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;
-}
-
-$left_frame  = '<frame src="left_main.php" name="left" frameborder="1" title="'.
-               _("Folder List") ."\" />\n";
-$right_frame = '<frame src="'.$right_frame_url.'" name="right" frameborder="1" title="'.
-               _("Message List") ."\" />\n";
-
-if ($location_of_bar == 'right') {
     $output .= $right_frame . $left_frame;
 }
-else {
-    $output .= $left_frame . $right_frame;
-}
+
+// Add the hook
 $ret = concat_hook_function('webmail_bottom', $output);
-if($ret != '') {
+if ($ret != '') {
     $output = $ret;
 }
 
-echo $output . '</frameset>';
-
+echo $output ."\n</frameset>";
\ No newline at end of file
-- 
2.25.1