Merge branch 'develop' into reuse

This commit is contained in:
Tobias Diekershoff 2024-08-24 19:20:00 +02:00
commit dc2d894a26
10 changed files with 1133 additions and 2307 deletions

View file

@ -421,13 +421,14 @@ class Register extends BaseModule
}
public static function getPolicy(): int
{
$admins = User::getAdminList(['login_date']);
$days = DI::config()->get('system', 'admin_inactivity_limit');
if ($days == 0) {
if ($days == 0 || empty($admins)) {
return intval(DI::config()->get('config', 'register_policy'));
}
$inactive_since = DateTimeFormat::utc('now - ' . $days . ' day');
foreach (User::getAdminList(['login_date']) as $admin) {
foreach ($admins as $admin) {
if (strtotime($admin['login_date']) > strtotime($inactive_since)) {
return intval(DI::config()->get('config', 'register_policy'));
}