Printer friendly fixed. Now it prints HTML messages.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2076 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index 0d624b86561de0620998730f48244ed66e6aa887..abc0cc52546c3552b1ca3b8a6292a70164bcf6af 100644 (file)
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -55,13 +55,34 @@ require_once('../functions/page_header.php');
     $to = decodeHeader(getLineOfAddrs($message->header->to));
 
      // and Body and Subject could easily stream off the page...
-    $body = mime_fetch_body($imap_stream, $passed_id, $passed_ent_id);
-    $body = str_replace("\n", "\n", trim(decodeBody($body, $message->header->encoding)));
+    $id = $message->header->id;
+    $ent_num = findDisplayEntity ($message, 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 );
+        }
+        } else {
+        translateText($body, $wrap_at, $body_message->header->charset);
+        }              
+    } 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 ( empty($pf_cleandisplay) || $pf_cleandisplay != 'no' ) {
 
         $num_leading_spaces = 9; // nine leading spaces for indentation
 
@@ -78,7 +99,7 @@ require_once('../functions/page_header.php');
         $date = pf_clean_string($date, $num_leading_spaces);
 
     } // end cleanup
-
+    */
     // --end display setup--
 
 
@@ -96,12 +117,10 @@ require_once('../functions/page_header.php');
     echo '<tr><td>' . _("Date") . ':</td><td>' . htmlentities($date) . "</td></td>\n".
          '<tr><td>' . _("Subject") . ':</td><td>' . htmlentities($subject) . "</td></td>\n".
          '</table>'.
-         "\n<pre>";
-
-
+         "\n";
      // body
     echo "<hr noshade size=1>\n";
-    echo htmlentities($body);
+    echo $body;
 
 // --end browser output--
 
@@ -150,4 +169,4 @@ function pf_clean_string ( $unclean_string, $num_leading_spaces ) {
 
 // --end pf-specific functions
 
-?>
+?>
\ No newline at end of file

diff --git a/src/printer_friendly_main.php b/src/printer_friendly_main.php
index 2a1d78d72d8902badfe480d9f548bd5daa6af30a..faaedc9ce8e177681305d291bd4a6bb6a0f9feaa 100644 (file)
--- a/src/printer_friendly_main.php
+++ b/src/printer_friendly_main.php
@@ -9,34 +9,18 @@
  * $Id$
  */
 
-/*****************************************************************/
-/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
-/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
-/***    + Base level indent should begin at left margin, as    ***/
-/***      the require_once below looks.                        ***/
-/***    + All identation should consist of four space blocks   ***/
-/***    + Tab characters are evil.                             ***/
-/***    + all comments should use "slash-star ... star-slash"  ***/
-/***      style -- no pound characters, no slash-slash style   ***/
-/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
-/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
-/***    + Please use ' instead of ", when possible. Note "     ***/
-/***      should always be used in _( ) function calls.        ***/
-/*** Thank you for your help making the SM code more readable. ***/
-/*****************************************************************/
-
 require_once('../src/validate.php');
 require_once('../functions/page_header.php');
 
-    displayHtmlHeader( _("Printer Friendly"), '', FALSE );
+displayHtmlHeader( _("Printer Friendly"), '', FALSE );
 
-    echo "<frameset rows=\"50, *\" noresize border=\"0\">\n".
-         "<frame src=\"printer_friendly_top.php\" name=\"top_frame\" scrolling=\"off\">".
-         '<frame src="printer_friendly_bottom.php?passed_ent_id=';
-    echo $passed_ent_id . '&mailbox=' . urlencode($mailbox) .
-         '&passed_id=' . $passed_id;
-    echo "\" name=\"bottom_frame\">".
-         "</frameset>\n".
-         "</html>\n";
+echo "<frameset rows=\"60, *\" noresize border=\"0\">\n".
+     "<frame src=\"printer_friendly_top.php\" name=\"top_frame\" scrolling=\"off\">".
+     '<frame src="printer_friendly_bottom.php?passed_ent_id='.
+     $passed_ent_id . '&mailbox=' . urlencode($mailbox) .
+     '&passed_id=' . $passed_id .
+     "\" name=\"bottom_frame\">".
+     "</frameset>\n".
+     "</html>\n";
 
-?>
+?>
\ No newline at end of file

diff --git a/src/printer_friendly_top.php b/src/printer_friendly_top.php
index a8e48fd0a6b82d25c404641aad623efbbbf81f6f..f1562b2ee3ef35cafd1325c43741baebffb2b18a 100644 (file)
--- a/src/printer_friendly_top.php
+++ b/src/printer_friendly_top.php
@@ -12,49 +12,33 @@
  * $Id$
  */
 
-/*****************************************************************/
-/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
-/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
-/***    + Base level indent should begin at left margin, as    ***/
-/***      the require_once below looks.                        ***/
-/***    + All identation should consist of four space blocks   ***/
-/***    + Tab characters are evil.                             ***/
-/***    + all comments should use "slash-star ... star-slash"  ***/
-/***      style -- no pound characters, no slash-slash style   ***/
-/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
-/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
-/***    + Please use ' instead of ", when possible. Note "     ***/
-/***      should always be used in _( ) function calls.        ***/
-/*** Thank you for your help making the SM code more readable. ***/
-/*****************************************************************/
-
 require_once('../src/validate.php');
 require_once('../functions/strings.php');
 require_once('../config/config.php');
 require_once('../src/load_prefs.php');
 require_once('../functions/page_header.php');
 
-    displayHtmlHeader( _("Printer Friendly"),
-                 "<script language=\"javascript\">\n".
-                 "<!--\n".
-                 "function printPopup() {\n".
-                    "parent.frames[1].focus();\n".
-                    "parent.frames[1].print();\n".
-                 "}\n".
-                 "-->\n".
-                 "</script>\n", FALSE );
+displayHtmlHeader( _("Printer Friendly"),
+             "<script language=\"javascript\">\n".
+             "<!--\n".
+             "function printPopup() {\n".
+                "parent.frames[1].focus();\n".
+                "parent.frames[1].print();\n".
+             "}\n".
+             "-->\n".
+             "</script>\n", FALSE );
 
 
-    echo "<body text=\"$color[8]\" bgcolor=\"$color[3]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\">\n" .
-         //'<table width="100%" height="100%" cellpadding="0" cellspacing="0" border="0"><tr><td valign="middle" align="center">'.
-         '<center><b>'.
-         '<form>'.
-         '<input type="button" value="' . _("Print") . '" onClick="printPopup()"> '.
-         '<input type="button" value="' . _("Close Window") . '" onClick="window.parent.close()">'.
-         '</form>'.
-         '</b>'.
-         //'</td></tr></table>'.
-         '</body>'.
-         "</html>\n";
+echo "<body text=\"$color[8]\" bgcolor=\"$color[3]\" link=\"$color[7]\" vlink=\"$color[7]\" alink=\"$color[7]\">\n" .
+     //'<table width="100%" height="100%" cellpadding="0" cellspacing="0" border="0"><tr><td valign="middle" align="center">'.
+     '<center><b>'.
+     '<form>'.
+     '<input type="button" value="' . _("Print") . '" onClick="printPopup()"> '.
+     '<input type="button" value="' . _("Close Window") . '" onClick="window.parent.close()">'.
+     '</form>'.
+     '</b>'.
+     //'</td></tr></table>'.
+     '</body>'.
+     "</html>\n";
 
-?>
+?>
\ No newline at end of file