diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-05 00:08:47 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-10-05 00:08:47 +0000 |
| commit | 64a01741f91b45042fa22cdd198e75e1ab69ec16 (patch) | |
| tree | 75723d4574e6006a9c44606d873b392c3b4f0802 | |
| parent | f4858c1b7d339cf62d64d59f7fab018817580763 (diff) | |
| download | forums-64a01741f91b45042fa22cdd198e75e1ab69ec16.tar forums-64a01741f91b45042fa22cdd198e75e1ab69ec16.tar.gz forums-64a01741f91b45042fa22cdd198e75e1ab69ec16.tar.bz2 forums-64a01741f91b45042fa22cdd198e75e1ab69ec16.tar.xz forums-64a01741f91b45042fa22cdd198e75e1ab69ec16.zip | |
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
| -rw-r--r-- | phpBB/includes/page_header.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/page_header.php b/phpBB/includes/page_header.php index 176df6cb17..71e00c0958 100644 --- a/phpBB/includes/page_header.php +++ b/phpBB/includes/page_header.php @@ -64,8 +64,8 @@ $online_userlist = ''; $prev_user_id = 0; $prev_user_ip = ''; -// && $auth->get_acl('forum', 'read', $forum_id) -$user_forum_sql = ( is_int($forum_id)) ? '' : "AND s.session_page LIKE '%f=$forum_id%'"; +// && $auth->get_acl('forum', 'read', $_GET['f']) +$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 FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE ." s WHERE s.session_time >= ".( time() - 300 ) . " @@ -123,7 +123,7 @@ if ( empty($online_userlist) ) $online_userlist = $lang['None']; } -if ( empty($forum_id) ) +if ( empty($_GET['f']) ) { $online_userlist = $lang['Registered_users'] . ' ' . $online_userlist; } diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 75ad8e14d2..d6d5cf134a 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -281,7 +281,7 @@ class session { $db->sql_query($sql); } - $del_user_id .= ', \'' . $row['session_user_id'] . '\''; + $del_user_id .= ( ( $del_user_id != '' ) ? ', ' : '' ) . ' \'' . $row['session_user_id'] . '\''; $del_sessions++; } |