X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=fca2e7f2d611ee7b6e1794fc357b158cb847b8b1;hb=a571cff36ff1c340cbd2130ce9c0e2ab7ef96977;hp=1194e37a6c1c89f88acf25cc2122ed97883d7454;hpb=7f6171be1aa27e7c34304058cfb7a04a8e73a2c4;p=squirrelmail.git
diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 1194e37a..fca2e7f2 100644
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -8,36 +8,35 @@
*
* - this is the page that does all the work, really.
*
- * @copyright © 1999-2005 The SquirrelMail Project Team
+ * @copyright © 1999-2006 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
/**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
*/
-define('SM_PATH','../');
+require('../include/init.php');
/* SquirrelMail required files. */
-require_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);
if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
$passed_ent_id = '';
}
+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];
@@ -69,10 +68,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");
}
@@ -97,61 +98,27 @@ $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" ;
-
- 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" ;
- }
+$aHeaders = array();
+$aHeaders[ _("From") ] = $from;
+$aHeaders[ _("Subject") ] = $subject;
+$aHeaders[ _("Date") ] = htmlspecialchars($date);
+$aHeaders[ _("To") ] = $to;
+$aHeaders[ _("Cc") ] = $cc;
+
+$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" .
- '