X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=9e8aba7d62ef665b523030f14f3b98c242201c45;hb=62cfbd1ddebba95655dfa53bd1ac1f45e8428f34;hp=c7c5ed861032de48aeade5a50ebc4842ece3a9a2;hpb=7e1c2d41620f012a608ca3cdc7f1733ce4723f91;p=squirrelmail.git diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index c7c5ed86..9e8aba7d 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -45,7 +45,11 @@ $subject = trim(decodeHeader($rfc822_header->subject)); $cc = decodeHeader($rfc822_header->getAddr_s('cc')); $to = decodeHeader($rfc822_header->getAddr_s('to')); -$ent_ar = $message->findDisplayEntity(); +if ($show_html_default == 1) { + $ent_ar = $message->findDisplayEntity(array()); +} else { + $ent_ar = $message->findDisplayEntity(array(), array('text/plain')); +} $body = ''; if ($ent_ar[0] != '') { for ($i = 0; $i < count($ent_ar); $i++) { @@ -88,27 +92,27 @@ displayHtmlHeader( _("Printer Friendly"), '', FALSE ); echo "\n" . /* headers (we use table because translations are not all the same width) */ - html_tag( 'table', '', '', '', 'width="100%" cellspacing="0" cellpadding="0" border="0"' ) . + html_tag( 'table', '', 'center', '', 'cellspacing="0" cellpadding="0" border="0"' ) . html_tag( 'tr', html_tag( 'td', _("From").' ', 'left' ,'','valign="top"') . - html_tag( 'td', htmlentities($from), 'left' ) + html_tag( 'td', htmlspecialchars($from), 'left' ) ) . "\n" . html_tag( 'tr', html_tag( 'td', _("Subject").' ', 'left','','valign="top"' ) . - html_tag( 'td', htmlentities($subject), 'left' ) + html_tag( 'td', htmlspecialchars($subject), 'left' ) ) . "\n" . html_tag( 'tr', html_tag( 'td', _("Date").' ', 'left' ) . - html_tag( 'td', htmlentities($date), 'left' ) + html_tag( 'td', htmlspecialchars($date), 'left' ) ) . "\n" . html_tag( 'tr', html_tag( 'td', _("To").' ', 'left','','valign="top"' ) . - html_tag( 'td', htmlentities($to), 'left' ) + html_tag( 'td', htmlspecialchars($to), 'left' ) ) . "\n"; if ( strlen($cc) > 0 ) { /* only show CC: if it's there... */ echo html_tag( 'tr', html_tag( 'td', _("CC").' ', 'left','','valign="top"' ) . - html_tag( 'td', htmlentities($cc), 'left' ) + html_tag( 'td', htmlspecialchars($cc), 'left' ) ); } /* body */