diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 85907e3ed9..7a5036f931 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1090,7 +1090,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 7e49ed3ede..67affce13d 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1595,7 +1595,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 05b3d83a1e..ef35ac553a 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 afea6a92da..864e6f3b6e 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -912,6 +912,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', ''), diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index f693942c39..24a97e837b 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1035,7 +1035,7 @@ switch ($mode) if ($auth->acl_get('u_viewonline')) { $sort_key_text['l'] = $user->lang['SORT_LAST_ACTIVE']; - $sort_key_sql['l'] = 'u.user_lastvisit'; + $sort_key_sql['l'] = 'u.user_last_active'; } $sort_key_text['m'] = $user->lang['SORT_RANK']; @@ -1137,15 +1137,15 @@ switch ($mode) { if ($active_select === 'lt' && (int) $active[0] == 0 && (int) $active[1] == 0 && (int) $active[2] == 0) { - $sql_where .= ' AND u.user_lastvisit = 0'; + $sql_where .= ' AND u.user_last_active = 0'; } else if ($active_select === 'gt') { - $sql_where .= ' AND u.user_lastvisit ' . $find_key_match[$active_select] . ' ' . $active_time; + $sql_where .= ' AND u.user_last_active ' . $find_key_match[$active_select] . ' ' . $active_time; } else { - $sql_where .= ' AND (u.user_lastvisit > 0 AND u.user_lastvisit < ' . $active_time . ')'; + $sql_where .= ' AND (u.user_last_active > 0 AND u.user_last_active < ' . $active_time . ')'; } } } @@ -1715,7 +1715,7 @@ switch ($mode) { $row['session_time'] = $session_ary[$row['user_id']]['session_time'] ?? 0; $row['session_viewonline'] = $session_ary[$row['user_id']]['session_viewonline'] ?? 0; - $row['last_visit'] = (!empty($row['session_time'])) ? $row['session_time'] : $row['user_lastvisit']; + $row['last_visit'] = (!empty($row['session_time'])) ? $row['session_time'] : $row['user_last_active']; $id_cache[$row['user_id']] = $row; } diff --git a/phpBB/phpbb/db/migration/data/v33x/add_user_last_active.php b/phpBB/phpbb/db/migration/data/v33x/add_user_last_active.php new file mode 100644 index 0000000000..d4506eea39 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/add_user_last_active.php @@ -0,0 +1,79 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +use phpbb\db\migration\migration; + +class add_user_last_active extends migration +{ + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v3311', + ]; + } + + public function update_schema() + { + return [ + 'add_columns' => [ + $this->table_prefix . 'users' => [ + 'user_last_active' => ['TIMESTAMP', 0, 'after' => 'user_lastvisit'], + ], + ], + ]; + } + + public function revert_schema() + { + return [ + 'drop_columns' => [ + $this->table_prefix . 'users' => ['user_last_active'], + ], + ]; + } + + public function update_data() + { + return [ + ['custom', [[$this, 'set_user_last_active']]], + ]; + } + + public function set_user_last_active($start = 0) + { + // Get maximum user id from database + $sql = "SELECT MAX(user_id) AS max_user_id + FROM {$this->table_prefix}users"; + $result = $this->db->sql_query($sql); + $max_id = (int) $this->db->sql_fetchfield('max_user_id'); + $this->db->sql_freeresult($result); + + if ($start > $max_id) + { + return; + } + + // Keep setting user_last_active time + $next_start = $start + 10000; + + $sql = 'UPDATE ' . $this->table_prefix . 'users + SET user_last_active = user_lastvisit + WHERE user_id > ' . (int) $start . ' + AND user_id <= ' . (int) ($next_start); + $this->db->sql_query($sql); + + return $next_start; + } +} diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 7adc190a52..5cfe3d91f3 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -450,10 +450,10 @@ class session // Is user banned? Are they excluded? Won't return on ban, exists within method $this->check_ban_for_current_session($config); - // Update user last visit time accordingly, but in a minute or so - if ((int) $this->data['session_time'] - (int) $this->data['user_lastvisit'] > 60) + // Update user last active time accordingly, but in a minute or so + if ((int) $this->data['session_time'] - (int) $this->data['user_last_active'] > 60) { - $this->update_user_lastvisit(); + $this->update_last_active_time(); } return true; @@ -700,8 +700,8 @@ class session { $this->session_id = $this->data['session_id']; - // Only sync user last visit time in a minute or so after last session data update or if the page changes - if ((int) $this->data['session_time'] - (int) $this->data['user_lastvisit'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page'])) + // Only update session DB a minute or so after last update or if page changes + if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page'])) { // Update the last visit time $this->update_user_lastvisit(); @@ -831,15 +831,22 @@ class session $this->data['user_form_salt'] = unique_id(); // Update the form key $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_form_salt = \'' . $db->sql_escape($this->data['user_form_salt']) . '\' + SET user_form_salt = \'' . $db->sql_escape($this->data['user_form_salt']) . '\', + user_last_active = ' . (int) $this->data['session_time'] . ' WHERE user_id = ' . (int) $this->data['user_id']; $db->sql_query($sql); } + else + { + $this->update_last_active_time(); + } } else { $this->data['session_time'] = $this->data['session_last_visit'] = $this->time_now; + $this->update_user_lastvisit(); + if ($phpbb_container->getParameter('session.force_sid')) { $SID = '?sid='; @@ -847,9 +854,6 @@ class session } } - // Update the last visit time - $this->update_user_lastvisit(); - $session_data = $sql_ary; /** * Event to send new session data to extension @@ -1713,7 +1717,26 @@ class session if (isset($this->data['session_time'], $this->data['user_id'])) { $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_lastvisit = ' . (int) $this->data['session_time'] . ' + SET user_lastvisit = ' . (int) $this->data['session_time'] . ', + user_last_active = ' . (int) $this->data['session_time'] . ' + WHERE user_id = ' . (int) $this->data['user_id']; + $db->sql_query($sql); + } + } + + /** + * Update user's last active time + * + * @return void + */ + public function update_last_active_time() + { + global $db; + + if (isset($this->data['session_time'], $this->data['user_id'])) + { + $sql = 'UPDATE ' . USERS_TABLE . ' + SET user_last_active = ' . (int) $this->data['session_time'] . ' WHERE user_id = ' . (int) $this->data['user_id']; $db->sql_query($sql); } diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php index e5bfdbf858..cd9040ca28 100644 --- a/tests/auth/provider_apache_test.php +++ b/tests/auth/provider_apache_test.php @@ -120,6 +120,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case 'user_email' => 'example@example.com', 'user_birthday' => '', 'user_lastvisit' => 0, + 'user_last_active' => 0, 'user_lastmark' => 0, 'user_lastpost_time' => 0, 'user_lastpage' => '',