X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=public_server%2Fpublic_server.php;h=b388f00bbc6ce3b1c6a3b2d5545555716fcc6739;hb=285079c12b9108572f1ea7978dc585f26d6b399d;hp=bb7ebec940feae73721ec630d4f2c585c6ff4e7b;hpb=6272ee3d09dc08c67db574ad27995ce83de3fb73;p=friendica-addons.git

diff --git a/public_server/public_server.php b/public_server/public_server.php
index bb7ebec9..b388f00b 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -13,10 +13,10 @@ use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Notify\Type;
-use Friendica\Util\ConfigFileLoader;
+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()
 {
@@ -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,73 +46,62 @@ 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::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' => 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)
+function public_server_enotify(App $a, array &$b)
 {
-	if (!empty($b['params']) && $b['params']['type'] == Type::SYSTEM
+	if (!empty($b['params']) && $b['params']['type'] == Notification\Type::SYSTEM
 		&& !empty($b['params']['system_type']) && $b['params']['system_type'] === 'public_server_expire') {
 		$b['itemlink'] = DI::baseUrl()->get();
 		$b['epreamble'] = $b['preamble'] = DI::l10n()->t('Your account on %s will expire in a few days.', DI::config()->get('system', 'sitename'));
@@ -121,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) {
@@ -133,32 +122,27 @@ function public_server_login($a, $b)
 	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']) ? 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'])) : '');
-	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"],