From 2cd314996a6046e3026d579273164268fe5a6c68 Mon Sep 17 00:00:00 2001
From: Philipp <admin@philipp.info>
Date: Tue, 27 Dec 2022 21:15:29 +0100
Subject: [PATCH] Introduce the data.config.php storage

---
 geonames/geonames.php               |  6 +++---
 gravatar/gravatar.php               |  6 +++---
 impressum/impressum.php             |  6 +++---
 ldapauth/ldapauth.php               |  6 +++---
 libravatar/libravatar.php           |  6 +++---
 openstreetmap/openstreetmap.php     |  6 +++---
 phpmailer/phpmailer.php             |  6 +++---
 piwik/piwik.php                     |  6 +++---
 public_server/public_server.php     |  6 +++---
 pumpio/pumpio.php                   |  6 +++---
 s3_storage/src/S3Config.php         | 26 ++++++++++++++------------
 testdrive/testdrive.php             |  6 +++---
 twitter/twitter.php                 |  6 +++---
 webdav_storage/src/WebDavConfig.php |  9 +++++----
 14 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/geonames/geonames.php b/geonames/geonames.php
index 2eb78fbd..9ffbc875 100644
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -11,7 +11,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Util\XML;
 
 function geonames_install()
@@ -33,9 +33,9 @@ function geonames_install()
 	Hook::register('addon_settings_post', __FILE__, 'geonames_addon_settings_post');
 }
 
-function geonames_load_config(App $a, ConfigFileLoader $loader)
+function geonames_load_config(App $a, ConfigFileManager $configFileManager)
 {
-	$a->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($configFileManager->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function geonames_post_hook(App $a, array &$item)
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index d53e8ef8..8aa2a25c 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -13,7 +13,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Util\Strings;
 
 /**
@@ -26,9 +26,9 @@ function gravatar_install() {
 	Logger::notice("registered gravatar in avatar_lookup hook");
 }
 
-function gravatar_load_config(App $a, ConfigFileLoader $loader)
+function gravatar_load_config(App $a, ConfigFileManager $configFileManager)
 {
-	$a->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($configFileManager->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**
diff --git a/impressum/impressum.php b/impressum/impressum.php
index 6842f6fc..25474a39 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -13,7 +13,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Util\Proxy as ProxyUtils;
 
 function impressum_install()
@@ -54,9 +54,9 @@ function impressum_footer(App $a, string &$body)
 	}
 }
 
-function impressum_load_config(App $a, ConfigFileLoader $loader)
+function impressum_load_config(App $a, ConfigFileManager $configFileManager)
 {
-	$a->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($configFileManager->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function impressum_show(App $a, string &$body)
diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 04ac00db..d6d279b3 100644
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -35,7 +35,7 @@ use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 
 function ldapauth_install()
 {
@@ -43,9 +43,9 @@ function ldapauth_install()
 	Hook::register('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate');
 }
 
-function ldapauth_load_config(App $a, ConfigFileLoader $loader)
+function ldapauth_load_config(App $a, ConfigFileManager $configFileManager)
 {
-	$a->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($configFileManager->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function ldapauth_hook_authenticate(App $a, array &$b)
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index f2a49ac8..88040845 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -12,7 +12,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 
 /**
  * Installs the addon hook
@@ -24,9 +24,9 @@ function libravatar_install()
 	Logger::notice("registered libravatar in avatar_lookup hook");
 }
 
-function libravatar_load_config(App $a, ConfigFileLoader $loader)
+function libravatar_load_config(App $a, ConfigFileManager $configFileManager)
 {
-	$a->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($configFileManager->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index e83e02c2..1206fc66 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -15,7 +15,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Util\Strings;
 
 const OSM_TMS = 'https://www.openstreetmap.org';
@@ -35,9 +35,9 @@ function openstreetmap_install()
 	Logger::notice("installed openstreetmap");
 }
 
-function openstreetmap_load_config(App $a, ConfigFileLoader $loader)
+function openstreetmap_load_config(App $a, ConfigFileManager $configFileManager)
 {
-	$a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($configFileManager->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function openstreetmap_alterheader(App $a, &$navHtml)
diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index 30f10ff8..ebf2cf07 100644
--- a/phpmailer/phpmailer.php
+++ b/phpmailer/phpmailer.php
@@ -11,7 +11,7 @@ use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Friendica\Object\EMail\IEmail;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception;
 
@@ -23,9 +23,9 @@ function phpmailer_install()
 	Hook::register('emailer_send_prepare', __FILE__, 'phpmailer_emailer_send_prepare', 5);
 }
 
-function phpmailer_load_config(App $a, ConfigFileLoader $loader)
+function phpmailer_load_config(App $a, ConfigFileManager $configFileManager)
 {
-	$a->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($configFileManager->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 /**
diff --git a/piwik/piwik.php b/piwik/piwik.php
index 370121d7..288302cf 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -39,7 +39,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 
 function piwik_install() {
 	Hook::register('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
@@ -48,9 +48,9 @@ function piwik_install() {
 	Logger::notice("installed piwik addon");
 }
 
-function piwik_load_config(App $a, ConfigFileLoader $loader)
+function piwik_load_config(App $a, ConfigFileManager $configFileManager)
 {
-	$a->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($configFileManager->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function piwik_analytics(App $a, string &$b)
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 95e1e8dd..30df42c8 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -15,7 +15,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Notification;
 use Friendica\Model\User;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Util\DateTimeFormat;
 
 function public_server_install()
@@ -27,9 +27,9 @@ function public_server_install()
 	Hook::register('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
 }
 
-function public_server_load_config(App $a, ConfigFileLoader $loader)
+function public_server_load_config(App $a, ConfigFileManager $configFileManager)
 {
-	$a->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($configFileManager->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function public_server_register_account(App $a, $b)
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index b13d5faf..e997f920 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -26,7 +26,7 @@ use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityNamespace;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
@@ -318,9 +318,9 @@ function pumpio_settings_post(App $a, array &$b)
 	}
 }
 
-function pumpio_load_config(App $a, ConfigFileLoader $loader)
+function pumpio_load_config(App $a, ConfigFileManager $configFileManager)
 {
-	$a->getConfigCache()->load($loader->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($configFileManager->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function pumpio_hook_fork(App $a, array &$b)
diff --git a/s3_storage/src/S3Config.php b/s3_storage/src/S3Config.php
index 809cdd28..86deeb12 100644
--- a/s3_storage/src/S3Config.php
+++ b/s3_storage/src/S3Config.php
@@ -229,34 +229,36 @@ class S3Config implements ICanConfigureStorage
 			];
 		}
 
-		$this->config->set('s3', 'access_key', ($this->accessKey = new HiddenString($data['access_key']))->getString());
-		$this->config->set('s3', 'secret_key', ($this->secretKey = new HiddenString($data['secret_key']))->getString());
-		$this->config->set('s3', 'bucket', ($this->bucket = $bucket));
+		$this->config->set('s3', 'access_key', ($this->accessKey = new HiddenString($data['access_key']))->getString(), false);
+		$this->config->set('s3', 'secret_key', ($this->secretKey = new HiddenString($data['secret_key']))->getString(), false);
+		$this->config->set('s3', 'bucket', ($this->bucket = $bucket), false);
 
 		if ($s3Config->getUseLegacyPathStyle()) {
-			$this->config->set('s3', 'legacy', '1');
+			$this->config->set('s3', 'legacy', '1', false);
 		} else {
-			$this->config->delete('s3', 'legacy');
+			$this->config->delete('s3', 'legacy', false);
 		}
 		if ($s3Config->getDualstackUrl()) {
-			$this->config->set('s3', 'dual_stack', '1');
+			$this->config->set('s3', 'dual_stack', '1', false);
 		} else {
-			$this->config->delete('s3', 'dual_stack');
+			$this->config->delete('s3', 'dual_stack', false);
 		}
-		$this->config->set('s3','signature_method', $s3Config->getSignatureMethod());
+		$this->config->set('s3','signature_method', $s3Config->getSignatureMethod(), false);
 
 		if (!empty($data['endpoint'])) {
-			$this->config->set('s3', 'endpoint', $s3Config->getEndpoint());
+			$this->config->set('s3', 'endpoint', $s3Config->getEndpoint(), false);
 		} else {
-			$this->config->delete('s3', 'endpoint');
+			$this->config->delete('s3', 'endpoint', false);
 		}
 
 		if (!empty($data['region'])) {
-			$this->config->set('s3', 'region', $s3Config->getRegion());
+			$this->config->set('s3', 'region', $s3Config->getRegion(), false);
 		} else {
-			$this->config->delete('s3', 'region');
+			$this->config->delete('s3', 'region', false);
 		}
 
+		$this->config->save();
+
 		return $feedback;
 	}
 }
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 903f80b1..41a4dd5e 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -13,7 +13,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Notification;
 use Friendica\Model\User;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Util\DateTimeFormat;
 
 function testdrive_install()
@@ -25,9 +25,9 @@ function testdrive_install()
 	Hook::register('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
 }
 
-function testdrive_load_config(App $a, ConfigFileLoader $loader)
+function testdrive_load_config(App $a, ConfigFileManager $configFileManager)
 {
-	$a->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($configFileManager->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function testdrive_globaldir_update(App $a, array &$b)
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 2e7c1573..f6996f18 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -86,7 +86,7 @@ use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Model\User;
 use Friendica\Protocol\Activity;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\System;
 use Friendica\Model\Photo;
 use Friendica\Util\DateTimeFormat;
@@ -124,9 +124,9 @@ function twitter_install()
 
 // Hook functions
 
-function twitter_load_config(App $a, ConfigFileLoader $loader)
+function twitter_load_config(App $a, ConfigFileManager $configFileManager)
 {
-	$a->getConfigCache()->load($loader->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($configFileManager->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function twitter_check_item_notification(App $a, array &$notification_data)
diff --git a/webdav_storage/src/WebDavConfig.php b/webdav_storage/src/WebDavConfig.php
index 2236e97a..e916efb6 100644
--- a/webdav_storage/src/WebDavConfig.php
+++ b/webdav_storage/src/WebDavConfig.php
@@ -144,10 +144,11 @@ class WebDavConfig implements ICanConfigureStorage
 			];
 		}
 
-		$this->config->set('webdav', 'url', $url);
-		$this->config->set('webdav', 'username', $username);
-		$this->config->set('webdav', 'password', $password);
-		$this->config->set('webdav', 'auth_type', $authType);
+		$this->config->set('webdav', 'url', $url, false);
+		$this->config->set('webdav', 'username', $username, false);
+		$this->config->set('webdav', 'password', $password, false);
+		$this->config->set('webdav', 'auth_type', $authType, false);
+		$this->config->save();
 
 		$this->url = $url;