Updating my previous comments.

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

diff --git a/functions/mime.php b/functions/mime.php
index fdd6da537662858e51a06651bee682138d4f7072..0a265568041d086335b27794769a542d286eea19 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -359,8 +359,9 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma
     // workaround for not updated config.php
     if (! isset($use_iframe)) $use_iframe = false;
 
     // workaround for not updated config.php
     if (! isset($use_iframe)) $use_iframe = false;
 

-    // If there's no "view_unsafe_images" setting in the user's preferences,
-    // turn unsafe images off by default.
+    // If there's no "view_unsafe_images" variable in the URL, turn unsafe
+    // images off by default.
+    // FIXME: Update this code to use the default value FALSE.

     if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
         $view_unsafe_images = false;
     }
     if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
         $view_unsafe_images = false;
     }


@@ -1854,11 +1855,13 @@ function sq_fix_url($attname, &$attvalue, $message, $id, $mailbox,$sQuote = '"')
         $attvalue = trim(substr($attvalue,1,-1));
     }
 
         $attvalue = trim(substr($attvalue,1,-1));
     }
 

-    // If there's no "view_unsafe_images" setting in the user's preferences,
-    // turn unsafe images off by default.
+    // If there's no "view_unsafe_images" variable in the URL, turn unsafe
+    // images off by default.
+    // FIXME: Update this code to use the default value FALSE.

     if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
         $view_unsafe_images = false;
     }
     if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
         $view_unsafe_images = false;
     }

+

     $secremoveimg = '../images/' . _("sec_remove_eng.png");
 
     /**
     $secremoveimg = '../images/' . _("sec_remove_eng.png");
 
     /**


@@ -2497,8 +2500,9 @@ function magicHTML($body, $id, $message, $mailbox = 'INBOX', $take_mailto_links
             )
         );
 
             )
         );
 

-    // If there's no "view_unsafe_images" setting in the user's preferences,
-    // turn unsafe images off by default.
+    // If there's no "view_unsafe_images" variable in the URL, turn unsafe
+    // images off by default.
+    // FIXME: Update this code to use the default value FALSE.

     if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
         $view_unsafe_images = false;
     }
     if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
         $view_unsafe_images = false;
     }

diff --git a/src/read_body.php b/src/read_body.php
index f8f6b114d70013877738393c135b6cecf429e7fe..7a7d9f8e39bbbe11ab674f4ae0602ca09bded266 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -691,12 +691,16 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
     // Build the printer friend link
     /* hackydiehack */
 
     // Build the printer friend link
     /* hackydiehack */
 

-    // If there's no "view_unsafe_images" setting in the user's preferences,
-    // turn unsafe images off by default.
+    // Pull "view_unsafe_images" from the URL to find out if the unsafe images
+    // should be displayed. The default is not to display unsafe images.

     if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
     if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {

+        // If "view_unsafe_images" isn't part of the URL, default to not
+        // displaying unsafe images.

         $view_unsafe_images = false;
     } else {
         $view_unsafe_images = false;
     } else {

-        // FIXME: Do we really want to display the unsafe images regardless of the user's preferences?
+        //  If "view_unsafe_images" is part of the URL, display unsafe images
+        //  regardless of the value of the URL variable.
+        // FIXME: Do we really want to display the unsafe images regardless of the value in URL variable?

         $view_unsafe_images = true;
     }
 
         $view_unsafe_images = true;
     }
 


@@ -814,6 +818,7 @@ if(sqgetGlobalVar('view_unsafe_images', $temp)) {
 } else {
     $view_unsafe_images = 0;
 }
 } else {
     $view_unsafe_images = 0;
 }

+

 /**
  * Retrieve mailbox cache
  */
 /**
  * Retrieve mailbox cache
  */