Merge pull request #534 from tobiasd/20180218-en

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

diff --git a/public_server/public_server.php b/public_server/public_server.php
index d3309e6e4334fd6de9406b29e52441ac722af27a..a5c4cec7ef0a31e25943bf53182098364ff13e20 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -5,10 +5,12 @@
  * Version: 1.1
  * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
  */
+
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Model\User;
+use Friendica\Util\DateTimeFormat;
 
 function public_server_install() {
 
@@ -37,7 +39,7 @@ function public_server_register_account($a,$b) {
                return;
 
        $r = q("UPDATE user set account_expires_on = '%s', expire = %d where uid = %d",
-               dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')),
+               dbesc(DateTimeFormat::utc('now +' . $days . ' days')),
                intval($days_posts),
                intval($uid)
        );
@@ -67,7 +69,7 @@ function public_server_cron($a,$b) {
                        ]);
 
                        q("update user set expire_notification_sent = '%s' where uid = %d",
-                               dbesc(datetime_convert()),
+                               dbesc(DateTimeFormat::utcNow()),
                                intval($rr['uid'])
                        );
                }
@@ -85,7 +87,7 @@ function public_server_cron($a,$b) {
                if(count($r)) {
                        foreach($r as $rr)
                                q("update user set account_expires_on = '%s' where uid = %d",
-                                       dbesc(datetime_convert('UTC','UTC','now +' . '6 days')),
+                                       dbesc(DateTimeFormat::utc('now +' . '6 days')),
                                        intval($rr['uid'])
                        );
                }
@@ -98,7 +100,7 @@ function public_server_cron($a,$b) {
                if(count($r)) {
                        foreach($r as $rr)
                                q("update user set account_expires_on = '%s' where uid = %d",
-                                       dbesc(datetime_convert('UTC','UTC','now +' . '6 days')),
+                                       dbesc(DateTimeFormat::utc('now +' . '6 days')),
                                        intval($rr['uid'])
                                );
                }
@@ -136,7 +138,7 @@ function public_server_login($a,$b) {
        if(! $days)
                return;
        $r = q("UPDATE user set account_expires_on = '%s' where uid = %d and account_expires_on > '0000-00-00 00:00:00'",
-       dbesc(datetime_convert('UTC','UTC','now +' . $days . ' days')),
+       dbesc(DateTimeFormat::utc('now +' . $days . ' days')),
        local_user()
        );
 }