From 9ecf09dbe8b88eef81e3a987cd30ece4e323ed98 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 18 May 2024 20:58:07 +0200 Subject: [PATCH] [ticket/17312] Add and use user_last_active where needed and useful PHPBB3-17312 --- phpBB/includes/acp/acp_users.php | 2 +- phpBB/includes/functions_display.php | 2 +- phpBB/includes/functions_user.php | 1 + phpBB/install/convertors/convert_phpbb20.php | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 14864cfdd4..7c3468f90d 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1084,7 +1084,7 @@ class acp_users $s_action_options .= ''; } - $last_active = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_lastvisit']; + $last_active = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_last_active']; $inactive_reason = ''; if ($user_row['user_type'] == USER_INACTIVE) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 8fd7085586..d995676e8f 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1603,7 +1603,7 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl if ($data['user_allow_viewonline'] || $auth->acl_get('u_viewonline')) { - $last_active = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit']; + $last_active = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_last_active']; } else { diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 0110034016..25adf4215a 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -227,6 +227,7 @@ function user_add($user_row, $cp_data = false, $notifications_data = null) 'user_inactive_time' => 0, 'user_lastmark' => time(), 'user_lastvisit' => 0, + 'user_last_active' => 0, 'user_lastpost_time' => 0, 'user_lastpage' => '', 'user_posts' => 0, diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 2d6a868938..7f9449609e 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -901,6 +901,7 @@ if (!$get_info) array('user_email', 'users.user_email', 'strtolower'), array('user_birthday', ((defined('MOD_BIRTHDAY')) ? 'users.user_birthday' : ''), 'phpbb_get_birthday'), array('user_lastvisit', 'users.user_lastvisit', 'intval'), + array('user_last_active', 'users.user_lastvisit', 'intval'), array('user_lastmark', 'users.user_lastvisit', 'intval'), array('user_lang', $config['default_lang'], ''), array('', 'users.user_lang', ''),