[public_server] Add expected "event" key in public_server_cron()

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

diff --git a/public_server/public_server.php b/public_server/public_server.php
index b388f00bbc6ce3b1c6a3b2d5545555716fcc6739..5bc08821d269634791f7a4759beb50aa6edae2bd 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,9 +27,9 @@ 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(App $a, ConfigFileManager $loader)
 {
-       $a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
+       $a->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
 }
 
 function public_server_register_account(App $a, $b)
@@ -55,6 +55,7 @@ function public_server_cron(App $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'),
@@ -118,7 +119,7 @@ function public_server_login(App $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);
 }