mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-07 16:15:22 +02:00
Code Issues Releases Wiki Activity

[ticket/13847] Changed enquote() logic to use whichever is the shortest

Browse Source 
Will enclose attribute values in single- or double- quotes depending on
whichever requires the least escaping. Characters that need to be escaped
are always escaped regardless.

PHPBB3-13847
This commit is contained in:
JoshyPHP 2015-05-19 23:10:35 +02:00
parent 8a077e0e94
commit e50d9186ce
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/phpbb/textformatter/s9e/utils.php
View File

@ -37,7 +37,7 @@ class utils implements \phpbb\textformatter\utils_interface
/** /**
* Return given string between quotes * Return given string between quotes
* *
* Will use either single- or double- quotes depending on whichever requires to be escaped. * Will use either single- or double- quotes depending on whichever requires less escaping.
* Quotes and backslashes are escaped with backslashes where necessary * Quotes and backslashes are escaped with backslashes where necessary
* *
* @param string $str Original string * @param string $str Original string
@ -45,9 +45,10 @@ class utils implements \phpbb\textformatter\utils_interface
*/ */
protected function enquote($str) protected function enquote($str)
{ {
$quote = (strpos($str, '"') === false || strpos($str, "'") !== false) ? '"' : "'"; $singleQuoted = "'" . addcslashes($str, "\\'") . "'";
$doubleQuoted = '"' . addcslashes($str, '\\"') . '"';
return $quote . addcslashes($str, '\\' . $quote) . $quote; return (strlen($singleQuoted) < strlen($doubleQuoted)) ? $singleQuoted : $doubleQuoted;
} }
/** /**

15
tests/text_formatter/s9e/utils_test.php
View File

@ -147,6 +147,21 @@ class phpbb_textformatter_s9e_utils_test extends phpbb_test_case
array('author' => "\\\"'"), array('author' => "\\\"'"),
'[quote="\\\\\\"\'"]...[/quote]', '[quote="\\\\\\"\'"]...[/quote]',
), ),
array(
'...',
array('author' => 'Lots of doubles """ one single \' one backslash \\'),
'[quote=\'Lots of doubles """ one single \\\' one backslash \\\\\']...[/quote]',
),
array(
'...',
array('author' => "Lots of singles ''' one double \" one backslash \\"),
'[quote="Lots of singles \'\'\' one double \\" one backslash \\\\"]...[/quote]',
),
array(
'...',
array('author' => 'Defaults to doublequotes """\'\'\''),
'[quote="Defaults to doublequotes \\"\\"\\"\'\'\'"]...[/quote]',
),
array( array(
'...', '...',
array( array(