X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=c93048be202ee8b2dc94331feea4afcbbd135572;hb=ccbe63bad9cfea0850e299e6be71eba5d76170d6;hp=96ebf40843c74c5d433456dedbb8d951a89e90f2;hpb=d68323ff96429e9d788a5144aaf8aa1afffc494c;p=squirrelmail.git diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index 96ebf408..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()); @@ -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 */ @@ -152,7 +157,7 @@ echo "