Merge pull request #803 from nupplaphil/config_refact

[friendica-addons.git] / impressum / impressum.php

diff --git a/impressum/impressum.php b/impressum/impressum.php
index c5a1c98dbe7a91eaa0be627d7f783bf3cd0efa56..c4f45a0d642bfea021cb8d1a56d3bd8d3f8fbc65 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -8,8 +8,8 @@
  */
 
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -17,23 +17,23 @@ use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
 function impressum_install() {
-       Addon::registerHook('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
-    Addon::registerHook('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
-    Addon::registerHook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
+       Hook::register('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
+    Hook::register('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
+    Hook::register('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
     Logger::log("installed impressum Addon");
 }
 
 function impressum_uninstall() {
-       Addon::unregisterHook('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
-    Addon::unregisterHook('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
-    Addon::unregisterHook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
+       Hook::unregister('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
+    Hook::unregister('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
+    Hook::unregister('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
     Logger::log("uninstalled impressum Addon");
 }
 
 function impressum_module() {
 }
 function impressum_content() {
-    $a = get_app();
+    $a = \get_app();
     $a->internalRedirect('friendica/');
 }
 
@@ -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) {