parse_ini_file disabled #354

This commit is contained in:
the-djmaze 2022-05-23 13:08:20 +02:00
parent 8ed00452f9
commit 4c752f9a15
3 changed files with 5 additions and 11 deletions

View file

@ -186,8 +186,8 @@ abstract class AbstractConfig implements \JsonSerializable
return true; return true;
} }
$aData = \RainLoop\Utils::CustomParseIniFile($this->sFile, true); $aData = \parse_ini_file($this->sFile, true);
if (\count($aData)) if ($aSubData && \count($aSubData))
{ {
foreach ($aData as $sSectionKey => $aSectionValue) foreach ($aData as $sSectionKey => $aSectionValue)
{ {
@ -204,8 +204,8 @@ abstract class AbstractConfig implements \JsonSerializable
if (\file_exists($this->sAdditionalFile) && \is_readable($this->sAdditionalFile)) if (\file_exists($this->sAdditionalFile) && \is_readable($this->sAdditionalFile))
{ {
$aSubData = \RainLoop\Utils::CustomParseIniFile($this->sAdditionalFile, true); $aSubData = \parse_ini_file($this->sAdditionalFile, true);
if (\is_array($aSubData) && \count($aSubData)) if ($aSubData && \count($aSubData))
{ {
foreach ($aSubData as $sSectionKey => $aSectionValue) foreach ($aSubData as $sSectionKey => $aSectionValue)
{ {

View file

@ -95,7 +95,7 @@ class DefaultDomain implements DomainInterface
if (\file_exists($this->sDomainPath.'/'.$sRealFileName.'.ini') && if (\file_exists($this->sDomainPath.'/'.$sRealFileName.'.ini') &&
(!$bCheckDisabled || 0 === \strlen($sDisabled) || false === \strpos(','.$sDisabled.',', ','.\MailSo\Base\Utils::IdnToAscii($sName, true).','))) (!$bCheckDisabled || 0 === \strlen($sDisabled) || false === \strpos(','.$sDisabled.',', ','.\MailSo\Base\Utils::IdnToAscii($sName, true).',')))
{ {
$aDomain = \RainLoop\Utils::CustomParseIniFile($this->sDomainPath.'/'.$sRealFileName.'.ini'); $aDomain = \parse_ini_file($this->sDomainPath.'/'.$sRealFileName.'.ini') ?: array();
// if ($bCheckAliases && !empty($aDomain['alias'])) // if ($bCheckAliases && !empty($aDomain['alias']))
// { // {
// $oDomain = $this->Load($aDomain['alias'], false, false, false); // $oDomain = $this->Load($aDomain['alias'], false, false, false);

View file

@ -181,12 +181,6 @@ class Utils
return array_values($aResult); return array_values($aResult);
} }
public static function CustomParseIniFile(string $sFileName, bool $bProcessSections = false) : array
{
return @\parse_ini_file($sFileName, !!$bProcessSections) ?: array();
// return @\parse_ini_string(\file_get_contents($sFileName), $bProcessSections) ?: array();
}
public static function inOpenBasedir(string $name) : string public static function inOpenBasedir(string $name) : string
{ {
static $open_basedir; static $open_basedir;