Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve \MailSo\Base\Utils::FunctionExistsAndEnabled()

Browse source
This commit is contained in:
the-djmaze 2022-03-03 10:44:15 +01:00
parent bb7d8e85a0
commit 5bb190d974
6 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

33
snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php
View file

@ -1143,24 +1143,29 @@ abstract class Utils
return (false === $sResult) ? $sStr : $sResult; return (false === $sResult) ? $sStr : $sResult;
} }
public static function FunctionExistsAndEnabled($mFunctionNameOrNames) : bool public static function FunctionsExistAndEnabled(array $aFunctionNames) : bool
{ {
if (\is_array($mFunctionNameOrNames)) foreach ($aFunctionNames as $sFunctionName) {
{ if (!static::FunctionExistsAndEnabled($sFunctionName)) {
foreach ($mFunctionNameOrNames as $sFunctionName) return false;
{
if (!static::FunctionExistsAndEnabled($sFunctionName))
{
return false;
}
} }
return true;
} }
return true;
}
return !empty($mFunctionNameOrNames) private static $disabled_functions = null;
&& \function_exists($mFunctionNameOrNames) public static function FunctionExistsAndEnabled(string $sFunctionName) : bool
&& \is_callable($mFunctionNameOrNames); {
if (null === static::$disabled_functions) {
static::$disabled_functions = \array_map('trim', \explode(',', \ini_get('disable_functions')));
}
/*
$disabled_classes = \explode(',', \ini_get('disable_classes'));
\in_array($function, $disabled_classes);
*/
return \function_exists($sFunctionName)
&& !\in_array($sFunctionName, static::$disabled_functions);
// && \is_callable($mFunctionNameOrNames);
} }
public static function ClearNullBite($mValue) : string public static function ClearNullBite($mValue) : string

2
snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -547,7 +547,7 @@ class Actions
break; break;
case ('APCU' === $sDriver) && case ('APCU' === $sDriver) &&
\MailSo\Base\Utils::FunctionExistsAndEnabled(array( \MailSo\Base\Utils::FunctionsExistAndEnabled(array(
'apcu_store', 'apcu_fetch', 'apcu_delete', 'apcu_clear_cache')): 'apcu_store', 'apcu_fetch', 'apcu_delete', 'apcu_clear_cache')):
$oDriver = new \MailSo\Cache\Drivers\APCU($sKey); $oDriver = new \MailSo\Cache\Drivers\APCU($sKey);

2
snappymail/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php
View file

@ -104,7 +104,7 @@ abstract class PdoAbstract
} }
// else if ('sqlite' === $sType && 'sqlite' === $sPdoType && $this->bSqliteCollate) // else if ('sqlite' === $sType && 'sqlite' === $sPdoType && $this->bSqliteCollate)
// { // {
// if (\method_exists($oPdo, 'sqliteCreateCollation') && \MailSo\Base\Utils::FunctionExistsAndEnabled('mb_strtoupper')) // if (\method_exists($oPdo, 'sqliteCreateCollation'))
// { // {
// $oPdo->sqliteCreateCollation('SQLITE_NOCASE_UTF8', array($this, 'sqliteNoCaseCollationHelper')); // $oPdo->sqliteCreateCollation('SQLITE_NOCASE_UTF8', array($this, 'sqliteNoCaseCollationHelper'));
// $bCaseFunc = true; // $bCaseFunc = true;

2
snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
View file

@ -45,7 +45,7 @@ abstract class AbstractConfig implements \JsonSerializable
$this->aData = $this->defaultValues(); $this->aData = $this->defaultValues();
$this->bUseApcCache = APP_USE_APCU_CACHE && $this->bUseApcCache = APP_USE_APCU_CACHE &&
\MailSo\Base\Utils::FunctionExistsAndEnabled(array('apcu_fetch', 'apcu_store')); \MailSo\Base\Utils::FunctionsExistAndEnabled(array('apcu_fetch', 'apcu_store'));
} }
protected abstract function defaultValues() : array; protected abstract function defaultValues() : array;

2
snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php
View file

@ -129,7 +129,7 @@ class Property implements \JsonSerializable
} }
// lower value for searching // lower value for searching
if ($this->IsValueForLower() && \MailSo\Base\Utils::FunctionExistsAndEnabled('mb_strtolower')) if ($this->IsValueForLower())
{ {
$this->ValueLower = (string) \mb_strtolower($this->Value, 'UTF-8'); $this->ValueLower = (string) \mb_strtolower($this->Value, 'UTF-8');
} }

5
snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
View file

@ -1382,11 +1382,6 @@ SQLITEINITIAL;
private function specialConvertSearchValueLower(string $sSearch, string $sEscapeSign = '=') : string private function specialConvertSearchValueLower(string $sSearch, string $sEscapeSign = '=') : string
{ {
if (!\MailSo\Base\Utils::FunctionExistsAndEnabled('mb_strtolower'))
{
return '';
}
return '%'.\str_replace(array($sEscapeSign, '_', '%'), return '%'.\str_replace(array($sEscapeSign, '_', '%'),
array($sEscapeSign.$sEscapeSign, $sEscapeSign.'_', $sEscapeSign.'%'), array($sEscapeSign.$sEscapeSign, $sEscapeSign.'_', $sEscapeSign.'%'),
(string) \mb_strtolower($sSearch, 'UTF-8')).'%'; (string) \mb_strtolower($sSearch, 'UTF-8')).'%';