PL translation blackout THX waldis

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

diff --git a/public_server/public_server.php b/public_server/public_server.php
index cfcb8fd74fe52ed7d5f05fa119dbf51daa98a16a..19aca3a86289cef53376d3513c02f279fc0e9ea5 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -9,11 +9,12 @@
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
 
 function public_server_install()
 {
+       Addon::registerHook('load_config',      'addon/public_server/public_server.php', 'public_server_load_config');
        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');
@@ -22,12 +23,18 @@ function public_server_install()
 
 function public_server_uninstall()
 {
+       Addon::unregisterHook('load_config',      'addon/public_server/public_server.php', 'public_server_load_config');
        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('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
 }
 
+function public_server_load_config(\Friendica\App $a)
+{
+       $a->loadConfigFile(__DIR__. '/config/public_server.ini.php');
+}
+
 function public_server_register_account($a, $b)
 {
        $uid = $b;
@@ -39,7 +46,7 @@ function public_server_register_account($a, $b)
        }
 
        $fields = ['account_expires_on' => DateTimeFormat::utc('now +' . $days . ' days'), 'expire' => $days_posts];
-       dba::update('user', $fields, ['uid' => $uid]);
+       DBA::update('user', $fields, ['uid' => $uid]);
 }
 
 function public_server_cron($a, $b)
@@ -50,9 +57,9 @@ function public_server_cron($a, $b)
        $r = q("SELECT * FROM `user` WHERE `account_expires_on` < UTC_TIMESTAMP() + INTERVAL 5 DAY AND
                `account_expires_on` > '%s' AND
                `expire_notification_sent` <= '%s'",
-               dbesc(NULL_DATE), dbesc(NULL_DATE));
+               DBA::escape(NULL_DATE), DBA::escape(NULL_DATE));
 
-       if (DBM::is_result($r)) {
+       if (DBA::isResult($r)) {
                foreach ($r as $rr) {
                        notification([
                                'uid' => $rr['uid'],
@@ -67,18 +74,18 @@ function public_server_cron($a, $b)
                        ]);
 
                        $fields = ['expire_notification_sent' => DateTimeFormat::utcNow()];
-                       dba::update('user', $fields, ['uid' => $rr['uid']]);
+                       DBA::update('user', $fields, ['uid' => $rr['uid']]);
                }
        }
 
        $nologin = Config::get('public_server', 'nologin', false);
        if ($nologin) {
                $r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND `login_date` <= '%s' AND `register_date` < UTC_TIMESTAMP() - INTERVAL %d DAY AND `account_expires_on` <= '%s'",
-                       dbesc(NULL_DATE), intval($nologin), dbesc(NULL_DATE));
-               if (DBM::is_result($r)) {
+                       DBA::escape(NULL_DATE), intval($nologin), DBA::escape(NULL_DATE));
+               if (DBA::isResult($r)) {
                        foreach ($r as $rr) {
                                $fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
-                               dba::update('user', $fields, ['uid' => $rr['uid']]);
+                               DBA::update('user', $fields, ['uid' => $rr['uid']]);
                        }
                }
        }
@@ -86,11 +93,11 @@ function public_server_cron($a, $b)
        $flagusers = Config::get('public_server', 'flagusers', false);
        if ($flagusers) {
                $r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND `login_date` < UTC_TIMESTAMP() - INTERVAL %d DAY AND `account_expires_on` <= '%s' AND `page-flags` = 0",
-                       intval($flagusers), dbesc(NULL_DATE));
-               if (DBM::is_result($r)) {
+                       intval($flagusers), DBA::escape(NULL_DATE));
+               if (DBA::isResult($r)) {
                        foreach ($r as $rr) {
                                $fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
-                               dba::update('user', $fields, ['uid' => $rr['uid']]);
+                               DBA::update('user', $fields, ['uid' => $rr['uid']]);
                        }
                }
        }
@@ -99,10 +106,10 @@ function public_server_cron($a, $b)
        $flagpostsexpire = Config::get('public_server', 'flagpostsexpire');
        if ($flagposts && $flagpostsexpire) {
                $r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND `login_date` < UTC_TIMESTAMP() - INTERVAL %d DAY AND `account_expires_on` <= '%s' and `expire` = 0 AND `page-flags` = 0",
-                       intval($flagposts), dbesc(NULL_DATE));
-               if (DBM::is_result($r)) {
+                       intval($flagposts), DBA::escape(NULL_DATE));
+               if (DBA::isResult($r)) {
                        foreach ($r as $rr) {
-                               dba::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]);
+                               DBA::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]);
                        }
                }
        }
@@ -117,7 +124,7 @@ function public_server_enotify(&$a, &$b)
                $b['itemlink'] = $a->get_baseurl();
                $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]");
+               $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=" . Config::get('system', 'url') . "]" . Config::get('config', 'sitename') . "[/url]");
        }
 }
 
@@ -130,7 +137,7 @@ function public_server_login($a, $b)
 
        $fields = ['account_expires_on' => DateTimeFormat::utc('now +' . $days . ' days')];
        $condition = ["`uid` = ? AND `account_expires_on` > ?", local_user(), NULL_DATE];
-       dba::update('user', $fields, $condition);
+       DBA::update('user', $fields, $condition);
 }
 
 function public_server_addon_admin_post(&$a)