mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
support _ in file names in viewonline - Bug #40405
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9428 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
abc458bc2a
commit
a97b5f5ed8
1 changed files with 3 additions and 3 deletions
|
@ -139,7 +139,7 @@ while ($row = $db->sql_fetchrow($result))
|
||||||
{
|
{
|
||||||
$view_online = $s_user_hidden = false;
|
$view_online = $s_user_hidden = false;
|
||||||
$user_colour = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : '';
|
$user_colour = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : '';
|
||||||
|
|
||||||
$username_full = ($row['user_type'] != USER_IGNORE) ? get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']) : '<span' . $user_colour . '>' . $row['username'] . '</span>';
|
$username_full = ($row['user_type'] != USER_IGNORE) ? get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']) : '<span' . $user_colour . '>' . $row['username'] . '</span>';
|
||||||
|
|
||||||
if (!$row['session_viewonline'])
|
if (!$row['session_viewonline'])
|
||||||
|
@ -187,7 +187,7 @@ while ($row = $db->sql_fetchrow($result))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
preg_match('#^([a-z/]+)#i', $row['session_page'], $on_page);
|
preg_match('#^([a-z/_]+)#i', $row['session_page'], $on_page);
|
||||||
if (!sizeof($on_page))
|
if (!sizeof($on_page))
|
||||||
{
|
{
|
||||||
$on_page[1] = '';
|
$on_page[1] = '';
|
||||||
|
@ -334,7 +334,7 @@ while ($row = $db->sql_fetchrow($result))
|
||||||
'U_USER_IP' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'mode=lookup' . (($mode != 'lookup' || $row['session_id'] != $session_id) ? '&s=' . $row['session_id'] : '') . "&sg=$show_guests&start=$start&sk=$sort_key&sd=$sort_dir"),
|
'U_USER_IP' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'mode=lookup' . (($mode != 'lookup' || $row['session_id'] != $session_id) ? '&s=' . $row['session_id'] : '') . "&sg=$show_guests&start=$start&sk=$sort_key&sd=$sort_dir"),
|
||||||
'U_WHOIS' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'mode=whois&s=' . $row['session_id']),
|
'U_WHOIS' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'mode=whois&s=' . $row['session_id']),
|
||||||
'U_FORUM_LOCATION' => $location_url,
|
'U_FORUM_LOCATION' => $location_url,
|
||||||
|
|
||||||
'S_USER_HIDDEN' => $s_user_hidden,
|
'S_USER_HIDDEN' => $s_user_hidden,
|
||||||
'S_GUEST' => ($row['user_id'] == ANONYMOUS) ? true : false,
|
'S_GUEST' => ($row['user_id'] == ANONYMOUS) ? true : false,
|
||||||
'S_USER_TYPE' => $row['user_type'],
|
'S_USER_TYPE' => $row['user_type'],
|
||||||
|
|
Loading…
Add table
Reference in a new issue