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

Merge pull request #6485 from rxu/ticket/17107-master

Browse source 
[ticket/17107] Fix viewonline page locations for posting modes - master
This commit is contained in:
Marc Alexander 2023-06-19 09:37:00 +02:00
commit 03bdfa5719
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
5 changed files with 181 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/config/default/container/services_content.yml
View file

@ -67,3 +67,5 @@ services:
viewonline_helper:
class: phpbb\viewonline_helper
arguments:
- '@dbal.conn'

54
phpBB/phpbb/viewonline_helper.php
View file

@ -16,15 +16,61 @@ namespace phpbb;
use phpbb\filesystem\helper as filesystem_helper;
/**
* Class to handle viewonline related tasks
*/
* Class to handle viewonline related tasks
*/
class viewonline_helper
{
/** @var \phpbb\db\driver\driver_interface */
protected $db;
/**
*
* @param \phpbb\db\driver\driver_interface $db
*/
public function __construct()
public function __construct(\phpbb\db\driver\driver_interface $db)
{
$this->db = $db;
}
/**
* Get forum IDs for topics
*
* Retrieve forum IDs and add the data into the session data array
* Array structure matches sql_fethrowset() result array
*
* @param array $session_data_rowset Users' session data array
* @return void
*/
public function get_forum_ids(array &$session_data_rowset): void
{
$topic_ids = $match = [];
foreach ($session_data_rowset as $number => $row)
{
if ($row['session_forum_id'] == 0 && preg_match('#t=([0-9]+)#', $row['session_page'], $match))
{
$topic_ids[$number] = (int) $match[1];
}
}
if (count($topic_ids = array_unique($topic_ids)))
{
$sql_ary = [
'SELECT' => 't.topic_id, t.forum_id',
'FROM' => [
TOPICS_TABLE => 't',
],
'WHERE' => $this->db->sql_in_set('t.topic_id', $topic_ids),
'ORDER_BY' => 't.topic_id',
];
$result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary));
$forum_ids_rowset = $this->db->sql_fetchrowset($result);
$this->db->sql_freeresult($result);
foreach ($forum_ids_rowset as $forum_ids_row)
{
$session_data_row_number = array_search((int) $forum_ids_row['topic_id'], $topic_ids);
$session_data_rowset[$session_data_row_number]['session_forum_id'] = (int) $forum_ids_row['forum_id'];
}
}
}
/**

9
phpBB/viewonline.php
View file

@ -180,6 +180,8 @@ $vars = array('sql_ary', 'show_guests', 'guest_counter', 'forum_data');
extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_sql', compact($vars)));
$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary));
$session_data_rowset = $db->sql_fetchrowset($result);
$db->sql_freeresult($result);
$prev_id = $prev_ip = $user_list = array();
$logged_visible_online = $logged_hidden_online = $counter = 0;
@ -190,7 +192,10 @@ $controller_helper = $phpbb_container->get('controller.helper');
/** @var \phpbb\group\helper $group_helper */
$group_helper = $phpbb_container->get('group_helper');
while ($row = $db->sql_fetchrow($result))
// Get forum IDs for session pages which have only 't' parameter
$viewonline_helper->get_forum_ids($session_data_rowset);
foreach ($session_data_rowset as $row)
{
if ($row['user_id'] != ANONYMOUS && !isset($prev_id[$row['user_id']]))
{
@ -438,7 +443,6 @@ while ($row = $db->sql_fetchrow($result))
$template->assign_block_vars('user_row', $template_row);
}
$db->sql_freeresult($result);
unset($prev_id, $prev_ip);
$group_helper->display_legend($db, $template);
@ -459,7 +463,6 @@ $template->assign_block_vars('navlinks', array(
$template->assign_vars(array(
'TOTAL_REGISTERED_USERS_ONLINE' => $user->lang('REG_USERS_ONLINE', (int) $logged_visible_online, $user->lang('HIDDEN_USERS_ONLINE', (int) $logged_hidden_online)),
'TOTAL_GUEST_USERS_ONLINE' => $user->lang('GUEST_USERS_ONLINE', (int) $guest_counter),
'LEGEND' => $legend,
'U_SORT_USERNAME' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=a&sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)),
'U_SORT_UPDATED' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=b&sd=' . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)),

112
tests/functional/viewonline_test.php Normal file
View file

@ -0,0 +1,112 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
/**
* @group functional
*/
class phpbb_functional_viewonline_test extends phpbb_functional_test_case
{
protected function get_forum_name_by_topic_id($topic_id)
{
$db = $this->get_db();
// Forum info
$sql = 'SELECT f.forum_name
FROM ' . FORUMS_TABLE . ' f,' . TOPICS_TABLE . ' t
WHERE t.forum_id = f.forum_id
AND t.topic_id = ' . (int) $topic_id;
$result = $db->sql_query($sql);
$forum_name = $db->sql_fetchfield('forum_name');
$db->sql_freeresult($result, 1800); // cache for 30 minutes
return $forum_name;
}
protected function get_forum_name_by_forum_id($forum_id)
{
$db = $this->get_db();
// Forum info
$sql = 'SELECT forum_name
FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . (int) $forum_id;
$result = $db->sql_query($sql);
$forum_name = $db->sql_fetchfield('forum_name');
$db->sql_freeresult($result, 1800); // cache for 30 minutes
return $forum_name;
}
public function test_viewonline()
{
$this->create_user('viewonline-test-user1');
// Log in as test user
self::$client->restart();
$this->login('viewonline-test-user1');
$crawler = self::request('GET', 'posting.php?mode=reply&t=1&sid=' . $this->sid);
$this->assertContainsLang('POST_REPLY', $crawler->text());
// Log in as another user
self::$client->restart();
$this->login();
// PHP goes faster than DBMS, make sure session data got written to the database
sleep(1);
$crawler = self::request('GET', 'viewonline.php?sid=' . $this->sid);
// Make sure posting reply page is in the list
$this->assertStringContainsString('viewonline-test-user1', $crawler->text());
$this->assertStringContainsString($this->lang('REPLYING_MESSAGE', $this->get_forum_name_by_topic_id(1)), $crawler->text());
// Log in as test user
self::$client->restart();
$this->login('viewonline-test-user1');
$crawler = self::request('GET', 'posting.php?mode=post&f=2&sid=' . $this->sid);
$this->assertContainsLang('POST_TOPIC', $crawler->text());
// Log in as another user
self::$client->restart();
$this->login();
// PHP goes faster than DBMS, make sure session data got written to the database
sleep(1);
$crawler = self::request('GET', 'viewonline.php?sid=' . $this->sid);
// Make sure posting message page is in the list
$this->assertStringContainsString('viewonline-test-user1', $crawler->text());
$this->assertStringContainsString($this->lang('POSTING_MESSAGE', $this->get_forum_name_by_forum_id(2)), $crawler->text());
// Log in as test user
self::$client->restart();
$this->login('viewonline-test-user1');
self::request('GET', 'viewtopic.php?t=1&sid=' . $this->sid);
// Log in as another user
self::$client->restart();
$this->login();
// PHP goes faster than DBMS, make sure session data got written to the database
sleep(1);
$crawler = self::request('GET', 'viewonline.php?sid=' . $this->sid);
// Make sure reading topic page is in the list
$this->assertStringContainsString('viewonline-test-user1', $crawler->text());
$this->assertStringContainsString($this->lang('READING_TOPIC', $this->get_forum_name_by_topic_id(1)), $crawler->text());
// Log in as test user
self::$client->restart();
$this->login('viewonline-test-user1');
self::request('GET', 'viewforum.php?f=2&sid=' . $this->sid);
// Log in as another user
self::$client->restart();
$this->login();
// PHP goes faster than DBMS, make sure session data got written to the database
sleep(1);
$crawler = self::request('GET', 'viewonline.php?sid=' . $this->sid);
// Make sure reading forum page is in the list
$this->assertStringContainsString('viewonline-test-user1', $crawler->text());
$this->assertStringContainsString($this->lang('READING_FORUM', $this->get_forum_name_by_forum_id(2)), $crawler->text());
}
}

6
tests/viewonline/helper_test.php
View file

@ -19,7 +19,11 @@ class phpbb_viewonline_helper_test extends phpbb_test_case
{
parent::setUp();
$this->viewonline_helper = new \phpbb\viewonline_helper();
$db = $this->getMockBuilder('\phpbb\db\driver\mysqli')
->disableOriginalConstructor()
->getMock();
$this->viewonline_helper = new \phpbb\viewonline_helper($db);
}
public function session_pages_data()