X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_main.php;h=45050fabdd89b5f2b8200f242afb6fea17763e2a;hb=7111b0daa5f74c1c96d3bcf87da7a05e4ba6e189;hp=639671c2d47a6e353090e3318f048a0a1554987a;hpb=a2b193bc8c1cefe3db9f4b38ce346f0527a0ec0e;p=squirrelmail.git

diff --git a/src/printer_friendly_main.php b/src/printer_friendly_main.php
index 639671c2..45050fab 100644
--- a/src/printer_friendly_main.php
+++ b/src/printer_friendly_main.php
@@ -3,20 +3,16 @@
 /**
  * printer_friendly frameset
  *
- * @copyright (c) 1999-2005 The SquirrelMail Project Team
+ * @copyright © 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
 
 /**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
  */
-define('SM_PATH','../');
-
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
+include('../include/init.php');
 
 /* get those globals into gear */
 global $color;
@@ -24,10 +20,11 @@ if ( ! sqgetGlobalVar('passed_ent_id',$passed_ent_id,SQ_GET))
     $passed_ent_id = 0;
 if ( ! sqgetGlobalVar('mailbox',$mailbox,SQ_GET) ||
      ! sqgetGlobalVar('passed_id',$passed_id,SQ_GET)) {
-    error_box(_("Invalid URL"),$color);
+    error_box(_("Invalid URL"));
 } else {
     $passed_id= (int) $passed_id;
     $view_unsafe_images = (bool) $_GET['view_unsafe_images'];
+    sqgetGlobalVar('show_html_default', $show_html_default, SQ_FORM);
 /* end globals */
     displayHtmlHeader( _("Printer Friendly"), '', false, true );
     echo '<frameset rows="60, *">' . "\n";
@@ -37,9 +34,10 @@ if ( ! sqgetGlobalVar('mailbox',$mailbox,SQ_GET) ||
         . urlencode($passed_ent_id) . '&amp;mailbox=' . urlencode($mailbox)
         . '&amp;passed_id=' . $passed_id
         . '&amp;view_unsafe_images='.$view_unsafe_images
+        . '&amp;show_html_default='.$show_html_default
         . '" name="bottom_frame" frameborder="0" />' . "\n";
     echo "</frameset>\n";
 }
 
 ?>
-</html>
\ No newline at end of file
+</html>