X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fwebmail.php;h=15d938fd0244cb22a94b6a369d9b8f627d74525d;hp=c4ef5b8c471f685aaa66230b93db635a9a995378;hb=30460a05016c7e066ad7b28df7788539e4054a99;hpb=1d80c108a1d741b7dcb562ea1cf6d2214322b192

diff --git a/src/webmail.php b/src/webmail.php
index c4ef5b8c..15d938fd 100644
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -1,143 +1,75 @@
 <?php
-
 /**
  * webmail.php -- Displays the main frameset
  *
- * Copyright (c) 1999-2003 The SquirrelMail development team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * This file generates the main frameset. The files that are
  * shown can be given as parameters. If the user is not logged in
  * this file will verify username and password.
  *
- * $Id$
+ * @copyright 1999-2009 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
  * @package squirrelmail
  */
 
-/** Path for SquirrelMail required files. */
-define('SM_PATH','../');
-
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'functions/strings.php');
-require_once(SM_PATH . 'config/config.php');
-require_once(SM_PATH . 'functions/prefs.php');
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/plugin.php');
-require_once(SM_PATH . 'functions/i18n.php');
-require_once(SM_PATH . 'functions/auth.php');
-require_once(SM_PATH . 'functions/global.php');
-
-if (!function_exists('sqm_baseuri')){
-    require_once(SM_PATH . 'functions/display_messages.php');
-}
-$base_uri = sqm_baseuri();
-
-sqsession_is_active();
+/** This is the webmail page */
+define('PAGE_NAME', 'webmail');
 
-sqgetGlobalVar('username', $username, SQ_SESSION);
-sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
-sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
-sqgetGlobalVar('use_frames', $use_frames, SQ_COOKIE);
-sqgetGlobalVar('right_frame', $right_frame, SQ_GET);
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../include/init.php');
 
-if ( isset($_SESSION['session_expired_post']) ) {
-    sqsession_unregister('session_expired_post');
-}
-global $plugins;
-
-switch ($allow_frames) {
-   case 4:    // if $use_frames unset, fall through to case 2
-      if (isset($use_frames))
-         break;
-   case 2:    // Do not use frames
-      $use_frames = 0;
-      break;
-   case 3:    // if $use_frames unset, fall through to case 1
-      if (isset($use_frames))
-         break;
-   default:   // default is also to use frames
-   case 1:    // use frames
-      $use_frames = 1;
-      break;
+if (sqgetGlobalVar('sort', $sort)) {
+    $sort = (int) $sort;
 }
 
-if(!sqgetGlobalVar('mailto', $mailto)) {
-    $mailto = '';
+if (sqgetGlobalVar('startMessage', $startMessage)) {
+    $startMessage = (int) $startMessage;
 }
 
-is_logged_in();
+if (!sqgetGlobalVar('mailbox', $mailbox)) {
+    $mailbox = 'INBOX';
+}
 
-do_hook('webmail_top');
+sqgetGlobalVar('right_frame', $right_frame, SQ_GET);
 
-/**
- * We'll need this to later have a noframes version
- *
- * Check if the user has a language preference, but no cookie.
- * Send him a cookie with his language preference, if there is
- * such discrepancy.
- */
-$my_language = getPref($data_dir, $username, 'language');
-if ($my_language != $squirrelmail_language) {
-    setcookie('squirrelmail_language', $my_language, time()+2592000, $base_uri);
+if (sqgetGlobalVar('mailtodata', $mailtodata)) {
+    $mailtourl = 'mailtodata='.urlencode($mailtodata);
+} else {
+    $mailtourl = '';
 }
 
-set_up_language(getPref($data_dir, $username, 'language'));
-
-if (isset($use_frames) && !$use_frames) {
-    if (!isset($right_frame))
-        $right_frame = '';
-    if ($right_frame == 'right_main.php') {
-        $urlMailbox = urlencode($mailbox);
-        $right_frame_url = "right_main.php?mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage";
-    } elseif ($right_frame == 'options.php') {
-        $right_frame_url = 'options.php';
-    } elseif ($right_frame == 'folders.php') {
-        $right_frame_url = 'folders.php';
-    } else if ($right_frame == '') {
-        $right_frame_url = 'right_main.php';
-    } else {
-        $right_frame_url =  $right_frame;
+// 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;
     }
-    header("Location: $right_frame_url");
 }
 
-
-echo "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\">\n".
-     "<html><head>\n" .
-     "<title>$org_title</title>\n".
-     "</head>";
-
-$left_size = getPref($data_dir, $username, 'left_size');
+// 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;
 }
-$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') {
-    echo "<frameset cols=\"*, $left_size\" id=\"fs1\">\n";
-}
-else {
-    echo "<frameset cols=\"$left_size, *\" id=\"fs1\">\n";
-}
+// this value may be changed by a plugin, but initialize
+// it first to avoid register_globals headaches
+//
+$right_frame_url = '';
+do_hook('webmail_top', $null);
 
+// Determine the main frame URL
 /*
  * There are three ways to call webmail.php
  * 1.  webmail.php
@@ -149,38 +81,55 @@ else {
  *
  * 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.
+ *
+ * Note that plugins are allowed to completely and freely override the URI
+ * used for the "right" (content) frame, and they do so by modifying the
+ * global variable $right_frame_url.
+ *
  */
-if (!isset($right_frame)) {
+if (empty($right_frame) || (strpos(urldecode($right_frame), '//') !== false)) {
     $right_frame = '';
-} 
-if ($right_frame == 'right_main.php') {
-    $urlMailbox = urlencode($mailbox);
-    $right_frame_url =
-        "right_main.php?mailbox=$urlMailbox&amp;sort=$sort&amp;startMessage=$startMessage";
-} elseif ($right_frame == 'options.php') {
-    $right_frame_url = 'options.php';
-} elseif ($right_frame == 'folders.php') {
-    $right_frame_url = 'folders.php';
-} elseif ($right_frame == 'compose.php') {
-    $right_frame_url = 'compose.php?' . $mailto;
-} else if ($right_frame == '') {
-    $right_frame_url = 'right_main.php';
+}
+if ( strpos($right_frame,'?') ) {
+    $right_frame_file = substr($right_frame,0,strpos($right_frame,'?'));
 } else {
-    $right_frame_url =  $right_frame;
+    $right_frame_file = $right_frame;
+}
+if (empty($right_frame_url)) {
+    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;
+    }
 }
 
-$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";
+$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);
+
+displayHtmlHeader($org_title, '', false, true);
+
+$oTemplate->display('webmail.tpl');
 
-if ($location_of_bar == 'right') {
-    echo $right_frame . $left_frame;
-}
-else {
-    echo $left_frame . $right_frame;
-}
-do_hook('webmail_bottom');
-?>
-</frameset>
-</html>