$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++) {
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 */