vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix phpunit

Browse source
This commit is contained in:
Laurent Destailleur 2025-11-26 23:37:10 +01:00
parent b52c5a0ffa
commit 81ac5bddf9
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
htdocs/core/lib/functions.lib.php
View file

@ -9550,8 +9550,18 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
$matches = array();
if (preg_match_all($pattern, $out, $matches)) {
// URLs are into $matches[1]
$urls = $matches[1];
// URLs are into $matches[1] or $matches[2]
$urls = array();
foreach ($matches[1] as $tmpval) {
if (!empty($tmpval)) {
$urls[] = $tmpval;
}
}
foreach ($matches[2] as $tmpval) {
if (!empty($tmpval)) {
$urls[] = $tmpval;
}
}
// Show URLs
$firstexturl = '';

4
test/phpunit/SecurityGETPOSTTest.php
View file

@ -490,13 +490,13 @@ class SecurityGETPOSTTest extends CommonClassTest
$_POST["pagecontentwithnowrapperlinks"] = '<img src="https://aaa">';
$result = GETPOST("pagecontentwithnowrapperlinks", 'restricthtml');
print __METHOD__." result=".$result."\n";
$this->assertEquals('ErrorHTMLExternalLinksNotAllowed', $result, 'Test on MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1 (no links to http allowed)');
$this->assertEquals('ErrorHTMLExternalLinksNotAllowed (Example: https://aaa)', $result, 'Test on MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1 (no links to http allowed)');
// Test that links not on wrapper and not data are disallowed
$_POST["pagecontentwithnowrapperlinks"] = '<span style="background: url(http://ddd)"></span>';
$result = GETPOST("pagecontentwithnowrapperlinks", 'restricthtml');
print __METHOD__." result=".$result."\n";
$this->assertEquals('ErrorHTMLExternalLinksNotAllowed', $result, 'Test on MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1 (no links to http allowed)');
$this->assertEquals('ErrorHTMLExternalLinksNotAllowed (Example: http://ddd)', $result, 'Test on MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1 (no links to http allowed)');
// Test substitution in GET url