makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

#12955 hideonline/viewonline again (minor)

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7828 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-07-03 15:14:20 +00:00
parent d2079e4ae8
commit 52f5c7d1ee
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -216,6 +216,7 @@ p a {
<li>[Fix] Minor language and style fixes (Bugs #12235, #12493, #11949)</li> <li>[Fix] Minor language and style fixes (Bugs #12235, #12493, #11949)</li>
<li>[Feature] Added backlinks to mcp_report (Bug #12905)</li> <li>[Feature] Added backlinks to mcp_report (Bug #12905)</li>
<li>[Fix] Only check usernames in guest posts upon edit (Bug #11349)</li> <li>[Fix] Only check usernames in guest posts upon edit (Bug #11349)</li>
<li>[Fix] Consider viewonline permission when viewing friends/foes (Bug #12955)</li>
<li>[Fix] Added proper unicode support to ban reasons (Bug #12947)</li> <li>[Fix] Added proper unicode support to ban reasons (Bug #12947)</li>
</ul> </ul>

6
phpBB/ucp.php
View file

@ -256,7 +256,7 @@ if ($module->is_active('zebra', 'friends'))
$update_time = $config['load_online_time'] * 60; $update_time = $config['load_online_time'] * 60;
$sql = $db->sql_build_query('SELECT_DISTINCT', array( $sql = $db->sql_build_query('SELECT_DISTINCT', array(
'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_colour, u.user_allow_viewonline, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_colour, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline',
'FROM' => array( 'FROM' => array(
USERS_TABLE => 'u', USERS_TABLE => 'u',
@ -274,7 +274,7 @@ if ($module->is_active('zebra', 'friends'))
AND z.friend = 1 AND z.friend = 1
AND u.user_id = z.zebra_id', AND u.user_id = z.zebra_id',
'GROUP_BY' => 'z.zebra_id, u.user_id, u.username_clean, u.user_allow_viewonline, u.user_colour, u.username', 'GROUP_BY' => 'z.zebra_id, u.user_id, u.username_clean, u.user_colour, u.username',
'ORDER_BY' => 'u.username_clean ASC', 'ORDER_BY' => 'u.username_clean ASC',
)); ));
@ -283,7 +283,7 @@ if ($module->is_active('zebra', 'friends'))
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
$which = (time() - $update_time < $row['online_time'] && $row['viewonline'] && $row['user_allow_viewonline']) ? 'online' : 'offline'; $which = (time() - $update_time < $row['online_time'] && ($row['viewonline'] || $auth->acl_get('u_viewonline'))) ? 'online' : 'offline';
$template->assign_block_vars("friends_{$which}", array( $template->assign_block_vars("friends_{$which}", array(
'USER_ID' => $row['user_id'], 'USER_ID' => $row['user_id'],

2
phpBB/viewonline.php
View file

@ -117,7 +117,7 @@ if (!$show_guests)
} }
// Get user list // Get user list
$sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_type, u.user_allow_viewonline, u.user_colour, s.session_id, s.session_time, s.session_page, s.session_ip, s.session_viewonline $sql = 'SELECT u.user_id, u.username, u.username_clean, u.user_type, u.user_colour, s.session_id, s.session_time, s.session_page, s.session_ip, s.session_viewonline
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() - ($config['load_online_time'] * 60)) . AND s.session_time >= ' . (time() - ($config['load_online_time'] * 60)) .