X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_text.php;h=948420e016b5ba1728b9c2791c281d66ac10530a;hb=d4c2aa240cb09ef33ece91769f2781186edffd2d;hp=83e293e00eba4f9fe93490f7b0e4300d8e1aaba2;hpb=9eb3fcb302b8e0363760bee586f1c43e7050b365;p=squirrelmail.git

diff --git a/src/view_text.php b/src/view_text.php
index 83e293e0..948420e0 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -1,35 +1,24 @@
 <?php
 
 /**
- * view_text.php -- Displays the main frameset
+ * view_text.php -- View a text attachment
  *
- * Copyright (c) 1999-2005 The SquirrelMail Project 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.
+ * Used by attachment_common code.
  *
+ * @copyright &copy; 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. */
+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');
 
-/* 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('messages',   $messages,     SQ_SESSION);
 sqgetGlobalVar('mailbox',    $mailbox,      SQ_GET);
 sqgetGlobalVar('ent_id',     $ent_id,       SQ_GET);
@@ -39,14 +28,14 @@ if (sqgetGlobalVar('passed_id', $temp, SQ_GET)) {
     $passed_id = (int) $temp;
 }
 
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
 $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);
 }
@@ -59,9 +48,14 @@ $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 . '&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);
+$hookResults = do_hook('message_body', $body);
+$body = $hookResults[1];
 
 if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
     function_exists($languages[$squirrelmail_language]['XTRA_CODE'].'_decode')) {
@@ -71,28 +65,39 @@ 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);
+    }
 } else {
+    $ishtml = FALSE;
     translateText($body, $wrap_at, $charset);
 }
 
 displayPageHeader($color, 'None');
 ?>
 <br /><table width="100%" border="0" cellspacing="0" cellpadding="2" align="center"><tr><td bgcolor="<?php echo $color[0]; ?>">
-<b><center>
+<b><div style="text-align: center;">
 <?php
 echo _("Viewing a text attachment") . ' - ' .
     '<a href="'.$msg_url.'">' . _("View message") . '</a>';
 ?>
-</b></td><tr><tr><td><center>
+</b></td><tr><tr><td><div style="text-align: center;">
 <?php
+if ( $ishtml ) {
+    echo '<a href="' . $unsafe_url . '">' . _("View Unsafe Images") . '</a> | ';
+}
 echo '<a href="' . $dwnld_url . '">' . _("Download this as a file") . '</a>';
 ?>
-</center><br />
-</center></b>
+</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>
-</body></html>
\ No newline at end of file
+<?php
+$oTemplate->display('footer.tpl');
+?>