diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php index 688396580ae..110e2dc4cca 100644 --- a/htdocs/core/boxes/box_external_rss.php +++ b/htdocs/core/boxes/box_external_rss.php @@ -4,7 +4,7 @@ * Copyright (C) 2004-2008 Laurent Destailleur * Copyright (C) 2005-2011 Regis Houssin * Copyright (C) 2015 Frederic France - * Copyright (C) 2024 MDW + * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -183,26 +183,27 @@ class box_external_rss extends ModeleBoxes $description = str_replace("\r\n", "", $description); $tooltip .= '
'.$description; + // Note: Escaping of value will be done by the showBox rendering method. $this->info_box_contents[$line][0] = array( 'td' => 'class="left" width="16"', 'text' => img_picto('', 'rss'), 'url' => $href, - 'tooltip' => dol_escape_htmltag($tooltip), + 'tooltip' => $tooltip, 'target' => 'newrss', ); $this->info_box_contents[$line][1] = array( 'td' => 'class="tdoverflowmax300"', - 'text' => dol_escape_htmltag($title), + 'text' => $title, 'url' => $href, - 'tooltip' => dol_escape_htmltag($tooltip), + 'tooltip' => $tooltip, 'maxlength' => 0, 'target' => 'newrss', ); $this->info_box_contents[$line][2] = array( 'td' => 'class="right nowraponall"', - 'text' => dol_escape_htmltag($date), + 'text' => $date, ); } } diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php index 5ebf55004ad..d8f5d74ebe5 100644 --- a/htdocs/core/boxes/modules_boxes.php +++ b/htdocs/core/boxes/modules_boxes.php @@ -341,7 +341,7 @@ class ModeleBoxes // Can't be abstract as it is instantiated to build "empty" bo if (!empty($head['graph'])) { $label .= ' '; } - $out .= ''; + $out .= ''; $out .= ''; } @@ -388,7 +388,7 @@ class ModeleBoxes // Can't be abstract as it is instantiated to build "empty" bo if (!empty($contents[$i][$j]['url']) && empty($contents[$i][$j]['logo'])) { $out .= 'trans("Show").' '.$tooltip, 1).'" class="classfortooltip"'; + $out .= ' title="'.dolPrintHTMLForAttribute($langs->trans("Show").' '.$tooltip, 1).'" class="classfortooltip"'; } //$out.= ' alt="'.$textwithnotags.'"'; // Pas de alt sur un "" $out .= isset($contents[$i][$j]['target']) ? ' target="'.$contents[$i][$j]['target'].'"' : '';