fixed data sanitizing in calendar plugin.

[squirrelmail.git] / src / printer_friendly_bottom.php

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 44d73afc5a58f12c0c27197ee73d6d1ab8d48948..9f2f74bb4743da2bb6ced7a5b8aac27ae7faf329 100644 (file)
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -35,17 +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 */
 
 $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-- */
@@ -237,7 +238,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");
             }
@@ -260,13 +261,13 @@ function pf_show_attachments($message, $exclude_id, $mailbox, $id) {
         $display_filename = $filename;
 
         // TODO: maybe make it nicer?
-        $attachments .= '<table cellpadding="0" cellspacing="0" 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;
@@ -279,4 +280,4 @@ function pf_show_attachments($message, $exclude_id, $mailbox, $id) {
 
 /* --end pf-specific functions */
 
-?>
\ No newline at end of file
+?>