X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=e90b134f30d9109c7dd38918ffbb0db7aa8936a3;hp=a4888333626b0e051545addf1eb0bd80fce71480;hb=a2bfcbce2e1620762431cd34cd51513eb403633a;hpb=b5cd24a854e0e8dad5e9857cc5f3d8437ffcb420
diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index a4888333..e90b134f 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,7 +35,7 @@ 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);
@@ -52,7 +52,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 +70,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];
@@ -80,7 +80,7 @@ if ($ent_ar[0] != '') {
}
/* now, if they choose to, we clean up the display a bit... */
-
+
if ($pf_cleandisplay) {
$num_leading_spaces = 9; // nine leading spaces for indentation
@@ -116,30 +116,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" .
@@ -153,12 +153,12 @@ echo '
\ No newline at end of file
+?>