/**
* 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
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])) {
/* --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);
$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 .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox, TRUE);
$body .= '<hr style="height: 1px;" />';
}
$hookResults = do_hook('message_body', $body);
$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);
/* 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', '<b>'._("From").':</b> ', 'left' ,'','valign="top"') .
html_tag( 'td', $from, 'left' )
) . "\n" .
html_tag( 'tr',
- html_tag( 'td', _("Subject").' ', 'left','','valign="top"' ) .
+ html_tag( 'td', '<b>'._("Subject").':</b> ', 'left','','valign="top"' ) .
html_tag( 'td', $subject, 'left' )
) . "\n" .
html_tag( 'tr',
- html_tag( 'td', _("Date").' ', 'left' ) .
+ html_tag( 'td', '<b>'._("Date").':</b> ', 'left' ) .
html_tag( 'td', htmlspecialchars($date), 'left' )
) . "\n" .
html_tag( 'tr',
- html_tag( 'td', _("To").' ', 'left','','valign="top"' ) .
+ html_tag( 'td', '<b>'._("To").':</b> ', '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', '<b>'._("Cc").':</b> ', 'left','','valign="top"' ) .
html_tag( 'td', $cc, 'left' )
);
}
* @param string unclean_string
* @param integer num_leading_spaces
* @return string
- * @access private
+ * @access private
*/
function pf_clean_string ( $unclean_string, $num_leading_spaces ) {
global $data_dir, $username;
} /* end pf_clean_string() function */
/* --end pf-specific functions */
+
?>
\ No newline at end of file