X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_text.php;h=563b8778db7a1a020baa5d6c40bd9bf98d6150e7;hb=06783280842a90181b2e984bd8ea13e3b7466edb;hp=969b60f52780137cdcf81d2fca350d32a2fde224;hpb=6c84ba1ec45ab854c37b6f65c5b4d84ab1c7aad4;p=squirrelmail.git
diff --git a/src/view_text.php b/src/view_text.php
index 969b60f5..563b8778 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -3,29 +3,24 @@
/**
* view_text.php -- Displays the main frameset
*
- * Copyright (c) 1999-2005 The SquirrelMail development team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* Who knows what this file does. However PUT IT HERE DID NOT PUT
* A SINGLE FREAKING COMMENT IN! Whoever is responsible for this,
* be very ashamed.
*
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
-/**
- * Path for SquirrelMail required files.
- * @ignore
- */
-define('SM_PATH','../');
/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/global.php');
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/mime.php');
-require_once(SM_PATH . 'functions/html.php');
+include('../include/init.php');
+include(SM_PATH . 'functions/imap_general.php');
+include(SM_PATH . 'functions/imap_messages.php');
+include(SM_PATH . 'functions/mime.php');
+include(SM_PATH . 'functions/date.php');
+include(SM_PATH . 'functions/url_parser.php');
sqgetGlobalVar('key', $key, SQ_COOKIE);
sqgetGlobalVar('username', $username, SQ_SESSION);
@@ -46,7 +41,7 @@ $message = &$messages[$mbx_response['UIDVALIDITY']][$passed_id];
if (!is_object($message)) {
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
}
-$message_ent = &$message->getEntity($ent_id);
+$message_ent = $message->getEntity($ent_id);
if ($passed_ent_id) {
$message = &$message->getEntity($passed_ent_id);
}
@@ -62,6 +57,8 @@ $dwnld_url = '../src/download.php?' . $QUERY_STRING . '&absolute_dl=true';
$body = mime_fetch_body($imapConnection, $passed_id, $ent_id);
$body = decodeBody($body, $encoding);
+$hookResults = do_hook('message_body', $body);
+$body = $hookResults[1];
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
function_exists($languages[$squirrelmail_language]['XTRA_CODE'].'_decode')) {
@@ -72,6 +69,9 @@ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
if ($type1 == 'html' || (isset($override_type1) && $override_type1 == 'html')) {
$body = MagicHTML( $body, $passed_id, $message, $mailbox);
+ // html attachment with character set information
+ if (! empty($charset))
+ $body = charset_decode($charset,$body,false,true);
} else {
translateText($body, $wrap_at, $charset);
}
@@ -79,20 +79,22 @@ if ($type1 == 'html' || (isset($override_type1) && $override_type1 == 'html'))
displayPageHeader($color, 'None');
?>
-
' . _("View message") . '';
?>
- |
' . _("Download this as a file") . '';
?>
- - + + |