X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=da14209be1fe48268ff760adc86f0ac92f73ad7e;hb=101068d9a51a7fd4b600de878f1e2d5349e209a3;hp=3e4e95fa1789c64e4a5c338782dc74df95f92909;hpb=5c4ff7bfc6e04337bd6bcf76743b1fbb92556233;p=squirrelmail.git
diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 3e4e95fa..da14209b 100644
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -8,27 +8,28 @@
*
* - this is the page that does all the work, really.
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
+/** This is the printer_friendly_bottom page */
+define('PAGE_NAME', 'printer_friendly_bottom');
+
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../');
+require('../include/init.php');
/* SquirrelMail required files. */
-include_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/imap_general.php');
+require_once(SM_PATH . 'functions/imap_messages.php');
+require_once(SM_PATH . 'functions/date.php');
+require_once(SM_PATH . 'functions/mime.php');
+require_once(SM_PATH . 'functions/url_parser.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);
@@ -38,7 +39,7 @@ if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
sqgetGlobalVar('show_html_default', $show_html_default, SQ_FORM);
/* end globals */
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+$imapConnection = sqimap_login($username, false, $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];
@@ -54,7 +55,7 @@ if ($passed_ent_id) {
$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);
+$date = getLongDateString($rfc822_header->date, $rfc822_header->date_unparsed);
$subject = trim($rfc822_header->subject);
/* we can clean these up if the list is too long... */
@@ -70,10 +71,12 @@ $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, TRUE);
- $body .= '
';
+ if ($i < count($ent_ar)-1) {
+ $body .= '
';
+ }
}
- $hookResults = do_hook('message_body', $body);
- $body = $hookResults[1];
+ /* Note that $body is passed to this hook (and modified) by reference as of 1.5.2 */
+ do_hook('message_body', $body);
} else {
$body = _("Message not printable");
}
@@ -98,60 +101,26 @@ $cc = decodeHeader($cc);
$from = decodeHeader($from);
$subject = decodeHeader($subject);
-$attachments = pf_show_attachments($message,$ent_ar,$mailbox,$passed_id);
-
// --end display setup--
/* --start browser output-- */
-displayHtmlHeader( $subject, '', FALSE );
+displayHtmlHeader($subject);
-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" ;
+$aHeaders = array();
+$aHeaders[ _("From") ] = $from;
+$aHeaders[ _("Subject") ] = $subject;
+$aHeaders[ _("Date") ] = htmlspecialchars($date);
+$aHeaders[ _("To") ] = $to;
+$aHeaders[ _("Cc") ] = $cc;
- 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" ;
- }
+$attachments_ar = buildAttachmentArray($message, $ent_ar, $mailbox, $passed_id);
+
+$oTemplate->assign('headers', $aHeaders);
+$oTemplate->assign('message_body', $body);
+$oTemplate->assign('attachments', $attachments_ar);
- echo '' . "\n";
+$oTemplate->display('printer_friendly_bottom.tpl');
$oTemplate->display('footer.tpl');
/* --end browser output-- */
@@ -201,83 +170,3 @@ function pf_clean_string ( $unclean_string, $num_leading_spaces ) {
return $clean_string;
} /* end pf_clean_string() function */
-
-/**
- * Displays attachment information
- *
- * Stripped version of formatAttachments() function from functions/mime.php.
- * @param object $message SquirrelMail message object
- * @param array $exclude_id message parts that are not attachments.
- * @param string $mailbox mailbox name
- * @param integer $id message id
- * @return string html formated attachment information.
- */
-function pf_show_attachments($message, $exclude_id, $mailbox, $id) {
- global $where, $what, $startMessage, $color, $passed_ent_id;
-
- $att_ar = $message->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(true));
- } 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', '', 'width="25%"') .
- html_tag( 'td',show_readable_size($header->size), 'left', '', 'width="75%"') .
- '
' . "\n" .
- html_tag( 'td',_("Type:"), 'right', '', 'width="25%"') .
- html_tag( 'td',htmlspecialchars($type0).'/'.htmlspecialchars($type1), 'left', '', 'width="75%"') .
- '
';
- if (! empty($description)) {
- $attachments .= $description;
- }
- $attachments .= "
\n";
- }
- return $attachments;
-}
-
-
-/* --end pf-specific functions */
-
-?>