adding error checking in deliver_sendmail class.

[squirrelmail.git] / src / printer_friendly_bottom.php

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 1d681ed1d9ab95ed036627fcbf3e3c4dadfa6bc4..f4a2fde200d4837d433054e46e76d51731950368 100644 (file)
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -3,14 +3,13 @@
 /**
  * printer_friendly_bottom.php
  *
- * 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
  * else, it is alone in a new window
  *
  * - this is the page that does all the work, really.
  *
+ * @copyright © 1999-2005 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
@@ -41,12 +40,12 @@ if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
 $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-- */
@@ -238,7 +237,7 @@ function pf_show_attachments($message, $exclude_id, $mailbox, $id) {
             }
             $from_o = $rfc822_header->from;
             if (is_object($from_o)) {
-                $from_name = decodeHeader($from_o->getAddress(false));
+                $from_name = decodeHeader($from_o->getAddress(true));
             } else {
                 $from_name = _("Unknown sender");
             }
@@ -261,13 +260,13 @@ function pf_show_attachments($message, $exclude_id, $mailbox, $id) {
         $display_filename = $filename;
 
         // TODO: maybe make it nicer?
-        $attachments .= '<table border="1"><tr><th colspan="2">'.decodeHeader($display_filename).'</th></tr>' .
-            '<tr border="0">'.
-            html_tag( 'td',_("Size:"), 'right') .
-            html_tag( 'td',show_readable_size($header->size), 'left') .
-            '</tr><tr>' .
-            html_tag( 'td',_("Type:"), 'right') .
-            html_tag( 'td',htmlspecialchars($type0).'/'.htmlspecialchars($type1), 'left') . 
+        $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;
@@ -280,4 +279,4 @@ function pf_show_attachments($message, $exclude_id, $mailbox, $id) {
 
 /* --end pf-specific functions */
 
-?>
\ No newline at end of file
+?>