makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2024-07-13 19:42:51 +02:00
commit ca3e692a95
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_users.php
View file

@ -1094,7 +1094,7 @@ class acp_users
$s_action_options .= '<option value="' . $value . '">' . $user->lang['USER_ADMIN_' . $lang] . '</option>'; $s_action_options .= '<option value="' . $value . '">' . $user->lang['USER_ADMIN_' . $lang] . '</option>';
} }
$last_active = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_last_active']; $last_active = $user_row['user_last_active'] ?: ($user_row['session_time'] ?? 0);
$inactive_reason = ''; $inactive_reason = '';
if ($user_row['user_type'] == USER_INACTIVE) if ($user_row['user_type'] == USER_INACTIVE)

2
phpBB/includes/functions_display.php
View file

@ -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')) if ($data['user_allow_viewonline'] || $auth->acl_get('u_viewonline'))
{ {
$last_active = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_last_active']; $last_active = $data['user_last_active'] ?: ($data['session_time'] ?? 0);
} }
else else
{ {

2
phpBB/memberlist.php
View file

@ -1724,7 +1724,7 @@ switch ($mode)
{ {
$row['session_time'] = $session_ary[$row['user_id']]['session_time'] ?? 0; $row['session_time'] = $session_ary[$row['user_id']]['session_time'] ?? 0;
$row['session_viewonline'] = $session_ary[$row['user_id']]['session_viewonline'] ?? 0; $row['session_viewonline'] = $session_ary[$row['user_id']]['session_viewonline'] ?? 0;
$row['last_visit'] = (!empty($row['session_time'])) ? $row['session_time'] : $row['user_last_active']; $row['last_visit'] = $row['user_last_active'] ?: $row['session_time'];
$id_cache[$row['user_id']] = $row; $id_cache[$row['user_id']] = $row;
} }

8
phpBB/phpbb/session.php
View file

@ -451,7 +451,7 @@ class session
$this->check_ban_for_current_session($config); $this->check_ban_for_current_session($config);
// Update user last active time accordingly, but in a minute or so // 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) if ($this->time_now - (int) $this->data['user_last_active'] > 60)
{ {
$this->update_last_active_time(); $this->update_last_active_time();
} }
@ -1718,7 +1718,7 @@ class session
{ {
$sql = 'UPDATE ' . USERS_TABLE . ' $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'] . ' user_last_active = ' . $this->time_now . '
WHERE user_id = ' . (int) $this->data['user_id']; WHERE user_id = ' . (int) $this->data['user_id'];
$db->sql_query($sql); $db->sql_query($sql);
} }
@ -1733,10 +1733,10 @@ class session
{ {
global $db; global $db;
if (isset($this->data['session_time'], $this->data['user_id'])) if (isset($this->time_now, $this->data['user_id']))
{ {
$sql = 'UPDATE ' . USERS_TABLE . ' $sql = 'UPDATE ' . USERS_TABLE . '
SET user_last_active = ' . (int) $this->data['session_time'] . ' SET user_last_active = ' . $this->time_now . '
WHERE user_id = ' . (int) $this->data['user_id']; WHERE user_id = ' . (int) $this->data['user_id'];
$db->sql_query($sql); $db->sql_query($sql);
} }