projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace array_search that only uses a boolean to check whether the value
[squirrelmail.git]
/
src
/
printer_friendly_bottom.php
diff --git
a/src/printer_friendly_bottom.php
b/src/printer_friendly_bottom.php
index c93048be202ee8b2dc94331feea4afcbbd135572..ee49b2fb802923ca665b1a395f43f972ce36e1e7 100644
(file)
--- a/
src/printer_friendly_bottom.php
+++ b/
src/printer_friendly_bottom.php
@@
-3,7
+3,7
@@
/**
* printer_friendly_bottom.php
*
/**
* printer_friendly_bottom.php
*
- * Copyright (c) 1999-200
3
The SquirrelMail Project Team
+ * Copyright (c) 1999-200
4
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
* 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,10
+11,14
@@
*
* - this is the page that does all the work, really.
*
*
* - 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. */
define('SM_PATH','../');
/* SquirrelMail required files. */
@@
-27,22
+31,19
@@
require_once(SM_PATH . 'functions/page_header.php');
require_once(SM_PATH . 'functions/html.php');
/* get some of these globals */
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 = '';
$passed_ent_id = '';
-} else {
- $passed_ent_id = $_GET['passed_ent_id'];
-}
+}
/* end globals */
$pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay');
/* 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])) {
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
if (isset($messages[$mbx_response['UIDVALIDITY']][$passed_id])) {
@@
-114,9
+115,9
@@
$subject = decodeHeader($subject);
/* --start browser output-- */
/* --start browser output-- */
-displayHtmlHeader(
_("Printer Friendly")
, '', FALSE );
+displayHtmlHeader(
$subject
, '', FALSE );
-echo
"<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\">
\n" .
+echo
'<body text="#000000" bgcolor="#FFFFFF" link="#000000" vlink="#000000" alink="#000000">'."
\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',
/* 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',