X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_text.php;h=982133c6fa950b4869850db5de4e5a909b4713b3;hb=cf039c515cde0bf2e1d23e1ee4c803c4bc3babe1;hp=948420e016b5ba1728b9c2791c281d66ac10530a;hpb=ac589f55403198b60460b8c1dbf09d27a072d3ec;p=squirrelmail.git
diff --git a/src/view_text.php b/src/view_text.php
index 948420e0..982133c6 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -5,12 +5,15 @@
*
* Used by attachment_common code.
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2017 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
+/** This is the view_text page */
+define('PAGE_NAME', 'view_text');
+
/** SquirrelMail required files. */
include('../include/init.php');
include(SM_PATH . 'functions/imap_general.php');
@@ -24,11 +27,10 @@ sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
sqgetGlobalVar('ent_id', $ent_id, SQ_GET);
sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET);
sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
-if (sqgetGlobalVar('passed_id', $temp, SQ_GET)) {
- $passed_id = (int) $temp;
-}
+sqgetGlobalVar('passed_id', $passed_id, SQ_GET, NULL, SQ_TYPE_BIGINT);
-$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
+global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0, $imap_stream_options);
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
$message = &$messages[$mbx_response['UIDVALIDITY']][$passed_id];
@@ -54,8 +56,7 @@ $unsafe_url = set_url_var($unsafe_url, 'view_unsafe_images', 1);
$body = mime_fetch_body($imapConnection, $passed_id, $ent_id);
$body = decodeBody($body, $encoding);
-$hookResults = do_hook('message_body', $body);
-$body = $hookResults[1];
+do_hook('message_body', $body);
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
function_exists($languages[$squirrelmail_language]['XTRA_CODE'].'_decode')) {
@@ -66,38 +67,23 @@ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
if ($type1 == 'html' || (isset($override_type1) && $override_type1 == 'html')) {
$ishtml = TRUE;
- $body = MagicHTML( $body, $passed_id, $message, $mailbox);
// html attachment with character set information
if (! empty($charset)) {
$body = charset_decode($charset,$body,false,true);
}
+ $body = MagicHTML( $body, $passed_id, $message, $mailbox);
} else {
$ishtml = FALSE;
translateText($body, $wrap_at, $charset);
}
-displayPageHeader($color, 'None');
-?>
-
-
-' . _("View message") . '';
-?>
- |
-' . _("View Unsafe Images") . ' | ';
-}
-echo '' . _("Download this as a file") . '';
-?>
- - - |
- |
- - |