X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=3fa0c95b82e2d081c857fd587cb5e8475eca25ba;hp=9e8aba7d62ef665b523030f14f3b98c242201c45;hb=cb104e1dc329188c066b6d6b843fdbd22f9e16de;hpb=c8d6aef3297916d765b00c96a6c31e5a359dbce4

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 9e8aba7d..3fa0c95b 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,36 +14,54 @@
  * $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 */
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
+
+sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
+sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
+
+if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_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($rfc822_header->getAddr_s('from'));
+$from = $rfc822_header->getAddr_s('from');
 $date = getLongDateString($rfc822_header->date);
-$subject = trim(decodeHeader($rfc822_header->subject));
+$subject = trim($rfc822_header->subject);
 
 /* we can clean these up if the list is too long... */
-$cc = decodeHeader($rfc822_header->getAddr_s('cc'));
-$to = decodeHeader($rfc822_header->getAddr_s('to'));
+$cc = $rfc822_header->getAddr_s('cc');
+$to = $rfc822_header->getAddr_s('to');
 
 if ($show_html_default == 1) {
     $ent_ar = $message->findDisplayEntity(array());
@@ -54,7 +72,7 @@ $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];
@@ -84,22 +102,27 @@ if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
 
 } // end cleanup
 
+$to = decodeHeader($to);
+$cc = decodeHeader($cc);
+$from = decodeHeader($from);
+$subject = decodeHeader($subject);
+
 // --end display setup--
 
 
 /* --start browser output-- */
 displayHtmlHeader( _("Printer Friendly"), '', FALSE );
 
-echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\">\n" .
+echo '<body text="#000000" bgcolor="#FFFFFF" link="#000000" vlink="#000000" alink="#000000">'."\n" .
      /* headers (we use table because translations are not all the same width) */
-     html_tag( 'table', '', 'center', '', '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").'&nbsp;', 'left' ,'','valign="top"') .
-         html_tag( 'td', htmlspecialchars($from), 'left' )
+         html_tag( 'td', $from, 'left' )
      ) . "\n" .
      html_tag( 'tr',
          html_tag( 'td', _("Subject").'&nbsp;', 'left','','valign="top"' ) .
-         html_tag( 'td', htmlspecialchars($subject), 'left' )
+         html_tag( 'td', $subject, 'left' )
      ) . "\n" .
      html_tag( 'tr',
          html_tag( 'td', _("Date").'&nbsp;', 'left' ) .
@@ -107,17 +130,17 @@ echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"
      ) . "\n" .
      html_tag( 'tr',
          html_tag( 'td', _("To").'&nbsp;', 'left','','valign="top"' ) .
-         html_tag( 'td', htmlspecialchars($to), 'left' )
-     ) . "\n";
+         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', htmlspecialchars($cc), 'left' )
+             html_tag( 'td', $cc, 'left' )
          );
      }
      /* body */
      echo html_tag( 'tr',
-         html_tag( 'td', '<hr noshade size=1><br>' . "\n" . $body, 'left', '', 'colspan="2"' )
+         html_tag( 'td', '<hr noshade size="1" /><br>' . "\n" . $body, 'left', '', 'colspan="2"' )
      ) . "\n" .
 
      '</table>' . "\n" .
@@ -131,7 +154,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 */
 
@@ -151,12 +174,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;