X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=testdrive%2Ftestdrive.php;h=5564528451e1beba982bfab3ea0c2e64fc13e237;hb=18266ea6ef1ba98ffd7023fb8537b90dc413fa4a;hp=58bcd88699f79010588eb00187d90f8d17c76966;hpb=4d7c1e795d8010316eadb9e72284ed8d25a0bf36;p=friendica-addons.git

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 58bcd886..55645284 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -13,68 +13,72 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Notification;
 use Friendica\Model\User;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Util\DateTimeFormat;
 
-function testdrive_install() {
-
+function testdrive_install()
+{
 	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_load_config(App $a, ConfigFileLoader $loader)
+function testdrive_load_config(ConfigFileManager $loader)
 {
-	$a->getConfigCache()->load($loader->loadAddonConfig('testdrive'));
+	DI::app()->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
-function testdrive_globaldir_update($a,&$b) {
+function testdrive_globaldir_update(array &$b)
+{
 	$b['url'] = '';
 }
 
-function testdrive_register_account($a,$b) {
-
+function testdrive_register_account($b)
+{
 	$uid = $b;
 
 	$days = DI::config()->get('testdrive','expiredays');
-	if(! $days)
+	if (!$days) {
 		return;
+	}
 
 	DBA::update('user', ['account_expires_on' => DateTimeFormat::convert('now +' . $days . ' days')], ['uid' => $uid]);
-};
+}
 
 
-function testdrive_cron($a,$b) {
-	$users = DBA::selectToArray('user', [], ["`account_expires_on` < UTC_TIMESTAMP() + INTERVAL ? DAY AND `expire_notification_sent` <= ?",
-		5, DBA::NULL_DATETIME]);
-	foreach($users as $rr) {
+function testdrive_cron($b)
+{
+	$users = DBA::selectToArray('user', [], ["`account_expires_on` < ? AND `expire_notification_sent` <= ?",
+		DateTimeFormat::utc('now + 5 days'), DBA::NULL_DATETIME]);
+
+	foreach ($users as $rr) {
 		DI::notify()->createFromArray([
 			'type' => Notification\Type::SYSTEM,
 			'uid' => $rr['uid'],
 			'system_type' => 'testdrive_expire',
 			'source_name'  => DI::l10n()->t('Administrator'),
-			'source_link'  => DI::baseUrl()->get(),
-			'source_photo' => DI::baseUrl()->get() . '/images/person-80.jpg',
+			'source_link'  => DI::baseUrl(),
+			'source_photo' => DI::baseUrl() . '/images/person-80.jpg',
 		]);
 
 		DBA::update('user', ['expire_notification_sent' => DateTimeFormat::utcNow()], ['uid' => $rr['uid']]);
 	}
 
-	$users = DBA::selectToArray('user', [], ["`account_expired` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL ? DAY", 5]);
+	$users = DBA::selectToArray('user', [], ["`account_expired` AND `account_expires_on` < ?", DateTimeFormat::utc('now - 5 days')]);
 	foreach($users as $rr) {
 		User::remove($rr['uid']);
 	}
 }
 
-function testdrive_enotify(&$a, &$b) {
-    if (!empty($b['params']) && $b['params']['type'] == Notification\Type::SYSTEM
+function testdrive_enotify(array &$b)
+{
+	if (!empty($b['params']) && $b['params']['type'] == Notification\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());
-    }
+		$b['itemlink'] = DI::baseUrl();
+		$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());
+	}
 }