X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=c7c5ed861032de48aeade5a50ebc4842ece3a9a2;hb=b135de9c8c0238f850abca25b972b0969bc5d205;hp=9f5a0978855b6a4d7f9f38dcdc04223aba52b0ab;hpb=18680db6cb05865c1c83d53991d1efab58dac87e;p=squirrelmail.git diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index 9f5a0978..c7c5ed86 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -27,30 +27,30 @@ $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); -} $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 .= '