From: stevetruckstuff Date: Wed, 18 Oct 2006 18:39:45 +0000 (+0000) Subject: Templates for printer-friendly views X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=be7a2943b374d951bf8d3f9b17220dde9eaa3295;p=squirrelmail.git Templates for printer-friendly views git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11923 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php index 00e416b4..e0f338a9 100644 --- a/src/printer_friendly_bottom.php +++ b/src/printer_friendly_bottom.php @@ -68,7 +68,9 @@ $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]; @@ -96,60 +98,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-- */ @@ -199,83 +167,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 .= '' . - ''. - 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 .= "

'.decodeHeader($display_filename).'

\n"; - } - return $attachments; -} - - -/* --end pf-specific functions */ - -?> diff --git a/src/printer_friendly_main.php b/src/printer_friendly_main.php index 45050fab..a4d3bed5 100644 --- a/src/printer_friendly_main.php +++ b/src/printer_friendly_main.php @@ -27,17 +27,18 @@ if ( ! sqgetGlobalVar('mailbox',$mailbox,SQ_GET) || sqgetGlobalVar('show_html_default', $show_html_default, SQ_FORM); /* end globals */ displayHtmlHeader( _("Printer Friendly"), '', false, true ); - echo '' . "\n"; - echo '' . "\n"; - echo '' . "\n"; - echo "\n"; -} + + $oErrorHandler->setDelayedErrors(true); + + $url = 'printer_friendly_bottom.php?passed_ent_id=' . + urlencode($passed_ent_id) . '&mailbox=' . urlencode($mailbox) . + '&passed_id=' . $passed_id . + '&view_unsafe_images='.$view_unsafe_images . + '&show_html_default='.$show_html_default; + + $oTemplate->assign('printer_friendly_url', $url); + + $oTemplate->display('printer_friendly_main.tpl'); -?> - + $oTemplate->display('footer.tpl'); +} diff --git a/src/printer_friendly_top.php b/src/printer_friendly_top.php index 837e58c9..2ffaf6b4 100644 --- a/src/printer_friendly_top.php +++ b/src/printer_friendly_top.php @@ -17,25 +17,10 @@ */ include('../include/init.php'); +displayHtmlHeader( _("Printer Friendly")); +$oErrorHandler->setDelayedErrors(true); -displayHtmlHeader( _("Printer Friendly"), - "\n", FALSE ); - - -echo '\n" . - html_tag( 'div', - '', - 'right' ); +$oTemplate->display('printer_friendly_top.tpl'); $oTemplate->display('footer.tpl'); ?> \ No newline at end of file diff --git a/templates/default/printer_friendly_bottom.tpl b/templates/default/printer_friendly_bottom.tpl new file mode 100644 index 00000000..0ba6c7c8 --- /dev/null +++ b/templates/default/printer_friendly_bottom.tpl @@ -0,0 +1,113 @@ + +

+ + $value) { + # If the value is empty, skip the entry. + if (empty($value)) + continue; + ?> + + + + + +

+ : + + +

+

+ + 0) { + ?> +

+Attachments: + + + + + + + + + + + + + + + + + +

+ +
+ : +	+ +
+ : +	+ +
+ : +	+ +

+ +

\ No newline at end of file diff --git a/templates/default/printer_friendly_main.tpl b/templates/default/printer_friendly_main.tpl new file mode 100644 index 00000000..8f0cb02e --- /dev/null +++ b/templates/default/printer_friendly_main.tpl @@ -0,0 +1,28 @@ + + + + + \ No newline at end of file diff --git a/templates/default/printer_friendly_top.tpl b/templates/default/printer_friendly_top.tpl new file mode 100644 index 00000000..cc70774d --- /dev/null +++ b/templates/default/printer_friendly_top.tpl @@ -0,0 +1,41 @@ + + +

+ + + + +

+ " onclick="printPopup()" /> + " onclick="window.parent.close()" /> +

+

\ No newline at end of file