Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Debug v21

Browse Source
This commit is contained in:
Laurent Destailleur
2024-11-08 18:45:56 +01:00
parent 59718892fa
commit ec7ea921d4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/class/html.formfile.class.php
View File

@@ -1403,7 +1403,8 @@ class FormFile
// Show title of list of existing files // Show title of list of existing files
$morehtmlright = ''; $morehtmlright = '';
if (!empty($moreoptions['showhideaddbutton']) && $conf->use_javascript_ajax) { if (!empty($moreoptions['showhideaddbutton']) && $conf->use_javascript_ajax) {
$morehtmlright .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', 'javascript:console.log("open add file form");jQuery(".divattachnewfile").toggle(); if (!jQuery(".divattachnewfile").is(":hidden")) { jQuery("input[type=\'file\']").click(); }', '', $permtoeditline); $url = 'javascript:console.log("open add file form");jQuery(".divattachnewfile").toggle(); if (!jQuery(".divattachnewfile").is(":hidden")) { jQuery("input[type=\'file\']").click(); }';
$morehtmlright .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', $url, '', $permtoeditline);
} }
if ((empty($useinecm) || $useinecm == 3 || $useinecm == 6) && $title != 'none') { if ((empty($useinecm) || $useinecm == 3 || $useinecm == 6) && $title != 'none') {

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

@@ -12874,7 +12874,7 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
$TCompiledAttr = array(); $TCompiledAttr = array();
foreach ($attr as $key => $value) { foreach ($attr as $key => $value) {
$TCompiledAttr[] = $key.'="'.dolPrintHTMLForAttribute($value).'"'; $TCompiledAttr[] = $key.'="'.dol_escape_htmltag($value).'"'; // Do not use dolPrintHTMLForAttribute() here, we must accept "javascript:string"
} }
$compiledAttributes = (empty($TCompiledAttr) ? '' : implode(' ', $TCompiledAttr)); $compiledAttributes = (empty($TCompiledAttr) ? '' : implode(' ', $TCompiledAttr));