Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-15 14:01:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0

Browse Source
This commit is contained in:
Laurent Destailleur
2024-10-15 15:41:31 +02:00
parent 448616d4c5 ccc27739d7
commit 53a1d06678
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1842,6 +1842,17 @@ function dol_escape_php($stringtoescape, $stringforquotes = 2)
return 'Bad parameter for stringforquotes in dol_escape_php'; return 'Bad parameter for stringforquotes in dol_escape_php';
} }
/**
* Returns text escaped for all protocols (so only alpha chars and numbers)
*
* @param string $stringtoescape String to escape
* @return string Escaped string for XML content.
*/
function dol_escape_all($stringtoescape)
{
return preg_replace('/[^a-z0-9_]/i', '', $stringtoescape);
}
/** /**
* Returns text escaped for inclusion into a XML string * Returns text escaped for inclusion into a XML string
* *

2
htdocs/fourn/commande/list.php
View File

@@ -1836,7 +1836,7 @@ if ($resql) {
// Alias // Alias
if (!empty($arrayfields['s.name_alias']['checked'])) { if (!empty($arrayfields['s.name_alias']['checked'])) {
print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->alias).'">'; print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->alias).'">';
print dol_escape_all($obj->alias); print dol_escape_htmltag($obj->alias);
print '</td>'."\n"; print '</td>'."\n";
if (!$i) { if (!$i) {
$totalarray['nbfield']++; $totalarray['nbfield']++;