X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fprinter_friendly_main.php;h=8632c630a1680ac67df08ae7b0cbcdd3e954a9dc;hb=3d45d9ce02144e5cad2cf96a1939f4cf8de36cf5;hp=fa6de8f44d51cd8c9a303cc5ac6716c2cc630ea2;hpb=202bcbcc2b67c7c153db1b09b608b62beeba0496;p=squirrelmail.git

diff --git a/src/printer_friendly_main.php b/src/printer_friendly_main.php
index fa6de8f4..8632c630 100644
--- a/src/printer_friendly_main.php
+++ b/src/printer_friendly_main.php
@@ -3,7 +3,7 @@
 /**
  * printer_friendly frameset
  *
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -20,24 +20,24 @@ 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
-        . '&amp;show_html_default='.$show_html_default
-        . '" 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);
+
+    $oTemplate->display('printer_friendly_main.tpl');
 
-?>
-</html>
+}