information about administrative restrictions in bug_report plugin

[squirrelmail.git] / src / view_text.php

diff --git a/src/view_text.php b/src/view_text.php
index d0c387426eec66a107812558a2c8934990fac171..63fc896058073d198f5f0c4906d9fee9774d65fd 100644 (file)
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -3,13 +3,12 @@
 /**
  * view_text.php -- Displays the main frameset
  *
- * Copyright (c) 1999-2004 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-2005 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
@@ -46,7 +45,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);
 }
@@ -58,7 +57,7 @@ $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);
@@ -72,17 +71,20 @@ 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);
 }
 
 displayPageHeader($color, 'None');
 ?>
-<br /><table width="100%" border="0" cellspacing="0" cellpadding="0" align="center"><tr><td bgcolor="<?php echo $color[0]; ?>">
+<br /><table width="100%" border="0" cellspacing="0" cellpadding="2" align="center"><tr><td bgcolor="<?php echo $color[0]; ?>">
 <b><center>
 <?php
 echo _("Viewing a text attachment") . ' - ' .
-     '<a href="'.$msg_url.'">'. _("View message") . '</a>';
+    '<a href="'.$msg_url.'">' . _("View message") . '</a>';
 ?>
 </b></td><tr><tr><td><center>
 <?php
@@ -95,4 +97,4 @@ echo '<a href="' . $dwnld_url . '">' . _("Download this as a file") . '</a>';
 <tr><td bgcolor="<?php echo $color[4]; ?>"><tt>
 <?php echo $body; ?>
 </tt></td></tr></table>
-</body></html>
+</body></html>
\ No newline at end of file