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 2c09656811ad53867325c3cfb0c93a68d4f50066..a5c4cec7ef0a31e25943bf53182098364ff13e20 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -5,16 +5,18 @@
  * 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() {
 
        Addon::registerHook('register_account', 'addon/public_server/public_server.php', 'public_server_register_account');
        Addon::registerHook('cron', 'addon/public_server/public_server.php', 'public_server_cron');
-    Addon::registerHook('enotify','addon/public_server/public_server.php', 'public_server_enotify');
+       Addon::registerHook('enotify', 'addon/public_server/public_server.php', 'public_server_enotify');
        Addon::registerHook('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
 }
 
@@ -23,7 +25,7 @@ function public_server_uninstall() {
 
        Addon::unregisterHook('register_account', 'addon/public_server/public_server.php', 'public_server_register_account');
        Addon::unregisterHook('cron', 'addon/public_server/public_server.php', 'public_server_cron');
-    Addon::unregisterHook('enotify','addon/public_server/public_server.php', 'public_server_enotify');
+       Addon::unregisterHook('enotify', 'addon/public_server/public_server.php', 'public_server_enotify');
        Addon::unregisterHook('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
 }
 
@@ -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)
        );
@@ -61,13 +63,13 @@ function public_server_cron($a,$b) {
                                'language'     => $rr['language'],
                                'to_name'      => $rr['username'],
                                'to_email'     => $rr['email'],
-                               'source_name'  => t('Administrator'),
+                               'source_name'  => L10n::t('Administrator'),
                                'source_link'  => $a->get_baseurl(),
                                'source_photo' => $a->get_baseurl() . '/images/person-80.jpg',
                        ]);
 
                        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'])
                                );
                }
@@ -125,9 +127,9 @@ function public_server_enotify(&$a, &$b) {
     if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM
                && x($b['params'], 'system_type') && $b['params']['system_type'] === 'public_server_expire') {
         $b['itemlink'] = $a->get_baseurl();
-        $b['epreamble'] = $b['preamble'] = sprintf( t('Your account on %s will expire in a few days.'), Config::get('system','sitename'));
-        $b['subject'] = t('Your Friendica account is about to expire.');
-        $b['body'] = sprintf( t("Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"), $b['params']['to_name'], "[url=" . $app->config["system"]["url"] . "]" . $app->config["sitename"] . "[/url]");
+        $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 account is about to expire.');
+        $b['body'] = L10n::t("Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days", $b['params']['to_name'], "[url=" . $app->config["system"]["url"] . "]" . $app->config["sitename"] . "[/url]");
     }
 }
 
@@ -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()
        );
 }
@@ -155,15 +157,15 @@ function public_server_addon_admin_post ( &$a ) {
     Config::set( 'public_server','flagusers',$flagusers);
     Config::set( 'public_server','flagposts',$flagposts );
     Config::set( 'public_server','flagpostsexpire',$flagpostsexpire );
-    info( t('Settings saved').EOL );
+    info(L10n::t('Settings saved').EOL );
 }
 function public_server_addon_admin ( &$a, &$o) {
     $token = get_form_security_token("publicserver");
     $t = get_markup_template( "admin.tpl", "addon/public_server");
     $o = replace_macros($t, [
-       '$submit' => t('Save Settings'),
+       '$submit' => L10n::t('Save Settings'),
        '$form_security_token' => $token,
-       '$infotext' => t('Set any of these options to 0 to deactivate it.'),
+       '$infotext' => L10n::t('Set any of these options to 0 to deactivate it.'),
        '$expiredays' => [ "expiredays","Expire Days", intval(Config::get('public_server', 'expiredays')), "When an account is created on the site, it is given a hard "],
        '$expireposts' => [ "expireposts", "Expire Posts", intval(Config::get('public_server','expireposts')), "Set the default days for posts to expire here"],
        '$nologin' => [ "nologin", "No Login", intval(Config::get('public_server','nologin')), "Remove users who have never logged in after nologin days "],
@@ -172,4 +174,3 @@ function public_server_addon_admin ( &$a, &$o) {
        '$flagpostsexpire' => [ "flagpostsexpire", "Flag posts expire", intval(Config::get('public_server','flagpostsexpire'))],
     ]);
 }
-