X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=68143c3c5201ed5780e9a29aa0e0d6b93139121b;hb=4b5049de2fa934c45599d6e4c74bf2bbee10d34d;hp=c7c5ed861032de48aeade5a50ebc4842ece3a9a2;hpb=7e1c2d41620f012a608ca3cdc7f1733ce4723f91;p=squirrelmail.git diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index c7c5ed86..68143c3c 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -3,131 +3,141 @@ /** * printer_friendly_bottom.php * - * Copyright (c) 1999-2002 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. * - * $Id$ + * @copyright © 1999-2007 The SquirrelMail Project Team + * @license http://opensource.org/licenses/gpl-license.php GNU Public License + * @version $Id$ + * @package squirrelmail + */ + +/** + * Include the SquirrelMail initialization file. */ +require('../include/init.php'); + +/* SquirrelMail required files. */ +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('passed_id', $passed_id, SQ_GET); +sqgetGlobalVar('mailbox', $mailbox, SQ_GET); -require_once('../src/validate.php'); -require_once('../functions/strings.php'); -require_once('../config/config.php'); -require_once('../src/load_prefs.php'); -require_once('../functions/imap.php'); -require_once('../functions/page_header.php'); -require_once('../functions/html.php'); - -$pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay'); -$mailbox = urldecode($mailbox); -$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); -sqimap_mailbox_select($imapConnection, $mailbox); -$message = sqimap_get_message($imapConnection, $passed_id, $mailbox); -$id = $passed_id; -if (isset($passed_ent_id)) { - $message = $message->getEntity($passed_ent_id); +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, false, $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]; +} else { + $message = sqimap_get_message($imapConnection, $passed_id, $mailbox); +} +if ($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 = decodeHeader($rfc822_header->getAddr_s('from')); +$from = $rfc822_header->getAddr_s('from'); $date = getLongDateString($rfc822_header->date); -$subject = trim(decodeHeader($rfc822_header->subject)); +$subject = trim($rfc822_header->subject); /* we can clean these up if the list is too long... */ -$cc = decodeHeader($rfc822_header->getAddr_s('cc')); -$to = decodeHeader($rfc822_header->getAddr_s('to')); +$cc = $rfc822_header->getAddr_s('cc'); +$to = $rfc822_header->getAddr_s('to'); -$ent_ar = $message->findDisplayEntity(); +if ($show_html_default == 1) { + $ent_ar = $message->findDisplayEntity(array()); +} else { + $ent_ar = $message->findDisplayEntity(array(), array('text/plain')); +} $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 .= '