X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=9e8aba7d62ef665b523030f14f3b98c242201c45;hb=62cfbd1ddebba95655dfa53bd1ac1f45e8428f34;hp=a153979c3b5dee277309d360dbc0fb012697b223;hpb=1c6634780266caff6f27c3210d1375cf538002d2;p=squirrelmail.git diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index a153979c..9e8aba7d 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -23,51 +23,47 @@ require_once('../functions/page_header.php'); require_once('../functions/html.php'); $pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay'); +$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); +} -$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); -sqimap_mailbox_select($imap_stream, $mailbox); -$message = sqimap_get_message($imap_stream, $passed_id, $mailbox); /* --start display setup-- */ +$rfc822_header = $message->rfc822_header; /* From and Date are usually fine as they are... */ -$from = decodeHeader($message->header->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(getLineOfAddrs($message->header->cc)); -$to = decodeHeader(getLineOfAddrs($message->header->to)); - -/* and Body and Subject could easily stream off the page... */ -$id = $message->header->id; -$ent_ar = findDisplayEntity ($message, 0); -$ent_num = $ent_ar[0]; - -$body_message = getEntity($message, $ent_num); -if (($body_message->header->type0 == 'text') || - ($body_message->header->type0 == 'rfc822')) { - $body = mime_fetch_body ($imap_stream, $id, $ent_num); - $body = decodeBody($body, $body_message->header->encoding); - $hookResults = do_hook('message_body', $body); - $body = $hookResults[1]; - if ($body_message->header->type1 == 'html') { - if( $show_html_default <> 1 ) { - $body = strip_tags( $body ); - translateText($body, $wrap_at, $body_message->header->charset); - } else { - $body = MagicHTML( $body, $id, $message ); - } - } else { - translateText($body, $wrap_at, $body_message->header->charset); - } +$cc = decodeHeader($rfc822_header->getAddr_s('cc')); +$to = decodeHeader($rfc822_header->getAddr_s('to')); + +if ($show_html_default == 1) { + $ent_ar = $message->findDisplayEntity(array()); } else { - $body = _("Message not printable"); + $ent_ar = $message->findDisplayEntity(array(), array('text/plain')); +} +$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 .= '