invidious/invidious.php aktualisiert

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

diff --git a/public_server/public_server.php b/public_server/public_server.php
index c6e3c364b0dd89fd62d1860221e5910593f50a7d..7591c7d0d32fe23a2b8ce8bd3c5301b14ee816d1 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -15,7 +15,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Notification;
 use Friendica\Model\User;
-use Friendica\Core\Config\Util\ConfigFileLoader;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Util\DateTimeFormat;
 
 function public_server_install()
@@ -27,12 +27,12 @@ function public_server_install()
        Hook::register('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
 }
 
-function public_server_load_config(App $a, ConfigFileLoader $loader)
+function public_server_load_config(ConfigFileManager $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
+       DI::app()->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
-function public_server_register_account($a, $b)
+function public_server_register_account($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($b)
 {
        Logger::notice("public_server: cron start");
 
@@ -55,11 +55,12 @@ function public_server_cron($a, $b)
        foreach ($users as $rr) {
                DI::notify()->createFromArray([
                        'type' => Notification\Type::SYSTEM,
+                       'event' => 'SYSTEM_PUBLIC_SERVER_EXPIRATION',
                        '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',
+                       'source_link'  => DI::baseUrl(),
+                       'source_photo' => DI::baseUrl() . '/images/person-80.jpg',
                ]);
 
                $fields = ['expire_notification_sent' => DateTimeFormat::utcNow()];
@@ -99,18 +100,18 @@ function public_server_cron($a, $b)
        Logger::notice("public_server: cron end");
 }
 
-function public_server_enotify(&$a, &$b)
+function public_server_enotify(array &$b)
 {
        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['itemlink'] = DI::baseUrl();
                $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)
+function public_server_login($b)
 {
        $days = DI::config()->get('public_server', 'expiredays');
        if (!$days) {
@@ -118,36 +119,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()
 {
        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(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"],