X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=public_server%2Fpublic_server.php;h=fd19c8f49c40551550fdb664dc215b2a694cb08d;hb=4b05d70b94033bf2bcf7a63ee5f9928a56504bd9;hp=7d8b81365762edd95f8d8764956a2033f53944e8;hpb=81e05e62745ce8d18cb9d6fd9d80a7d5978b178e;p=friendica-addons.git

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 7d8b8136..fd19c8f4 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -7,7 +7,8 @@
  * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
  */
 
-
+use Friendica\Core\Config;
+use Friendica\Model\User;
 
 
 function public_server_install() {
@@ -31,8 +32,8 @@ function public_server_register_account($a,$b) {
 
 	$uid = $b;
 
-	$days = get_config('public_server','expiredays');
-	$days_posts = get_config('public_server','expireposts');
+	$days = Config::get('public_server','expiredays');
+	$days_posts = Config::get('public_server','expireposts');
 	if(! $days)
 		return;
 
@@ -75,12 +76,11 @@ function public_server_cron($a,$b) {
 
 	$r = q("select * from user where account_expired = 1 and account_expires_on < UTC_TIMESTAMP() - INTERVAL 5 DAY and account_expires_on > '0000-00-00 00:00:00'");
 	if(count($r)) {
-		require_once('include/Contact.php');
-		foreach($r as $rr)
-			user_remove($rr['uid']);
-
+		foreach($r as $rr) {
+			User::remove($rr['uid']);
+		}
 	}
-	$nologin = get_config('public_server','nologin');
+	$nologin = Config::get('public_server','nologin');
 	if($nologin) {
 		$r = q("select uid from user where account_expired = 0 and login_date = '0000-00-00 00:00:00' and register_date <  UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00'",intval($nologin));
 		if(count($r)) {
@@ -93,7 +93,7 @@ function public_server_cron($a,$b) {
         }
 
 
-        $flagusers = get_config('public_server','flagusers');
+        $flagusers = Config::get('public_server','flagusers');
 	if($flagusers) {
 		$r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and `page-flags` = 0",intval($flagusers));
 		if(count($r)) {
@@ -105,8 +105,8 @@ function public_server_cron($a,$b) {
 		}
         }
 
-        $flagposts = get_config('public_server','flagposts');
-        $flagpostsexpire = get_config('public_server','flagpostsexpire');
+        $flagposts = Config::get('public_server','flagposts');
+        $flagpostsexpire = Config::get('public_server','flagpostsexpire');
 	if ($flagposts && $flagpostsexpire) {
 		$r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and expire = 0 and `page-flags` = 0",intval($flagposts));
 		if(count($r)) {
@@ -123,17 +123,17 @@ function public_server_cron($a,$b) {
 }
 
 function public_server_enotify(&$a, &$b) {
-    if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM 
+    if (x($b, 'params') && $b['params']['type'] == NOTIFY_SYSTEM
 		&& x($b['params'], 'system_type') && $b['params']['system_type'] === 'public_server_expire') {
         $b['itemlink'] = $a->get_baseurl();
-        $b['epreamble'] = $b['preamble'] = sprintf( t('Your account on %s will expire in a few days.'), get_config('system','sitename'));
+        $b['epreamble'] = $b['preamble'] = sprintf( t('Your account on %s will expire in a few days.'), Config::get('system','sitename'));
         $b['subject'] = t('Your Friendica account is about to expire.');
         $b['body'] = sprintf( 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]");
     }
 }
 
 function public_server_login($a,$b) {
-	$days = get_config('public_server','expiredays');
+	$days = Config::get('public_server','expiredays');
 	if(! $days)
 		return;
 	$r = q("UPDATE user set account_expires_on = '%s' where uid = %d and account_expires_on > '0000-00-00 00:00:00'",
@@ -150,12 +150,12 @@ function public_server_plugin_admin_post ( &$a ) {
     $flagusers = (( x($_POST, 'flagusers') ) ? notags(trim($_POST['flagusers'] )) : '');
     $flagposts = (( x($_POST, 'flagposts') ) ? notags(trim($_POST['flagposts'] )) : '');
     $flagpostsexpire = (( x($_POST, 'flagpostsexpire') ) ? notags(trim($_POST['flagpostsexpire'] )) : '');
-    set_config( 'public_server','expiredays',$expiredays );
-    set_config( 'public_server','expireposts',$expireposts );
-    set_config( 'public_server','nologin',$nologin );
-    set_config( 'public_server','flagusers',$flagusers);
-    set_config( 'public_server','flagposts',$flagposts );
-    set_config( 'public_server','flagpostsexpire',$flagpostsexpire );
+    Config::set( 'public_server','expiredays',$expiredays );
+    Config::set( 'public_server','expireposts',$expireposts );
+    Config::set( 'public_server','nologin',$nologin );
+    Config::set( 'public_server','flagusers',$flagusers);
+    Config::set( 'public_server','flagposts',$flagposts );
+    Config::set( 'public_server','flagpostsexpire',$flagpostsexpire );
     info( t('Settings saved').EOL );
 }
 function public_server_plugin_admin ( &$a, &$o) {
@@ -165,12 +165,12 @@ function public_server_plugin_admin ( &$a, &$o) {
 	'$submit' => t('Save Settings'),
 	'$form_security_token' => $token,
 	'$infotext' => t('Set any of these options to 0 to deactivate it.'),
-	'$expiredays' => Array( "expiredays","Expire Days", intval(get_config('public_server', 'expiredays')), "When an account is created on the site, it is given a hard "),
-	'$expireposts' => Array( "expireposts", "Expire Posts", intval(get_config('public_server','expireposts')), "Set the default days for posts to expire here"),
-	'$nologin' => Array( "nologin", "No Login", intval(get_config('public_server','nologin')), "Remove users who have never logged in after nologin days "),
-	'$flagusers' => Array( "flagusers", "Flag users", intval(get_config('public_server','flagusers')), "Remove users who last logged in over flagusers days ago"),
-	'$flagposts' => Array( "flagposts", "Flag posts", intval(get_config('public_server','flagposts')), "For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire "),
-	'$flagpostsexpire' => Array( "flagpostsexpire", "Flag posts expire", intval(get_config('public_server','flagpostsexpire'))),
+	'$expiredays' => Array( "expiredays","Expire Days", intval(Config::get('public_server', 'expiredays')), "When an account is created on the site, it is given a hard "),
+	'$expireposts' => Array( "expireposts", "Expire Posts", intval(Config::get('public_server','expireposts')), "Set the default days for posts to expire here"),
+	'$nologin' => Array( "nologin", "No Login", intval(Config::get('public_server','nologin')), "Remove users who have never logged in after nologin days "),
+	'$flagusers' => Array( "flagusers", "Flag users", intval(Config::get('public_server','flagusers')), "Remove users who last logged in over flagusers days ago"),
+	'$flagposts' => Array( "flagposts", "Flag posts", intval(Config::get('public_server','flagposts')), "For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire "),
+	'$flagpostsexpire' => Array( "flagpostsexpire", "Flag posts expire", intval(Config::get('public_server','flagpostsexpire'))),
     ));
 }