X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=c93048be202ee8b2dc94331feea4afcbbd135572;hb=ccbe63bad9cfea0850e299e6be71eba5d76170d6;hp=0ff5dd9d5219ff769ad46486a2f4c6241c24a85a;hpb=5caf2d0cef47f1057b5d4cd5f7a508d4a7692252;p=squirrelmail.git

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 0ff5dd9d..c93048be 100644
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -3,7 +3,7 @@
 /**
  * printer_friendly_bottom.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 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
@@ -14,43 +14,68 @@
  * $Id$
  */
 
-require_once('../src/validate.php');
-require_once('../functions/strings.php');
-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');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'config/config.php');
+require_once(SM_PATH . 'include/load_prefs.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/page_header.php');
+require_once(SM_PATH . 'functions/html.php');
+
+/* get some of these globals */
+$key = $_COOKIE['key'];
+$username = $_SESSION['username'];
+$onetimepad = $_SESSION['onetimepad'];
+
+$passed_id = (int) $_GET['passed_id'];
+$mailbox = $_GET['mailbox'];
+
+if (!isset($_GET['passed_ent_id'])) {
+    $passed_ent_id = '';
+} else {
+    $passed_ent_id = $_GET['passed_ent_id'];
+}
+/* end globals */
 
 $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);
+$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
+if (isset($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);
 }
-
 
 /* --start display setup-- */
 
-
+$rfc822_header = $message->rfc822_header; 
 /* From and Date are usually fine as they are... */
-$from = decodeHeader($message->header->getAddr_s('from'));
-$date = getLongDateString($message->header->date);
-$subject = trim(decodeHeader($message->header->subject));
+$from = $rfc822_header->getAddr_s('from');
+$date = getLongDateString($rfc822_header->date);
+$subject = trim($rfc822_header->subject);
 
 /* we can clean these up if the list is too long... */
-$cc = decodeHeader($message->header->getAddr_s('cc'));
-$to = decodeHeader($message->header->getAddr_s('to'));
+$cc = $rfc822_header->getAddr_s('cc');
+$to = $rfc822_header->getAddr_s('to');
 
-$ent_ar = $message->findDisplayEntity();
+if ($show_html_default == 1) {
+    $ent_ar = $message->findDisplayEntity(array());
+} else {
+    $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>';
+     $body .= '<hr noshade size="1" />';
   }
   $hookResults = do_hook('message_body', $body);
   $body = $hookResults[1];
@@ -80,6 +105,11 @@ if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
 
 } // end cleanup
 
+$to = decodeHeader($to);
+$cc = decodeHeader($cc);
+$from = decodeHeader($from);
+$subject = decodeHeader($subject);
+
 // --end display setup--
 
 
@@ -88,33 +118,32 @@ 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) */
-     html_tag( 'table', '', '', '', 'width="100%" cellspacing="0" cellpadding="0" border="0"' ) .
+     html_tag( 'table', '', 'center', '', 'cellspacing="0" cellpadding="0" border="0" width="100%"' ) .
      html_tag( 'tr',
-         html_tag( 'td', _("From"), 'left' ) .
-         html_tag( 'td', htmlentities($from), 'left' )
+         html_tag( 'td', _("From").'&nbsp;', 'left' ,'','valign="top"') .
+         html_tag( 'td', $from, 'left' )
      ) . "\n" .
      html_tag( 'tr',
-         html_tag( 'td', _("To"), 'left' ) .
-         html_tag( 'td', htmlentities($to), 'left' )
-     ) . "\n";
+         html_tag( 'td', _("Subject").'&nbsp;', 'left','','valign="top"' ) .
+         html_tag( 'td', $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', $to, 'left' )
+    ) . "\n";
     if ( strlen($cc) > 0 ) { /* only show CC: if it's there... */
          echo html_tag( 'tr',
-             html_tag( 'td', _("CC"), 'left' ) .
-             html_tag( 'td', htmlentities($cc), 'left' )
+             html_tag( 'td', _("CC").'&nbsp;', 'left','','valign="top"' ) .
+             html_tag( 'td', $cc, 'left' )
          );
      }
-     echo html_tag( 'tr',
-         html_tag( 'td', _("Date"), 'left' ) .
-         html_tag( 'td', htmlentities($date), 'left' )
-     ) . "\n" .
-     html_tag( 'tr',
-         html_tag( 'td', _("Subject"), 'left' ) .
-         html_tag( 'td', htmlentities($subject), 'left' )
-     ) . "\n" .
-
      /* body */
-     html_tag( 'tr',
-         html_tag( 'td', '<hr noshade size=1><br>' . "\n" . $body, 'left', '', 'colspan="2"' )
+     echo html_tag( 'tr',
+         html_tag( 'td', '<hr noshade size="1" /><br>' . "\n" . $body, 'left', '', 'colspan="2"' )
      ) . "\n" .
 
      '</table>' . "\n" .
@@ -128,7 +157,7 @@ echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"
 /* $string = pf_clean_string($string, 9); */
 function pf_clean_string ( $unclean_string, $num_leading_spaces ) {
     global $data_dir, $username;
-
+    $unclean_string = str_replace('&nbsp;',' ',$unclean_string);
     $wrap_at = getPref($data_dir, $username, 'wrap_at', 86);
     $wrap_at = $wrap_at - $num_leading_spaces; /* header stuff */
 
@@ -148,12 +177,12 @@ function pf_clean_string ( $unclean_string, $num_leading_spaces ) {
         }
         else
         {
-            $clean_string .= substr( $this_line, 0, strrpos( $this_line, ' ' ));
-            $clean_string .= "\n" . $leading_spaces;
-            $unclean_string = substr($unclean_string, (1+strrpos( $this_line, ' ' )));
-        }
+	    $i = strrpos( $this_line, ' ');
+    	    $clean_string .= substr( $this_line, 0, $i);
+    	    $clean_string .= "\n" . $leading_spaces;
+    	    $unclean_string = substr($unclean_string, 1+$i);
+	}
     }
-
     $clean_string .= $unclean_string;
 
     return $clean_string;