sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't place smilies inside of pre or code tags. Don't skip smilie after a smilie with an 8 in it. Fix regular expression used for smiley translations to work when there is only one registered emoticon. 

Props solarissmoke, soulseekah, mdbitz, yonasy. ht to mdbitz for the Unit Tests and a comprehensive patch.
Fixes #16448, #20124, #25303.



git-svn-id: https://develop.svn.wordpress.org/trunk@26191 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2013-11-15 02:45:39 +00:00
parent e7fc90c34e
commit 15c1c2f130
3 changed files with 275 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/wp-includes/formatting.php
View File

@ -1798,13 +1798,31 @@ function convert_smilies($text) {
$output = '';
if ( get_option( 'use_smilies' ) && ! empty( $wp_smiliessearch ) ) {
// HTML loop taken from texturize function, could possible be consolidated
$textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between
$textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // capture the tags as well as in between
$stop = count( $textarr );// loop stuff
// Ignore proessing of specific tags
$tags_to_ignore = 'code|pre|style|script|textarea';
$ignore_block_element = '';
for ( $i = 0; $i < $stop; $i++ ) {
$content = $textarr[$i];
if ((strlen($content) > 0) && ('<' != $content[0])) { // If it's not a tag
// If we're in an ignore block, wait until we find its closing tag
if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) ) {
$ignore_block_element = $matches[1];
}
// If it's not a tag and not in ignore block
if ( '' == $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
$content = preg_replace_callback( $wp_smiliessearch, 'translate_smiley', $content );
}
// did we exit ignore block
if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content ) {
$ignore_block_element = '';
}
$output .= $content;
}
} else {

8
src/wp-includes/functions.php
View File

@ -2477,6 +2477,7 @@ function _mce_set_direction( $input ) {
return $input;
}
/**
* Convert smiley code to the icon graphic file equivalent.
*
@ -2566,7 +2567,7 @@ function smilies_init() {
*/
krsort($wpsmiliestrans);
$wp_smiliessearch = '/(?:\s|^)';
$wp_smiliessearch = '/((?:\s|^)';
$subchar = '';
foreach ( (array) $wpsmiliestrans as $smiley => $img ) {
@ -2576,7 +2577,7 @@ function smilies_init() {
// new subpattern?
if ($firstchar != $subchar) {
if ($subchar != '') {
$wp_smiliessearch .= ')|(?:\s|^)';
$wp_smiliessearch .= ')(?=\s|$))|((?:\s|^)'; ;
}
$subchar = $firstchar;
$wp_smiliessearch .= preg_quote($firstchar, '/') . '(?:';
@ -2586,7 +2587,8 @@ function smilies_init() {
$wp_smiliessearch .= preg_quote($rest, '/');
}
$wp_smiliessearch .= ')(?:\s|$)/m';
$wp_smiliessearch .= ')(?=\s|$))/m';
}
/**

290
tests/phpunit/tests/formatting/Smilies.php
View File

@ -5,56 +5,99 @@
*/
class Tests_Formatting_Smilies extends WP_UnitTestCase {
function test_convert_smilies() {
global $wpsmiliestrans;
/**
* Basic Test Content DataProvider
*
* array ( input_txt, converted_output_txt)
*/
public function get_smilies_input_output() {
$includes_path = includes_url("images/smilies/");
return array (
array (
'Lorem ipsum dolor sit amet mauris ;-) Praesent gravida sodales. :lol: Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, :eek: mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, :mrgreen: tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus :?:',
'Lorem ipsum dolor sit amet mauris <img src=\'' . $includes_path . 'icon_wink.gif\' alt=\';-)\' class=\'wp-smiley\' /> Praesent gravida sodales. <img src=\'' . $includes_path . 'icon_lol.gif\' alt=\':lol:\' class=\'wp-smiley\' /> Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, <img src=\'' . $includes_path . 'icon_surprised.gif\' alt=\':eek:\' class=\'wp-smiley\' /> mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, <img src=\'' . $includes_path . 'icon_mrgreen.gif\' alt=\':mrgreen:\' class=\'wp-smiley\' /> tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus <img src=\'' . $includes_path . 'icon_question.gif\' alt=\':?:\' class=\'wp-smiley\' /> '
),
array (
'<strong>Welcome to the jungle!</strong> We got fun n games! :) We got everything you want 8-) <em>Honey we know the names :)</em>',
'<strong>Welcome to the jungle!</strong> We got fun n games! <img src=\'' . $includes_path . 'icon_smile.gif\' alt=\':)\' class=\'wp-smiley\' /> We got everything you want <img src=\'' . $includes_path . 'icon_cool.gif\' alt=\'8-)\' class=\'wp-smiley\' /> <em>Honey we know the names <img src=\'' . $includes_path . 'icon_smile.gif\' alt=\':)\' class=\'wp-smiley\' /> </em>'
),
array (
"<strong;)>a little bit of this\na little bit:other: of that :D\n:D a little bit of good\nyeah with a little bit of bad8O",
"<strong;)>a little bit of this\na little bit:other: of that <img src='{$includes_path}icon_biggrin.gif' alt=':D' class='wp-smiley' /> <img src='{$includes_path}icon_biggrin.gif' alt=':D' class='wp-smiley' /> a little bit of good\nyeah with a little bit of bad8O"
),
array (
'<strong style="here comes the sun :-D">and I say it\'s allright:D:D',
'<strong style="here comes the sun :-D">and I say it\'s allright:D:D'
),
array (
'<!-- Woo-hoo, I\'m a comment, baby! :x > -->',
'<!-- Woo-hoo, I\'m a comment, baby! :x > -->'
),
array (
':?:P:?::-x:mrgreen:::',
':?:P:?::-x:mrgreen:::'
),
);
}
/**
* @dataProvider get_smilies_input_output
*
* Basic Validation Test to confirm that smilies are converted to image
* when use_smilies = 1 and not when use_smilies = 0
*/
function test_convert_standard_smilies( $in_txt, $converted_txt ) {
global $wpsmiliestrans;
// standard smilies, use_smilies: ON
update_option( 'use_smilies', 1 );
smilies_init();
$inputs = array(
'Lorem ipsum dolor sit amet mauris ;-) Praesent gravida sodales. :lol: Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, :eek: mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, :mrgreen: tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus :?:',
'<strong>Welcome to the jungle!</strong> We got fun n games! :) We got everything you want 8-) <em>Honey we know the names :)</em>',
"<strong;)>a little bit of this\na little bit:other: of that :D\n:D a little bit of good\nyeah with a little bit of bad8O",
'<strong style="here comes the sun :-D">and I say it\'s allright:D:D',
'<!-- Woo-hoo, I\'m a comment, baby! :x > -->',
':?:P:?::-x:mrgreen:::', /*
'the question is, <textarea>Should smilies be converted in textareas :?:</textarea>',
'the question is, <code>Should smilies be converted in code or pre tags :?:</code>',
'the question is, <code style="color:#fff">Should smilies be converted in code or pre tags :?:</code>',
'the question is, <code>Should smilies be converted in invalid code or pre tags :?:</pre>',
'<Am I greedy?>Yes I am :)> :) The world makes me :mad:' */
);
$outputs = array(
'Lorem ipsum dolor sit amet mauris <img src=\''.$includes_path.'icon_wink.gif\' alt=\';-)\' class=\'wp-smiley\' /> Praesent gravida sodales. <img src=\''.$includes_path.'icon_lol.gif\' alt=\':lol:\' class=\'wp-smiley\' /> Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, <img src=\''.$includes_path.'icon_surprised.gif\' alt=\':eek:\' class=\'wp-smiley\' /> mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, <img src=\''.$includes_path.'icon_mrgreen.gif\' alt=\':mrgreen:\' class=\'wp-smiley\' /> tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus <img src=\''.$includes_path.'icon_question.gif\' alt=\':?:\' class=\'wp-smiley\' /> ',
'<strong>Welcome to the jungle!</strong> We got fun n games! <img src=\''.$includes_path.'icon_smile.gif\' alt=\':)\' class=\'wp-smiley\' /> We got everything you want <img src=\''.$includes_path.'icon_cool.gif\' alt=\'8-)\' class=\'wp-smiley\' /> <em>Honey we know the names <img src=\''.$includes_path.'icon_smile.gif\' alt=\':)\' class=\'wp-smiley\' /> </em>',
"<strong;)>a little bit of this\na little bit:other: of that <img src='{$includes_path}icon_biggrin.gif' alt=':D' class='wp-smiley' /> <img src='{$includes_path}icon_biggrin.gif' alt=':D' class='wp-smiley' /> a little bit of good\nyeah with a little bit of bad8O",
'<strong style="here comes the sun :-D">and I say it\'s allright:D:D',
'<!-- Woo-hoo, I\'m a comment, baby! :x > -->',
' <img src=\''.$includes_path.'icon_question.gif\' alt=\':?:\' class=\'wp-smiley\' /> P:?::-x:mrgreen:::', /*
'the question is, <textarea>Should smilies be converted in textareas :?:</textarea>',
'the question is, <code>Should smilies be converted in code or pre tags :?:</code>',
'the question is, <code style="color:#fff">Should smilies be converted in code or pre tags :?:</code>',
'the question is, <code>Should smilies be converted in invalid code or pre tags :?:</pre>',
'<Am I greedy?>Yes I am <img src=\''.$includes_path.'icon_smile.gif\' alt=\':)\' class=\'wp-smiley\' /> > <img src=\''.$includes_path.'icon_smile.gif\' alt=\':)\' class=\'wp-smiley\' /> The world makes me <img src=\'http://wp-test.php/wp-includes/images/smilies/icon_mad.gif\' alt=\':mad:\' class=\'wp-smiley\' />' */
);
foreach ( $inputs as $k => $input ) {
$this->assertEquals( $outputs[$k], convert_smilies($input) );
}
update_option( 'use_smilies', 0 );
$this->assertEquals( $converted_txt, convert_smilies($in_txt) );
// standard smilies, use_smilies: OFF
update_option( 'use_smilies', 0 );
foreach ( $inputs as $input ) {
$this->assertEquals( $input, convert_smilies($input) );
$this->assertEquals( $in_txt, convert_smilies($in_txt) );
unset( $wpsmiliestrans );
}
return;
/**
* Custom Smilies Test Content DataProvider
*
* array ( input_txt, converted_output_txt)
*/
public function get_custom_smilies_input_output() {
$includes_path = includes_url("images/smilies/");
return array (
array (
'Peter Brian Gabriel (born 13 February 1950) is a British singer, musician, and songwriter who rose to fame as the lead vocalist and flautist of the progressive rock group Genesis. :monkey:',
'Peter Brian Gabriel (born 13 February 1950) is a British singer, musician, and songwriter who rose to fame as the lead vocalist and flautist of the progressive rock group Genesis. <img src=\'' . $includes_path . 'icon_shock_the_monkey.gif\' alt=\':monkey:\' class=\'wp-smiley\' /> '
),
array (
'Star Wars Jedi Knight :arrow: Jedi Academy is a first and third-person shooter action game set in the Star Wars universe. It was developed by Raven Software and published, distributed and marketed by LucasArts in North America and by Activision in the rest of the world. :nervou:',
'Star Wars Jedi Knight <img src=\'' . $includes_path . 'icon_arrow.gif\' alt=\':arrow:\' class=\'wp-smiley\' /> Jedi Academy is a first and third-person shooter action game set in the Star Wars universe. It was developed by Raven Software and published, distributed and marketed by LucasArts in North America and by Activision in the rest of the world. <img src=\'' . $includes_path . 'icon_nervou.gif\' alt=\':nervou:\' class=\'wp-smiley\' /> '
),
array (
':arrow: monkey: Lorem ipsum dolor sit amet enim. Etiam ullam :PP <br />corper. Suspendisse a pellentesque dui, non felis.<a> :arrow: :arrow</a>',
' <img src=\'' . $includes_path . 'icon_arrow.gif\' alt=\':arrow:\' class=\'wp-smiley\' /> monkey: Lorem ipsum dolor sit amet enim. Etiam ullam <img src=\'' . $includes_path . 'icon_tongue.gif\' alt=\':PP\' class=\'wp-smiley\' /> <br />corper. Suspendisse a pellentesque dui, non felis.<a> <img src=\'' . $includes_path . 'icon_arrow.gif\' alt=\':arrow:\' class=\'wp-smiley\' /> :arrow</a>'
),
);
}
/**
* @dataProvider get_custom_smilies_input_output
*
* Validate Custom Smilies are converted to images when use_smilies = 1
* @uses $wpsmiliestrans
*/
function test_convert_custom_smilies ( $in_txt, $converted_txt ) {
global $wpsmiliestrans;
$trans_orig = $wpsmiliestrans; // save original translations array
// custom smilies, use_smilies: ON
update_option( 'use_smilies', 1 );
@ -67,18 +110,169 @@ class Tests_Formatting_Smilies extends WP_UnitTestCase {
smilies_init();
$inputs = array('Peter Brian Gabriel (born 13 February 1950) is a British singer, musician, and songwriter who rose to fame as the lead vocalist and flautist of the progressive rock group Genesis. :monkey:',
'Star Wars Jedi Knight:arrow: Jedi Academy is a first and third-person shooter action game set in the Star Wars universe. It was developed by Raven Software and published, distributed and marketed by LucasArts in North America and by Activision in the rest of the world. :nervou:',
':arrow:monkey:Lorem ipsum dolor sit amet enim. Etiam ullam:PP<br />corper. Suspendisse a pellentesque dui, non felis.<a>:arrow::arrow</a>'
$this->assertEquals( $converted_txt, convert_smilies($in_txt) );
// standard smilies, use_smilies: OFF
update_option( 'use_smilies', 0 );
$this->assertEquals( $in_txt, convert_smilies($in_txt) );
$wpsmiliestrans = $trans_orig; // reset original translations array
}
/**
* DataProvider of HTML elements/tags that smilie matches should be ignored in
*
*/
public function get_smilies_ignore_tags() {
return array (
array( 'pre' ),
array( 'code' ),
array( 'script' ),
array( 'style' ),
array( 'textarea'),
);
}
/**
* Validate Conversion of Smilies is ignored in pre-determined tags
* pre, code, script, style
*
* @ticket 16448
* @dataProvider get_smilies_ignore_tags
* @uses $wpsmiliestrans
*/
public function test_ignore_smilies_in_tags( $element ) {
global $wpsmiliestrans;
$trans_orig = $wpsmiliestrans; // save original translations array
$includes_path = includes_url("images/smilies/");
$in_str = 'Do we ingore smilies ;-) in ' . $element . ' tags <' . $element . '>My Content Here :?: </' . $element . '>';
$exp_str = 'Do we ingore smilies <img src=\'' . $includes_path . 'icon_wink.gif\' alt=\';-)\' class=\'wp-smiley\' /> in ' . $element . ' tags <' . $element . '>My Content Here :?: </' . $element . '>';
// standard smilies, use_smilies: ON
update_option( 'use_smilies', 1 );
smilies_init();
$this->assertEquals( $exp_str, convert_smilies($in_str) );
// standard smilies, use_smilies: OFF
update_option( 'use_smilies', 0 );
$wpsmiliestrans = $trans_orig; // reset original translations array
}
/**
* DataProvider of Smilie Combinations
*
*/
public function get_smilies_combinations() {
$includes_path = includes_url("images/smilies/");
return array (
array (
'8-O :-(',
' <img src=\'' . $includes_path . 'icon_eek.gif\' alt=\'8-O\' class=\'wp-smiley\' /> <img src=\'' . $includes_path . 'icon_sad.gif\' alt=\':-(\' class=\'wp-smiley\' /> '
),
array (
'8-) 8-O',
' <img src=\'' . $includes_path . 'icon_cool.gif\' alt=\'8-)\' class=\'wp-smiley\' /> <img src=\'' . $includes_path . 'icon_eek.gif\' alt=\'8-O\' class=\'wp-smiley\' /> '
),
array (
'8-) 8O',
' <img src=\'' . $includes_path . 'icon_cool.gif\' alt=\'8-)\' class=\'wp-smiley\' /> <img src=\'' . $includes_path . 'icon_eek.gif\' alt=\'8O\' class=\'wp-smiley\' /> '
),
array (
'8-) :-(',
' <img src=\'' . $includes_path . 'icon_cool.gif\' alt=\'8-)\' class=\'wp-smiley\' /> <img src=\'' . $includes_path . 'icon_sad.gif\' alt=\':-(\' class=\'wp-smiley\' /> '
),
array (
'8-) :twisted:',
' <img src=\'' . $includes_path . 'icon_cool.gif\' alt=\'8-)\' class=\'wp-smiley\' /> <img src=\'' . $includes_path . 'icon_twisted.gif\' alt=\':twisted:\' class=\'wp-smiley\' /> '
),
array (
'8O :twisted: :( :? :(',
' <img src=\'' . $includes_path . 'icon_eek.gif\' alt=\'8O\' class=\'wp-smiley\' /> <img src=\'' . $includes_path . 'icon_twisted.gif\' alt=\':twisted:\' class=\'wp-smiley\' /> <img src=\'' . $includes_path . 'icon_sad.gif\' alt=\':(\' class=\'wp-smiley\' /> <img src=\'' . $includes_path . 'icon_confused.gif\' alt=\':?\' class=\'wp-smiley\' /> <img src=\'' . $includes_path . 'icon_sad.gif\' alt=\':(\' class=\'wp-smiley\' /> '
),
);
}
/**
* Validate Combinations of Smilies separated by single space
* are converted correctly
*
* @ticket 20124
* @dataProvider get_smilies_combinations
* @uses $wpsmiliestrans
*/
public function test_smilies_combinations( $in_txt, $converted_txt ) {
global $wpsmiliestrans;
// custom smilies, use_smilies: ON
update_option( 'use_smilies', 1 );
smilies_init();
$this->assertEquals( $converted_txt, convert_smilies($in_txt) );
// custom smilies, use_smilies: OFF
update_option( 'use_smilies', 0 );
$this->assertEquals( $in_txt, convert_smilies($in_txt) );
}
/**
* DataProvider of Single Smilies input and converted output
*
*/
public function get_single_smilies_input_output() {
$includes_path = includes_url("images/smilies/");
return array (
array (
'8-O :-(',
'8-O :-('
),
array (
'8O :) additional text here :)',
'8O <img src=\'' . $includes_path . 'icon_smile.gif\' alt=\':)\' class=\'wp-smiley\' /> additional text here <img src=\'' . $includes_path . 'icon_smile.gif\' alt=\':)\' class=\'wp-smiley\' /> '
),
array (
':) :) :) :)',
' <img src=\'' . $includes_path . 'icon_smile.gif\' alt=\':)\' class=\'wp-smiley\' /> <img src=\'' . $includes_path . 'icon_smile.gif\' alt=\':)\' class=\'wp-smiley\' /> <img src=\'' . $includes_path . 'icon_smile.gif\' alt=\':)\' class=\'wp-smiley\' /> <img src=\'' . $includes_path . 'icon_smile.gif\' alt=\':)\' class=\'wp-smiley\' /> '
),
);
}
/**
* Validate Smilies are converted for single smilie in
* the $wpsmiliestrans global array
*
* @ticket 25303
* @dataProvider get_single_smilies_input_output
* @uses $wpsmiliestrans
*/
public function test_single_smilies_in_wpsmiliestrans( $in_txt, $converted_txt ) {
global $wpsmiliestrans;
$orig_trans = $wpsmiliestrans; // save original tranlations array
// standard smilies, use_smilies: ON
update_option( 'use_smilies', 1 );
$wpsmiliestrans = array (
':)' => 'icon_smile.gif'
);
$outputs = array('Peter Brian Gabriel (born 13 February 1950) is a British singer, musician, and songwriter who rose to fame as the lead vocalist and flautist of the progressive rock group Genesis. <img src=\''.$includes_path.'icon_shock_the_monkey.gif\' alt=\'icon_arrow\' class=\'wp-smiley\' />',
'Star Wars Jedi Knight<img src=\''.$includes_path.'icon_arrow.gif\' alt=\'icon_arrow\' class=\'wp-smiley\' /> Jedi Academy is a first and third-person shooter action game set in the Star Wars universe. It was developed by Raven Software and published, distributed and marketed by LucasArts in North America and by Activision in the rest of the world. <img src=\''.$includes_path.'icon_nervou.gif\' alt=\'icon_nervou\' class=\'wp-smiley\' />',
'<img src=\''.$includes_path.'icon_arrow.gif\' alt=\'icon_arrow\' class=\'wp-smiley\' />monkey:Lorem ipsum dolor sit amet enim. Etiam ullam<img src=\''.$includes_path.'icon_tongue.gif\' alt=\'icon_tongue\' class=\'wp-smiley\' /><br />corper. Suspendisse a pellentesque dui, non felis.<a><img src=\''.$includes_path.'icon_arrow.gif\' alt=\'icon_arrow\' class=\'wp-smiley\' />:arrow</a>'
);
smilies_init();
foreach ( $inputs as $k => $input ) {
$this->assertEquals( $outputs[$k], convert_smilies($input) );
}
$this->assertEquals( $converted_txt, convert_smilies($in_txt) );
// standard smilies, use_smilies: OFF
update_option( 'use_smilies', 0 );
$this->assertEquals( $in_txt, convert_smilies($in_txt) );
$wpsmiliestrans = $orig_trans; // reset original translations array
}
}