X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=1d681ed1d9ab95ed036627fcbf3e3c4dadfa6bc4;hb=87745b9cf4c1ea33c3788ab0c3a554e9574ec5d7;hp=4afb3e94bd3c35218d452962fcf8b37be0776e18;hpb=2b0f4faf44f1d51c04895f802156d44cc80a40e3;p=squirrelmail.git diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index 4afb3e94..1d681ed1 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -82,7 +82,7 @@ if ($ent_ar[0] != '') { $num_leading_spaces = 9; // nine leading spaces for indentation -// sometimes I see ',,' instead of ',' seperating addresses *shrug* +// sometimes I see ',,' instead of ',' separating addresses *shrug* $cc = pf_clean_string(str_replace(',,', ',', $cc), $num_leading_spaces); $to = pf_clean_string(str_replace(',,', ',', $to), $num_leading_spaces); @@ -98,6 +98,8 @@ $cc = decodeHeader($cc); $from = decodeHeader($from); $subject = decodeHeader($subject); +$attachments = pf_show_attachments($message,$ent_ar,$mailbox,$passed_id); + // --end display setup-- @@ -132,9 +134,24 @@ echo '
' . "\n" . $body, 'left', '', 'colspan="2"' ) - ) . "\n" . + ) . "\n" ; + + if (! empty($attachments)) { + // attachments title + echo html_tag( 'tr', + html_tag( 'td',''._("Attachments:").'', 'left', '', 'colspan="2"' ) + ) . "\n" ; + // list of attachments + echo html_tag( 'tr', + html_tag( 'td',$attachments, 'left', '', 'colspan="2"' ) + ) . "\n" ; + // add separator line + echo html_tag( 'tr', + html_tag( 'td', '

', 'left', '', 'colspan="2"' ) + ) . "\n" ; + } - '' . "\n" . + echo '' . "\n" . ''; /* --end browser output-- */ @@ -185,5 +202,82 @@ function pf_clean_string ( $unclean_string, $num_leading_spaces ) { return $clean_string; } /* end pf_clean_string() function */ +/** + * Displays attachment information + * + * Stripped version of formatAttachments() function from functions/mime.php. + * @param object $message SquirrelMail message object + * @param array $exclude_id message parts that are not attachments. + * @param string $mailbox mailbox name + * @param integer $id message id + * @return string html formated attachment information. + */ +function pf_show_attachments($message, $exclude_id, $mailbox, $id) { + global $where, $what, $startMessage, $color, $passed_ent_id; + + $att_ar = $message->getAttachments($exclude_id); + + if (!count($att_ar)) return ''; + + $attachments = ''; + + $urlMailbox = urlencode($mailbox); + + foreach ($att_ar as $att) { + $ent = $att->entity_id; + $header = $att->header; + $type0 = strtolower($header->type0); + $type1 = strtolower($header->type1); + $name = ''; + + if ($type0 =='message' && $type1 == 'rfc822') { + $rfc822_header = $att->rfc822_header; + $filename = $rfc822_header->subject; + if (trim( $filename ) == '') { + $filename = 'untitled-[' . $ent . ']' ; + } + $from_o = $rfc822_header->from; + if (is_object($from_o)) { + $from_name = decodeHeader($from_o->getAddress(false)); + } else { + $from_name = _("Unknown sender"); + } + $description = ''. + html_tag( 'td',_("From:"), 'right') . + html_tag( 'td',$from_name, 'left') . + ''; + } else { + $filename = $att->getFilename(); + if ($header->description) { + $description = ''. + html_tag( 'td',_("Info:"), 'right') . + html_tag( 'td',decodeHeader($header->description), 'left') . + ''; + } else { + $description = ''; + } + } + + $display_filename = $filename; + + // TODO: maybe make it nicer? + $attachments .= '' . + ''. + html_tag( 'td',_("Size:"), 'right') . + html_tag( 'td',show_readable_size($header->size), 'left') . + '' . + html_tag( 'td',_("Type:"), 'right') . + html_tag( 'td',htmlspecialchars($type0).'/'.htmlspecialchars($type1), 'left') . + ''; + if (! empty($description)) { + $attachments .= $description; + } + $attachments .= "

'.decodeHeader($display_filename).'

\n"; + } + return $attachments; +} + + /* --end pf-specific functions */ -?> + +?> \ No newline at end of file