3) Introducing ConfigFactory

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

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 2a65692..272e6b9 100644 (file)
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -7,8 +7,8 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
@@ -16,28 +16,28 @@ use Friendica\Util\DateTimeFormat;
 
 function testdrive_install() {
 
-       Addon::registerHook('load_config',      'addon/testdrive/testdrive.php', 'testdrive_load_config');
-       Addon::registerHook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
-       Addon::registerHook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
-       Addon::registerHook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
-       Addon::registerHook('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
+       Hook::register('load_config',      'addon/testdrive/testdrive.php', 'testdrive_load_config');
+       Hook::register('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
+       Hook::register('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
+       Hook::register('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
+       Hook::register('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
 
 }
 
 
 function testdrive_uninstall() {
 
-       Addon::unregisterHook('load_config',      'addon/testdrive/testdrive.php', 'testdrive_load_config');
-       Addon::unregisterHook('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
-       Addon::unregisterHook('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
-       Addon::unregisterHook('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
-       Addon::unregisterHook('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
+       Hook::unregister('load_config',      'addon/testdrive/testdrive.php', 'testdrive_load_config');
+       Hook::unregister('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
+       Hook::unregister('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
+       Hook::unregister('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
+       Hook::unregister('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
 
 }
 
-function testdrive_load_config(App $a)
+function testdrive_load_config(App $a, Config\ConfigCacheLoader $loader)
 {
-       $a->loadConfigFile(__DIR__. '/config/testdrive.ini.php');
+       $a->getConfig()->loadConfigArray($loader->loadConfigFile('testdrive'));
 }
 
 function testdrive_globaldir_update($a,&$b) {
@@ -97,8 +97,8 @@ function testdrive_cron($a,$b) {
 }
 
 function testdrive_enotify(&$a, &$b) {
-    if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM
-               && x($b['params'], 'system_type') && $b['params']['system_type'] === 'testdrive_expire') {
+    if (!empty($b['params']) && $b['params']['type'] == NOTIFY_SYSTEM
+               && !empty($b['params']['system_type']) && $b['params']['system_type'] === 'testdrive_expire') {
         $b['itemlink'] = $a->getBaseURL();
         $b['epreamble'] = $b['preamble'] = L10n::t('Your account on %s will expire in a few days.', Config::get('system', 'sitename'));
         $b['subject'] = L10n::t('Your Friendica test account is about to expire.');