lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX html detection fails if only u tag is present

Browse Source
This commit is contained in:
Laurent Destailleur 2016-07-26 16:11:38 +02:00
parent 2866d60240
commit b615b52f47
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions.lib.php
View File

@ -4548,7 +4548,7 @@ function dol_textishtml($msg,$option=0)
{ {
if (preg_match('/<html/i',$msg)) return true; if (preg_match('/<html/i',$msg)) return true;
elseif (preg_match('/<body/i',$msg)) return true; elseif (preg_match('/<body/i',$msg)) return true;
elseif (preg_match('/<(b|em|i)>/i',$msg)) return true; elseif (preg_match('/<(b|em|i|u)>/i',$msg)) return true;
elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i',$msg)) return true; elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i',$msg)) return true;
elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i',$msg)) return true; elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i',$msg)) return true;
elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i',$msg)) return true; elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i',$msg)) return true;

27
test/phpunit/FunctionsLibTest.php
View File

@ -206,40 +206,43 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
// True // True
$input='<html>xxx</html>'; $input='<html>xxx</html>';
$after=dol_textishtml($input); $after=dol_textishtml($input);
$this->assertTrue($after); $this->assertTrue($after, 'Test with html tag');
$input='<body>xxx</body>'; $input='<body>xxx</body>';
$after=dol_textishtml($input); $after=dol_textishtml($input);
$this->assertTrue($after); $this->assertTrue($after, 'Test with body tag');
$input='xxx <b>yyy</b> zzz'; $input='xxx <b>yyy</b> zzz';
$after=dol_textishtml($input); $after=dol_textishtml($input);
$this->assertTrue($after); $this->assertTrue($after, 'Test with b tag');
$input='xxx <u>yyy</u> zzz';
$after=dol_textishtml($input);
$this->assertTrue($after, 'Test with u tag');
$input='text with <div>some div</div>'; $input='text with <div>some div</div>';
$after=dol_textishtml($input); $after=dol_textishtml($input);
$this->assertTrue($after); $this->assertTrue($after, 'Test with div tag');
$input='text with HTML &nbsp; entities'; $input='text with HTML &nbsp; entities';
$after=dol_textishtml($input); $after=dol_textishtml($input);
$this->assertTrue($after); $this->assertTrue($after, 'Test with entities tag');
$input='xxx<br>'; $input='xxx<br>';
$after=dol_textishtml($input); $after=dol_textishtml($input);
$this->assertTrue($after); $this->assertTrue($after, 'Test with entities br');
$input='xxx<br >'; $input='xxx<br >';
$after=dol_textishtml($input); $after=dol_textishtml($input);
$this->assertTrue($after); $this->assertTrue($after, 'Test with entities br');
$input='xxx<br style="eee">'; $input='xxx<br style="eee">';
$after=dol_textishtml($input); $after=dol_textishtml($input);
$this->assertTrue($after); $this->assertTrue($after, 'Test with entities br and attributes');
$input='xxx<br style="eee" >'; $input='xxx<br style="eee" >';
$after=dol_textishtml($input); $after=dol_textishtml($input);
$this->assertTrue($after); $this->assertTrue($after, 'Test with entities br and attributes bis');
$input='<h2>abc</h2>'; $input='<h2>abc</h2>';
$after=dol_textishtml($input); $after=dol_textishtml($input);
$this->assertTrue($after); $this->assertTrue($after, 'Test with entities h2');
$input='<img id="abc" src="https://xxx.com/aaa/image.png" />'; $input='<img id="abc" src="https://xxx.com/aaa/image.png" />';
$after=dol_textishtml($input); $after=dol_textishtml($input);
$this->assertTrue($after,'Failure on test of img tag'); $this->assertTrue($after, 'Test with img tag');
$input='<a class="azerty" href="https://xxx.com/aaa/image.png" />'; $input='<a class="azerty" href="https://xxx.com/aaa/image.png" />';
$after=dol_textishtml($input); $after=dol_textishtml($input);
$this->assertTrue($after,'Failure on test of a tag'); $this->assertTrue($after, 'Test with a tag');
// False // False
$input='xxx < br>'; $input='xxx < br>';