X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_bottom.php;h=a4888333626b0e051545addf1eb0bd80fce71480;hb=99e400a4186ba63f7df2adc19dbcb14d6af4856e;hp=a153979c3b5dee277309d360dbc0fb012697b223;hpb=1c6634780266caff6f27c3210d1375cf538002d2;p=squirrelmail.git

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index a153979c..a4888333 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-2004 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
@@ -11,64 +11,77 @@
  *
  * - this is the page that does all the work, really.
  *
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
  */
 
-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');
-
-$pf_cleandisplay = getPref($data_dir, $username, 'pf_cleandisplay');
-
-$imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-sqimap_mailbox_select($imap_stream, $mailbox);
-$message = sqimap_get_message($imap_stream, $passed_id, $mailbox);
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/imap.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', false);
+$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];
+} 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->from);
-$date = getLongDateString($message->header->date);
+$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(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 = $rfc822_header->getAddr_s('cc');
+$to = $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' ) {
+ 
+if ($pf_cleandisplay) {
 
     $num_leading_spaces = 9; // nine leading spaces for indentation
 
@@ -77,7 +90,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);
@@ -85,42 +100,46 @@ if ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
     $date = pf_clean_string($date, $num_leading_spaces);
 
 } // end cleanup
-*/
+
+$to = decodeHeader($to);
+$cc = decodeHeader($cc);
+$from = decodeHeader($from);
+$subject = decodeHeader($subject);
+
 // --end display setup--
 
 
 /* --start browser output-- */
-displayHtmlHeader( _("Printer Friendly"), '', FALSE );
+displayHtmlHeader( $subject, '', 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', '', '', '', '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";
-    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' )
-         );
-     }
-     echo html_tag( 'tr',
-         html_tag( 'td', _("Date"), 'left' ) .
-         html_tag( 'td', htmlentities($date), 'left' )
+         html_tag( 'td', _("Subject").'&nbsp;', 'left','','valign="top"' ) .
+         html_tag( 'td', $subject, 'left' )
      ) . "\n" .
      html_tag( 'tr',
-         html_tag( 'td', _("Subject"), 'left' ) .
-         html_tag( 'td', htmlentities($subject), 'left' )
+         html_tag( 'td', _("Date").'&nbsp;', 'left' ) .
+         html_tag( 'td', htmlspecialchars($date), 'left' )
      ) . "\n" .
-
-     /* body */
      html_tag( 'tr',
-         html_tag( 'td', '<hr noshade size=1><br>' . "\n" . $body, 'left', '', 'colspan="2"' )
+         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").'&nbsp;', 'left','','valign="top"' ) .
+             html_tag( 'td', $cc, 'left' )
+         );
+     }
+     /* body */
+     echo html_tag( 'tr',
+         html_tag( 'td', '<hr noshade size="1" /><br />' . "\n" . $body, 'left', '', 'colspan="2"' )
      ) . "\n" .
 
      '</table>' . "\n" .
@@ -131,10 +150,19 @@ echo "<body text=\"$color[8]\" bgcolor=\"$color[4]\" link=\"$color[7]\" vlink=\"
 
 /* --start pf-specific functions-- */
 
-/* $string = pf_clean_string($string, 9); */
+/**
+ * Function should clean layout of printed messages when user
+ * enables "Printer Friendly Clean Display" option.
+ *
+ * @param string unclean_string
+ * @param integer num_leading_spaces
+ * @return string
+ * @example $string = pf_clean_string($string, 9);
+ * @access private 
+ */
 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 */
 
@@ -154,17 +182,16 @@ function pf_clean_string ( $unclean_string, $num_leading_spaces ) {
         }
         else
         {
-            $clean_string .= substr( $this_line, 0, 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+strrpos( $this_line, ' ' )));
+            $unclean_string = substr($unclean_string, 1+$i);
         }
     }
-
     $clean_string .= $unclean_string;
 
     return $clean_string;
 } /* end pf_clean_string() function */
 
 /* --end pf-specific functions */
-
-?>
+?>
\ No newline at end of file