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 b0f91071c0bd0d53abfa3baa74f1e46a1ca9849b..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
2
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,36
+31,41
@@
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);
+
+sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
+sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
-$passed_id = (int) $_GET['passed_id'];
-$mailbox = $_GET['mailbox'];
+if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_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);
$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);
+$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;
/* From and Date are usually fine as they are... */
/* --start display setup-- */
$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);
$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... */
/* 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());
if ($show_html_default == 1) {
$ent_ar = $message->findDisplayEntity(array());
@@
-67,7
+76,7
@@
$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);
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 .= '<hr noshade size=
1
>';
+ $body .= '<hr noshade size=
"1" /
>';
}
$hookResults = do_hook('message_body', $body);
$body = $hookResults[1];
}
$hookResults = do_hook('message_body', $body);
$body = $hookResults[1];
@@
-97,22
+106,27
@@
if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
} // end cleanup
} // end cleanup
+$to = decodeHeader($to);
+$cc = decodeHeader($cc);
+$from = decodeHeader($from);
+$subject = decodeHeader($subject);
+
// --end display setup--
/* --start browser output-- */
// --end display setup--
/* --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',
html_tag( 'td', _("From").' ', 'left' ,'','valign="top"') .
/* 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"' ) .
) . "\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' ) .
) . "\n" .
html_tag( 'tr',
html_tag( 'td', _("Date").' ', 'left' ) .
@@
-120,17
+134,17
@@
echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"
) . "\n" .
html_tag( 'tr',
html_tag( 'td', _("To").' ', 'left','','valign="top"' ) .
) . "\n" .
html_tag( 'tr',
html_tag( 'td', _("To").' ', 'left','','valign="top"' ) .
- html_tag( 'td',
htmlspecialchars($to)
, 'left' )
-
) . "\n";
+ html_tag( 'td',
$to
, 'left' )
+ ) . "\n";
if ( strlen($cc) > 0 ) { /* only show CC: if it's there... */
echo html_tag( 'tr',
html_tag( 'td', _("CC").' ', 'left','','valign="top"' ) .
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',
htmlspecialchars($cc)
, 'left' )
+ html_tag( 'td',
$cc
, 'left' )
);
}
/* body */
echo html_tag( 'tr',
);
}
/* body */
echo html_tag( 'tr',
- html_tag( 'td', '<hr noshade size=
1
><br>' . "\n" . $body, 'left', '', 'colspan="2"' )
+ html_tag( 'td', '<hr noshade size=
"1" /
><br>' . "\n" . $body, 'left', '', 'colspan="2"' )
) . "\n" .
'</table>' . "\n" .
) . "\n" .
'</table>' . "\n" .
@@
-144,7
+158,7
@@
echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"
/* $string = pf_clean_string($string, 9); */
function pf_clean_string ( $unclean_string, $num_leading_spaces ) {
global $data_dir, $username;
/* $string = pf_clean_string($string, 9); */
function pf_clean_string ( $unclean_string, $num_leading_spaces ) {
global $data_dir, $username;
-
+ $unclean_string = str_replace(' ',' ',$unclean_string);
$wrap_at = getPref($data_dir, $username, 'wrap_at', 86);
$wrap_at = $wrap_at - $num_leading_spaces; /* header stuff */
$wrap_at = getPref($data_dir, $username, 'wrap_at', 86);
$wrap_at = $wrap_at - $num_leading_spaces; /* header stuff */
@@
-164,12
+178,12
@@
function pf_clean_string ( $unclean_string, $num_leading_spaces ) {
}
else
{
}
else
{
- $clean_string .= substr( $this_line, 0, strrpos( $this_line, ' ' ));
- $clean_string .= "\n" . $leading_spaces;
- $unclean_string = substr($unclean_string, (1+strrpos( $this_line, ' ' )));
- }
+ $i = strrpos( $this_line, ' ');
+ $clean_string .= substr( $this_line, 0, $i);
+ $clean_string .= "\n" . $leading_spaces;
+ $unclean_string = substr($unclean_string, 1+$i);
+ }
}
}
-
$clean_string .= $unclean_string;
return $clean_string;
$clean_string .= $unclean_string;
return $clean_string;