X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=public_server%2Fpublic_server.php;h=41c6283253d86a0cedf1ba54a568c0b3653fe447;hb=19b2c8d83315ba7bc024ec2b29ea87762bc1ffa6;hp=52c04d5dc71a35a68356ddb789a1944db91972d3;hpb=08206fdcc0750ec9dd12a68addb341cd05f8bcfb;p=friendica-addons.git

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 52c04d5d..41c62832 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -1,20 +1,20 @@
 <?php
 /**
  * Name: public_server
- * Description: Friendica addon with functions suitable for a public server.
+ * Description: Friendica addon with functions suitable for a public server. WARNING: This addon is currently not well maintained. It may produce unexpected results. Use with caution!
  * Version: 1.1
  * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
  */
 
 use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 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\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
@@ -36,17 +36,17 @@ function public_server_uninstall()
 	Hook::unregister('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
 }
 
-function public_server_load_config(App $a)
+function public_server_load_config(App $a, ConfigFileLoader $loader)
 {
-	$a->loadConfigFile(__DIR__ . '/config/public_server.config.php');
+	$a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
 }
 
 function public_server_register_account($a, $b)
 {
 	$uid = $b;
 
-	$days = Config::get('public_server', 'expiredays');
-	$days_posts = Config::get('public_server', 'expireposts');
+	$days = DI::config()->get('public_server', 'expiredays');
+	$days_posts = DI::config()->get('public_server', 'expireposts');
 	if (!$days) {
 		return;
 	}
@@ -68,14 +68,14 @@ function public_server_cron($a, $b)
 		foreach ($r as $rr) {
 			notification([
 				'uid' => $rr['uid'],
-				'type' => NOTIFY_SYSTEM,
+				'type' => Type::SYSTEM,
 				'system_type' => 'public_server_expire',
 				'language'     => $rr['language'],
 				'to_name'      => $rr['username'],
 				'to_email'     => $rr['email'],
-				'source_name'  => L10n::t('Administrator'),
-				'source_link'  => $a->getBaseURL(),
-				'source_photo' => $a->getBaseURL() . '/images/person-80.jpg',
+				'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()];
@@ -83,7 +83,7 @@ function public_server_cron($a, $b)
 		}
 	}
 
-	$nologin = Config::get('public_server', 'nologin', false);
+	$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);
@@ -95,7 +95,7 @@ function public_server_cron($a, $b)
 		}
 	}
 
-	$flagusers = Config::get('public_server', 'flagusers', false);
+	$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);
@@ -107,8 +107,8 @@ function public_server_cron($a, $b)
 		}
 	}
 
-	$flagposts = Config::get('public_server', 'flagposts');
-	$flagpostsexpire = Config::get('public_server', 'flagpostsexpire');
+	$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);
@@ -124,18 +124,18 @@ function public_server_cron($a, $b)
 
 function public_server_enotify(&$a, &$b)
 {
-	if (!empty($b['params']) && $b['params']['type'] == NOTIFY_SYSTEM
+	if (!empty($b['params']) && $b['params']['type'] == Type::SYSTEM
 		&& !empty($b['params']['system_type']) && $b['params']['system_type'] === 'public_server_expire') {
-		$b['itemlink'] = $a->getBaseURL();
-		$b['epreamble'] = $b['preamble'] = L10n::t('Your account on %s will expire in a few days.', Config::get('system', 'sitename'));
-		$b['subject'] = L10n::t('Your Friendica account is about to expire.');
-		$b['body'] = L10n::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=" . Config::get('system', 'url') . "]" . Config::get('config', 'sitename') . "[/url]");
+		$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'));
+		$b['subject'] = DI::l10n()->t('Your Friendica account is about to expire.');
+		$b['body'] = DI::l10n()->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=" . DI::config()->get('system', 'url') . "]" . DI::config()->get('config', 'sitename') . "[/url]");
 	}
 }
 
 function public_server_login($a, $b)
 {
-	$days = Config::get('public_server', 'expiredays');
+	$days = DI::config()->get('public_server', 'expiredays');
 	if (!$days) {
 		return;
 	}
@@ -154,13 +154,13 @@ function public_server_addon_admin_post(&$a)
 	$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'])) : '');
-	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(L10n::t('Settings saved').EOL);
+	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);
+	info(DI::l10n()->t('Settings saved').EOL);
 }
 
 function public_server_addon_admin(&$a, &$o)
@@ -168,14 +168,14 @@ function public_server_addon_admin(&$a, &$o)
 	$token = BaseModule::getFormSecurityToken("publicserver");
 	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/public_server");
 	$o = Renderer::replaceMacros($t, [
-		'$submit' => L10n::t('Save Settings'),
+		'$submit' => DI::l10n()->t('Save Settings'),
 		'$form_security_token' => $token,
-		'$infotext' => L10n::t('Set any of these options to 0 to deactivate it.'),
-		'$expiredays' => ["expiredays","Expire Days", intval(Config::get('public_server', 'expiredays')), "When an account is created on the site, it is given a hard "],
-		'$expireposts' => ["expireposts", "Expire Posts", intval(Config::get('public_server', 'expireposts')), "Set the default days for posts to expire here"],
-		'$nologin' => ["nologin", "No Login", intval(Config::get('public_server', 'nologin')), "Remove users who have never logged in after nologin days "],
-		'$flagusers' => ["flagusers", "Flag users", intval(Config::get('public_server', 'flagusers')), "Remove users who last logged in over flagusers days ago"],
-		'$flagposts' => ["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' => ["flagpostsexpire", "Flag posts expire", intval(Config::get('public_server', 'flagpostsexpire'))],
+		'$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 "],
+		'$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"],
+		'$flagposts' => ["flagposts", "Flag posts", intval(DI::config()->get('public_server', 'flagposts')), "For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire "],
+		'$flagpostsexpire' => ["flagpostsexpire", "Flag posts expire", intval(DI::config()->get('public_server', 'flagpostsexpire'))],
 	]);
 }