X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=fca2e7f2d611ee7b6e1794fc357b158cb847b8b1;hb=a571cff36ff1c340cbd2130ce9c0e2ab7ef96977;hp=da3764c5656ad2420d22d486f7b94d6c31422a2f;hpb=0b97a708e71c931153cd1ceee1495c9f4e1e209b;p=squirrelmail.git diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index da3764c5..fca2e7f2 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -3,61 +3,61 @@ /** * 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-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. */ -define('SM_PATH','../'); +/** + * Include the SquirrelMail initialization file. + */ +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 */ -$key = $_COOKIE['key']; -$username = $_SESSION['username']; -$onetimepad = $_SESSION['onetimepad']; +sqgetGlobalVar('passed_id', $passed_id, SQ_GET); +sqgetGlobalVar('mailbox', $mailbox, SQ_GET); -$passed_ent_id = $_GET['passed_ent_id']; -$passed_id = $_GET['passed_id']; -$mailbox = $_GET['mailbox']; +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'); -$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); +$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'); if ($show_html_default == 1) { $ent_ar = $message->findDisplayEntity(array()); @@ -67,85 +67,77 @@ 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 .= '