X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=350c466b637ca91a0ef3012e95ac856a4d281b66;hb=7111b0daa5f74c1c96d3bcf87da7a05e4ba6e189;hp=ffaccb00b9ca9669881c3e3c72bdf7e4b3d6a00f;hpb=f8a1ed5aa365d515e4e2ac3602f900bfb9447fce;p=squirrelmail.git diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index ffaccb00..350c466b 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -3,27 +3,28 @@ /** * printer_friendly_bottom.php * - * 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 * else, it is alone in a new window * * - this is the page that does all the work, really. * + * @copyright © 1999-2006 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License * @version $Id$ * @package squirrelmail */ /** - * Path for SquirrelMail required files. - * @ignore + * Include the SquirrelMail initialization file. */ -define('SM_PATH','../'); +require('../include/init.php'); /* SquirrelMail required files. */ -require_once(SM_PATH . 'include/validate.php'); -require_once(SM_PATH . 'functions/imap.php'); +require_once(SM_PATH . 'functions/imap_general.php'); +require_once(SM_PATH . 'functions/imap_messages.php'); +require_once(SM_PATH . 'functions/date.php'); +require_once(SM_PATH . 'functions/mime.php'); +require_once(SM_PATH . 'functions/url_parser.php'); /* get some of these globals */ sqgetGlobalVar('username', $username, SQ_SESSION); @@ -36,17 +37,18 @@ sqgetGlobalVar('mailbox', $mailbox, SQ_GET); if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) { $passed_ent_id = ''; } +sqgetGlobalVar('show_html_default', $show_html_default, SQ_FORM); /* end globals */ $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox); if (isset($messages[$mbx_response['UIDVALIDITY']][$passed_id])) { - $message = &$messages[$mbx_response['UIDVALIDITY']][$passed_id]; + $message = $messages[$mbx_response['UIDVALIDITY']][$passed_id]; } else { $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); } if ($passed_ent_id) { - $message = &$message->getEntity($passed_ent_id); + $message = $message->getEntity($passed_ent_id); } /* --start display setup-- */ @@ -82,7 +84,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 +100,8 @@ $cc = decodeHeader($cc); $from = decodeHeader($from); $subject = decodeHeader($subject); +$attachments = pf_show_attachments($message,$ent_ar,$mailbox,$passed_id); + // --end display setup-- @@ -132,10 +136,25 @@ echo '
' . "\n" . $body, 'left', '', 'colspan="2"' ) - ) . "\n" . + ) . "\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" ; + } + + echo '' . "\n"; +$oTemplate->display('footer.tpl'); /* --end browser output-- */ @@ -185,5 +204,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(true)); + } 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', '', 'width="25%"') . + html_tag( 'td',show_readable_size($header->size), 'left', '', 'width="75%"') . + '' . "\n" . + html_tag( 'td',_("Type:"), 'right', '', 'width="25%"') . + html_tag( 'td',htmlspecialchars($type0).'/'.htmlspecialchars($type1), 'left', '', 'width="75%"') . + ''; + if (! empty($description)) { + $attachments .= $description; + } + $attachments .= "
'.decodeHeader($display_filename).'
\n"; + } + return $attachments; +} + + /* --end pf-specific functions */ -?> \ No newline at end of file + +?>