From b541efc5e6bf72768215f4a59494c02cdc9058ba Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 3 Feb 2019 22:22:03 +0100 Subject: [PATCH 1/4] 3) Introducing ConfigFactory --- geonames/geonames.php | 5 +++-- gravatar/gravatar.php | 4 ++-- impressum/impressum.php | 4 ++-- ldapauth/ldapauth.php | 5 +++-- libravatar/libravatar.php | 4 ++-- openstreetmap/openstreetmap.php | 6 +++--- piwik/piwik.php | 5 +++-- public_server/public_server.php | 5 ++--- pumpio/pumpio.php | 4 ++-- testdrive/testdrive.php | 4 ++-- twitter/twitter.php | 4 ++-- 11 files changed, 26 insertions(+), 24 deletions(-) diff --git a/geonames/geonames.php b/geonames/geonames.php index 7023336b..30577176 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -21,6 +21,7 @@ * system will call the name_uninstall() function. * */ + use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; @@ -76,9 +77,9 @@ function geonames_uninstall() { Logger::log("removed geonames"); } -function geonames_load_config(\Friendica\App $a) +function geonames_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->loadConfigFile(__DIR__. '/config/geonames.config.php'); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('geonames')); } function geonames_post_hook($a, &$item) { diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php index 70e81448..e5fd4c06 100644 --- a/gravatar/gravatar.php +++ b/gravatar/gravatar.php @@ -36,9 +36,9 @@ function gravatar_uninstall() { Logger::log("unregistered gravatar in avatar_lookup hook"); } -function gravatar_load_config(App $a) +function gravatar_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->loadConfigFile(__DIR__ . '/config/gravatar.config.php'); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('gravatar')); } /** diff --git a/impressum/impressum.php b/impressum/impressum.php index b68c0e2e..c8ca7e34 100644 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -52,9 +52,9 @@ function impressum_footer($a, &$b) { } } -function impressum_load_config(\Friendica\App $a) +function impressum_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->loadConfigFile(__DIR__ . '/config/impressum.config.php'); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('impressum')); } function impressum_show($a,&$b) { diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php index e564bbe6..637643a8 100644 --- a/ldapauth/ldapauth.php +++ b/ldapauth/ldapauth.php @@ -53,6 +53,7 @@ * * ...etc. */ + use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\Logger; @@ -70,9 +71,9 @@ function ldapauth_uninstall() Hook::unregister('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate'); } -function ldapauth_load_config(\Friendica\App $a) +function ldapauth_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->loadConfigFile(__DIR__ . '/config/ldapauth.config.php'); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('ldapauth')); } function ldapauth_hook_authenticate($a, &$b) diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php index 232278a9..e4f3672a 100644 --- a/libravatar/libravatar.php +++ b/libravatar/libravatar.php @@ -36,9 +36,9 @@ function libravatar_uninstall() Logger::log("unregistered libravatar in avatar_lookup hook"); } -function libravatar_load_config(App $a) +function libravatar_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->loadConfigFile(__DIR__ . '/config/libravatar.config.php'); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('libravatar')); } /** diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php index c3982ec5..09ad61b6 100644 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -8,13 +8,13 @@ * Author: Klaus Weidenbach * */ + use Friendica\Core\Cache; use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Util\Network; use Friendica\Util\Strings; @@ -47,9 +47,9 @@ function openstreetmap_uninstall() Logger::log("removed openstreetmap"); } -function openstreetmap_load_config(\Friendica\App $a) +function openstreetmap_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->loadConfigFile(__DIR__ . '/config/openstreetmap.config.php'); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('openstreetmap')); } function openstreetmap_alterheader($a, &$navHtml) diff --git a/piwik/piwik.php b/piwik/piwik.php index fa04413e..2143c331 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -30,6 +30,7 @@ * about http/https but beware to put the trailing / at the end of your * setting. */ + use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; @@ -51,9 +52,9 @@ function piwik_uninstall() { Logger::log("uninstalled piwik addon"); } -function piwik_load_config(\Friendica\App $a) +function piwik_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->loadConfigFile(__DIR__ . '/config/piwik.config.php'); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('piwik')); } function piwik_analytics($a,&$b) { diff --git a/public_server/public_server.php b/public_server/public_server.php index 52d9c6e0..8769b217 100644 --- a/public_server/public_server.php +++ b/public_server/public_server.php @@ -8,7 +8,6 @@ use Friendica\App; use Friendica\BaseModule; -use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\Hook; use Friendica\Core\L10n; @@ -36,9 +35,9 @@ function public_server_uninstall() Hook::unregister('logged_in', 'addon/public_server/public_server.php', 'public_server_login'); } -function public_server_load_config(App $a) +function public_server_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->loadConfigFile(__DIR__ . '/config/public_server.config.php'); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('public_server')); } function public_server_register_account($a, $b) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 87583358..55943a81 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -378,9 +378,9 @@ function pumpio_settings_post(App $a, array &$b) } } -function pumpio_load_config(App $a) +function pumpio_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->loadConfigFile(__DIR__ . '/config/pumpio.config.php'); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('pumpio')); } function pumpio_hook_fork(App $a, array &$b) diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php index f15acc26..272e6b9d 100644 --- a/testdrive/testdrive.php +++ b/testdrive/testdrive.php @@ -35,9 +35,9 @@ function testdrive_uninstall() { } -function testdrive_load_config(App $a) +function testdrive_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->loadConfigFile(__DIR__ . '/config/testdrive.config.php'); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('testdrive')); } function testdrive_globaldir_update($a,&$b) { diff --git a/twitter/twitter.php b/twitter/twitter.php index 64b8f409..3054a345 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -140,9 +140,9 @@ function twitter_uninstall() Hook::unregister('addon_settings_post', __FILE__, 'twitter_settings_post'); } -function twitter_load_config(App $a) +function twitter_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->loadConfigFile(__DIR__ . '/config/twitter.config.php'); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('twitter')); } function twitter_check_item_notification(App $a, array &$notification_data) From b8a492c80e89110637edbf0d6b035d9cfd95979a Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sun, 3 Feb 2019 22:46:49 +0100 Subject: [PATCH 2/4] 4) Adding Factories to other entrypoints --- advancedcontentfilter/advancedcontentfilter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php index 6479fe8e..86026130 100644 --- a/advancedcontentfilter/advancedcontentfilter.php +++ b/advancedcontentfilter/advancedcontentfilter.php @@ -58,13 +58,13 @@ require_once 'include/dba.php'; require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php'; -function advancedcontentfilter_install() +function advancedcontentfilter_install(App $a) { Hook::register('dbstructure_definition' , __FILE__, 'advancedcontentfilter_dbstructure_definition'); Hook::register('prepare_body_content_filter', __FILE__, 'advancedcontentfilter_prepare_body_content_filter'); Hook::register('addon_settings' , __FILE__, 'advancedcontentfilter_addon_settings'); - DBStructure::update(false, true); + DBStructure::update($a->getBasePath(), false, true); Logger::log("installed advancedcontentfilter"); } From 2ba4c95f4b714654f4c298501e60d48921f7a949 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Mon, 4 Feb 2019 02:07:58 +0100 Subject: [PATCH 3/4] Bugfixing Addon-config --- geonames/geonames.php | 2 +- gravatar/gravatar.php | 2 +- impressum/impressum.php | 2 +- ldapauth/ldapauth.php | 2 +- libravatar/libravatar.php | 2 +- openstreetmap/openstreetmap.php | 2 +- piwik/piwik.php | 2 +- public_server/public_server.php | 2 +- pumpio/pumpio.php | 2 +- testdrive/testdrive.php | 2 +- twitter/twitter.php | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/geonames/geonames.php b/geonames/geonames.php index 30577176..b1d8278b 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -79,7 +79,7 @@ function geonames_uninstall() { function geonames_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('geonames')); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('geonames', true)); } function geonames_post_hook($a, &$item) { diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php index e5fd4c06..f004eb80 100644 --- a/gravatar/gravatar.php +++ b/gravatar/gravatar.php @@ -38,7 +38,7 @@ function gravatar_uninstall() { function gravatar_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('gravatar')); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('gravatar', true)); } /** diff --git a/impressum/impressum.php b/impressum/impressum.php index c8ca7e34..49bf8264 100644 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -54,7 +54,7 @@ function impressum_footer($a, &$b) { function impressum_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('impressum')); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('impressum', true)); } function impressum_show($a,&$b) { diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php index 637643a8..cf6b4b4a 100644 --- a/ldapauth/ldapauth.php +++ b/ldapauth/ldapauth.php @@ -73,7 +73,7 @@ function ldapauth_uninstall() function ldapauth_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('ldapauth')); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('ldapauth', true)); } function ldapauth_hook_authenticate($a, &$b) diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php index e4f3672a..0edcc767 100644 --- a/libravatar/libravatar.php +++ b/libravatar/libravatar.php @@ -38,7 +38,7 @@ function libravatar_uninstall() function libravatar_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('libravatar')); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('libravatar', true)); } /** diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php index 09ad61b6..14cd411d 100644 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -49,7 +49,7 @@ function openstreetmap_uninstall() function openstreetmap_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('openstreetmap')); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('openstreetmap', true)); } function openstreetmap_alterheader($a, &$navHtml) diff --git a/piwik/piwik.php b/piwik/piwik.php index 2143c331..6341a702 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -54,7 +54,7 @@ function piwik_uninstall() { function piwik_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('piwik')); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('piwik', true)); } function piwik_analytics($a,&$b) { diff --git a/public_server/public_server.php b/public_server/public_server.php index 8769b217..bb294e3a 100644 --- a/public_server/public_server.php +++ b/public_server/public_server.php @@ -37,7 +37,7 @@ function public_server_uninstall() function public_server_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('public_server')); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('public_server', true)); } function public_server_register_account($a, $b) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 55943a81..428d626d 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -380,7 +380,7 @@ function pumpio_settings_post(App $a, array &$b) function pumpio_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('pumpio')); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('pumpio', true)); } function pumpio_hook_fork(App $a, array &$b) diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php index 272e6b9d..bf670983 100644 --- a/testdrive/testdrive.php +++ b/testdrive/testdrive.php @@ -37,7 +37,7 @@ function testdrive_uninstall() { function testdrive_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('testdrive')); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('testdrive', true)); } function testdrive_globaldir_update($a,&$b) { diff --git a/twitter/twitter.php b/twitter/twitter.php index 3054a345..fa9354ed 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -142,7 +142,7 @@ function twitter_uninstall() function twitter_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('twitter')); + $a->getConfig()->loadConfigArray($loader->loadConfigFile('twitter', true)); } function twitter_check_item_notification(App $a, array &$notification_data) From 7aa076074252cac1a7e6fa0bc5e667e1dfbc2e6c Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Tue, 5 Feb 2019 22:27:56 +0100 Subject: [PATCH 4/4] Refactoring ConfigCacheLoader methods --- geonames/geonames.php | 2 +- gravatar/gravatar.php | 2 +- impressum/impressum.php | 2 +- ldapauth/ldapauth.php | 2 +- libravatar/libravatar.php | 2 +- openstreetmap/openstreetmap.php | 2 +- piwik/piwik.php | 2 +- public_server/public_server.php | 2 +- pumpio/pumpio.php | 2 +- testdrive/testdrive.php | 2 +- twitter/twitter.php | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/geonames/geonames.php b/geonames/geonames.php index b1d8278b..cf971984 100644 --- a/geonames/geonames.php +++ b/geonames/geonames.php @@ -79,7 +79,7 @@ function geonames_uninstall() { function geonames_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('geonames', true)); + $a->getConfig()->loadConfigArray($loader->loadAddonConfig('geonames')); } function geonames_post_hook($a, &$item) { diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php index f004eb80..363515d3 100644 --- a/gravatar/gravatar.php +++ b/gravatar/gravatar.php @@ -38,7 +38,7 @@ function gravatar_uninstall() { function gravatar_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('gravatar', true)); + $a->getConfig()->loadConfigArray($loader->loadAddonConfig('gravatar')); } /** diff --git a/impressum/impressum.php b/impressum/impressum.php index 49bf8264..07a0e073 100644 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -54,7 +54,7 @@ function impressum_footer($a, &$b) { function impressum_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('impressum', true)); + $a->getConfig()->loadConfigArray($loader->loadAddonConfig('impressum')); } function impressum_show($a,&$b) { diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php index cf6b4b4a..dfd9f59d 100644 --- a/ldapauth/ldapauth.php +++ b/ldapauth/ldapauth.php @@ -73,7 +73,7 @@ function ldapauth_uninstall() function ldapauth_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('ldapauth', true)); + $a->getConfig()->loadConfigArray($loader->loadAddonConfig('ldapauth')); } function ldapauth_hook_authenticate($a, &$b) diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php index 0edcc767..2ba32cc7 100644 --- a/libravatar/libravatar.php +++ b/libravatar/libravatar.php @@ -38,7 +38,7 @@ function libravatar_uninstall() function libravatar_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('libravatar', true)); + $a->getConfig()->loadConfigArray($loader->loadAddonConfig('libravatar')); } /** diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php index 14cd411d..ab6ec27f 100644 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -49,7 +49,7 @@ function openstreetmap_uninstall() function openstreetmap_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('openstreetmap', true)); + $a->getConfig()->loadConfigArray($loader->loadAddonConfig('openstreetmap')); } function openstreetmap_alterheader($a, &$navHtml) diff --git a/piwik/piwik.php b/piwik/piwik.php index 6341a702..9e43cd5f 100644 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -54,7 +54,7 @@ function piwik_uninstall() { function piwik_load_config(\Friendica\App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('piwik', true)); + $a->getConfig()->loadConfigArray($loader->loadAddonConfig('piwik')); } function piwik_analytics($a,&$b) { diff --git a/public_server/public_server.php b/public_server/public_server.php index bb294e3a..ec46e271 100644 --- a/public_server/public_server.php +++ b/public_server/public_server.php @@ -37,7 +37,7 @@ function public_server_uninstall() function public_server_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('public_server', true)); + $a->getConfig()->loadConfigArray($loader->loadAddonConfig('public_server')); } function public_server_register_account($a, $b) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 428d626d..e2892568 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -380,7 +380,7 @@ function pumpio_settings_post(App $a, array &$b) function pumpio_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('pumpio', true)); + $a->getConfig()->loadConfigArray($loader->loadAddonConfig('pumpio')); } function pumpio_hook_fork(App $a, array &$b) diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php index bf670983..9fc04201 100644 --- a/testdrive/testdrive.php +++ b/testdrive/testdrive.php @@ -37,7 +37,7 @@ function testdrive_uninstall() { function testdrive_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('testdrive', true)); + $a->getConfig()->loadConfigArray($loader->loadAddonConfig('testdrive')); } function testdrive_globaldir_update($a,&$b) { diff --git a/twitter/twitter.php b/twitter/twitter.php index fa9354ed..811d62ef 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -142,7 +142,7 @@ function twitter_uninstall() function twitter_load_config(App $a, Config\ConfigCacheLoader $loader) { - $a->getConfig()->loadConfigArray($loader->loadConfigFile('twitter', true)); + $a->getConfig()->loadConfigArray($loader->loadAddonConfig('twitter')); } function twitter_check_item_notification(App $a, array &$notification_data)