mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
another oopsie in sessions + whos online fix for forum_id in page_header (index displays correctly now)
git-svn-id: file:///svn/phpbb/trunk@2929 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
f4858c1b7d
commit
64a01741f9
2 changed files with 4 additions and 4 deletions
|
@ -64,8 +64,8 @@ $online_userlist = '';
|
||||||
|
|
||||||
$prev_user_id = 0;
|
$prev_user_id = 0;
|
||||||
$prev_user_ip = '';
|
$prev_user_ip = '';
|
||||||
// && $auth->get_acl('forum', 'read', $forum_id)
|
// && $auth->get_acl('forum', 'read', $_GET['f'])
|
||||||
$user_forum_sql = ( is_int($forum_id)) ? '' : "AND s.session_page LIKE '%f=$forum_id%'";
|
$user_forum_sql = ( empty($_GET['f'])) ? '' : "AND s.session_page LIKE '%f=" . intval($_GET['f']) . "%'";
|
||||||
$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_colour, s.session_ip
|
$sql = "SELECT u.username, u.user_id, u.user_allow_viewonline, u.user_colour, s.session_ip
|
||||||
FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE ." s
|
FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE ." s
|
||||||
WHERE s.session_time >= ".( time() - 300 ) . "
|
WHERE s.session_time >= ".( time() - 300 ) . "
|
||||||
|
@ -123,7 +123,7 @@ if ( empty($online_userlist) )
|
||||||
$online_userlist = $lang['None'];
|
$online_userlist = $lang['None'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( empty($forum_id) )
|
if ( empty($_GET['f']) )
|
||||||
{
|
{
|
||||||
$online_userlist = $lang['Registered_users'] . ' ' . $online_userlist;
|
$online_userlist = $lang['Registered_users'] . ' ' . $online_userlist;
|
||||||
}
|
}
|
||||||
|
|
|
@ -281,7 +281,7 @@ class session {
|
||||||
$db->sql_query($sql);
|
$db->sql_query($sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
$del_user_id .= ', \'' . $row['session_user_id'] . '\'';
|
$del_user_id .= ( ( $del_user_id != '' ) ? ', ' : '' ) . ' \'' . $row['session_user_id'] . '\'';
|
||||||
$del_sessions++;
|
$del_sessions++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue