X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fview_text.php;h=dbdc16b89bf42173e1f73af12265f2f069845142;hp=54ddf14217f278a8ecb0bd2983ce4e4af37e2e2f;hb=4c5be18d4e2e9de885bcfa26ee45861f37e4b429;hpb=e842b215cc74203501fe50e52497f9f0329e721b

diff --git a/src/view_text.php b/src/view_text.php
index 54ddf142..dbdc16b8 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -1,97 +1,90 @@
 <?php
 
 /**
- * view_text.php -- Displays the main frameset
+ * view_text.php -- View a text attachment
  *
- * Copyright (c) 1999-2003 The SquirrelMail development team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
+ * Used by attachment_common code.
  *
- * 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 &copy; 1999-2007 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');
-
-sqgetGlobalVar('key',        $key,          SQ_COOKIE);
-sqgetGlobalVar('username',   $username,     SQ_SESSION);
-sqgetGlobalVar('onetimepad', $onetimepad,   SQ_SESSION);
-sqgetGlobalVar('delimiter',  $delimiter,    SQ_SESSION);
+/** 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');
+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('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);
 sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
-sqgetGlobalVar('messages', $messages);
-sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
-
-if ( sqgetGlobalVar('mailbox', $temp, SQ_GET) ) {
-  $mailbox = $temp;
-}
-if ( !sqgetGlobalVar('ent_id', $ent_id, SQ_GET) ) {
-  $ent_id = '';
+if (sqgetGlobalVar('passed_id', $temp, SQ_GET)) {
+    $passed_id = (int) $temp;
 }
-if ( !sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
-  $passed_ent_id = '';
-} 
 
+$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
+$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
 
-
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-$mbx_response =  sqimap_mailbox_select($imapConnection, $mailbox);
-
-$message = &$messages[$mbx_response['UIDVALIDITY']]["$passed_id"];
-$message_ent = &$message->getEntity($ent_id);
+$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);
 if ($passed_ent_id) {
     $message = &$message->getEntity($passed_ent_id);
 }
-   
-$header = $message_ent->header;
-$charset = $header->getParameter('charset');
-$type0 = $header->type0;
-$type1 = $header->type1;
+$header   = $message_ent->header;
+$type0    = $header->type0;
+$type1    = $header->type1;
+$charset  = $header->getParameter('charset');
 $encoding = strtolower($header->encoding);
 
-$msg_url = 'read_body.php?' . $QUERY_STRING;
-$msg_url = set_url_var($msg_url, 'ent_id', 0);
+$msg_url   = 'read_body.php?' . $QUERY_STRING;
+$msg_url   = set_url_var($msg_url, 'ent_id', 0);
+$dwnld_url = '../src/download.php?' . $QUERY_STRING . '&amp;absolute_dl=true';
+$unsafe_url = 'view_text.php?' . $QUERY_STRING;
+$unsafe_url = set_url_var($unsafe_url, 'view_unsafe_images', 1);
+
 
 $body = mime_fetch_body($imapConnection, $passed_id, $ent_id);
 $body = decodeBody($body, $encoding);
+do_hook('message_body', $body);
 
-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") . " - ";
-echo '<a href="'.$msg_url.'">'. _("View message") . '</a>';
-
-$dwnld_url = '../src/download.php?'. $QUERY_STRING.'&amp;absolute_dl=true';
-echo '</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>";
-
-    if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
-        function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
-        if (mb_detect_encoding($body) != 'ASCII') {
-            $body = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $body);
-        }
+if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+    function_exists($languages[$squirrelmail_language]['XTRA_CODE'].'_decode')) {
+    if (mb_detect_encoding($body) != 'ASCII') {
+        $body = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode', $body);
     }
+}
 
 if ($type1 == 'html' || (isset($override_type1) &&  $override_type1 == 'html')) {
+    $ishtml = TRUE;
+    // 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);
 }
-echo $body . "</TT></TD></TR></TABLE>";
 
-?>
+displayPageHeader($color);
+
+$oTemplate->assign('view_message_href', $msg_url);
+$oTemplate->assign('download_href', $dwnld_url);
+$oTemplate->assign('view_unsafe_image_href', $ishtml ? $unsafe_url : '');
+$oTemplate->assign('body', $body);
+
+$oTemplate->display('view_text.tpl');
+
+$oTemplate->display('footer.tpl');