X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=350c466b637ca91a0ef3012e95ac856a4d281b66;hb=7111b0daa5f74c1c96d3bcf87da7a05e4ba6e189;hp=ee49b2fb802923ca665b1a395f43f972ce36e1e7;hpb=30967a1e09679c395b31929cbdb1a0e88b13f01e;p=squirrelmail.git diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index ee49b2fb..350c466b 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -3,32 +3,28 @@ /** * printer_friendly_bottom.php * - * Copyright (c) 1999-2004 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/strings.php'); -require_once(SM_PATH . 'config/config.php'); -require_once(SM_PATH . 'include/load_prefs.php'); -require_once(SM_PATH . 'functions/imap.php'); -require_once(SM_PATH . 'functions/page_header.php'); -require_once(SM_PATH . 'functions/html.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); @@ -40,24 +36,24 @@ 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 */ -$pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay'); $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-- */ -$rfc822_header = $message->rfc822_header; +$rfc822_header = $message->rfc822_header; /* From and Date are usually fine as they are... */ $from = $rfc822_header->getAddr_s('from'); $date = getLongDateString($rfc822_header->date); @@ -75,8 +71,8 @@ if ($show_html_default == 1) { $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 .= '
'; + $body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox, TRUE); + $body .= '
'; } $hookResults = do_hook('message_body', $body); $body = $hookResults[1]; @@ -84,33 +80,28 @@ if ($ent_ar[0] != '') { $body = _("Message not printable"); } - /* now, if they choose to, we clean up the display a bit... */ - -if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) { - - $num_leading_spaces = 9; // nine leading spaces for indentation - - // 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); +/* now we clean up the display a bit... */ - // the body should have no leading zeros - // disabled because it destroys html mail +$num_leading_spaces = 9; // nine leading spaces for indentation -// $body = pf_clean_string($body, 0); +// 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); - // 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); +// 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-- @@ -121,41 +112,65 @@ echo ''._("From").': ', 'left' ,'','valign="top"') . html_tag( 'td', $from, 'left' ) ) . "\n" . html_tag( 'tr', - html_tag( 'td', _("Subject").' ', 'left','','valign="top"' ) . + html_tag( 'td', ''._("Subject").': ', 'left','','valign="top"' ) . html_tag( 'td', $subject, 'left' ) ) . "\n" . html_tag( 'tr', - html_tag( 'td', _("Date").' ', 'left' ) . + html_tag( 'td', ''._("Date").': ', 'left' ) . html_tag( 'td', htmlspecialchars($date), 'left' ) ) . "\n" . html_tag( 'tr', - html_tag( 'td', _("To").' ', 'left','','valign="top"' ) . + html_tag( 'td', ''._("To").': ', 'left','','valign="top"' ) . html_tag( 'td', $to, 'left' ) ) . "\n"; - if ( strlen($cc) > 0 ) { /* only show CC: if it's there... */ + 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', ''._("Cc").': ', 'left','','valign="top"' ) . html_tag( 'td', $cc, 'left' ) ); } /* body */ echo html_tag( 'tr', - html_tag( 'td', '

' . "\n" . $body, 'left', '', 'colspan="2"' ) - ) . "\n" . + html_tag( 'td', '

' . "\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" ; + } + + echo '' . "\n"; +$oTemplate->display('footer.tpl'); /* --end browser output-- */ /* --start pf-specific functions-- */ -/* $string = pf_clean_string($string, 9); */ +/** + * Function should clean layout of printed messages when user + * enables "Printer Friendly Clean Display" option. + * For example: $string = pf_clean_string($string, 9); + * + * @param string unclean_string + * @param integer num_leading_spaces + * @return string + * @access private + */ function pf_clean_string ( $unclean_string, $num_leading_spaces ) { global $data_dir, $username; $unclean_string = str_replace(' ',' ',$unclean_string); @@ -178,17 +193,93 @@ function pf_clean_string ( $unclean_string, $num_leading_spaces ) { } else { - $i = strrpos( $this_line, ' '); - $clean_string .= substr( $this_line, 0, $i); - $clean_string .= "\n" . $leading_spaces; - $unclean_string = substr($unclean_string, 1+$i); - } + $i = strrpos( $this_line, ' '); + $clean_string .= substr( $this_line, 0, $i); + $clean_string .= "\n" . $leading_spaces; + $unclean_string = substr($unclean_string, 1+$i); + } } $clean_string .= $unclean_string; 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 */ ?>