aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewonline.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-12-14 02:41:33 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-12-14 02:41:33 +0000
commit880013144e2c80490f9b71457a3f0104c2b3a6d2 (patch)
treef396e2bf37edb717ffb87de59f3df4c440bc94b6 /phpBB/viewonline.php
parentbef3314e50e1f38fe53cbaaf47dd09fc46d42f49 (diff)
downloadforums-880013144e2c80490f9b71457a3f0104c2b3a6d2.tar
forums-880013144e2c80490f9b71457a3f0104c2b3a6d2.tar.gz
forums-880013144e2c80490f9b71457a3f0104c2b3a6d2.tar.bz2
forums-880013144e2c80490f9b71457a3f0104c2b3a6d2.tar.xz
forums-880013144e2c80490f9b71457a3f0104c2b3a6d2.zip
Remove guest user topic tracking via cookies, update viewtopic to re-fix highlighting of search terms, add lang capability to images, various other issues, removed remote avatar size reduction
git-svn-id: file:///svn/phpbb/trunk@1566 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewonline.php')
-rw-r--r--phpBB/viewonline.php22
1 files changed, 11 insertions, 11 deletions
diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php
index 85dd89a3b4..9cf47d72bd 100644
--- a/phpBB/viewonline.php
+++ b/phpBB/viewonline.php
@@ -77,12 +77,12 @@ $template->assign_var_from_handle("JUMPBOX", "jumpbox");
// End header
//
-$sql = "SELECT u.user_id, u.username, u.user_allow_viewonline, s.session_page, s.session_logged_in, s.session_time
+$sql = "SELECT u.user_id, u.username, u.user_session_time, u.user_session_page, u.user_allow_viewonline, s.session_logged_in
FROM " . USERS_TABLE . " u, " . SESSIONS_TABLE . " s
- WHERE u.user_id <> " . ANONYMOUS . "
- AND u.user_id = s.session_user_id
- AND s.session_time >= " . ( time() - 300 ) . "
- AND s.session_logged_in = " . TRUE . "
+ WHERE s.session_logged_in = " . TRUE . "
+ AND u.user_id = s.session_user_id
+ AND u.user_id <> " . ANONYMOUS . "
+ AND u.user_session_time >= " . ( time() - 300 ) . "
ORDER BY s.session_time DESC";
if(!$result = $db->sql_query($sql))
{
@@ -90,7 +90,7 @@ if(!$result = $db->sql_query($sql))
}
$onlinerow_reg = $db->sql_fetchrowset($result);
-$sql = "SELECT session_page, session_logged_in, session_time, session_ip
+$sql = "SELECT session_page, session_logged_in, session_time
FROM " . SESSIONS_TABLE . "
WHERE session_logged_in = 0
AND session_time >= " . ( time() - 300 ) . "
@@ -161,9 +161,9 @@ if( count($onlinerow_reg) )
$hidden = TRUE;
}
- if( $onlinerow_reg[$i]['session_page'] < 1 || !$is_auth_ary[$onlinerow_reg[$i]['session_page']]['auth_view'] )
+ if( $onlinerow_reg[$i]['user_session_page'] < 1 || !$is_auth_ary[$onlinerow_reg[$i]['user_session_page']]['auth_view'] )
{
- switch($onlinerow_reg[$i]['session_page'])
+ switch($onlinerow_reg[$i]['user_session_page'])
{
case PAGE_INDEX:
$location = $lang['Forum_index'];
@@ -208,8 +208,8 @@ if( count($onlinerow_reg) )
}
else
{
- $location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $onlinerow_reg[$i]['session_page']);
- $location = $forum_data[$onlinerow_reg[$i]['session_page']];
+ $location_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=" . $onlinerow_reg[$i]['user_session_page']);
+ $location = $forum_data[$onlinerow_reg[$i]['user_session_page']];
}
if( !$hidden || $userdata['user_level'] == ADMIN )
@@ -221,7 +221,7 @@ if( count($onlinerow_reg) )
"ROW_COLOR" => "#" . $row_color,
"ROW_CLASS" => $row_class,
"USERNAME" => $username,
- "LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['session_time'], $board_config['board_timezone']),
+ "LASTUPDATE" => create_date($board_config['default_dateformat'], $onlinerow_reg[$i]['user_session_time'], $board_config['board_timezone']),
"FORUM_LOCATION" => $location,
"U_USER_PROFILE" => append_sid("profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . "=" . $onlinerow_reg[$i]['user_id']),