Merge pull request #1288 from nupplaphil/feat/move_monolog

[friendica-addons.git] / public_server / public_server.php

diff --git a/public_server/public_server.php b/public_server/public_server.php
index c6e3c364b0dd89fd62d1860221e5910593f50a7d..b388f00bbc6ce3b1c6a3b2d5545555716fcc6739 100644 (file)
--- 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,7 +46,7 @@ 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");
 
@@ -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) {
@@ -122,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 = 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);
-       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"],