friendica
/
friendica-addons
7
2
Fork 13
Code Issues 3 Pull Requests 3 Releases 16 Wiki Activity

Introduce the data.config.php storage

This commit is contained in:
Philipp Holzer 2022-12-27 21:15:29 +01:00
parent 5af972bb22
commit 2cd314996a
Signed by: nupplaPhil
GPG Key ID: 24A7501396EB5432
14 changed files with 55 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
geonames/geonames.php
View File

@ -11,7 +11,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Core\Config\Util\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileManager;
use Friendica\Util\XML; use Friendica\Util\XML;
function geonames_install() function geonames_install()
@ -33,9 +33,9 @@ function geonames_install()
Hook::register('addon_settings_post', __FILE__, 'geonames_addon_settings_post'); 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) function geonames_post_hook(App $a, array &$item)

6
gravatar/gravatar.php
View File

@ -13,7 +13,7 @@ use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Core\Config\Util\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileManager;
use Friendica\Util\Strings; use Friendica\Util\Strings;
/** /**
@ -26,9 +26,9 @@ function gravatar_install() {
Logger::notice("registered gravatar in avatar_lookup hook"); 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);
} }
/** /**

6
impressum/impressum.php
View File

@ -13,7 +13,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Core\Config\Util\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileManager;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
function impressum_install() 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) function impressum_show(App $a, string &$body)

6
ldapauth/ldapauth.php
View File

@ -35,7 +35,7 @@ use Friendica\Core\Logger;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Core\Config\Util\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileManager;
function ldapauth_install() function ldapauth_install()
{ {
@ -43,9 +43,9 @@ function ldapauth_install()
Hook::register('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate'); 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) function ldapauth_hook_authenticate(App $a, array &$b)

6
libravatar/libravatar.php
View File

@ -12,7 +12,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Core\Config\Util\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileManager;
/** /**
* Installs the addon hook * Installs the addon hook
@ -24,9 +24,9 @@ function libravatar_install()
Logger::notice("registered libravatar in avatar_lookup hook"); 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);
} }
/** /**

6
openstreetmap/openstreetmap.php
View File

@ -15,7 +15,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Core\Config\Util\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileManager;
use Friendica\Util\Strings; use Friendica\Util\Strings;
const OSM_TMS = 'https://www.openstreetmap.org'; const OSM_TMS = 'https://www.openstreetmap.org';
@ -35,9 +35,9 @@ function openstreetmap_install()
Logger::notice("installed openstreetmap"); 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) function openstreetmap_alterheader(App $a, &$navHtml)

6
phpmailer/phpmailer.php
View File

@ -11,7 +11,7 @@ use Friendica\App;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;
use Friendica\Object\EMail\IEmail; use Friendica\Object\EMail\IEmail;
use Friendica\Core\Config\Util\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileManager;
use PHPMailer\PHPMailer\PHPMailer; use PHPMailer\PHPMailer\PHPMailer;
use PHPMailer\PHPMailer\Exception; use PHPMailer\PHPMailer\Exception;
@ -23,9 +23,9 @@ function phpmailer_install()
Hook::register('emailer_send_prepare', __FILE__, 'phpmailer_emailer_send_prepare', 5); 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);
} }
/** /**

6
piwik/piwik.php
View File

@ -39,7 +39,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Core\Config\Util\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileManager;
function piwik_install() { function piwik_install() {
Hook::register('load_config', 'addon/piwik/piwik.php', 'piwik_load_config'); Hook::register('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
@ -48,9 +48,9 @@ function piwik_install() {
Logger::notice("installed piwik addon"); 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) function piwik_analytics(App $a, string &$b)

6
public_server/public_server.php
View File

@ -15,7 +15,7 @@ use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Notification; use Friendica\Model\Notification;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Core\Config\Util\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileManager;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
function public_server_install() 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'); 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) function public_server_register_account(App $a, $b)

6
pumpio/pumpio.php
View File

@ -26,7 +26,7 @@ use Friendica\Network\HTTPClient\Client\HttpClientAccept;
use Friendica\Network\HTTPClient\Client\HttpClientOptions; use Friendica\Network\HTTPClient\Client\HttpClientOptions;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityNamespace; use Friendica\Protocol\ActivityNamespace;
use Friendica\Core\Config\Util\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileManager;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\XML; 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) function pumpio_hook_fork(App $a, array &$b)

26
s3_storage/src/S3Config.php
View File

@ -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', '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()); $this->config->set('s3', 'secret_key', ($this->secretKey = new HiddenString($data['secret_key']))->getString(), false);
$this->config->set('s3', 'bucket', ($this->bucket = $bucket)); $this->config->set('s3', 'bucket', ($this->bucket = $bucket), false);
if ($s3Config->getUseLegacyPathStyle()) { if ($s3Config->getUseLegacyPathStyle()) {
$this->config->set('s3', 'legacy', '1'); $this->config->set('s3', 'legacy', '1', false);
} else { } else {
$this->config->delete('s3', 'legacy'); $this->config->delete('s3', 'legacy', false);
} }
if ($s3Config->getDualstackUrl()) { if ($s3Config->getDualstackUrl()) {
$this->config->set('s3', 'dual_stack', '1'); $this->config->set('s3', 'dual_stack', '1', false);
} else { } 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'])) { if (!empty($data['endpoint'])) {
$this->config->set('s3', 'endpoint', $s3Config->getEndpoint()); $this->config->set('s3', 'endpoint', $s3Config->getEndpoint(), false);
} else { } else {
$this->config->delete('s3', 'endpoint'); $this->config->delete('s3', 'endpoint', false);
} }
if (!empty($data['region'])) { if (!empty($data['region'])) {
$this->config->set('s3', 'region', $s3Config->getRegion()); $this->config->set('s3', 'region', $s3Config->getRegion(), false);
} else { } else {
$this->config->delete('s3', 'region'); $this->config->delete('s3', 'region', false);
} }
$this->config->save();
return $feedback; return $feedback;
} }
} }

6
testdrive/testdrive.php
View File

@ -13,7 +13,7 @@ use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Notification; use Friendica\Model\Notification;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Core\Config\Util\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileManager;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
function testdrive_install() function testdrive_install()
@ -25,9 +25,9 @@ function testdrive_install()
Hook::register('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update'); 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) function testdrive_globaldir_update(App $a, array &$b)

6
twitter/twitter.php
View File

@ -86,7 +86,7 @@ use Friendica\Model\Post;
use Friendica\Model\Tag; use Friendica\Model\Tag;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Core\Config\Util\ConfigFileLoader; use Friendica\Core\Config\Util\ConfigFileManager;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
@ -124,9 +124,9 @@ function twitter_install()
// Hook functions // 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) function twitter_check_item_notification(App $a, array &$notification_data)

9
webdav_storage/src/WebDavConfig.php
View File

@ -144,10 +144,11 @@ class WebDavConfig implements ICanConfigureStorage
]; ];
} }
$this->config->set('webdav', 'url', $url); $this->config->set('webdav', 'url', $url, false);
$this->config->set('webdav', 'username', $username); $this->config->set('webdav', 'username', $username, false);
$this->config->set('webdav', 'password', $password); $this->config->set('webdav', 'password', $password, false);
$this->config->set('webdav', 'auth_type', $authType); $this->config->set('webdav', 'auth_type', $authType, false);
$this->config->save();
$this->url = $url; $this->url = $url;