From c59d19781fec3ed0fbe788c0c8ab96cffafe50f4 Mon Sep 17 00:00:00 2001 From: Sergey Mosin Date: Mon, 3 Jul 2023 23:49:41 -0400 Subject: [PATCH] add 'view_images' to admin settings ('defaults' section) --- snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php | 4 ++-- .../v/0.0.0/app/libraries/RainLoop/Config/Application.php | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php index 17fc033b9..eb7356db5 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -680,7 +680,7 @@ class Actions 'contactsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(), 'ViewHTML' => (bool) $oConfig->Get('defaults', 'view_html', true), - 'ViewImages' => 'ask', + 'ViewImages' => $oConfig->Get('defaults', 'view_images', 'ask'), 'ViewImagesWhitelist' => '', 'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false), 'AllowStyles' => false, @@ -778,7 +778,7 @@ class Actions $aResult['ViewHTML'] = (bool)$oSettings->GetConf('ViewHTML', $aResult['ViewHTML']); $show_images = (bool) $oSettings->GetConf('ShowImages', false); - $aResult['ViewImages'] = $oSettings->GetConf('ViewImages', $show_images ? 'always' : 'ask'); + $aResult['ViewImages'] = $oSettings->GetConf('ViewImages', $show_images ? 'always' : $aResult['ViewImages']); $aResult['ViewImagesWhitelist'] = $oSettings->GetConf('ViewImagesWhitelist', ''); $aResult['RemoveColors'] = (bool)$oSettings->GetConf('RemoveColors', $aResult['RemoveColors']); $aResult['AllowStyles'] = (bool)$oSettings->GetConf('AllowStyles', $aResult['AllowStyles']); diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php index 82f6caf11..b9c92220c 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php @@ -296,6 +296,10 @@ Values: 'autologout' => array(30), 'view_html' => array(true), 'show_images' => array(false), + 'view_images' => array('ask', 'View external images: + "ask" - always ask + "match" - whitelist or ask + "always" - show always'), 'contacts_autosave' => array(true), 'mail_use_threads' => array(false), 'allow_draft_autosave' => array(true),