From e434d511577c1cc9261fdb079768adc94d866f31 Mon Sep 17 00:00:00 2001
From: djmaze <>
Date: Fri, 24 Dec 2021 01:12:27 +0100
Subject: [PATCH] simplify custom include.php

---
 _include.php                                  | 32 +++++++++----------
 .../RainLoop/Config/AbstractConfig.php        | 11 ++++---
 snappymail/v/0.0.0/include.php                | 16 ++++++----
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/_include.php b/_include.php
index 6e020e660..9f16ed888 100644
--- a/_include.php
+++ b/_include.php
@@ -4,35 +4,33 @@
 
 //header('Strict-Transport-Security: max-age=31536000');
 
-// Uncomment to use gzip compressed output
+/**
+ * Uncomment to use gzip compressed output
+ */
 //define('USE_GZIP', 1);
 
-// Uncomment to use brotli compressed output
+/**
+ * Uncomment to use brotli compressed output
+ */
 //define('USE_BROTLI', 1);
 
-// Uncomment to enable multiple domain installation.
+/**
+ * Uncomment to enable multiple domain installation.
+ */
 //define('MULTIDOMAIN', 1);
 
-// Uncomment to disable APCU.
+/**
+ * Uncomment to disable APCU.
+ */
 //define('APP_USE_APCU_CACHE', false);
 
 /**
  * Custom 'data' folder path
- * @return string
  */
-function __get_custom_data_full_path()
-{
-	return '';
-	return dirname(__DIR__) . '/snappymail-data';
-	return '/var/external-snappymail-data-folder';
-}
+//define('APP_DATA_FOLDER_PATH', dirname(__DIR__) . '/snappymail-data/');
+//define('APP_DATA_FOLDER_PATH', '/var/external-snappymail-data-folder/');
 
 /**
  * Additional configuration file name
- * @return string
  */
-function __get_additional_configuration_name()
-{
-	return '';
-	return defined('APP_SITE') && 0 < strlen(APP_SITE) ? APP_SITE.'.ini' : '';
-}
+//define('APP_CONFIGURATION_NAME', $_SERVER['HTTP_HOST'].'.ini');
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 16c33918c..1cb303ebb 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
@@ -12,7 +12,7 @@ abstract class AbstractConfig implements \JsonSerializable
 	/**
 	 * @var string
 	 */
-	private $sAdditionalFile;
+	private $sAdditionalFile = '';
 
 	/**
 	 * @var array
@@ -34,9 +34,12 @@ abstract class AbstractConfig implements \JsonSerializable
 		$this->sFile = \APP_PRIVATE_DATA.'configs/'.\trim($sFileName);
 
 		$sAdditionalFileName = \trim($sAdditionalFileName);
-		$this->sAdditionalFile = \APP_PRIVATE_DATA.'configs/'.$sAdditionalFileName;
-		$this->sAdditionalFile = \strlen($sAdditionalFileName) &&
-			\file_exists($this->sAdditionalFile) ? $this->sAdditionalFile : '';
+		if (\strlen($sAdditionalFileName)) {
+			$sAdditionalFileName = \APP_PRIVATE_DATA.'configs/'.$sAdditionalFileName;
+			if (\file_exists($this->sAdditionalFile)) {
+				$this->sAdditionalFile = $this->sAdditionalFile;
+			}
+		}
 
 		$this->sFileHeader = $sFileHeader;
 		$this->aData = $this->defaultValues();
diff --git a/snappymail/v/0.0.0/include.php b/snappymail/v/0.0.0/include.php
index bebae1994..4d98539db 100644
--- a/snappymail/v/0.0.0/include.php
+++ b/snappymail/v/0.0.0/include.php
@@ -65,13 +65,17 @@ define('APP_PRIVATE_DATA_NAME', $sPrivateDataFolderInternalName ?: '_default_');
 
 defined('APP_USE_APCU_CACHE') || define('APP_USE_APCU_CACHE', true);
 
-$sCustomDataPath = function_exists('__get_custom_data_full_path') ? rtrim(trim(__get_custom_data_full_path()), '\\/') : $sCustomDataPath;
-define('APP_DATA_FOLDER_PATH', strlen($sCustomDataPath) ? $sCustomDataPath.'/' : APP_INDEX_ROOT_PATH.'data/');
-unset($sCustomDataPath);
+if (!defined('APP_DATA_FOLDER_PATH')) {
+	$sCustomDataPath = function_exists('__get_custom_data_full_path') ? rtrim(trim(__get_custom_data_full_path()), '\\/') : $sCustomDataPath;
+	define('APP_DATA_FOLDER_PATH', strlen($sCustomDataPath) ? $sCustomDataPath.'/' : APP_INDEX_ROOT_PATH.'data/');
+	unset($sCustomDataPath);
+}
 
-define('APP_CONFIGURATION_NAME', function_exists('__get_additional_configuration_name')
-	? trim(__get_additional_configuration_name()) : $sCustomConfiguration);
-unset($sCustomConfiguration);
+if (!defined('APP_CONFIGURATION_NAME')) {
+	define('APP_CONFIGURATION_NAME', function_exists('__get_additional_configuration_name')
+		? trim(__get_additional_configuration_name()) : $sCustomConfiguration);
+	unset($sCustomConfiguration);
+}
 
 // installation checking data folder
 $sInstalled = is_file(APP_DATA_FOLDER_PATH.'INSTALLED') ? file_get_contents(APP_DATA_FOLDER_PATH.'INSTALLED') : '';