From 1d52d74ce1bfe138799f1d731ab3d08854dee277 Mon Sep 17 00:00:00 2001 From: Jens Spanier Date: Wed, 7 Feb 2024 18:35:18 +0100 Subject: [PATCH 1/5] Also include *.config.php files Signed-off-by: Jens Spanier --- lib/Updater.php | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/lib/Updater.php b/lib/Updater.php index 37d112d1..ad4410e6 100644 --- a/lib/Updater.php +++ b/lib/Updater.php @@ -41,17 +41,33 @@ public function __construct(string $baseDir) { $this->baseDir = $baseDir; if ($dir = getenv('NEXTCLOUD_CONFIG_DIR')) { - $configFileName = rtrim($dir, '/') . '/config.php'; + $configDir = rtrim($dir, '/'); } else { - $configFileName = $this->baseDir . '/../config/config.php'; + $configDir = $this->baseDir . '/../config'; } - if (!file_exists($configFileName)) { + + $configFiles = [$configDir . '/config.php']; + + if (!file_exists($configFiles[0])) { throw new \Exception('Could not find config.php. Is this file in the "updater" subfolder of Nextcloud?'); } - /** @var array $CONFIG */ - require_once $configFileName; - $this->configValues = $CONFIG; + $extraConfigFiles = glob($configDir . '/*.config.php'); + if (is_array($extraConfigFiles)) { + natsort($extraConfigFiles); + $configFiles = array_merge($configFiles, $extraConfigFiles); + } + + foreach ($configFiles as $configFile) { + unset($CONFIG); + + /** @var array $CONFIG */ + require_once $configFile; + + if (isset($CONFIG) && is_array($CONFIG)) { + $this->configValues = array_merge($this->configValues, $CONFIG); + } + } if (php_sapi_name() !== 'cli' && ($this->configValues['upgrade.disable-web'] ?? false)) { // updater disabled From b1a0a21bb928031b372cf7e65b99a65bfaea6dd6 Mon Sep 17 00:00:00 2001 From: Jens Spanier Date: Tue, 5 Mar 2024 12:07:03 +0100 Subject: [PATCH 2/5] Move unset + fix psalm errors Signed-off-by: Jens Spanier --- lib/Updater.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/Updater.php b/lib/Updater.php index ad4410e6..f8c012fa 100644 --- a/lib/Updater.php +++ b/lib/Updater.php @@ -59,14 +59,17 @@ public function __construct(string $baseDir) { } foreach ($configFiles as $configFile) { - unset($CONFIG); - - /** @var array $CONFIG */ + /** + * @psalm-suppress UnresolvableInclude + * @var mixed $CONFIG + */ require_once $configFile; if (isset($CONFIG) && is_array($CONFIG)) { $this->configValues = array_merge($this->configValues, $CONFIG); } + + unset($CONFIG); } if (php_sapi_name() !== 'cli' && ($this->configValues['upgrade.disable-web'] ?? false)) { From 9f8110e6ac44e4e9a30637e723af5dbc804ff99f Mon Sep 17 00:00:00 2001 From: Jens Spanier Date: Tue, 5 Mar 2024 12:15:36 +0100 Subject: [PATCH 3/5] Update index.php + updater.phar Signed-off-by: Jens Spanier --- index.php | 31 +++++++++++++++++++++++++------ updater.phar | Bin 1172792 -> 1173189 bytes 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/index.php b/index.php index 69c1d161..2426bf89 100644 --- a/index.php +++ b/index.php @@ -79,17 +79,36 @@ public function __construct(string $baseDir) { $this->baseDir = $baseDir; if ($dir = getenv('NEXTCLOUD_CONFIG_DIR')) { - $configFileName = rtrim($dir, '/') . '/config.php'; + $configDir = rtrim($dir, '/'); } else { - $configFileName = $this->baseDir . '/../config/config.php'; + $configDir = $this->baseDir . '/../config'; } - if (!file_exists($configFileName)) { + + $configFiles = [$configDir . '/config.php']; + + if (!file_exists($configFiles[0])) { throw new \Exception('Could not find config.php. Is this file in the "updater" subfolder of Nextcloud?'); } - /** @var array $CONFIG */ - require_once $configFileName; - $this->configValues = $CONFIG; + $extraConfigFiles = glob($configDir . '/*.config.php'); + if (is_array($extraConfigFiles)) { + natsort($extraConfigFiles); + $configFiles = array_merge($configFiles, $extraConfigFiles); + } + + foreach ($configFiles as $configFile) { + /** + * @psalm-suppress UnresolvableInclude + * @var mixed $CONFIG + */ + require_once $configFile; + + if (isset($CONFIG) && is_array($CONFIG)) { + $this->configValues = array_merge($this->configValues, $CONFIG); + } + + unset($CONFIG); + } if (php_sapi_name() !== 'cli' && ($this->configValues['upgrade.disable-web'] ?? false)) { // updater disabled diff --git a/updater.phar b/updater.phar index 3e760b1bd4669b4725feebfedcb7caa81fbb8e27..9d8a6f414b34110a1db1fb2cd85d7a345553a792 100755 GIT binary patch delta 7928 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 From 19a13076941bafbcab58695c64faf05562620ab2 Mon Sep 17 00:00:00 2001 From: Jens Spanier Date: Tue, 5 Mar 2024 17:22:54 +0100 Subject: [PATCH 4/5] Fix leading spaces Signed-off-by: Jens Spanier --- lib/Updater.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Updater.php b/lib/Updater.php index f8c012fa..14f4dca4 100644 --- a/lib/Updater.php +++ b/lib/Updater.php @@ -60,9 +60,9 @@ public function __construct(string $baseDir) { foreach ($configFiles as $configFile) { /** - * @psalm-suppress UnresolvableInclude + * @psalm-suppress UnresolvableInclude * @var mixed $CONFIG - */ + */ require_once $configFile; if (isset($CONFIG) && is_array($CONFIG)) { From 37d8c034ce3b4f5f2a605522c425bd22ed43aa22 Mon Sep 17 00:00:00 2001 From: Jens Spanier Date: Tue, 5 Mar 2024 17:30:39 +0100 Subject: [PATCH 5/5] Update index.php + updater.phar Signed-off-by: Jens Spanier --- index.php | 4 ++-- updater.phar | Bin 1173189 -> 1173187 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 2426bf89..04db613d 100644 --- a/index.php +++ b/index.php @@ -98,9 +98,9 @@ public function __construct(string $baseDir) { foreach ($configFiles as $configFile) { /** - * @psalm-suppress UnresolvableInclude + * @psalm-suppress UnresolvableInclude * @var mixed $CONFIG - */ + */ require_once $configFile; if (isset($CONFIG) && is_array($CONFIG)) { diff --git a/updater.phar b/updater.phar index 9d8a6f414b34110a1db1fb2cd85d7a345553a792..de6e25b1dc3e8f6b10e95309830d1ca225276122 100755 GIT binary patch delta 2495 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 T^?J?Kt_Ky2`J`-O^~C=Gq(2^E