From 4c752f9a1532bdfd68737ba5d8efdfab6a250fec Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 23 May 2022 13:08:20 +0200
Subject: [PATCH] parse_ini_file disabled #354

---
 .../app/libraries/RainLoop/Config/AbstractConfig.php      | 8 ++++----
 .../libraries/RainLoop/Providers/Domain/DefaultDomain.php | 2 +-
 snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php       | 6 ------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
index 84fad5f3d..c2a9402e0 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
@@ -186,8 +186,8 @@ abstract class AbstractConfig implements \JsonSerializable
 				return true;
 			}
 
-			$aData = \RainLoop\Utils::CustomParseIniFile($this->sFile, true);
-			if (\count($aData))
+			$aData = \parse_ini_file($this->sFile, true);
+			if ($aSubData && \count($aSubData))
 			{
 				foreach ($aData as $sSectionKey => $aSectionValue)
 				{
@@ -204,8 +204,8 @@ abstract class AbstractConfig implements \JsonSerializable
 
 				if (\file_exists($this->sAdditionalFile) && \is_readable($this->sAdditionalFile))
 				{
-					$aSubData = \RainLoop\Utils::CustomParseIniFile($this->sAdditionalFile, true);
-					if (\is_array($aSubData) && \count($aSubData))
+					$aSubData = \parse_ini_file($this->sAdditionalFile, true);
+					if ($aSubData && \count($aSubData))
 					{
 						foreach ($aSubData as $sSectionKey => $aSectionValue)
 						{
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
index e99267ae3..960fe5e90 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
@@ -95,7 +95,7 @@ class DefaultDomain implements DomainInterface
 		if (\file_exists($this->sDomainPath.'/'.$sRealFileName.'.ini') &&
 			(!$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']))
 //			{
 //				$oDomain = $this->Load($aDomain['alias'], false, false, false);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
index db5e4ea2f..4156ed3b8 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
@@ -181,12 +181,6 @@ class Utils
 		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
 	{
 		static $open_basedir;