diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-24 13:37:23 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-06-24 13:37:23 +0000 |
| commit | 097769fd0740abeae1cb9b67916e13e1d6339db6 (patch) | |
| tree | 9c02fde154d9f5ef9e6c7947f527498180d7198a | |
| parent | 3439d0f96e4deeecc2e681e08bf66b7c70f01930 (diff) | |
| download | forums-097769fd0740abeae1cb9b67916e13e1d6339db6.tar forums-097769fd0740abeae1cb9b67916e13e1d6339db6.tar.gz forums-097769fd0740abeae1cb9b67916e13e1d6339db6.tar.bz2 forums-097769fd0740abeae1cb9b67916e13e1d6339db6.tar.xz forums-097769fd0740abeae1cb9b67916e13e1d6339db6.zip | |
Apply load_onlinetrack to view profile as well
git-svn-id: file:///svn/phpbb/trunk@6123 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/memberlist.php | 38 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/memberlist_view.html | 2 |
2 files changed, 25 insertions, 15 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index e8269eb182..63d8342040 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -327,16 +327,19 @@ switch ($mode) $group_options .= '<option value="' . $row['group_id'] . '"' . (($row['group_id'] == $member['group_id']) ? ' selected="selected"' : '') . '>' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>'; } - $sql = 'SELECT MAX(session_time) AS session_time, MIN(session_viewonline) AS session_viewonline - FROM ' . SESSIONS_TABLE . " - WHERE session_user_id = $user_id"; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); + if ($config['load_onlinetrack']) + { + $sql = 'SELECT MAX(session_time) AS session_time, MIN(session_viewonline) AS session_viewonline + FROM ' . SESSIONS_TABLE . " + WHERE session_user_id = $user_id"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); - $member['session_time'] = (isset($row['session_time'])) ? $row['session_time'] : 0; - $member['session_viewonline'] = (isset($row['session_viewonline'])) ? $row['session_viewonline'] : 0; - unset($row); + $member['session_time'] = (isset($row['session_time'])) ? $row['session_time'] : 0; + $member['session_viewonline'] = (isset($row['session_viewonline'])) ? $row['session_viewonline'] : 0; + unset($row); + } if ($config['load_user_activity']) { @@ -1200,8 +1203,15 @@ function show_profile($data) $last_visit = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit']; - $update_time = $config['load_online_time'] * 60; - $online = (time() - $update_time < $data['session_time'] && ((isset($data['session_viewonline']) && $data['user_allow_viewonline']) || $auth->acl_get('u_viewonline'))) ? true : false; + if ($config['load_onlinetrack']) + { + $update_time = $config['load_online_time'] * 60; + $online = (time() - $update_time < $data['session_time'] && ((isset($data['session_viewonline']) && $data['user_allow_viewonline']) || $auth->acl_get('u_viewonline'))) ? true : false; + } + else + { + $online = false; + } // Dump it out to the template return array( @@ -1213,8 +1223,8 @@ function show_profile($data) 'POSTS' => ($data['user_posts']) ? $data['user_posts'] : 0, 'WARNINGS' => isset($data['user_warnings']) ? $data['user_warnings'] : 0, - 'ONLINE_IMG' => ($online) ? $user->img('btn_online', 'ONLINE') : $user->img('btn_offline', 'OFFLINE'), - 'S_ONLINE' => ($online) ? true : false, + 'ONLINE_IMG' => (!$config['load_onlinetrack']) ? '' : (($online) ? $user->img('btn_online', 'ONLINE') : $user->img('btn_offline', 'OFFLINE')), + 'S_ONLINE' => ($config['load_onlinetrack'] && $online) ? true : false, 'RANK_IMG' => $rank_img, 'RANK_IMG_SRC' => $rank_img_src, 'ICQ_STATUS_IMG' => (!empty($data['user_icq'])) ? '<img src="http://web.icq.com/whitepages/online?icq=' . $data['user_icq'] . '&img=5" width="18" height="18" />' : '', @@ -1235,8 +1245,6 @@ function show_profile($data) 'LOCATION' => ($data['user_from']) ? $data['user_from'] : '', 'L_VIEWING_PROFILE' => sprintf($user->lang['VIEWING_PROFILE'], $username), - - 'S_ONLINE' => ($online) ? true : false ); } diff --git a/phpBB/styles/subSilver/template/memberlist_view.html b/phpBB/styles/subSilver/template/memberlist_view.html index e3f391cce5..18b2d33bac 100644 --- a/phpBB/styles/subSilver/template/memberlist_view.html +++ b/phpBB/styles/subSilver/template/memberlist_view.html @@ -34,9 +34,11 @@ <td align="center">{AVATAR_IMG}</td> </tr> <!-- ENDIF --> + <!-- IF ONLINE_IMG --> <tr> <td align="center">{ONLINE_IMG}</td> </tr> + <!-- ENDIF --> <!-- IF U_SWITCH_PERMISSIONS --> <tr> <td class="genmed" align="center">[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</td> |