/**
* printer_friendly_bottom.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* with javascript on, it is the bottom frame of printer_friendly_main.php
}
/* end globals */
-$pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay', false);
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
if (isset($messages[$mbx_response['UIDVALIDITY']][$passed_id])) {
$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 .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox, TRUE);
$body .= '<hr style="height: 1px;" />';
}
$hookResults = do_hook('message_body', $body);
$body = _("Message not printable");
}
- /* now, if they choose to, we clean up the display a bit... */
+/* now we clean up the display a bit... */
-if ($pf_cleandisplay) {
+$num_leading_spaces = 9; // nine leading spaces for indentation
- $num_leading_spaces = 9; // nine leading spaces for indentation
+// 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);
- // sometimes I see ',,' instead of ',' seperating addresses *shrug*
- $cc = pf_clean_string(str_replace(',,', ',', $cc), $num_leading_spaces);
- $to = pf_clean_string(str_replace(',,', ',', $to), $num_leading_spaces);
+// clean up everything else...
+$subject = pf_clean_string($subject, $num_leading_spaces);
+$from = pf_clean_string($from, $num_leading_spaces);
+$date = pf_clean_string($date, $num_leading_spaces);
- // the body should have no leading zeros
- // disabled because it destroys html mail
-
-// $body = pf_clean_string($body, 0);
-
- // clean up everything else...
- $subject = pf_clean_string($subject, $num_leading_spaces);
- $from = pf_clean_string($from, $num_leading_spaces);
- $date = pf_clean_string($date, $num_leading_spaces);
-
-} // end cleanup
+// end cleanup
$to = decodeHeader($to);
$cc = decodeHeader($cc);
$from = decodeHeader($from);
$subject = decodeHeader($subject);
+$attachments = pf_show_attachments($message,$ent_ar,$mailbox,$passed_id);
+
// --end display setup--
/* headers (we use table because translations are not all the same width) */
html_tag( 'table', '', 'center', '', 'cellspacing="0" cellpadding="0" border="0" width="100%"' ) .
html_tag( 'tr',
- html_tag( 'td', _("From").' ', 'left' ,'','valign="top"') .
+ html_tag( 'td', '<b>'._("From").':</b> ', 'left' ,'','valign="top"') .
html_tag( 'td', $from, 'left' )
) . "\n" .
html_tag( 'tr',
- html_tag( 'td', _("Subject").' ', 'left','','valign="top"' ) .
+ html_tag( 'td', '<b>'._("Subject").':</b> ', 'left','','valign="top"' ) .
html_tag( 'td', $subject, 'left' )
) . "\n" .
html_tag( 'tr',
- html_tag( 'td', _("Date").' ', 'left' ) .
+ html_tag( 'td', '<b>'._("Date").':</b> ', 'left' ) .
html_tag( 'td', htmlspecialchars($date), 'left' )
) . "\n" .
html_tag( 'tr',
- html_tag( 'td', _("To").' ', 'left','','valign="top"' ) .
+ html_tag( 'td', '<b>'._("To").':</b> ', 'left','','valign="top"' ) .
html_tag( 'td', $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', '<b>'._("Cc").':</b> ', 'left','','valign="top"' ) .
html_tag( 'td', $cc, 'left' )
);
}
/* body */
echo html_tag( 'tr',
html_tag( 'td', '<hr style="height: 1px;" /><br />' . "\n" . $body, 'left', '', 'colspan="2"' )
- ) . "\n" .
+ ) . "\n" ;
+
+ if (! empty($attachments)) {
+ // attachments title
+ echo html_tag( 'tr',
+ html_tag( 'td','<b>'._("Attachments:").'</b>', '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', '<hr style="height: 1px;" />', 'left', '', 'colspan="2"' )
+ ) . "\n" ;
+ }
- '</table>' . "\n" .
+ echo '</table>' . "\n" .
'</body></html>';
/* --end browser output-- */
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 = '<tr>'.
+ html_tag( 'td',_("From:"), 'right') .
+ html_tag( 'td',$from_name, 'left') .
+ '</tr>';
+ } else {
+ $filename = $att->getFilename();
+ if ($header->description) {
+ $description = '<tr>'.
+ html_tag( 'td',_("Info:"), 'right') .
+ html_tag( 'td',decodeHeader($header->description), 'left') .
+ '</tr>';
+ } else {
+ $description = '';
+ }
+ }
+
+ $display_filename = $filename;
+
+ // TODO: maybe make it nicer?
+ $attachments .= '<table border="1"><tr><th colspan="2">'.decodeHeader($display_filename).'</th></tr>' .
+ '<tr border="0">'.
+ html_tag( 'td',_("Size:"), 'right') .
+ html_tag( 'td',show_readable_size($header->size), 'left') .
+ '</tr><tr>' .
+ html_tag( 'td',_("Type:"), 'right') .
+ html_tag( 'td',htmlspecialchars($type0).'/'.htmlspecialchars($type1), 'left') .
+ '</tr>';
+ if (! empty($description)) {
+ $attachments .= $description;
+ }
+ $attachments .= "</table>\n";
+ }
+ return $attachments;
+}
+
+
/* --end pf-specific functions */
+
?>
\ No newline at end of file
projects / squirrelmail.git / blobdiff