From 6cfe4fbdb42514e6c8b73ac58f49c1f240652a31 Mon Sep 17 00:00:00 2001 From: Thomas Skerbis Date: Tue, 30 Jan 2024 16:04:08 +0100 Subject: [PATCH 1/3] use: rex_file::putConfig and rex_file::getConfig --- install.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/install.php b/install.php index 8054cdc..a46d2fe 100644 --- a/install.php +++ b/install.php @@ -11,14 +11,9 @@ */ $addon = rex_addon::get('maintenance'); -// Write maintenance to setup addOns system config $config_file = rex_path::coreData('config.yml'); -$config = rex_file::get($config_file); -if ($config !== null) { - $data = rex_string::yamlDecode($config); - if (in_array("maintenance", $data['setup_addons'], true)) { - } else { - $data['setup_addons'][] = 'maintenance'; - rex_file::put($config_file, rex_string::yamlEncode($data, 3)); - } +$data = rex_file::getConfig($config_file); +if ($data && !in_array('maintenance', $data['setup_addons'], true)) { + $data['setup_addons'][] = 'maintenance'; + rex_file::putConfig($config_file, $data); } From 9914b97f27671194d6a0fa80065b479230011d8d Mon Sep 17 00:00:00 2001 From: Thomas Skerbis Date: Tue, 30 Jan 2024 16:05:53 +0100 Subject: [PATCH 2/3] use: rex_file::putConfig and rex_file::getConfig --- uninstall.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/uninstall.php b/uninstall.php index ccb8863..a0e0364 100644 --- a/uninstall.php +++ b/uninstall.php @@ -1,11 +1,7 @@ !in_array($e, ['maintenance'],true)); - rex_file::put($config_file, rex_string::yamlEncode($data, 3)); - } +$data = rex_file::getConfig($config_file); +if ($data && in_array('maintenance', $data['setup_addons'], true)) { + $data['setup_addons'] = array_filter($data['setup_addons'], fn($e) => $e !== 'maintenance'); + rex_file::putConfig($config_file, $data); } From c3e268db5d29e46aa5ef2a152d6f84b0b74c646b Mon Sep 17 00:00:00 2001 From: Thomas Skerbis Date: Tue, 30 Jan 2024 16:06:27 +0100 Subject: [PATCH 3/3] 2.9.3 --- package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.yml b/package.yml index 55616e7..dccd782 100644 --- a/package.yml +++ b/package.yml @@ -1,5 +1,5 @@ package: maintenance -version: '2.9.2' +version: '2.9.3' author: Friends Of REDAXO supportpage: https://github.com/FriendsOfREDAXO/maintenance title: 'Maintenance'