X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=9e8aba7d62ef665b523030f14f3b98c242201c45;hb=62cfbd1ddebba95655dfa53bd1ac1f45e8428f34;hp=9f5a0978855b6a4d7f9f38dcdc04223aba52b0ab;hpb=18680db6cb05865c1c83d53991d1efab58dac87e;p=squirrelmail.git
diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 9f5a0978..9e8aba7d 100644
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -27,30 +27,34 @@ $mailbox = urldecode($mailbox);
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
sqimap_mailbox_select($imapConnection, $mailbox);
$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+$id = $passed_id;
+if (isset($passed_ent_id)) {
+ $message = $message->getEntity($passed_ent_id);
+}
+
/* --start display setup-- */
+$rfc822_header = $message->rfc822_header;
/* From and Date are usually fine as they are... */
-$from = decodeHeader($message->header->getAddr_s('from'));
-$date = getLongDateString($message->header->date);
+$from = decodeHeader($rfc822_header->getAddr_s('from'));
+$date = getLongDateString($rfc822_header->date);
+$subject = trim(decodeHeader($rfc822_header->subject));
/* we can clean these up if the list is too long... */
-$cc = decodeHeader($message->header->getAddr_s('cc'));
-$to = decodeHeader($message->header->getAddr_s('to'));
-//$cc = decodeHeader(getLineOfAddrs($message->header->cc));
-//$to = decodeHeader(getLineOfAddrs($message->header->to));
+$cc = decodeHeader($rfc822_header->getAddr_s('cc'));
+$to = decodeHeader($rfc822_header->getAddr_s('to'));
-/* and Body and Subject could easily stream off the page... */
-$id = $passed_id;
-if (isset($passed_ent_id)) {
- $message = $message->getEntity($passed_ent_id);
+if ($show_html_default == 1) {
+ $ent_ar = $message->findDisplayEntity(array());
+} else {
+ $ent_ar = $message->findDisplayEntity(array(), array('text/plain'));
}
-$ent_ar = $message->findDisplayEntity();
-//$ent_num = $ent_ar[0];
$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 .= '
';
}
$hookResults = do_hook('message_body', $body);
$body = $hookResults[1];
@@ -58,8 +62,6 @@ if ($ent_ar[0] != '') {
$body = _("Message not printable");
}
-$subject = trim(decodeHeader($message->header->subject));
-
/* now, if they choose to, we clean up the display a bit... */
if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
@@ -71,7 +73,9 @@ if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
$to = pf_clean_string(str_replace(',,', ',', $to), $num_leading_spaces);
// the body should have no leading zeros
- $body = pf_clean_string($body, 0);
+ // disabled because it destroys html mail
+
+// $body = pf_clean_string($body, 0);
// clean up everything else...
$subject = pf_clean_string($subject, $num_leading_spaces);
@@ -88,32 +92,31 @@ 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' ) .
- html_tag( 'td', htmlentities($from), 'left' )
+ html_tag( 'td', _("From").' ', 'left' ,'','valign="top"') .
+ html_tag( 'td', htmlspecialchars($from), 'left' )
) . "\n" .
html_tag( 'tr',
- html_tag( 'td', _("To"), 'left' ) .
- html_tag( 'td', htmlentities($to), 'left' )
+ html_tag( 'td', _("Subject").' ', 'left','','valign="top"' ) .
+ html_tag( 'td', htmlspecialchars($subject), 'left' )
+ ) . "\n" .
+ html_tag( 'tr',
+ html_tag( 'td', _("Date").' ', 'left' ) .
+ html_tag( 'td', htmlspecialchars($date), 'left' )
+ ) . "\n" .
+ html_tag( 'tr',
+ html_tag( 'td', _("To").' ', 'left','','valign="top"' ) .
+ 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' ) .
- html_tag( 'td', htmlentities($cc), 'left' )
+ html_tag( 'td', _("CC").' ', 'left','','valign="top"' ) .
+ html_tag( 'td', htmlspecialchars($cc), 'left' )
);
}
- echo html_tag( 'tr',
- html_tag( 'td', _("Date"), 'left' ) .
- html_tag( 'td', htmlentities($date), 'left' )
- ) . "\n" .
- html_tag( 'tr',
- html_tag( 'td', _("Subject"), 'left' ) .
- html_tag( 'td', htmlentities($subject), 'left' )
- ) . "\n" .
-
/* body */
- html_tag( 'tr',
+ echo html_tag( 'tr',
html_tag( 'td', '
' . "\n" . $body, 'left', '', 'colspan="2"' )
) . "\n" .