mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Dropped 'GROUP BY' from whosonline query for compatibility with non-MySQL DB's
git-svn-id: file:///svn/phpbb/trunk@1845 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
5792aeeb85
commit
0ff22ee594
1 changed files with 22 additions and 16 deletions
|
@ -89,12 +89,11 @@ $s_last_visit = ( $userdata['session_logged_in'] ) ? create_date($board_config['
|
||||||
// Get basic (usernames + totals) online
|
// Get basic (usernames + totals) online
|
||||||
// situation
|
// situation
|
||||||
//
|
//
|
||||||
$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, s.session_logged_in, s.session_ip, count(*) as online_count
|
$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, s.session_logged_in, s.session_ip
|
||||||
FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
|
FROM ".USERS_TABLE." u, ".SESSIONS_TABLE." s
|
||||||
WHERE u.user_id = s.session_user_id
|
WHERE u.user_id = s.session_user_id
|
||||||
AND ( s.session_time >= ".( time() - 300 ) . "
|
AND ( s.session_time >= ".( time() - 300 ) . "
|
||||||
OR u.user_session_time >= " . ( time() - 300 ) . " )
|
OR u.user_session_time >= " . ( time() - 300 ) . " )
|
||||||
GROUP BY u.user_id
|
|
||||||
ORDER BY u.username ASC";
|
ORDER BY u.username ASC";
|
||||||
$result = $db->sql_query($sql);
|
$result = $db->sql_query($sql);
|
||||||
if(!$result)
|
if(!$result)
|
||||||
|
@ -107,31 +106,38 @@ $userlist_visible = array();
|
||||||
$logged_visible_online = 0;
|
$logged_visible_online = 0;
|
||||||
$logged_hidden_online = 0;
|
$logged_hidden_online = 0;
|
||||||
$guests_online = 0;
|
$guests_online = 0;
|
||||||
|
$prev_user_id = 0;
|
||||||
|
|
||||||
while( $row = $db->sql_fetchrow($result) )
|
while( $row = $db->sql_fetchrow($result) )
|
||||||
{
|
{
|
||||||
|
// User is logged in and therefor not a guest
|
||||||
if( $row['session_logged_in'] )
|
if( $row['session_logged_in'] )
|
||||||
{
|
{
|
||||||
if( $row['user_allow_viewonline'] )
|
// Skip multiple sessions for one user
|
||||||
|
if( $row['user_id'] != $prev_user_id )
|
||||||
{
|
{
|
||||||
$user_online_link = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . "\">" . $row['username'] . "</a>";
|
if( $row['user_allow_viewonline'] )
|
||||||
$logged_visible_online++;
|
{
|
||||||
}
|
$user_online_link = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . "\">" . $row['username'] . "</a>";
|
||||||
else
|
$logged_visible_online++;
|
||||||
{
|
}
|
||||||
$user_online_link = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . "\"><i>" . $row['username'] . "</i></a>";
|
else
|
||||||
$logged_hidden_online++;
|
{
|
||||||
}
|
$user_online_link = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=" . $row['user_id']) . "\"><i>" . $row['username'] . "</i></a>";
|
||||||
|
$logged_hidden_online++;
|
||||||
if( $row['user_allow_viewonline'] || $userdata['user_level'] == ADMIN )
|
}
|
||||||
{
|
|
||||||
$online_userlist .= ($online_userlist != "") ? ", " . $user_online_link : $user_online_link;
|
if( $row['user_allow_viewonline'] || $userdata['user_level'] == ADMIN )
|
||||||
|
{
|
||||||
|
$online_userlist .= ($online_userlist != "") ? ", " . $user_online_link : $user_online_link;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$guests_online += $row['online_count'];
|
$guests_online++;
|
||||||
}
|
}
|
||||||
|
$prev_user_id = $row['user_id'];
|
||||||
}
|
}
|
||||||
|
|
||||||
$online_userlist = $lang['Registered_users'] . " " . $online_userlist;
|
$online_userlist = $lang['Registered_users'] . " " . $online_userlist;
|
||||||
|
|
Loading…
Add table
Reference in a new issue