mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/17312] Use user_last_active instead of user_lastvisit where possible

Browse Source 
PHPBB3-17312
This commit is contained in:
Marc Alexander
2024-05-16 20:40:56 +02:00
parent a7a53de34d
commit ed0b5020a9
3 changed files with 73 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/memberlist.php
View File

@@ -1036,7 +1036,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'];
@@ -1138,15 +1138,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 . ')';
}
}
}
@@ -1713,7 +1713,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;
}