X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=a9a76830a64fd1e44a793a2d739d154a12486e86;hb=8f6f9ba5df6491d396aa690dcf3e5b9070a565ca;hp=b1b6274fa586443121830e1690f0413f3db26968;hpb=76911253eb850bacde3d86c8cb7b4af072e67ebe;p=squirrelmail.git diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index b1b6274f..a9a76830 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -12,9 +12,10 @@ * - this is the page that does all the work, really. * * $Id$ + * @package squirrelmail */ -/* Path for SquirrelMail required files. */ +/** Path for SquirrelMail required files. */ define('SM_PATH','../'); /* SquirrelMail required files. */ @@ -27,22 +28,19 @@ require_once(SM_PATH . 'functions/page_header.php'); require_once(SM_PATH . 'functions/html.php'); /* get some of these globals */ -$key = $_COOKIE['key']; -$username = $_SESSION['username']; -$onetimepad = $_SESSION['onetimepad']; +sqgetGlobalVar('username', $username, SQ_SESSION); +sqgetGlobalVar('key', $key, SQ_COOKIE); +sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION); -$passed_id = (int) $_GET['passed_id']; -$mailbox = $_GET['mailbox']; +sqgetGlobalVar('passed_id', $passed_id, SQ_GET); +sqgetGlobalVar('mailbox', $mailbox, SQ_GET); -if (!isset($_GET['passed_ent_id'])) { +if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) { $passed_ent_id = ''; -} else { - $passed_ent_id = $_GET['passed_ent_id']; -} +} /* end globals */ $pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay'); -$mailbox = urldecode($mailbox); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox); if (isset($messages[$mbx_response['UIDVALIDITY']][$passed_id])) { @@ -58,13 +56,13 @@ if ($passed_ent_id) { $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()); @@ -105,22 +103,27 @@ if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) { } // end cleanup +$to = decodeHeader($to); +$cc = decodeHeader($cc); +$from = decodeHeader($from); +$subject = decodeHeader($subject); + // --end display setup-- /* --start browser output-- */ -displayHtmlHeader( _("Printer Friendly"), '', FALSE ); +displayHtmlHeader( $subject, '', FALSE ); -echo "\n" . +echo ''."\n" . /* headers (we use table because translations are not all the same width) */ html_tag( 'table', '', 'center', '', 'cellspacing="0" cellpadding="0" border="0" width="100%"' ) . html_tag( 'tr', html_tag( 'td', _("From").' ', 'left' ,'','valign="top"') . - html_tag( 'td', htmlspecialchars($from), 'left' ) + html_tag( 'td', $from, 'left' ) ) . "\n" . html_tag( 'tr', html_tag( 'td', _("Subject").' ', 'left','','valign="top"' ) . - html_tag( 'td', htmlspecialchars($subject), 'left' ) + html_tag( 'td', $subject, 'left' ) ) . "\n" . html_tag( 'tr', html_tag( 'td', _("Date").' ', 'left' ) . @@ -128,12 +131,12 @@ echo " 0 ) { /* only show CC: if it's there... */ echo html_tag( 'tr', html_tag( 'td', _("CC").' ', 'left','','valign="top"' ) . - html_tag( 'td', htmlspecialchars($cc), 'left' ) + html_tag( 'td', $cc, 'left' ) ); } /* body */ @@ -152,7 +155,7 @@ echo "