mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge pull request #6352 from rxu/ticket/16902-master

Browse Source 
[ticket/16902] Improve search results count - master
This commit is contained in:
Marc Alexander
2022-01-19 20:34:29 +01:00
parent e92b5caf66 0a88251fe5
commit 3b50ddf9f8
10 changed files with 199 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
tests/test_framework/phpbb_functional_test_case.php
View File

@@ -995,7 +995,7 @@ class phpbb_functional_test_case extends phpbb_test_case
// Any output before the doc type means there was an error
$content = self::get_content();
self::assertStringNotContainsString('[phpBB Debug]', $content);
self::assertStringStartsWith('<!DOCTYPE', strtoupper(substr(trim($content), 0, 10)), 'Output found before DOCTYPE specification.');
self::assertStringStartsWith('<!DOCTYPE', strtoupper(substr(trim($content), 0, 10)), $content);
if ($status_code !== false)
{
@@ -1458,4 +1458,87 @@ class phpbb_functional_test_case extends phpbb_test_case
return $file_form_data;
}
/**
* Get username of currently logged in user
*
* @return string|bool username if logged in, false otherwise
*/
protected function get_logged_in_user()
{
$username_logged_in = false;
$crawler = self::request('GET', 'index.php');
$is_logged_in = strpos($crawler->filter('div[class="navbar"]')->text(), 'Login') === false;
if ($is_logged_in)
{
$username_logged_in = $crawler->filter('li[id="username_logged_in"] > div > a > span')->text();
}
return $username_logged_in;
}
/**
* Posting flood control
*/
protected function set_flood_interval($flood_interval)
{
$relogin_back = false;
$logged_in_username = $this->get_logged_in_user();
if ($logged_in_username && $logged_in_username !== 'admin')
{
$this->logout();
$relogin_back = true;
}
if (!$logged_in_username || $relogin_back)
{
$this->login();
$this->admin_login();
}
$this->add_lang('acp/common');
$crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=post&sid=' . $this->sid);
$form = $crawler->selectButton('submit')->form([
'config[flood_interval]' => $flood_interval,
]);
$crawler = self::submit($form);
$this->assertContainsLang('CONFIG_UPDATED', $crawler->text());
// Get logged out back or get logged in in user back if needed
if (!$logged_in_username)
{
$this->logout();
}
if ($relogin_back)
{
$this->logout();
$this->login($logged_in_username);
}
}
/**
* Check if a user exists by username or user_id
*
* @param string $username The username to check or empty if user_id is used
* @param int $user_id The user id to check or empty if username is used
*
* @return bool Returns true if a user exists, false otherwise
*/
protected function user_exists($username, $user_id = null)
{
global $db;
$db = $this->get_db();
if (!function_exists('utf_clean_string'))
{
require_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php');
}
if (!function_exists('user_get_id_name'))
{
require_once(__DIR__ . '/../../phpBB/includes/functions_user.php');
}
return user_get_id_name($user_id, $username) ? false : true;
}
}