mirror of
https://github.com/phpbb/phpbb.git
synced 2025-01-18 06:38:43 +01:00
Merge branch '3.3.x'
This commit is contained in:
Marc Alexander
commit
63e0b1b2f3
@ -920,13 +920,17 @@ function make_clickable_callback($type, $whitespace, $url, $relative_url, $class
|
||||
}
|
||||
|
||||
/**
|
||||
* make_clickable function
|
||||
*
|
||||
* Replace magic urls of form http://xxx.xxx., www.xxx. and xxx@xxx.xxx.
|
||||
* Cuts down displayed size of link if over 50 chars, turns absolute links
|
||||
* into relative versions when the server/script path matches the link
|
||||
*/
|
||||
function make_clickable($text, $server_url = false, $class = 'postlink')
|
||||
* Replaces magic urls of form http://xxx.xxx., www.xxx. and xxx@xxx.xxx.
|
||||
* Cuts down displayed size of link if over 50 chars, turns absolute links
|
||||
* into relative versions when the server/script path matches the link
|
||||
*
|
||||
* @param string $text Message text to parse URL/email entries
|
||||
* @param bool|string $server_url The server URL. If false, the board URL will be used
|
||||
* @param string $class CSS class selector to add to the parsed URL entries
|
||||
*
|
||||
* @return string A text with parsed URL/email entries
|
||||
*/
|
||||
function make_clickable($text, $server_url = false, string $class = 'postlink')
|
||||
{
|
||||
if ($server_url === false)
|
||||
{
|
||||
@ -947,39 +951,70 @@ function make_clickable($text, $server_url = false, $class = 'postlink')
|
||||
$magic_url_match_args = array();
|
||||
}
|
||||
|
||||
// Check if the match for this $server_url and $class already exists
|
||||
$element_exists = false;
|
||||
if (isset($magic_url_match_args[$server_url]))
|
||||
{
|
||||
array_walk_recursive($magic_url_match_args[$server_url], function($value) use (&$element_exists, $static_class)
|
||||
{
|
||||
if ($value == $static_class)
|
||||
{
|
||||
$element_exists = true;
|
||||
return;
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
// Only add new $server_url and $class matches if not exist
|
||||
if (!$element_exists)
|
||||
{
|
||||
// relative urls for this board
|
||||
$magic_url_match_args[$server_url][] = array(
|
||||
$magic_url_match_args[$server_url][] = [
|
||||
'#(^|[\n\t (>.])(' . preg_quote($server_url, '#') . ')/(' . get_preg_expression('relative_url_inline') . ')#iu',
|
||||
MAGIC_URL_LOCAL,
|
||||
$local_class,
|
||||
);
|
||||
$static_class,
|
||||
];
|
||||
|
||||
// matches a xxxx://aaaaa.bbb.cccc. ...
|
||||
$magic_url_match_args[$server_url][] = array(
|
||||
$magic_url_match_args[$server_url][] = [
|
||||
'#(^|[\n\t (>.])(' . get_preg_expression('url_inline') . ')#iu',
|
||||
MAGIC_URL_FULL,
|
||||
$class,
|
||||
);
|
||||
$static_class,
|
||||
];
|
||||
|
||||
// matches a "www.xxxx.yyyy[/zzzz]" kinda lazy URL thing
|
||||
$magic_url_match_args[$server_url][] = array(
|
||||
$magic_url_match_args[$server_url][] = [
|
||||
'#(^|[\n\t (>])(' . get_preg_expression('www_url_inline') . ')#iu',
|
||||
MAGIC_URL_WWW,
|
||||
$class,
|
||||
);
|
||||
$static_class,
|
||||
];
|
||||
}
|
||||
|
||||
if (!isset($magic_url_match_args[$server_url]['email']))
|
||||
{
|
||||
// matches an email@domain type address at the start of a line, or after a space or after what might be a BBCode.
|
||||
$magic_url_match_args[$server_url][] = array(
|
||||
$magic_url_match_args[$server_url]['email'] = [
|
||||
'/(^|[\n\t (>])(' . get_preg_expression('email') . ')/iu',
|
||||
MAGIC_URL_EMAIL,
|
||||
'',
|
||||
);
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($magic_url_match_args[$server_url] as $magic_args)
|
||||
{
|
||||
if (preg_match($magic_args[0], $text, $matches))
|
||||
{
|
||||
// Only apply $class from the corresponding function call argument (excepting emails which never has a class)
|
||||
if ($magic_args[3] != $static_class && $magic_args[1] != MAGIC_URL_EMAIL)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
$text = preg_replace_callback($magic_args[0], function($matches) use ($magic_args)
|
||||
{
|
||||
$relative_url = isset($matches[3]) ? $matches[3] : '';
|
||||
|
||||
@ -27,131 +27,173 @@ class phpbb_functions_make_clickable_test extends phpbb_test_case
|
||||
**/
|
||||
public function data_test_make_clickable_url_positive()
|
||||
{
|
||||
return array(
|
||||
array(
|
||||
return [
|
||||
[
|
||||
'http://www.phpbb.com/community/',
|
||||
'<!-- m --><a class="postlink" href="http://www.phpbb.com/community/">http://www.phpbb.com/community/</a><!-- m -->'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'http://www.phpbb.com/path/file.ext#section',
|
||||
'<!-- m --><a class="postlink" href="http://www.phpbb.com/path/file.ext#section">http://www.phpbb.com/path/file.ext#section</a><!-- m -->'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'ftp://ftp.phpbb.com/',
|
||||
'<!-- m --><a class="postlink" href="ftp://ftp.phpbb.com/">ftp://ftp.phpbb.com/</a><!-- m -->'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'sip://bantu@phpbb.com',
|
||||
'<!-- m --><a class="postlink" href="sip://bantu@phpbb.com">sip://bantu@phpbb.com</a><!-- m -->'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'www.phpbb.com/community/',
|
||||
'<!-- w --><a class="postlink" href="http://www.phpbb.com/community/">www.phpbb.com/community/</a><!-- w -->'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'http://testhost/viewtopic.php?t=1',
|
||||
'<!-- l --><a class="postlink-local" href="http://testhost/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'javascript://testhost/viewtopic.php?t=1',
|
||||
'javascript://testhost/viewtopic.php?t=1'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
"java\nscri\npt://testhost/viewtopic.php?t=1",
|
||||
"java\nscri\n<!-- m --><a class=\"postlink\" href=\"pt://testhost/viewtopic.php?t=1\">pt://testhost/viewtopic.php?t=1</a><!-- m -->"
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'email@domain.com',
|
||||
'<!-- e --><a href="mailto:email@domain.com">email@domain.com</a><!-- e -->'
|
||||
),
|
||||
],
|
||||
// Test appending punctuation mark to the URL
|
||||
array(
|
||||
[
|
||||
'http://testhost/viewtopic.php?t=1!',
|
||||
'<!-- l --><a class="postlink-local" href="http://testhost/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->!'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'www.phpbb.com/community/?',
|
||||
'<!-- w --><a class="postlink" href="http://www.phpbb.com/community/">www.phpbb.com/community/</a><!-- w -->?'
|
||||
),
|
||||
],
|
||||
// Test shortened text for URL > 55 characters long
|
||||
// URL text should be turned into: first 39 chars + ' ... ' + last 10 chars
|
||||
array(
|
||||
[
|
||||
'http://www.phpbb.com/community/path/to/long/url/file.ext#section',
|
||||
'<!-- m --><a class="postlink" href="http://www.phpbb.com/community/path/to/long/url/file.ext#section">http://www.phpbb.com/community/path/to/ ... xt#section</a><!-- m -->'
|
||||
),
|
||||
);
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
public function data_test_make_clickable_url_idn()
|
||||
{
|
||||
return array(
|
||||
array(
|
||||
return [
|
||||
[
|
||||
'http://www.täst.de/community/',
|
||||
'<!-- m --><a class="postlink" href="http://www.täst.de/community/">http://www.täst.de/community/</a><!-- m -->'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'http://www.täst.de/path/file.ext#section',
|
||||
'<!-- m --><a class="postlink" href="http://www.täst.de/path/file.ext#section">http://www.täst.de/path/file.ext#section</a><!-- m -->'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'ftp://ftp.täst.de/',
|
||||
'<!-- m --><a class="postlink" href="ftp://ftp.täst.de/">ftp://ftp.täst.de/</a><!-- m -->'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'javascript://täst.de/',
|
||||
'javascript://täst.de/'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'sip://bantu@täst.de',
|
||||
'<!-- m --><a class="postlink" href="sip://bantu@täst.de">sip://bantu@täst.de</a><!-- m -->'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'www.täst.de/community/',
|
||||
'<!-- w --><a class="postlink" href="http://www.täst.de/community/">www.täst.de/community/</a><!-- w -->'
|
||||
),
|
||||
],
|
||||
// Test appending punctuation mark to the URL
|
||||
array(
|
||||
[
|
||||
'http://домен.рф/viewtopic.php?t=1!',
|
||||
'<!-- m --><a class="postlink" href="http://домен.рф/viewtopic.php?t=1">http://домен.рф/viewtopic.php?t=1</a><!-- m -->!'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'www.домен.рф/сообщество/?',
|
||||
'<!-- w --><a class="postlink" href="http://www.домен.рф/сообщество/">www.домен.рф/сообщество/</a><!-- w -->?'
|
||||
),
|
||||
],
|
||||
// Test shortened text for URL > 55 characters long
|
||||
// URL text should be turned into: first 39 chars + ' ... ' + last 10 chars
|
||||
array(
|
||||
[
|
||||
'http://www.домен.рф/сообщество/путь/по/длинной/ссылке/file.ext#section',
|
||||
'<!-- m --><a class="postlink" href="http://www.домен.рф/сообщество/путь/по/длинной/ссылке/file.ext#section">http://www.домен.рф/сообщество/путь/по/ ... xt#section</a><!-- m -->'
|
||||
),
|
||||
],
|
||||
|
||||
// IDN with invalid characters shouldn't be parsed correctly (only 'valid' part)
|
||||
array(
|
||||
[
|
||||
'http://www.täst╫.de',
|
||||
'<!-- m --><a class="postlink" href="http://www.täst">http://www.täst</a><!-- m -->╫.de'
|
||||
),
|
||||
],
|
||||
// IDN in emails is unsupported yet
|
||||
array('почта@домен.рф', 'почта@домен.рф'),
|
||||
);
|
||||
['почта@домен.рф', 'почта@домен.рф'],
|
||||
];
|
||||
}
|
||||
|
||||
public function data_test_make_clickable_local_url_idn()
|
||||
{
|
||||
return array(
|
||||
array(
|
||||
return [
|
||||
[
|
||||
'http://www.домен.рф/viewtopic.php?t=1',
|
||||
'<!-- l --><a class="postlink-local" href="http://www.домен.рф/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->'
|
||||
),
|
||||
],
|
||||
// Test appending punctuation mark to the URL
|
||||
array(
|
||||
[
|
||||
'http://www.домен.рф/viewtopic.php?t=1!',
|
||||
'<!-- l --><a class="postlink-local" href="http://www.домен.рф/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->!'
|
||||
),
|
||||
array(
|
||||
],
|
||||
[
|
||||
'http://www.домен.рф/сообщество/?',
|
||||
'<!-- l --><a class="postlink-local" href="http://www.домен.рф/сообщество/">сообщество/</a><!-- l -->?'
|
||||
),
|
||||
);
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
public function data_test_make_clickable_custom_classes()
|
||||
{
|
||||
return [
|
||||
[
|
||||
'http://www.домен.рф/viewtopic.php?t=1',
|
||||
'http://www.домен.рф',
|
||||
'class1',
|
||||
'<!-- l --><a class="class1-local" href="http://www.домен.рф/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->'
|
||||
],
|
||||
[
|
||||
'http://www.домен.рф/viewtopic.php?t=1!',
|
||||
false,
|
||||
'class2',
|
||||
'<!-- m --><a class="class2" href="http://www.домен.рф/viewtopic.php?t=1">http://www.домен.рф/viewtopic.php?t=1</a><!-- m -->!'
|
||||
],
|
||||
[
|
||||
'http://www.домен.рф/сообщество/?',
|
||||
false,
|
||||
'class3',
|
||||
'<!-- m --><a class="class3" href="http://www.домен.рф/сообщество/">http://www.домен.рф/сообщество/</a><!-- m -->?'
|
||||
],
|
||||
[
|
||||
'www.phpbb.com/community/',
|
||||
false,
|
||||
'class2',
|
||||
'<!-- w --><a class="class2" href="http://www.phpbb.com/community/">www.phpbb.com/community/</a><!-- w -->'
|
||||
],
|
||||
[
|
||||
'http://testhost/viewtopic.php?t=1',
|
||||
false,
|
||||
'class1',
|
||||
'<!-- l --><a class="class1-local" href="http://testhost/viewtopic.php?t=1">viewtopic.php?t=1</a><!-- l -->'
|
||||
],
|
||||
[
|
||||
'email@domain.com',
|
||||
false,
|
||||
'class-email',
|
||||
'<!-- e --><a href="mailto:email@domain.com">email@domain.com</a><!-- e -->'
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
protected function setUp(): void
|
||||
@ -166,16 +208,9 @@ class phpbb_functions_make_clickable_test extends phpbb_test_case
|
||||
|
||||
/**
|
||||
* @dataProvider data_test_make_clickable_url_positive
|
||||
*/
|
||||
public function test_urls_matching_positive($url, $expected)
|
||||
{
|
||||
$this->assertSame($expected, make_clickable($url));
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider data_test_make_clickable_url_idn
|
||||
*/
|
||||
public function test_urls_matching_idn($url, $expected)
|
||||
public function test_urls_matching_positive($url, $expected)
|
||||
{
|
||||
$this->assertSame($expected, make_clickable($url));
|
||||
}
|
||||
@ -187,4 +222,12 @@ class phpbb_functions_make_clickable_test extends phpbb_test_case
|
||||
{
|
||||
$this->assertSame($expected, make_clickable($url, "http://www.домен.рф"));
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider data_test_make_clickable_custom_classes
|
||||
*/
|
||||
public function test_make_clickable_custom_classes($url, $server_url, $class, $expected)
|
||||
{
|
||||
$this->assertSame($expected, make_clickable($url, $server_url, $class));
|
||||
}
|
||||
}
|
||||
|
||||
51
tests/functions_user/whois_test.php
Normal file
51
tests/functions_user/whois_test.php
Normal file
@ -0,0 +1,51 @@
|
||||
<?php
|
||||
/**
|
||||
*
|
||||
* @package testing
|
||||
* @copyright (c) 2020 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
|
||||
*
|
||||
*/
|
||||
|
||||
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
|
||||
|
||||
class phpbb_functions_user_whois_test extends phpbb_test_case
|
||||
{
|
||||
public function setUp()
|
||||
{
|
||||
global $config, $phpbb_dispatcher, $user, $request, $symfony_request, $phpbb_root_path, $phpEx;
|
||||
|
||||
$user = $this->getMockBuilder('\phpbb\user')
|
||||
->setConstructorArgs([
|
||||
new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)),
|
||||
'\phpbb\datetime',
|
||||
])
|
||||
->getMock();
|
||||
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
|
||||
$config = new \phpbb\config\config([]);
|
||||
$request = $this->getMockBuilder('\phpbb\request\request')
|
||||
->getMock();
|
||||
$symfony_request = $this->getMockBuilder('\phpbb\symfony_request')
|
||||
->disableOriginalConstructor()
|
||||
->getMock();
|
||||
}
|
||||
|
||||
public function ips_data()
|
||||
{
|
||||
return [
|
||||
['2001:4860:4860::8888'], // Google public DNS
|
||||
['64.233.161.139'], // google.com
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider ips_data
|
||||
*/
|
||||
public function test_ip_whois($ip)
|
||||
{
|
||||
$ip_whois = user_ipwhois($ip);
|
||||
$this->assertStringNotContainsString('Query terms are ambiguous', $ip_whois);
|
||||
$this->assertStringNotContainsString('no entries found', $ip_whois);
|
||||
$this->assertStringNotContainsString('ERROR', $ip_whois);
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user