From a724f8463465c336c9fdd7eaa0ed6c6f6b22445d Mon Sep 17 00:00:00 2001 From: jervfors Date: Thu, 6 Mar 2008 03:50:56 +0000 Subject: [PATCH] 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 --- functions/mime.php | 3 --- src/read_body.php | 1 - 2 files changed, 4 deletions(-) diff --git a/functions/mime.php b/functions/mime.php index f89aa546..fdd6da53 100644 --- 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 6782f46b..f8f6b114 100644 --- 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 { -- 2.25.1