Pass HTML viewing to View Printable

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

diff --git a/src/printer_friendly_bottom.php b/src/printer_friendly_bottom.php
index f4a2fde200d4837d433054e46e76d51731950368..9f2f74bb4743da2bb6ced7a5b8aac27ae7faf329 100644 (file)
--- a/src/printer_friendly_bottom.php
+++ b/src/printer_friendly_bottom.php
@@ -35,6 +35,7 @@ sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
 if (! sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
     $passed_ent_id = '';
 }
+sqgetGlobalVar('show_html_default', $show_html_default, SQ_FORM);
 /* end globals */
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);

diff --git a/src/printer_friendly_main.php b/src/printer_friendly_main.php
index d1cfe9bad5e922630ab69e0a4b01209f4cae975e..a2842efe4f3295aee7981fa06dc4f8b1203d780d 100644 (file)
--- a/src/printer_friendly_main.php
+++ b/src/printer_friendly_main.php
@@ -28,6 +28,7 @@ if ( ! sqgetGlobalVar('mailbox',$mailbox,SQ_GET) ||
 } 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 +38,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>

diff --git a/src/read_body.php b/src/read_body.php
index de7b9c43a480084b35c73b3166dc44351b0b4282..2a48ccc7419661478ff71d846a5abde69863ada4 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -80,7 +80,7 @@ function findPreviousMessage($uidset, $passed_id) {
  * @param int $passed_id
  */
 function printer_friendly_link($mailbox, $passed_id, $passed_ent_id) {
-    global $javascript_on;
+    global $javascript_on, $show_html_default;
 
     /* hackydiehack */
     if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
@@ -90,8 +90,9 @@ function printer_friendly_link($mailbox, $passed_id, $passed_ent_id) {
     }
     $params = '?passed_ent_id=' . urlencode($passed_ent_id) .
               '&mailbox=' . urlencode($mailbox) .
-              '&passed_id=' . urlencode($passed_id).
-              '&view_unsafe_images='. (bool) $view_unsafe_images;
+              '&passed_id=' . urlencode($passed_id) .
+              '&view_unsafe_images='. (bool) $view_unsafe_images .
+              '&show_html_default=' . $show_html_default;
 
     $print_text = _("View Printable Version");