X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=d1139de92ab937c2902cd9e4e36152acba93caca;hp=f9f59a1e558ef5a20c91ba5281ad48705e287f03;hb=48027e89566ad3b27266166bc8f11cfbb5670d5b;hpb=692155b7fd835420fda759bff62c0f34f6b1d583 diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index f9f59a1e..d1139de9 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -1,111 +1,166 @@ header->from); - $date = getLongDateString($message->header->date); - - // we can clean these up if the list is too long... - $cc = decodeHeader(getLineOfAddrs($message->header->cc)); - $to = decodeHeader(getLineOfAddrs($message->header->to)); - - // and Body and Subject could easily stream off the page... - $body = mime_fetch_body($imap_stream, $passed_id, $passed_ent_id); - $body = str_replace("\n", "\n", trim(decodeBody($body, $message->header->encoding))); - $subject = trim(decodeHeader($message->header->subject)); - - // now, if they choose to, we clean up the display a bit... - if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) - { - - $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); - - // the body should have no leading zeros - $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 display setup-- - - - // --start browser output-- - displayHtmlHeader( _("Printer Friendly"), '', FALSE ); - - echo "\n" . - // headers (we use table becasue translations are not all the same width) - ''. - '\n". - '\n"; - if ( strlen($cc) > 0 ) { // only show CC: if it's there... - echo '\n"; - } - echo '\n". - '\n". - '
' . _("From") . ':' . htmlentities($from) . "
' . _("To") . ':' . htmlentities($to) . "
' . _("CC") . ':' . htmlentities($cc) . "
' . _("Date") . ':' . htmlentities($date) . "
' . _("Subject") . ':' . htmlentities($subject) . "
'. - "\n
";
-
-
-     // body
-    echo "
\n";
-    echo htmlentities($body);
-
-// --end browser output--
-
-
-?>
- - - -getEntity($passed_ent_id); +} + +/* --start display setup-- */ + +$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); +$subject = trim($rfc822_header->subject); + +/* we can clean these up if the list is too long... */ +$cc = $rfc822_header->getAddr_s('cc'); +$to = $rfc822_header->getAddr_s('to'); + +if ($show_html_default == 1) { + $ent_ar = $message->findDisplayEntity(array()); +} else { + $ent_ar = $message->findDisplayEntity(array(), array('text/plain')); +} +$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 .= '
'; + } + $hookResults = do_hook('message_body', $body); + $body = $hookResults[1]; +} else { + $body = _("Message not printable"); +} + + /* now, if they choose to, we clean up the display a bit... */ + +if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) { + + $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); + + // the body should have no leading zeros + // disabled because it destroys html mail + +// $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 + +$to = decodeHeader($to); +$cc = decodeHeader($cc); +$from = decodeHeader($from); +$subject = decodeHeader($subject); + +// --end display setup-- + + +/* --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" . + + '' . "\n" . + ''; + +/* --end browser output-- */ + + +/* --start pf-specific functions-- */ + +/* $string = pf_clean_string($string, 9); */ function pf_clean_string ( $unclean_string, $num_leading_spaces ) { global $data_dir, $username; - - $wrap_at = getPref($data_dir, $username, 'wrap_at'); - $wrap_at = $wrap_at - $num_leading_spaces; // header stuff + $unclean_string = str_replace(' ',' ',$unclean_string); + $wrap_at = getPref($data_dir, $username, 'wrap_at', 86); + $wrap_at = $wrap_at - $num_leading_spaces; /* header stuff */ $leading_spaces = ''; while ( strlen($leading_spaces) < $num_leading_spaces ) @@ -115,7 +170,7 @@ function pf_clean_string ( $unclean_string, $num_leading_spaces ) { while ( strlen($unclean_string) > $wrap_at ) { $this_line = substr($unclean_string, 0, $wrap_at); - if ( strrpos( $this_line, "\n" ) ) // this should NEVER happen with anything but the $body + if ( strrpos( $this_line, "\n" ) ) /* this should NEVER happen with anything but the $body */ { $clean_string .= substr( $this_line, 0, strrpos( $this_line, "\n" )); $clean_string .= $leading_spaces; @@ -123,16 +178,17 @@ function pf_clean_string ( $unclean_string, $num_leading_spaces ) { } 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; -} // end pf_clean_string() function +} /* end pf_clean_string() function */ -// --end pf-specific functions +/* --end pf-specific functions */ -?> +?> \ No newline at end of file