X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=9e8aba7d62ef665b523030f14f3b98c242201c45;hb=62cfbd1ddebba95655dfa53bd1ac1f45e8428f34;hp=0c8cc2bf89cd0c5f2fdf8dfa4398734fea8167d1;hpb=328869924180ada40dae9f4625520cb03b93ff98;p=squirrelmail.git

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 0c8cc2bf..9e8aba7d 100644
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -20,53 +20,50 @@ require_once('../config/config.php');
 require_once('../src/load_prefs.php');
 require_once('../functions/imap.php');
 require_once('../functions/page_header.php');
+require_once('../functions/html.php');
 
 $pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay');
+$mailbox = urldecode($mailbox);
+$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+sqimap_mailbox_select($imapConnection, $mailbox);
+$message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+$id = $passed_id;
+if (isset($passed_ent_id)) {
+   $message = $message->getEntity($passed_ent_id);
+}
 
-$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-sqimap_mailbox_select($imap_stream, $mailbox);
-$message = sqimap_get_message($imap_stream, $passed_id, $mailbox);
 
 /* --start display setup-- */
 
+$rfc822_header = $message->rfc822_header; 
 /* From and Date are usually fine as they are... */
-$from = decodeHeader($message->header->from);
-$date = getLongDateString($message->header->date);
+$from = decodeHeader($rfc822_header->getAddr_s('from'));
+$date = getLongDateString($rfc822_header->date);
+$subject = trim(decodeHeader($rfc822_header->subject));
 
 /* we can clean these up if the list is too long... */
-$cc = decodeHeader(getLineOfAddrs($message->header->cc));
-$to = decodeHeader(getLineOfAddrs($message->header->to));
-
-/* and Body and Subject could easily stream off the page... */
-$id = $message->header->id;
-$ent_ar = findDisplayEntity ($message, 0);
-$ent_num = $ent_ar[0];
-  
-$body_message = getEntity($message, $ent_num);
-if (($body_message->header->type0 == 'text') ||
-    ($body_message->header->type0 == 'rfc822')) {    
-    $body = mime_fetch_body ($imap_stream, $id, $ent_num);
-    $body = decodeBody($body, $body_message->header->encoding);
-    $hookResults = do_hook('message_body', $body);
-    $body = $hookResults[1];
-    if ($body_message->header->type1 == 'html') {
-    if( $show_html_default <> 1 ) {
-        $body = strip_tags( $body );
-        translateText($body, $wrap_at, $body_message->header->charset);
-    } else {
-        $body = MagicHTML( $body, $id, $message );
-    }
-    } else {
-        translateText($body, $wrap_at, $body_message->header->charset);
-    }              
+$cc = decodeHeader($rfc822_header->getAddr_s('cc'));
+$to = decodeHeader($rfc822_header->getAddr_s('to'));
+
+if ($show_html_default == 1) {
+    $ent_ar = $message->findDisplayEntity(array());
 } else {
-    $body = _("Message not printable");
+    $ent_ar = $message->findDisplayEntity(array(), array('text/plain'));
+}
+$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 .= '<hr noshade size=1>';
+  }
+  $hookResults = do_hook('message_body', $body);
+  $body = $hookResults[1];
+} else {
+  $body = _("Message not printable");
 }
-
-$subject = trim(decodeHeader($message->header->subject));
 
  /* now, if they choose to, we clean up the display a bit... */
- /*
+ 
 if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
 
     $num_leading_spaces = 9; // nine leading spaces for indentation
@@ -76,7 +73,9 @@ if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
     $to = pf_clean_string(str_replace(',,', ',', $to), $num_leading_spaces);
 
      // the body should have no leading zeros
-    $body = pf_clean_string($body, 0);
+    // disabled because it destroys html mail
+
+//    $body = pf_clean_string($body, 0);
 
      // clean up everything else...
     $subject = pf_clean_string($subject, $num_leading_spaces);
@@ -84,7 +83,7 @@ if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
     $date = pf_clean_string($date, $num_leading_spaces);
 
 } // end cleanup
-*/
+
 // --end display setup--
 
 
@@ -93,23 +92,39 @@ displayHtmlHeader( _("Printer Friendly"), '', FALSE );
 
 echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\">\n" .
      /* headers (we use table because translations are not all the same width) */
-     '<table>'.
-     '<tr><td>' . _("From") . ':</td><td>' . htmlentities($from) . "</td></tr>\n".
-     '<tr><td>' . _("To") . ':</td><td>' . htmlentities($to) . "</td></tr>\n";
-if ( strlen($cc) > 0 ) { /* only show CC: if it's there... */
-     echo '<tr><td>' . _("CC") . ':</td><td>' . htmlentities($cc) . "</td></tr>\n";
-}
-echo '<tr><td>' . _("Date") . ':</td><td>' . htmlentities($date) . "</td></tr>\n".
-     '<tr><td>' . _("Subject") . ':</td><td>' . htmlentities($subject) . "</td></tr>\n".
-     '</table>'.
-     "\n";
-/* body */
-echo "<hr noshade size=1>\n";
-echo $body;
+     html_tag( 'table', '', 'center', '', 'cellspacing="0" cellpadding="0" border="0"' ) .
+     html_tag( 'tr',
+         html_tag( 'td', _("From").'&nbsp;', 'left' ,'','valign="top"') .
+         html_tag( 'td', htmlspecialchars($from), 'left' )
+     ) . "\n" .
+     html_tag( 'tr',
+         html_tag( 'td', _("Subject").'&nbsp;', 'left','','valign="top"' ) .
+         html_tag( 'td', htmlspecialchars($subject), 'left' )
+     ) . "\n" .
+     html_tag( 'tr',
+         html_tag( 'td', _("Date").'&nbsp;', 'left' ) .
+         html_tag( 'td', htmlspecialchars($date), 'left' )
+     ) . "\n" .
+     html_tag( 'tr',
+         html_tag( 'td', _("To").'&nbsp;', 'left','','valign="top"' ) .
+         html_tag( 'td', htmlspecialchars($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', htmlspecialchars($cc), 'left' )
+         );
+     }
+     /* body */
+     echo html_tag( 'tr',
+         html_tag( 'td', '<hr noshade size=1><br>' . "\n" . $body, 'left', '', 'colspan="2"' )
+     ) . "\n" .
+
+     '</table>' . "\n" .
+     '</body></html>';
 
 /* --end browser output-- */
 
-echo '</body></html>';
 
 /* --start pf-specific functions-- */