X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_main.php;h=a4d3bed5b98e083ff5d36fea2a7669bc01732b32;hb=01520835fafbe4eb34a55185df4d1be14ddc0ec1;hp=d1cfe9bad5e922630ab69e0a4b01209f4cae975e;hpb=4b4abf93a9624311afef0c385023724ee46a2b60;p=squirrelmail.git

diff --git a/src/printer_friendly_main.php b/src/printer_friendly_main.php
index d1cfe9ba..a4d3bed5 100644
--- a/src/printer_friendly_main.php
+++ b/src/printer_friendly_main.php
@@ -3,20 +3,16 @@
 /**
  * printer_friendly frameset
  *
- * @copyright © 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,22 +20,25 @@ 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";
-    echo '<frame src="printer_friendly_top.php" name="top_frame" '
-        . 'scrolling="no" noresize="noresize" frameborder="0" />' . "\n";
-    echo '<frame src="printer_friendly_bottom.php?passed_ent_id='
-        . urlencode($passed_ent_id) . '&amp;mailbox=' . urlencode($mailbox)
-        . '&amp;passed_id=' . $passed_id
-        . '&amp;view_unsafe_images='.$view_unsafe_images
-        . '" name="bottom_frame" frameborder="0" />' . "\n";
-    echo "</frameset>\n";
-}
+    
+    $oErrorHandler->setDelayedErrors(true);
+    
+    $url = 'printer_friendly_bottom.php?passed_ent_id=' .
+           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;
+           
+    $oTemplate->assign('printer_friendly_url', $url);
 
-?>
-</html>
\ No newline at end of file
+    $oTemplate->display('printer_friendly_main.tpl');
+
+    $oTemplate->display('footer.tpl');
+}