X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=3e4e95fa1789c64e4a5c338782dc74df95f92909;hp=0c4f94f545916040ab9ee7b6042ef9a1fb286557;hb=151562a780a0919b32e04d204ba7f33fb215bd84;hpb=91e0dccca7b2452d8b450791cae3aa4125e8889e

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 0c4f94f5..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 */
@@ -36,18 +35,18 @@ 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-- */
@@ -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 .= '<hr style="height: 1px;" />';
   }
   $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 '<body text="#000000" bgcolor="#FFFFFF" link="#000000" vlink="#000000" alin
      /* 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").'&nbsp;', 'left' ,'','valign="top"') .
+         html_tag( 'td', '<b>'._("From").':</b>&nbsp;', 'left' ,'','valign="top"') .
          html_tag( 'td', $from, 'left' )
      ) . "\n" .
      html_tag( 'tr',
-         html_tag( 'td', _("Subject").'&nbsp;', 'left','','valign="top"' ) .
+         html_tag( 'td', '<b>'._("Subject").':</b>&nbsp;', 'left','','valign="top"' ) .
          html_tag( 'td', $subject, 'left' )
      ) . "\n" .
      html_tag( 'tr',
-         html_tag( 'td', _("Date").'&nbsp;', 'left' ) .
+         html_tag( 'td', '<b>'._("Date").':</b>&nbsp;', 'left' ) .
          html_tag( 'td', htmlspecialchars($date), 'left' )
      ) . "\n" .
      html_tag( 'tr',
-         html_tag( 'td', _("To").'&nbsp;', 'left','','valign="top"' ) .
+         html_tag( 'td', '<b>'._("To").':</b>&nbsp;', '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").'&nbsp;', 'left','','valign="top"' ) .
+             html_tag( 'td', '<b>'._("Cc").':</b>&nbsp;', 'left','','valign="top"' ) .
              html_tag( 'td', $cc, 'left' )
          );
      }
      /* body */
      echo html_tag( 'tr',
          html_tag( 'td', '<hr style="height: 1px;" /><br />' . "\n" . $body, 'left', '', 'colspan="2"' )
-     ) . "\n" .
+     ) . "\n" ;
+
+     if (! empty($attachments)) {
+         // attachments title
+         echo html_tag( 'tr',
+             html_tag( 'td','<b>'._("Attachments:").'</b>', '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', '<hr style="height: 1px;" />', 'left', '', 'colspan="2"' )
+         ) . "\n" ;
+     }
 
-     '</table>' . "\n" .
-     '</body></html>';
+     echo '</table>' . "\n";
+$oTemplate->display('footer.tpl');
 
 /* --end browser output-- */
 
@@ -193,5 +202,82 @@ 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 = '<tr>'.
+                html_tag( 'td',_("From:"), 'right') .
+                html_tag( 'td',$from_name, 'left') .
+                '</tr>';
+        } else {
+            $filename = $att->getFilename();
+            if ($header->description) {
+                $description = '<tr>'.
+                    html_tag( 'td',_("Info:"), 'right') .
+                    html_tag( 'td',decodeHeader($header->description), 'left') .
+                    '</tr>';
+            } else {
+                $description = '';
+            }
+        }
+
+        $display_filename = $filename;
+
+        // TODO: maybe make it nicer?
+        $attachments .= '<table cellpadding="1" cellspacing="0" width="100%" border="1"><tr><th colspan="2">'.decodeHeader($display_filename).'</th></tr>' .
+            '<tr>'.
+            html_tag( 'td',_("Size:"), 'right', '', 'width="25%"') .
+            html_tag( 'td',show_readable_size($header->size), 'left', '', 'width="75%"') .
+            '</tr><tr>' . "\n" .
+            html_tag( 'td',_("Type:"), 'right', '', 'width="25%"') .
+            html_tag( 'td',htmlspecialchars($type0).'/'.htmlspecialchars($type1), 'left', '', 'width="75%"') .
+            '</tr>';
+        if (! empty($description)) {
+            $attachments .= $description;
+        }
+        $attachments .= "</table>\n";
+    }
+    return $attachments;
+}
+
+
 /* --end pf-specific functions */
-?>
\ No newline at end of file
+
+?>