Merge pull request #1261 from tobiasd/20220613-ar

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

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 482a8a0c65a75824e74e05885306ae28ff96c99f..c6e3c364b0dd89fd62d1860221e5910593f50a7d 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -14,9 +14,9 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Notification;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Model\User;
+use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Strings;
 
 function public_server_install()
 {
@@ -48,66 +48,55 @@ function public_server_register_account($a, $b)
 
 function public_server_cron($a, $b)
 {
-       Logger::log("public_server: cron start");
-
-       $r = q("SELECT * FROM `user` WHERE `account_expires_on` < UTC_TIMESTAMP() + INTERVAL 5 DAY AND
-               `account_expires_on` > '%s' AND
-               `expire_notification_sent` <= '%s'",
-               DBA::NULL_DATETIME, DBA::NULL_DATETIME);
-
-       if (DBA::isResult($r)) {
-               foreach ($r as $rr) {
-                       notification([
-                               'type' => Notification\Type::SYSTEM,
-                               'uid' => $rr['uid'],
-                               'system_type' => 'public_server_expire',
-                               'source_name'  => DI::l10n()->t('Administrator'),
-                               'source_link'  => DI::baseUrl()->get(),
-                               'source_photo' => DI::baseUrl()->get() . '/images/person-80.jpg',
-                       ]);
-
-                       $fields = ['expire_notification_sent' => DateTimeFormat::utcNow()];
-                       DBA::update('user', $fields, ['uid' => $rr['uid']]);
-               }
+       Logger::notice("public_server: cron start");
+
+       $users = DBA::selectToArray('user', [], ["`account_expires_on` > ? AND `account_expires_on` < ?
+               AND `expire_notification_sent` <= ?", DBA::NULL_DATETIME, DateTimeFormat::utc('now + 5 days'), DBA::NULL_DATETIME]);
+       foreach ($users as $rr) {
+               DI::notify()->createFromArray([
+                       'type' => Notification\Type::SYSTEM,
+                       'uid' => $rr['uid'],
+                       'system_type' => 'public_server_expire',
+                       'source_name'  => DI::l10n()->t('Administrator'),
+                       'source_link'  => DI::baseUrl()->get(),
+                       'source_photo' => DI::baseUrl()->get() . '/images/person-80.jpg',
+               ]);
+
+               $fields = ['expire_notification_sent' => DateTimeFormat::utcNow()];
+               DBA::update('user', $fields, ['uid' => $rr['uid']]);
        }
 
        $nologin = DI::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'",
-                       DBA::NULL_DATETIME, intval($nologin), DBA::NULL_DATETIME);
-               if (DBA::isResult($r)) {
-                       foreach ($r as $rr) {
-                               $fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
-                               DBA::update('user', $fields, ['uid' => $rr['uid']]);
-                       }
+               $users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` <= ? AND `register_date` < ? AND `account_expires_on` <= ?",
+                       DBA::NULL_DATETIME, DateTimeFormat::utc('now -  ' . (int)$nologin . ' days'), DBA::NULL_DATETIME]);
+               foreach ($users as $rr) {
+                       $fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
+                       DBA::update('user', $fields, ['uid' => $rr['uid']]);
                }
        }
 
        $flagusers = DI::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), DBA::NULL_DATETIME);
-               if (DBA::isResult($r)) {
-                       foreach ($r as $rr) {
-                               $fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
-                               DBA::update('user', $fields, ['uid' => $rr['uid']]);
-                       }
+               $users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` < ? AND `account_expires_on` <= ? AND `page-flags` = ?",
+            DateTimeFormat::utc('now -  ' . (int)$flagusers . ' days'), DBA::NULL_DATETIME, User::PAGE_FLAGS_NORMAL]);
+               foreach ($users as $rr) {
+                       $fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
+                       DBA::update('user', $fields, ['uid' => $rr['uid']]);
                }
        }
 
        $flagposts = DI::config()->get('public_server', 'flagposts');
        $flagpostsexpire = DI::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), DBA::NULL_DATETIME);
-               if (DBA::isResult($r)) {
-                       foreach ($r as $rr) {
-                               DBA::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]);
-                       }
+               $users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` < ? AND `account_expires_on` <= ? AND NOT `expire` AND `page-flags` = ?",
+            DateTimeFormat::utc('now -  ' . (int)$flagposts . ' days'), DBA::NULL_DATETIME, User::PAGE_FLAGS_NORMAL]);
+               foreach ($users as $rr) {
+                       DBA::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]);
                }
        }
 
-       Logger::log("public_server: cron end");
+       Logger::notice("public_server: cron end");
 }
 
 function public_server_enotify(&$a, &$b)
@@ -136,12 +125,12 @@ function public_server_login($a, $b)
 function public_server_addon_admin_post(&$a)
 {
        BaseModule::checkFormSecurityTokenRedirectOnError('/admin/addons/publicserver', 'publicserver');
-       $expiredays = (!empty($_POST['expiredays']) ? Strings::escapeTags(trim($_POST['expiredays'])) : '');
-       $expireposts = (!empty($_POST['expireposts']) ? Strings::escapeTags(trim($_POST['expireposts'])) : '');
-       $nologin = (!empty($_POST['nologin']) ? Strings::escapeTags(trim($_POST['nologin'])) : '');
-       $flagusers = (!empty($_POST['flagusers']) ? Strings::escapeTags(trim($_POST['flagusers'])) : '');
-       $flagposts = (!empty($_POST['flagposts']) ? Strings::escapeTags(trim($_POST['flagposts'])) : '');
-       $flagpostsexpire = (!empty($_POST['flagpostsexpire']) ? Strings::escapeTags(trim($_POST['flagpostsexpire'])) : '');
+       $expiredays = trim($_POST['expiredays'] ?? '');
+       $expireposts = trim($_POST['expireposts'] ?? '');
+       $nologin = trim($_POST['nologin'] ?? '');
+       $flagusers = trim($_POST['flagusers'] ?? '');
+       $flagposts = trim($_POST['flagposts'] ?? '');
+       $flagpostsexpire = trim($_POST['flagpostsexpire'] ?? '');
        DI::config()->set('public_server', 'expiredays', $expiredays);
        DI::config()->set('public_server', 'expireposts', $expireposts);
        DI::config()->set('public_server', 'nologin', $nologin);