X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=c93048be202ee8b2dc94331feea4afcbbd135572;hb=ccbe63bad9cfea0850e299e6be71eba5d76170d6;hp=2d4acfd5ea78c400a9266e08211f590465840e7f;hpb=d4538b2520e1896397204c1b35e3b02ed2f99ebc;p=squirrelmail.git
diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 2d4acfd5..c93048be 100644
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -3,7 +3,7 @@
/**
* printer_friendly_bottom.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* with javascript on, it is the bottom frame of printer_friendly_main.php
@@ -58,13 +58,13 @@ if ($passed_ent_id) {
$rfc822_header = $message->rfc822_header;
/* From and Date are usually fine as they are... */
-$from = decodeHeader($rfc822_header->getAddr_s('from'));
+$from = $rfc822_header->getAddr_s('from');
$date = getLongDateString($rfc822_header->date);
-$subject = trim(decodeHeader($rfc822_header->subject));
+$subject = trim($rfc822_header->subject);
/* we can clean these up if the list is too long... */
-$cc = decodeHeader($rfc822_header->getAddr_s('cc'));
-$to = decodeHeader($rfc822_header->getAddr_s('to'));
+$cc = $rfc822_header->getAddr_s('cc');
+$to = $rfc822_header->getAddr_s('to');
if ($show_html_default == 1) {
$ent_ar = $message->findDisplayEntity(array());
@@ -75,7 +75,7 @@ $body = '';
if ($ent_ar[0] != '') {
for ($i = 0; $i < count($ent_ar); $i++) {
$body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox);
- $body .= '
';
+ $body .= '
';
}
$hookResults = do_hook('message_body', $body);
$body = $hookResults[1];
@@ -105,6 +105,11 @@ if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
} // end cleanup
+$to = decodeHeader($to);
+$cc = decodeHeader($cc);
+$from = decodeHeader($from);
+$subject = decodeHeader($subject);
+
// --end display setup--
@@ -116,11 +121,11 @@ echo " 0 ) { /* only show CC: if it's there... */
echo html_tag( 'tr',
html_tag( 'td', _("CC").' ', 'left','','valign="top"' ) .
- html_tag( 'td', htmlspecialchars($cc), 'left' )
+ html_tag( 'td', $cc, 'left' )
);
}
/* body */
echo html_tag( 'tr',
- html_tag( 'td', '
' . "\n" . $body, 'left', '', 'colspan="2"' )
+ html_tag( 'td', '
' . "\n" . $body, 'left', '', 'colspan="2"' )
) . "\n" .
'' . "\n" .
@@ -152,7 +157,7 @@ echo "