From 059b9eb32227309050e9e56527c805d7c6cd79b1 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Wed, 2 Mar 2022 11:30:32 +0100 Subject: [PATCH] Remove unused HtmlStrictAllowedTags and HtmlStrictDebug --- .../v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php | 6 +----- snappymail/v/0.0.0/app/libraries/MailSo/Config.php | 10 ---------- snappymail/v/0.0.0/app/libraries/RainLoop/Api.php | 2 -- 3 files changed, 1 insertion(+), 17 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php index b3ab1c431..5a9082501 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php @@ -204,10 +204,6 @@ abstract class HtmlUtils $aRemoveTags[] = 'style'; } - $aHtmlAllowedTags = isset(\MailSo\Config::$HtmlStrictAllowedTags) && - \is_array(\MailSo\Config::$HtmlStrictAllowedTags) && \count(\MailSo\Config::$HtmlStrictAllowedTags) ? - \MailSo\Config::$HtmlStrictAllowedTags : null; - $aRemove = array(); $aNodes = $oDom->getElementsByTagName('*'); foreach ($aNodes as /* @var $oElement \DOMElement */ $oElement) @@ -217,7 +213,7 @@ abstract class HtmlUtils $sTagNameLower = \trim(\strtolower($oElement->tagName)); if ('' !== $sTagNameLower) { - if (\in_array($sTagNameLower, $aRemoveTags) || ($aHtmlAllowedTags && !\in_array($sTagNameLower, $aHtmlAllowedTags))) + if (\in_array($sTagNameLower, $aRemoveTags)) { $aRemove[] = @$oElement; } diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Config.php b/snappymail/v/0.0.0/app/libraries/MailSo/Config.php index 6f4a1b132..cdaf705eb 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Config.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Config.php @@ -16,16 +16,6 @@ namespace MailSo; */ class Config { - /** - * @var array|null - */ - public static $HtmlStrictAllowedTags = null; - - /** - * @var boolean - */ - public static $HtmlStrictDebug = false; - /** * @var int */ diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php index 59e9da4f4..6b14e8908 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php @@ -115,8 +115,6 @@ class Api }); } - \MailSo\Config::$HtmlStrictDebug = !!static::Config()->Get('debug', 'enable', false); - \MailSo\Config::$CheckNewMessages = !!static::Config()->Get('labs', 'check_new_messages', true); } }