X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_text.php;h=563b8778db7a1a020baa5d6c40bd9bf98d6150e7;hb=06783280842a90181b2e984bd8ea13e3b7466edb;hp=e15000addc8f021845baa83e4c84a692e9188f8f;hpb=1d80c108a1d741b7dcb562ea1cf6d2214322b192;p=squirrelmail.git

diff --git a/src/view_text.php b/src/view_text.php
index e15000ad..563b8778 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -3,26 +3,24 @@
 /**
  * view_text.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.
- *
  * 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.
  *
- * $Id$
+ * @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. */
-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);
@@ -37,13 +35,13 @@ if (sqgetGlobalVar('passed_id', $temp, SQ_GET)) {
 }
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-$mbx_response   = sqimap_mailbox_select($imapConnection, $mailbox);
+$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
 
 $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);
 }
@@ -55,37 +53,48 @@ $encoding = strtolower($header->encoding);
 
 $msg_url   = 'read_body.php?' . $QUERY_STRING;
 $msg_url   = set_url_var($msg_url, 'ent_id', 0);
-$dwnld_url = '../src/download.php?'. $QUERY_STRING . '&absolute_dl=true';
+$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'])) {
+    function_exists($languages[$squirrelmail_language]['XTRA_CODE'].'_decode')) {
     if (mb_detect_encoding($body) != 'ASCII') {
-        $body = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $body);
+        $body = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode', $body);
     }
 }
 
 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);
 }
 
 displayPageHeader($color, 'None');
-
-echo '<BR><TABLE WIDTH="100%" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR="' . $color[0] . '">' .
-     '<B><CENTER>' .
-     _("Viewing a text attachment") . ' - ' .
-     '<a href="'.$msg_url.'">'. _("View message") . '</a>' .
-     '</b></td><tr><tr><td><CENTER><A HREF="' . $dwnld_url . '">' .
-     _("Download this as a file") .
-     '</A></CENTER><BR>' .
-     '</CENTER></B>' .
-     '</TD></TR></TABLE>' .
-     '<TABLE WIDTH="98%" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR="' . $color[0] . '">' .
-     '<TR><TD BGCOLOR="' . $color[4] . '"><TT>' .
-     $body . '</TT></TD></TR></TABLE>';
-     noframes_bottom();
+?>
+<br /><table width="100%" border="0" cellspacing="0" cellpadding="2" align="center"><tr><td bgcolor="<?php echo $color[0]; ?>">
+<b><div style="text-align: center;">
+<?php
+echo _("Viewing a text attachment") . ' - ' .
+    '<a href="'.$msg_url.'">' . _("View message") . '</a>';
+?>
+</b></td><tr><tr><td><div style="text-align: center;">
+<?php
+echo '<a href="' . $dwnld_url . '">' . _("Download this as a file") . '</a>';
+?>
+</div><br />
+</div></b>
+</td></tr></table>
+<table width="98%" border="0" cellspacing="0" cellpadding="2" align="center"><tr><td bgcolor="<?php echo $color[0]; ?>">
+<tr><td bgcolor="<?php echo $color[4]; ?>"><tt>
+<?php echo $body; ?>
+</tt></td></tr></table>
+<?php
+$oTemplate->display('footer.tpl');
 ?>
\ No newline at end of file