Merge pull request #803 from nupplaphil/config_refact

Config Refactoring

diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index a22436cabe1a04a4bed0f37889ea14339ad92081..dbbfb2e2ec67747137fb65e376b7406fb901f945 100644 (file)
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -54,13 +54,13 @@ use Symfony\Component\ExpressionLanguage;
 
 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");
 }

diff --git a/geonames/geonames.php b/geonames/geonames.php
index 7023336bcdcd2826e5a8df69fd1f71098bd65486..cf9719841c1acfd2e0220b8e2f76d31e2f47e0ff 100644 (file)
--- 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->loadAddonConfig('geonames'));
 }
 
 function geonames_post_hook($a, &$item) {

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 70e81448df8fc7de8288888b9e48876c25f10dc1..363515d368df607dd91c44e68c66e92e66f64d91 100644 (file)
--- 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->loadAddonConfig('gravatar'));
 }
 
 /**

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 0b49ee57e883d5376d08e1a95ac9564cf1163df9..c4f45a0d642bfea021cb8d1a56d3bd8d3f8fbc65 100644 (file)
--- 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->loadAddonConfig('impressum'));
 }
 
 function impressum_show($a,&$b) {

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index e564bbe63a6ac18c467c73c096b5b5d3b3304a67..dfd9f59dede8f04cbae3d5da95f6a9aab3a3d29b 100644 (file)
--- 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->loadAddonConfig('ldapauth'));
 }
 
 function ldapauth_hook_authenticate($a, &$b)

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 232278a99561e5f27f53dbc485c7d0452d1c3980..2ba32cc7b630da4fcceea8b58045d5a6da2f2736 100644 (file)
--- 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->loadAddonConfig('libravatar'));
 }
 
 /**

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index c3982ec5bc7c765b23eff6c34399a87f873609b3..ab6ec27fc9987ceb2ddcbcca01204d123125e90d 100644 (file)
--- 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->loadAddonConfig('openstreetmap'));
 }
 
 function openstreetmap_alterheader($a, &$navHtml)

diff --git a/piwik/piwik.php b/piwik/piwik.php
index fa04413ecdb255003bf273f443ddfea65b96bb92..9e43cd5f184d31b1144cc67a824a3a3d8ba6b338 100644 (file)
--- 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->loadAddonConfig('piwik'));
 }
 
 function piwik_analytics($a,&$b) {

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 52c04d5dc71a35a68356ddb789a1944db91972d3..2dcefe8531fd7bf6c591d7577e3e92ecb3c1c0d7 100644 (file)
--- 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->loadAddonConfig('public_server'));
 }
 
 function public_server_register_account($a, $b)

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index b5c5029fb358ee6a3bba99f0861fa103f5ac8f10..d8a2c546f1fe0d69501cffd999c2495a087774b5 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -377,9 +377,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->loadAddonConfig('pumpio'));
 }
 
 function pumpio_hook_fork(App $a, array &$b)

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 326b1915e12525c772385dae348a969440c3ec99..dea5026ba5ad3d66100cfe41dd9b422bb7f2540b 100644 (file)
--- 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->loadAddonConfig('testdrive'));
 }
 
 function testdrive_globaldir_update($a,&$b) {

diff --git a/twitter/twitter.php b/twitter/twitter.php
index b1eeb5b8638037cf4665d93b7456d75aa4a6911e..f5c7de0dfc456564751dfb41b689ca585c86063e 100644 (file)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -136,9 +136,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->loadAddonConfig('twitter'));
 }
 
 function twitter_check_item_notification(App $a, array &$notification_data)