mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 23:25:30 +02:00
Code Issues Releases Wiki Activity

[ticket/11711] Improve coding and comments of character check

Browse Source 
PHPBB3-11711
This commit is contained in:
Marc Alexander 2014-06-10 15:51:25 +02:00
parent 65884bf2bd
commit 5ee7f20f4e
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/message_parser.php
View File

@ -1195,7 +1195,7 @@ class parse_message extends bbcode_firstpass
} }
// Check for out-of-bounds characters that are currently // Check for out-of-bounds characters that are currently
// not supported by utf8_bin // not supported by utf8_bin in MySQL
if (preg_match_all('/[\x{10000}-\x{10FFFF}]/u', $this->message, $matches)) if (preg_match_all('/[\x{10000}-\x{10FFFF}]/u', $this->message, $matches))
{ {
$character_list = implode('<br />', $matches[0]); $character_list = implode('<br />', $matches[0]);

2
phpBB/posting.php
View File

@ -1029,7 +1029,7 @@ if ($submit || $preview || $refresh)
} }
// Check for out-of-bounds characters that are currently // Check for out-of-bounds characters that are currently
// not supported by utf8_bin // not supported by utf8_bin in MySQL
if (preg_match_all('/[\x{10000}-\x{10FFFF}]/u', $post_data['post_subject'], $matches)) if (preg_match_all('/[\x{10000}-\x{10FFFF}]/u', $post_data['post_subject'], $matches))
{ {
$character_list = implode('<br />', $matches[0]); $character_list = implode('<br />', $matches[0]);

6
tests/functional/posting_test.php
View File

@ -48,13 +48,15 @@ class phpbb_functional_posting_test extends phpbb_functional_test_case
'Unsupported characters', 'Unsupported characters',
"This is a test with these weird characters: \xF0\x9F\x88\xB3 \xF0\x9F\x9A\xB6", "This is a test with these weird characters: \xF0\x9F\x88\xB3 \xF0\x9F\x9A\xB6",
array(), array(),
'Your message contains the following unsupported characters'); 'Your message contains the following unsupported characters'
);
self::create_post(2, self::create_post(2,
1, 1,
"Unsupported: \xF0\x9F\x88\xB3 \xF0\x9F\x9A\xB6", "Unsupported: \xF0\x9F\x88\xB3 \xF0\x9F\x9A\xB6",
'This is a test with emoji characters in the topic title.', 'This is a test with emoji characters in the topic title.',
array(), array(),
'Your subject contains the following unsupported characters'); 'Your subject contains the following unsupported characters'
);
} }
} }

9
tests/test_framework/phpbb_functional_test_case.php
View File

@ -996,16 +996,19 @@ class phpbb_functional_test_case extends phpbb_test_case
// Instead, I send it as a request with the submit button "post" set to true. // Instead, I send it as a request with the submit button "post" set to true.
$crawler = self::request('POST', $posting_url, $form_data); $crawler = self::request('POST', $posting_url, $form_data);
if ($expected !== '' && isset($this->lang[$expected])) if ($expected !== '')
{
if (isset($this->lang[$expected]))
{ {
$this->assertContainsLang($expected, $crawler->filter('html')->text()); $this->assertContainsLang($expected, $crawler->filter('html')->text());
return null;
} }
else if ($expected !== '') else
{ {
$this->assertContains($expected, $crawler->filter('html')->text()); $this->assertContains($expected, $crawler->filter('html')->text());
}
return null; return null;
} }
$url = $crawler->selectLink($form_data['subject'])->link()->getUri(); $url = $crawler->selectLink($form_data['subject'])->link()->getUri();
return array( return array(