Don't use regular expressions when you don't need to

[squirrelmail.git] / src / view_html.php

diff --git a/src/view_html.php b/src/view_html.php
index 5e7df7c6b15904c187e6c553dde2c9098289d7ac..2cda58b8cab404208cf2877b6cb52fbb9291d41b 100644 (file)
--- a/src/view_html.php
+++ b/src/view_html.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * $Source$
+ * view_html
  * Displays html message parts
  *
  * File is used to display html message parts. Usually inside iframe.
@@ -10,12 +10,15 @@
  * optional. User must be authenticated ($key in cookie. $username and
  * $onetimepad in session).
  *
- * @copyright &copy; 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2011 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
 
+/** This is the view_html page */
+define('PAGE_NAME', 'view_html');
+
 /**
  * Include the SquirrelMail initialization file.
  */
@@ -31,9 +34,7 @@ sqgetGlobalVar('messages',   $messages,     SQ_SESSION);
 sqgetGlobalVar('mailbox',    $mailbox,      SQ_GET);
 sqgetGlobalVar('ent_id',     $ent_id,       SQ_GET);
 sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET);
-if (sqgetGlobalVar('passed_id', $temp, SQ_GET)) {
-    $passed_id = (int) $temp;
-}
+sqgetGlobalVar('passed_id', $passed_id, SQ_GET, NULL, SQ_TYPE_BIGINT);
 
 // TODO: add required var checks here.
 
@@ -56,8 +57,7 @@ $encoding = strtolower($header->encoding);
 
 $body = mime_fetch_body($imap_stream, $passed_id, $ent_id);
 $body = decodeBody($body, $encoding);
-$hookResults = do_hook('message_body', $body);
-$body = $hookResults[1];
+do_hook('message_body', $body);
 
 /**
  * TODO: check if xtra_code is needed.
@@ -75,4 +75,3 @@ $body = MagicHTML( $body, $passed_id, $message, $mailbox);
 /** TODO: charset might be part of html code. */
 header('Content-Type: text/html; charset=' . $charset);
 echo $body;
-?>