Merge pull request #12680 from nupplaphil/feat/addon_logger

[friendica.git] / src / Module / Moderation / BaseUsers.php

diff --git a/src/Module/Moderation/BaseUsers.php b/src/Module/Moderation/BaseUsers.php
index eddfc0909775021c5470a6bbf6f356e0e9fd1fa9..cbcb625a863c93ae56153d061d55de5296fcc671 100644 (file)
--- a/src/Module/Moderation/BaseUsers.php
+++ b/src/Module/Moderation/BaseUsers.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -113,7 +113,7 @@ abstract class BaseUsers extends BaseModeration
 
        protected function setupUserCallback(): \Closure
        {
-               $adminlist = explode(',', str_replace(' ', '', DI::config()->get('config', 'admin_email')));
+               $adminlist = User::getAdminEmailList();
                return function ($user) use ($adminlist) {
                        $page_types = [
                                User::PAGE_FLAGS_NORMAL    => $this->t('Normal Account Page'),
@@ -137,7 +137,7 @@ abstract class BaseUsers extends BaseModeration
                        $user['account_type']     = ($user['page_flags_raw'] == 0) ? $account_types[$user['account-type']] : '';
 
                        $user['register_date'] = Temporal::getRelativeDate($user['register_date']);
-                       $user['login_date']    = Temporal::getRelativeDate($user['login_date']);
+                       $user['login_date']    = Temporal::getRelativeDate($user['last-activity'], false);
                        $user['lastitem_date'] = Temporal::getRelativeDate($user['last-item']);
                        $user['is_admin']      = in_array($user['email'], $adminlist);
                        $user['is_deletable']  = !$user['account_removed'] && intval($user['uid']) != $this->session->getLocalUserId();