X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=b65da692986a047892493bf7d30af112dca867cd;hp=a4280087c9b041c9464d98b4c156c45320e7e8e3;hb=4329d54c09e166f978df937209d32758350ef28c;hpb=3c621ba1116356a3a8e2616ef6d267f5edb3ea06
diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index a4280087..b65da692 100644
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -3,64 +3,56 @@
/**
* printer_friendly_bottom.php
*
- * 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
* else, it is alone in a new window
*
* - this is the page that does all the work, really.
*
+ * @copyright © 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../');
+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 */
-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);
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');
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+$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];
+ $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);
+ $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 = $rfc822_header->getAddr_s('from');
-$date = getLongDateString($rfc822_header->date);
+$date = getLongDateString($rfc822_header->date, $rfc822_header->date_unparsed);
$subject = trim($rfc822_header->subject);
/* we can clean these up if the list is too long... */
@@ -75,36 +67,31 @@ 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 .= '
';
+ $body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox, TRUE);
+ if ($i < count($ent_ar)-1) {
+ $body .= '
';
+ }
}
- $hookResults = do_hook('message_body', $body);
- $body = $hookResults[1];
+ /* Note that $body is passed to this hook (and modified) by reference as of 1.5.2 */
+ do_hook('message_body', $body);
} else {
$body = _("Message not printable");
}
- /* now, if they choose to, we clean up the display a bit... */
-
-if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
+/* now we clean up the display a bit... */
- $num_leading_spaces = 9; // nine leading spaces for indentation
+$num_leading_spaces = 9; // nine leading spaces for indentation
- // sometimes I see ',,' instead of ',' seperating addresses *shrug*
- $cc = pf_clean_string(str_replace(',,', ',', $cc), $num_leading_spaces);
- $to = pf_clean_string(str_replace(',,', ',', $to), $num_leading_spaces);
+// sometimes I see ',,' instead of ',' separating addresses *shrug*
+$cc = pf_clean_string(str_replace(',,', ',', $cc), $num_leading_spaces);
+$to = pf_clean_string(str_replace(',,', ',', $to), $num_leading_spaces);
- // the body should have no leading zeros
- // disabled because it destroys html mail
+// clean up everything else...
+$subject = pf_clean_string($subject, $num_leading_spaces);
+$from = pf_clean_string($from, $num_leading_spaces);
+$date = pf_clean_string($date, $num_leading_spaces);
-// $body = pf_clean_string($body, 0);
-
- // clean up everything else...
- $subject = pf_clean_string($subject, $num_leading_spaces);
- $from = pf_clean_string($from, $num_leading_spaces);
- $date = pf_clean_string($date, $num_leading_spaces);
-
-} // end cleanup
+// end cleanup
$to = decodeHeader($to);
$cc = decodeHeader($cc);
@@ -115,47 +102,39 @@ $subject = decodeHeader($subject);
/* --start browser output-- */
-displayHtmlHeader( $subject, '', FALSE );
-
-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', $from, 'left' )
- ) . "\n" .
- html_tag( 'tr',
- html_tag( 'td', _("Subject").' ', 'left','','valign="top"' ) .
- html_tag( 'td', $subject, 'left' )
- ) . "\n" .
- html_tag( 'tr',
- html_tag( 'td', _("Date").' ', 'left' ) .
- html_tag( 'td', htmlspecialchars($date), 'left' )
- ) . "\n" .
- html_tag( 'tr',
- html_tag( 'td', _("To").' ', 'left','','valign="top"' ) .
- 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"' ) .
- html_tag( 'td', $cc, 'left' )
- );
- }
- /* body */
- echo html_tag( 'tr',
- html_tag( 'td', '
' . "\n" . $body, 'left', '', 'colspan="2"' )
- ) . "\n" .
+displayHtmlHeader($subject);
+
+$aHeaders = array();
+$aHeaders[ _("From") ] = $from;
+$aHeaders[ _("Subject") ] = $subject;
+$aHeaders[ _("Date") ] = htmlspecialchars($date);
+$aHeaders[ _("To") ] = $to;
+$aHeaders[ _("Cc") ] = $cc;
- '' . "\n" .
- '