Fix for security token missing in newmail plugin (#2919418).

[squirrelmail.git] / plugins / message_details / message_details_main.php

diff --git a/plugins/message_details/message_details_main.php b/plugins/message_details/message_details_main.php
index 9e8b07e47fa0609c766caf3c51da0dd6931d29e8..bfe70600e5ea0584601c2f91aa2bfc504b69caeb 100644 (file)
--- a/plugins/message_details/message_details_main.php
+++ b/plugins/message_details/message_details_main.php
@@ -1,27 +1,38 @@
 <?php
-/** Message Source  
-*
-* Plugin to view the RFC822 raw message output and the bodystructure of a message
-*
-* Copyright (c) 2002 Marc Groot Koerkamp, The Netherlands
-* Licensed under the GNU GPL. For full terms see the file COPYING.
-* 
-* $Id$
-**/
-/* Path for SquirrelMail required files. */
 
-chdir('..');
-define('SM_PATH','../');
+/**
+ * Message Details plugin - main frame
+ *
+ * Plugin to view the RFC822 raw message output and the bodystructure of a message
+ *
+ * @author Marc Groot Koerkamp
+ * @copyright 2002 Marc Groot Koerkamp, The Netherlands
+ * @copyright 2002-2009 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package plugins
+ * @subpackage message_details
+ */
 
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/page_header.php');
-require_once(SM_PATH . 'functions/strings.php');
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../../include/init.php');
 
-displayHtmlHeader( _("Message details"), '', FALSE );
+displayHtmlHeader( _("Message Details"), '', FALSE );
 
-echo "<frameset rows=\"60, *\" noresize border=\"0\">\n";
-echo '<frame src="message_details_top.php?mailbox=' . urlencode($mailbox) .'&passed_id=' . "$passed_id". '" name="top_frame" scrolling="off">';
-echo '<frame src="message_details_bottom.php?mailbox=' . urlencode($mailbox) .'&passed_id=' . "$passed_id" . '" name="bottom_frame">';
+sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
+sqgetGlobalVar('passed_id', $passed_id, SQ_GET, NULL, SQ_TYPE_BIGINT);
+if (!sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET))
+    $passed_ent_id = 0;
+
+//FIXME: Don't echo HTML directly - need to "templatize" this
+echo "<frameset rows=\"60, *\" >\n";
+echo '<frame src="message_details_top.php?mailbox=' . urlencode($mailbox) .'&amp;passed_id=' . $passed_id 
+    . '&amp;passed_ent_id=' . $passed_ent_id
+    . '" name="top_frame" scrolling="no" noresize="noresize" frameborder="0" />';
+echo '<frame src="message_details_bottom.php?mailbox=' . urlencode($mailbox) 
+    . '&amp;get_message_details=yes&amp;passed_id=' . $passed_id 
+    . '&amp;passed_ent_id=' . $passed_ent_id
+    . '" name="bottom_frame" frameborder="0" />';
 echo  '</frameset>'."\n"."</html>\n";
-?>
\ No newline at end of file