From 22e858f9056d14f776962f6367131bbded379077 Mon Sep 17 00:00:00 2001 From: djmaze Date: Tue, 23 Nov 2021 10:16:32 +0100 Subject: [PATCH] No need to check 'disable_functions', function_exists/is_callable do that. --- .../0.0.0/app/libraries/MailSo/Base/Utils.php | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php index c1ab77371..92836c62c 100644 --- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php +++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php @@ -1340,8 +1340,6 @@ END; public static function FunctionExistsAndEnabled($mFunctionNameOrNames) : bool { - static $aCache = null; - if (\is_array($mFunctionNameOrNames)) { foreach ($mFunctionNameOrNames as $sFunctionName) @@ -1355,20 +1353,9 @@ END; return true; } - if (empty($mFunctionNameOrNames) || !\function_exists($mFunctionNameOrNames) || !\is_callable($mFunctionNameOrNames)) - { - return false; - } - - if (null === $aCache) - { - $sDisableFunctions = \ini_get('disable_functions'); - $sDisableFunctions = \is_string($sDisableFunctions) ? $sDisableFunctions : ''; - - $aCache = \explode(',', $sDisableFunctions); - } - - return !\in_array($mFunctionNameOrNames, $aCache); + return !empty($mFunctionNameOrNames) + && \function_exists($mFunctionNameOrNames) + && !\is_callable($mFunctionNameOrNames); } public static function ClearNullBite($mValue) : string