Merge pull request #841 from annando/no-queue

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

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 39b3f7fde33c291e673392362a354168eaca9ea2..092a0615144179719236061c6afd3ff0f2b3e0b6 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -8,36 +8,37 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\Util\Config\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
 function public_server_install()
 {
-       Addon::registerHook('load_config',      'addon/public_server/public_server.php', 'public_server_load_config');
-       Addon::registerHook('register_account', 'addon/public_server/public_server.php', 'public_server_register_account');
-       Addon::registerHook('cron', 'addon/public_server/public_server.php', 'public_server_cron');
-       Addon::registerHook('enotify', 'addon/public_server/public_server.php', 'public_server_enotify');
-       Addon::registerHook('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
+       Hook::register('load_config',      'addon/public_server/public_server.php', 'public_server_load_config');
+       Hook::register('register_account', 'addon/public_server/public_server.php', 'public_server_register_account');
+       Hook::register('cron', 'addon/public_server/public_server.php', 'public_server_cron');
+       Hook::register('enotify', 'addon/public_server/public_server.php', 'public_server_enotify');
+       Hook::register('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
 }
 
 function public_server_uninstall()
 {
-       Addon::unregisterHook('load_config',      'addon/public_server/public_server.php', 'public_server_load_config');
-       Addon::unregisterHook('register_account', 'addon/public_server/public_server.php', 'public_server_register_account');
-       Addon::unregisterHook('cron', 'addon/public_server/public_server.php', 'public_server_cron');
-       Addon::unregisterHook('enotify', 'addon/public_server/public_server.php', 'public_server_enotify');
-       Addon::unregisterHook('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
+       Hook::unregister('load_config',      'addon/public_server/public_server.php', 'public_server_load_config');
+       Hook::unregister('register_account', 'addon/public_server/public_server.php', 'public_server_register_account');
+       Hook::unregister('cron', 'addon/public_server/public_server.php', 'public_server_cron');
+       Hook::unregister('enotify', 'addon/public_server/public_server.php', 'public_server_enotify');
+       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, ConfigFileLoader $loader)
 {
-       $a->loadConfigFile(__DIR__ . '/config/public_server.config.php');
+       $a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
 }
 
 function public_server_register_account($a, $b)