X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=db37b09a26836d6c093bf4457e559e7d64b516ee;hb=c189a9636981d340246670a156f85de3a7bce40f;hp=6c4d811ca7a64ddc7ff3ba2981501fd5dfdabb56;hpb=9dbdf00b7cac8f8f49fd154c21b87a569786be25;p=squirrelmail.git
diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 6c4d811c..db37b09a 100644
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -3,7 +3,7 @@
/**
* printer_friendly_bottom.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 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
@@ -35,10 +35,9 @@ sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
$passed_ent_id = '';
-}
+}
/* end globals */
-$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])) {
@@ -52,7 +51,7 @@ if ($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);
@@ -70,8 +69,8 @@ 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);
+ $body .= '
';
}
$hookResults = do_hook('message_body', $body);
$body = $hookResults[1];
@@ -79,27 +78,20 @@ if ($ent_ar[0] != '') {
$body = _("Message not printable");
}
- /* now, if they choose to, we clean up the display a bit... */
-
-if ($pf_cleandisplay) {
-
- $num_leading_spaces = 9; // nine leading spaces for indentation
+/* now we clean up the display a bit... */
- // 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);
+$num_leading_spaces = 9; // nine leading spaces for indentation
- // the body should have no leading zeros
- // disabled because it destroys html mail
+// 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);
-// $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);
- // 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);
@@ -116,30 +108,30 @@ echo ''._("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','','valign="top"' ) .
html_tag( 'td', $subject, 'left' )
) . "\n" .
html_tag( 'tr',
- html_tag( 'td', _("Date").' ', 'left' ) .
+ 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','','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','','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" .
@@ -158,7 +150,7 @@ echo '
\ No newline at end of file