makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 17c64bada3 into b7db1b0844

Browse source
This commit is contained in:
v12mike 2025-05-03 17:50:09 +01:00 • committed by GitHub
commit 05004df32d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 63 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/language/en/common.php
View file

@ -865,6 +865,7 @@ $lang = array_merge($lang, array(
'UNREAD_MESSAGES' => 'Unread messages',
'UNREAD_POST' => 'Unread post',
'UNREAD_POSTS' => 'Unread posts',
'UNRECOGNISED_PAGE' => 'Unrecognised page',
'UNWATCH_FORUM_CONFIRM' => 'Are you sure you wish to unsubscribe from this forum?',
'UNWATCH_FORUM_DETAILED' => 'Are you sure you wish to unsubscribe from the forum “%s”?',
'UNWATCH_TOPIC_CONFIRM' => 'Are you sure you wish to unsubscribe from this topic?',

67
phpBB/viewonline.php
View file

@ -268,6 +268,57 @@ foreach ($session_data_rowset as $row)
case 'viewtopic':
$forum_id = $row['session_forum_id'];
if (!$forum_id)
{
$array_match_index = 5;
// find the forum_id from the page URI
$matches = array();
$pattern = '#(viewtopic|posting)\.' . $phpEx . '((\?|&)\w+=\w+)*(\?|&)';
preg_match($pattern . 'f=(\d+)#', $row['session_page'], $matches);
if ($matches[$array_match_index])
{
$forum_id = (int) $matches[$array_match_index];
}
else
{
preg_match($pattern . 't=(\d+)#', $row['session_page'], $matches);
if ($matches[$array_match_index])
{
$topic_id = $matches[$array_match_index];
$sql = 'SELECT forum_id
FROM ' . TOPICS_TABLE . "
WHERE topic_id = $topic_id";
$result1 = $db->sql_query($sql);
$forum_id = (int) $db->sql_fetchfield('forum_id');
$db->sql_freeresult($result1);
}
else
{
preg_match($pattern . 'p=(\d+)#', $row['session_page'], $matches);
if ($matches[$array_match_index])
{
$post_id = $matches[$array_match_index];
$topic_forum = array();
$sql = 'SELECT t.forum_id
FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p
WHERE p.post_id = ' . $post_id . '
AND t.topic_id = p.topic_id';
$result1 = $db->sql_query($sql);
$forum_id = (int) $db->sql_fetchfield('forum_id');
$db->sql_freeresult($result1);
}
else
{
$forum_id = 0;
}
}
}
}
if ($forum_id && $auth->acl_get('f_list', $forum_id))
{
$location = '';
@ -309,7 +360,7 @@ foreach ($session_data_rowset as $row)
}
else
{
$location = $user->lang['INDEX'];
$location = $user->lang['UNRECOGNISED_PAGE'];
$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
}
break;
@ -382,17 +433,23 @@ foreach ($session_data_rowset as $row)
break;
default:
$location = $user->lang['INDEX'];
$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
if ($row['session_page'] === 'app.' . $phpEx . '/help/faq' ||
$row['session_page'] === 'app.' . $phpEx . '/help/bbcode')
{
$location = $user->lang['VIEWING_FAQ'];
$location_url = $controller_helper->route('phpbb_help_faq_controller');
}
else
{
$location = $user->lang['UNRECOGNISED_PAGE'];
$location_url = append_sid("{$phpbb_root_path}index.$phpEx");
}
break;
}
if ($auth->acl_get('a_'))
{
$location .= nl2br("\n" . substr($row['session_page'], 0, 99));
}
/**
* Overwrite the location's name and URL, which are displayed in the list
@ -410,7 +467,7 @@ foreach ($session_data_rowset as $row)
extract($phpbb_dispatcher->trigger_event('core.viewonline_overwrite_location', compact($vars)));
$template_row = array(
'USERNAME' => $row['username'],
'USERNAME' => $row['username'],
'USERNAME_COLOUR' => $row['user_colour'],
'USERNAME_FULL' => $username_full,
'LASTUPDATE' => $user->format_date($row['session_time']),