X-Git-Url: https://reisub.nsupdate.info/git/?a=blobdiff_plain;f=testdrive%2Ftestdrive.php;h=5c3930cd35188167186d1b21fc185c18debf210e;hb=db8253ef6d97171337acab0307a5a9d6fe674e41;hp=6eb9344e65b288b765b4f13eb5254803ab2d9d77;hpb=f8c162cbfb777793891f885e019eb8eae319dce1;p=friendica-addons.git%2F.git

diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 6eb9344e..5c3930cd 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -5,10 +5,12 @@
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
+
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Model\User;
+use Friendica\Util\DateTimeFormat;
 
 function testdrive_install() {
 
@@ -42,7 +44,7 @@ function testdrive_register_account($a,$b) {
 		return;
 
 	$r = q("UPDATE user set account_expires_on = '%s' where uid = %d",
-		dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')),
+		dbesc(DateTimeFormat::convert('now +' . $days . ' days')),
 		intval($uid)
 	);
 
@@ -70,7 +72,7 @@ function testdrive_cron($a,$b) {
 			]);
 
 			q("update user set expire_notification_sent = '%s' where uid = %d",
-				dbesc(datetime_convert()),
+				dbesc(DateTimeFormat::utcNow()),
 				intval($rr['uid'])
 			);
 
@@ -89,8 +91,8 @@ 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->get_baseurl();
-        $b['epreamble'] = $b['preamble'] = sprintf(L10n::t('Your account on %s will expire in a few days.'), Config::get('system','sitename'));
+        $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'] = sprintf(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 http://friendica.com."), $b['params']['to_name'], "[url=".$app->config["system"]["url"]."]".$app->config["sitename"]."[/url]", get_server());
+        $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 http://friendica.com.", $b['params']['to_name'], "[url=".$app->config["system"]["url"]."]".$app->config["sitename"]."[/url]", get_server());
     }
 }