Browse Source

Fixed bug #1124764. Show unsafe images in printable view when
view_unsafe_images is set to true.

stekkel 20 years ago
parent
commit
701c7e9332
2 changed files with 10 additions and 1 deletions
  1. 2 0
      src/printer_friendly_main.php
  2. 8 1
      src/read_body.php

+ 2 - 0
src/printer_friendly_main.php

@@ -27,6 +27,7 @@ if ( ! sqgetGlobalVar('mailbox',$mailbox,SQ_GET) ||
     error_box(_("Invalid URL"),$color);
     error_box(_("Invalid URL"),$color);
 } else {
 } else {
     $passed_id= (int) $passed_id;
     $passed_id= (int) $passed_id;
+    $view_unsafe_images = (bool) $_GET['view_unsafe_images'];
 /* end globals */
 /* end globals */
     displayHtmlHeader( _("Printer Friendly"), '', false, true );
     displayHtmlHeader( _("Printer Friendly"), '', false, true );
     echo '<frameset rows="60, *">' . "\n";
     echo '<frameset rows="60, *">' . "\n";
@@ -35,6 +36,7 @@ if ( ! sqgetGlobalVar('mailbox',$mailbox,SQ_GET) ||
     echo '<frame src="printer_friendly_bottom.php?passed_ent_id='
     echo '<frame src="printer_friendly_bottom.php?passed_ent_id='
         . urlencode($passed_ent_id) . '&amp;mailbox=' . urlencode($mailbox)
         . urlencode($passed_ent_id) . '&amp;mailbox=' . urlencode($mailbox)
         . '&amp;passed_id=' . $passed_id
         . '&amp;passed_id=' . $passed_id
+        . '&amp;view_unsafe_images='.$view_unsafe_images
         . '" name="bottom_frame" frameborder="0" />' . "\n";
         . '" name="bottom_frame" frameborder="0" />' . "\n";
     echo "</frameset>\n";
     echo "</frameset>\n";
 }
 }

+ 8 - 1
src/read_body.php

@@ -93,9 +93,16 @@ function findPreviousMessage($uidset, $passed_id) {
 function printer_friendly_link($mailbox, $passed_id, $passed_ent_id) {
 function printer_friendly_link($mailbox, $passed_id, $passed_ent_id) {
     global $javascript_on;
     global $javascript_on;
 
 
+    /* hackydiehack */
+    if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
+        $view_unsafe_images = false;
+    } else {
+        $view_unsafe_images = true;
+    }
     $params = '?passed_ent_id=' . urlencode($passed_ent_id) .
     $params = '?passed_ent_id=' . urlencode($passed_ent_id) .
               '&mailbox=' . urlencode($mailbox) .
               '&mailbox=' . urlencode($mailbox) .
-              '&passed_id=' . urlencode($passed_id);
+              '&passed_id=' . urlencode($passed_id).
+              '&view_unsafe_images='. (bool) $view_unsafe_images;
 
 
     $print_text = _("View Printable Version");
     $print_text = _("View Printable Version");