X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=350c466b637ca91a0ef3012e95ac856a4d281b66;hb=7111b0daa5f74c1c96d3bcf87da7a05e4ba6e189;hp=1d681ed1d9ab95ed036627fcbf3e3c4dadfa6bc4;hpb=d3c4749fafa36e7bb45c3e9dba1efe2294e5cf7f;p=squirrelmail.git diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index 1d681ed1..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-- */ @@ -135,7 +137,7 @@ echo '
' . "\n" . $body, 'left', '', 'colspan="2"' ) ) . "\n" ; - + if (! empty($attachments)) { // attachments title echo html_tag( 'tr', @@ -151,8 +153,8 @@ echo '' . "\n" . - ''; + echo '' . "\n"; +$oTemplate->display('footer.tpl'); /* --end browser output-- */ @@ -238,7 +240,7 @@ function pf_show_attachments($message, $exclude_id, $mailbox, $id) { } $from_o = $rfc822_header->from; if (is_object($from_o)) { - $from_name = decodeHeader($from_o->getAddress(false)); + $from_name = decodeHeader($from_o->getAddress(true)); } else { $from_name = _("Unknown sender"); } @@ -261,13 +263,13 @@ function pf_show_attachments($message, $exclude_id, $mailbox, $id) { $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') . + $attachments .= '

'.decodeHeader($display_filename).'

' . + ''. + 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; @@ -280,4 +282,4 @@ function pf_show_attachments($message, $exclude_id, $mailbox, $id) { /* --end pf-specific functions */ -?> \ No newline at end of file +?>

'.decodeHeader($display_filename).'