Viewing unsafe images is a core functionality, so I remove these comments.

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

diff --git a/functions/mime.php b/functions/mime.php
index f89aa54606875663c2d9cbe98ecab6768a147e67..fdd6da537662858e51a06651bee682138d4f7072 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -361,7 +361,6 @@ function formatBody($imap_stream, $message, $color, $wrap_at, $ent_num, $id, $ma
 
     // If there's no "view_unsafe_images" setting in the user's preferences,
     // turn unsafe images off by default.
-    // FIXME: Check if the UIR plugin is enabled. If it's not, no unsafe images should be displayed regardless of the user's preferences. This test is done in several places in the code and they should all be fixed in the same way.
     if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
         $view_unsafe_images = false;
     }
@@ -1857,7 +1856,6 @@ function sq_fix_url($attname, &$attvalue, $message, $id, $mailbox,$sQuote = '"')
 
     // If there's no "view_unsafe_images" setting in the user's preferences,
     // turn unsafe images off by default.
-    // FIXME: Check if the UIR plugin is enabled. If it's not, no unsafe images should be displayed regardless of the user's preferences. This test is done in several places in the code and they should all be fixed in the same way.
     if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
         $view_unsafe_images = false;
     }
@@ -2501,7 +2499,6 @@ 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.
-    // FIXME: Check if the UIR plugin is enabled. If it's not, no unsafe images should be displayed regardless of the user's preferences. This test is done in several places in the code and they should all be fixed in the same way.
     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 6782f46b665850601cc80f19b8ceffb3a9be0148..f8f6b114d70013877738393c135b6cecf429e7fe 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -693,7 +693,6 @@ function formatToolbar($mailbox, $passed_id, $passed_ent_id, $message, $color) {
 
     // If there's no "view_unsafe_images" setting in the user's preferences,
     // turn unsafe images off by default.
-    // FIXME: Check if the UIR plugin is enabled. If it's not, no unsafe images should be displayed regardless of the user's preferences. This test is done in several places in the code and they should all be fixed in the same way.
     if( !sqgetGlobalVar('view_unsafe_images', $view_unsafe_images, SQ_GET) ) {
         $view_unsafe_images = false;
     } else {