X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=testdrive%2Ftestdrive.php;h=7c3af59e0253e21c5442d605dc5895669db64823;hb=e53818d9f109f42865343dcca9b7c4e54305bfb8;hp=3b4691b01ddc8c1691b0ca3dbbd9104cb237acf2;hpb=2e33d99f187ce10cab56c68841d3a768c41b4699;p=friendica-addons.git diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php index 3b4691b0..7c3af59e 100644 --- a/testdrive/testdrive.php +++ b/testdrive/testdrive.php @@ -7,11 +7,13 @@ */ use Friendica\App; -use Friendica\Core\Config; use Friendica\Core\Hook; -use Friendica\Core\L10n; +use Friendica\Core\Search; use Friendica\Database\DBA; +use Friendica\DI; +use Friendica\Model\Notification; use Friendica\Model\User; +use Friendica\Util\ConfigFileLoader; use Friendica\Util\DateTimeFormat; function testdrive_install() { @@ -24,18 +26,7 @@ function testdrive_install() { } - -function testdrive_uninstall() { - - 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, Config\Cache\ConfigCacheLoader $loader) +function testdrive_load_config(App $a, ConfigFileLoader $loader) { $a->getConfigCache()->load($loader->loadAddonConfig('testdrive')); } @@ -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; @@ -67,15 +58,12 @@ function testdrive_cron($a,$b) { if(count($r)) { foreach($r as $rr) { notification([ + 'type' => Notification\Type::SYSTEM, 'uid' => $rr['uid'], - 'type' => NOTIFY_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", @@ -95,11 +83,11 @@ function testdrive_cron($a,$b) { } function testdrive_enotify(&$a, &$b) { - if (!empty($b['params']) && $b['params']['type'] == NOTIFY_SYSTEM + if (!empty($b['params']) && $b['params']['type'] == Notification\Type::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.'); - $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()); + $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()); } }