X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=testdrive%2Ftestdrive.php;h=1806ea2cc528ada368e123a9b8827b8965535632;hb=62c6b497820ba80c94abe25a7fbb9a201da6eb76;hp=2a65692885b24b0e19f025a329b0299ac269017a;hpb=ce2af45897ea3263c1973802b9bf592ccb7f73e9;p=friendica-addons.git

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 2a656928..1806ea2c 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -7,37 +7,28 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
+use Friendica\Core\Hook;
+use Friendica\Core\Search;
 use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Model\Notify\Type;
 use Friendica\Model\User;
+use Friendica\Util\ConfigFileLoader;
 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');
-
-}
-
-function testdrive_load_config(App $a)
+function testdrive_load_config(App $a, ConfigFileLoader $loader)
 {
-	$a->loadConfigFile(__DIR__. '/config/testdrive.ini.php');
+	$a->getConfigCache()->load($loader->loadAddonConfig('testdrive'));
 }
 
 function testdrive_globaldir_update($a,&$b) {
@@ -48,7 +39,7 @@ function testdrive_register_account($a,$b) {
 
 	$uid = $b;
 
-	$days = Config::get('testdrive','expiredays');
+	$days = DI::config()->get('testdrive','expiredays');
 	if(! $days)
 		return;
 
@@ -61,8 +52,6 @@ function testdrive_register_account($a,$b) {
 
 
 function testdrive_cron($a,$b) {
-	require_once('include/enotify.php');
-
 	$r = q("select * from user where account_expires_on < UTC_TIMESTAMP() + INTERVAL 5 DAY and
 		expire_notification_sent = '0000-00-00 00:00:00' ");
 
@@ -70,14 +59,14 @@ function testdrive_cron($a,$b) {
 		foreach($r as $rr) {
 			notification([
 				'uid' => $rr['uid'],
-				'type' => NOTIFY_SYSTEM,
+				'type' => Type::SYSTEM,
 				'system_type' => 'testdrive_expire',
 				'language'     => $rr['language'],
 				'to_name'      => $rr['username'],
 				'to_email'     => $rr['email'],
-				'source_name'  => L10n::t('Administrator'),
-				'source_link'  => $a->getBaseURL(),
-				'source_photo' => $a->getBaseURL() . '/images/person-80.jpg',
+				'source_name'  => DI::l10n()->t('Administrator'),
+				'source_link'  => DI::baseUrl()->get(),
+				'source_photo' => DI::baseUrl()->get() . '/images/person-80.jpg',
 			]);
 
 			q("update user set expire_notification_sent = '%s' where uid = %d",
@@ -97,11 +86,11 @@ 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') {
-        $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.');
-        $b['body'] = L10n::t("Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.", $b['params']['to_name'], "[url=".Config::get('system', 'url')."]".Config::get('config', 'sitename')."[/url]", get_server());
+    if (!empty($b['params']) && $b['params']['type'] == Type::SYSTEM
+		&& !empty($b['params']['system_type']) && $b['params']['system_type'] === 'testdrive_expire') {
+        $b['itemlink'] = DI::baseUrl()->get();
+        $b['epreamble'] = $b['preamble'] = DI::l10n()->t('Your account on %s will expire in a few days.', DI::config()->get('system', 'sitename'));
+        $b['subject'] = DI::l10n()->t('Your Friendica test account is about to expire.');
+        $b['body'] = DI::l10n()->t("Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.", $b['params']['to_name'], "[url=".DI::config()->get('system', 'url')."]".DI::config()->get('config', 'sitename')."[/url]", Search::getGlobalDirectory());
     }
 }