X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=3e4e95fa1789c64e4a5c338782dc74df95f92909;hp=460dbb511ea67aedd4af7330419eeaf610f944bd;hb=151562a780a0919b32e04d204ba7f33fb215bd84;hpb=83ae18bcffdbda8eb4b4c5d7d88979df319d2e95
diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 460dbb51..3e4e95fa 100644
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -3,14 +3,13 @@
/**
* 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-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
@@ -22,7 +21,7 @@
define('SM_PATH','../');
/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include_once(SM_PATH . 'include/validate.php');
require_once(SM_PATH . 'functions/imap.php');
/* get some of these globals */
@@ -35,24 +34,24 @@ 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', false);
$imapConnection = sqimap_login($username, $key, $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);
@@ -70,7 +69,7 @@ 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 .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox, TRUE);
$body .= '
';
}
$hookResults = do_hook('message_body', $body);
@@ -79,33 +78,28 @@ 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 ',' separating 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);
$from = decodeHeader($from);
$subject = decodeHeader($subject);
+$attachments = pf_show_attachments($message,$ent_ar,$mailbox,$passed_id);
+
// --end display setup--
@@ -116,34 +110,49 @@ 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"' )
- ) . "\n" .
+ ) . "\n" ;
+
+ if (! empty($attachments)) {
+ // attachments title
+ echo html_tag( 'tr',
+ html_tag( 'td',''._("Attachments:").'', 'left', '', 'colspan="2"' )
+ ) . "\n" ;
+ // list of attachments
+ echo html_tag( 'tr',
+ html_tag( 'td',$attachments, 'left', '', 'colspan="2"' )
+ ) . "\n" ;
+ // add separator line
+ echo html_tag( 'tr',
+ html_tag( 'td', '
', 'left', '', 'colspan="2"' )
+ ) . "\n" ;
+ }
- '' . "\n" .
- '