X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=1d681ed1d9ab95ed036627fcbf3e3c4dadfa6bc4;hp=c7c5ed861032de48aeade5a50ebc4842ece3a9a2;hb=65d0d1624a60633c008fd0b5631ca37713a7ad7c;hpb=7e1c2d41620f012a608ca3cdc7f1733ce4723f91
diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index c7c5ed86..1d681ed1 100644
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -3,7 +3,7 @@
/**
* printer_friendly_bottom.php
*
- * Copyright (c) 1999-2002 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
@@ -11,46 +11,66 @@
*
* - this is the page that does all the work, really.
*
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
*/
-require_once('../src/validate.php');
-require_once('../functions/strings.php');
-require_once('../config/config.php');
-require_once('../src/load_prefs.php');
-require_once('../functions/imap.php');
-require_once('../functions/page_header.php');
-require_once('../functions/html.php');
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
+define('SM_PATH','../');
-$pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay');
-$mailbox = urldecode($mailbox);
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-sqimap_mailbox_select($imapConnection, $mailbox);
-$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
-$id = $passed_id;
-if (isset($passed_ent_id)) {
- $message = $message->getEntity($passed_ent_id);
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/imap.php');
+
+/* get some of these globals */
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
+
+sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
+sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
+
+if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
+ $passed_ent_id = '';
}
+/* end globals */
+$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];
+} else {
+ $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+}
+if ($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 = decodeHeader($rfc822_header->getAddr_s('from'));
+$from = $rfc822_header->getAddr_s('from');
$date = getLongDateString($rfc822_header->date);
-$subject = trim(decodeHeader($rfc822_header->subject));
+$subject = trim($rfc822_header->subject);
/* we can clean these up if the list is too long... */
-$cc = decodeHeader($rfc822_header->getAddr_s('cc'));
-$to = decodeHeader($rfc822_header->getAddr_s('to'));
+$cc = $rfc822_header->getAddr_s('cc');
+$to = $rfc822_header->getAddr_s('to');
-$ent_ar = $message->findDisplayEntity();
+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 .= '
';
+ $body .= formatBody($imapConnection, $message, $color, $wrap_at, $ent_ar[$i], $passed_id, $mailbox, TRUE);
+ $body .= '
';
}
$hookResults = do_hook('message_body', $body);
$body = $hookResults[1];
@@ -58,65 +78,80 @@ if ($ent_ar[0] != '') {
$body = _("Message not printable");
}
- /* now, if they choose to, we clean up the display a bit... */
-
-if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
+/* now we clean up the display a bit... */
- $num_leading_spaces = 9; // nine leading spaces for indentation
+$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);
+// 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);
- // the body should have no leading zeros
- // disabled because it destroys html mail
+// 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);
-// $body = pf_clean_string($body, 0);
+// end cleanup
- // 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);
+$to = decodeHeader($to);
+$cc = decodeHeader($cc);
+$from = decodeHeader($from);
+$subject = decodeHeader($subject);
-} // end cleanup
+$attachments = pf_show_attachments($message,$ent_ar,$mailbox,$passed_id);
// --end display setup--
/* --start browser output-- */
-displayHtmlHeader( _("Printer Friendly"), '', FALSE );
+displayHtmlHeader( $subject, '', FALSE );
-echo "\n" .
+echo ''."\n" .
/* headers (we use table because translations are not all the same width) */
- html_tag( 'table', '', '', '', 'width="100%" cellspacing="0" cellpadding="0" border="0"' ) .
+ 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', htmlentities($from), 'left' )
+ 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', htmlentities($subject), 'left' )
+ html_tag( 'td', ''._("Subject").': ', 'left','','valign="top"' ) .
+ html_tag( 'td', $subject, 'left' )
) . "\n" .
html_tag( 'tr',
- html_tag( 'td', _("Date").' ', 'left' ) .
- html_tag( 'td', htmlentities($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', htmlentities($to), 'left' )
- ) . "\n";
- if ( strlen($cc) > 0 ) { /* only show CC: if it's there... */
+ 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', htmlentities($cc), 'left' )
+ 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" .
+ html_tag( 'td', '
' . "\n" . $body, 'left', '', 'colspan="2"' )
+ ) . "\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" .
+ echo '' . "\n" .
'';
/* --end browser output-- */
@@ -124,10 +159,19 @@ echo "getAttachments($exclude_id);
+
+ if (!count($att_ar)) return '';
+
+ $attachments = '';
+
+ $urlMailbox = urlencode($mailbox);
+
+ foreach ($att_ar as $att) {
+ $ent = $att->entity_id;
+ $header = $att->header;
+ $type0 = strtolower($header->type0);
+ $type1 = strtolower($header->type1);
+ $name = '';
+
+ if ($type0 =='message' && $type1 == 'rfc822') {
+ $rfc822_header = $att->rfc822_header;
+ $filename = $rfc822_header->subject;
+ if (trim( $filename ) == '') {
+ $filename = 'untitled-[' . $ent . ']' ;
+ }
+ $from_o = $rfc822_header->from;
+ if (is_object($from_o)) {
+ $from_name = decodeHeader($from_o->getAddress(false));
+ } else {
+ $from_name = _("Unknown sender");
+ }
+ $description = ''.
+ html_tag( 'td',_("From:"), 'right') .
+ html_tag( 'td',$from_name, 'left') .
+ '
';
+ } else {
+ $filename = $att->getFilename();
+ if ($header->description) {
+ $description = ''.
+ html_tag( 'td',_("Info:"), 'right') .
+ html_tag( 'td',decodeHeader($header->description), 'left') .
+ '
';
+ } else {
+ $description = '';
+ }
+ }
+
+ $display_filename = $filename;
+
+ // TODO: maybe make it nicer?
+ $attachments .= ''.decodeHeader($display_filename).' |
' .
+ ''.
+ html_tag( 'td',_("Size:"), 'right') .
+ html_tag( 'td',show_readable_size($header->size), 'left') .
+ '
' .
+ html_tag( 'td',_("Type:"), 'right') .
+ html_tag( 'td',htmlspecialchars($type0).'/'.htmlspecialchars($type1), 'left') .
+ '
';
+ if (! empty($description)) {
+ $attachments .= $description;
+ }
+ $attachments .= "
\n";
+ }
+ return $attachments;
+}
+
+
/* --end pf-specific functions */
-?>
+?>
\ No newline at end of file