X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=a4888333626b0e051545addf1eb0bd80fce71480;hp=c93048be202ee8b2dc94331feea4afcbbd135572;hb=28e62e6d76cf414fbdaa1dd02eae4344d11ab2d6;hpb=a91189d6c4f1d6ded74e248a6f009326288e9350 diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index c93048be..a4888333 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -3,7 +3,7 @@ /** * printer_friendly_bottom.php * - * Copyright (c) 1999-2003 The SquirrelMail Project Team + * 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 @@ -11,38 +11,34 @@ * * - this is the page that does all the work, really. * - * $Id$ + * @version $Id$ + * @package squirrelmail */ -/* Path for SquirrelMail required files. */ +/** + * Path for SquirrelMail required files. + * @ignore + */ define('SM_PATH','../'); /* 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'); /* 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); +$pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay', false); $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox); if (isset($messages[$mbx_response['UIDVALIDITY']][$passed_id])) { @@ -85,7 +81,7 @@ if ($ent_ar[0] != '') { /* now, if they choose to, we clean up the display a bit... */ -if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) { +if ($pf_cleandisplay) { $num_leading_spaces = 9; // nine leading spaces for indentation @@ -114,9 +110,9 @@ $subject = decodeHeader($subject); /* --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', @@ -135,15 +131,15 @@ echo " 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"' ) + html_tag( 'td', '

' . "\n" . $body, 'left', '', 'colspan="2"' ) ) . "\n" . '' . "\n" . @@ -154,7 +150,16 @@ echo " +?> \ No newline at end of file