X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=public_server%2Fpublic_server.php;h=c6e3c364b0dd89fd62d1860221e5910593f50a7d;hb=5d7dbe354a4ca5d47a45df783eab91114624e30d;hp=0c37098107f5d1c83cb1e3992552a4dfa0de3459;hpb=63fca0af29909286f0b2d59a46e9afb82486e7db;p=friendica-addons.git

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 0c370981..c6e3c364 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -17,7 +17,6 @@ use Friendica\Model\Notification;
 use Friendica\Model\User;
 use Friendica\Core\Config\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Strings;
 
 function public_server_install()
 {
@@ -51,8 +50,8 @@ function public_server_cron($a, $b)
 {
 	Logger::notice("public_server: cron start");
 
-	$users = DBA::selectToArray('user', [], ["`account_expires_on` < UTC_TIMESTAMP() + INTERVAL ? DAY AND
-		`account_expires_on` > ? AND `expire_notification_sent` <= ?", 5, DBA::NULL_DATETIME, DBA::NULL_DATETIME]);
+	$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,
@@ -69,8 +68,8 @@ function public_server_cron($a, $b)
 
 	$nologin = DI::config()->get('public_server', 'nologin', false);
 	if ($nologin) {
-		$users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` <= ? AND `register_date` < UTC_TIMESTAMP() - INTERVAL ? DAY AND `account_expires_on` <= ?",
-			DBA::NULL_DATETIME, $nologin, DBA::NULL_DATETIME]);
+		$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']]);
@@ -79,8 +78,8 @@ function public_server_cron($a, $b)
 
 	$flagusers = DI::config()->get('public_server', 'flagusers', false);
 	if ($flagusers) {
-		$users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` < UTC_TIMESTAMP() - INTERVAL ? DAY AND `account_expires_on` <= ? AND `page-flags` = ?",
-			$flagusers, DBA::NULL_DATETIME, User::PAGE_FLAGS_NORMAL]);
+		$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']]);
@@ -90,8 +89,8 @@ function public_server_cron($a, $b)
 	$flagposts = DI::config()->get('public_server', 'flagposts');
 	$flagpostsexpire = DI::config()->get('public_server', 'flagpostsexpire');
 	if ($flagposts && $flagpostsexpire) {
-		$users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` < UTC_TIMESTAMP() - INTERVAL ? DAY AND `account_expires_on` <= ? AND NOT `expire` AND `page-flags` = ?",
-			$flagposts, DBA::NULL_DATETIME, User::PAGE_FLAGS_NORMAL]);
+		$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']]);
 		}
@@ -126,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);