X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=public_server%2Fpublic_server.php;h=cc85ba60b54f2aeff9eeaa0d3cd4ebc188876ca4;hb=97fcee53c04345271c62df18f44e6fad948a3d0e;hp=97e4b78562344e00349d997526d0f9c3b7aade38;hpb=cff3dd67b065983dcbe13858a2a31f2de9992659;p=friendica-addons.git

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 97e4b785..cc85ba60 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -32,7 +32,7 @@ function public_server_load_config(App $a, ConfigFileLoader $loader)
 	$a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
 }
 
-function public_server_register_account($a, $b)
+function public_server_register_account(App $a, $b)
 {
 	$uid = $b;
 
@@ -46,12 +46,12 @@ function public_server_register_account($a, $b)
 	DBA::update('user', $fields, ['uid' => $uid]);
 }
 
-function public_server_cron($a, $b)
+function public_server_cron(App $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,
@@ -68,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']]);
@@ -78,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']]);
@@ -89,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']]);
 		}
@@ -99,7 +99,7 @@ function public_server_cron($a, $b)
 	Logger::notice("public_server: cron end");
 }
 
-function public_server_enotify(&$a, &$b)
+function public_server_enotify(App $a, array &$b)
 {
 	if (!empty($b['params']) && $b['params']['type'] == Notification\Type::SYSTEM
 		&& !empty($b['params']['system_type']) && $b['params']['system_type'] === 'public_server_expire') {
@@ -110,7 +110,7 @@ function public_server_enotify(&$a, &$b)
 	}
 }
 
-function public_server_login($a, $b)
+function public_server_login(App $a, $b)
 {
 	$days = DI::config()->get('public_server', 'expiredays');
 	if (!$days) {
@@ -118,36 +118,31 @@ function public_server_login($a, $b)
 	}
 
 	$fields = ['account_expires_on' => DateTimeFormat::utc('now +' . $days . ' days')];
-	$condition = ["`uid` = ? AND `account_expires_on` > ?", local_user(), DBA::NULL_DATETIME];
+	$condition = ["`uid` = ? AND `account_expires_on` > ?", DI::userSession()->getLocalUserId(), DBA::NULL_DATETIME];
 	DBA::update('user', $fields, $condition);
 }
 
-function public_server_addon_admin_post(&$a)
+function public_server_addon_admin_post(App $a)
 {
 	BaseModule::checkFormSecurityTokenRedirectOnError('/admin/addons/publicserver', 'publicserver');
-	$expiredays = (!empty($_POST['expiredays']) ? trim($_POST['expiredays']) : '');
-	$expireposts = (!empty($_POST['expireposts']) ? trim($_POST['expireposts']) : '');
-	$nologin = (!empty($_POST['nologin']) ? trim($_POST['nologin']) : '');
-	$flagusers = (!empty($_POST['flagusers']) ? trim($_POST['flagusers']) : '');
-	$flagposts = (!empty($_POST['flagposts']) ? trim($_POST['flagposts']) : '');
-	$flagpostsexpire = (!empty($_POST['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);
-	DI::config()->set('public_server', 'flagusers', $flagusers);
-	DI::config()->set('public_server', 'flagposts', $flagposts);
-	DI::config()->set('public_server', 'flagpostsexpire', $flagpostsexpire);
+
+	DI::config()->set('public_server', 'expiredays', trim($_POST['expiredays'] ?? ''));
+	DI::config()->set('public_server', 'expireposts', trim($_POST['expireposts'] ?? ''));
+	DI::config()->set('public_server', 'nologin', trim($_POST['nologin'] ?? ''));
+	DI::config()->set('public_server', 'flagusers', trim($_POST['flagusers'] ?? ''));
+	DI::config()->set('public_server', 'flagposts', trim($_POST['flagposts'] ?? ''));
+	DI::config()->set('public_server', 'flagpostsexpire', trim($_POST['flagpostsexpire'] ?? ''));
 }
 
-function public_server_addon_admin(&$a, &$o)
+function public_server_addon_admin(App $a, string &$o)
 {
-	$token = BaseModule::getFormSecurityToken("publicserver");
-	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/public_server");
+	$token = BaseModule::getFormSecurityToken('publicserver');
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/public_server');
 	$o = Renderer::replaceMacros($t, [
 		'$submit' => DI::l10n()->t('Save Settings'),
 		'$form_security_token' => $token,
 		'$infotext' => DI::l10n()->t('Set any of these options to 0 to deactivate it.'),
-		'$expiredays' => ["expiredays","Expire Days", intval(DI::config()->get('public_server', 'expiredays')), "When an account is created on the site, it is given a hard "],
+		'$expiredays' => ["expiredays", "Expire Days", intval(DI::config()->get('public_server', 'expiredays')), "When an account is created on the site, it is given a hard "],
 		'$expireposts' => ["expireposts", "Expire Posts", intval(DI::config()->get('public_server', 'expireposts')), "Set the default days for posts to expire here"],
 		'$nologin' => ["nologin", "No Login", intval(DI::config()->get('public_server', 'nologin')), "Remove users who have never logged in after nologin days "],
 		'$flagusers' => ["flagusers", "Flag users", intval(DI::config()->get('public_server', 'flagusers')), "Remove users who last logged in over flagusers days ago"],