From c1bc4c72982bb63f706b59680e694ea0ba3daca0 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 3 Jul 2026 18:35:07 +0200 Subject: [PATCH] Debug v24 --- htdocs/core/class/html.formfile.class.php | 8 ++++---- htdocs/core/lib/functions.lib.php | 13 +++++++------ htdocs/exports/export.php | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 38f11697b05..b06cdc0c8ce 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -1053,17 +1053,17 @@ class FormFile // Show picto delete, print... if ($delallowed || $printer || $morepicto) { - $$tmpout .= ''; + $tmpout .= ''; if ($delallowed) { $tmpurlsource = preg_replace('/#[a-zA-Z0-9_]*$/', '', $urlsource); - $tmpout .= ''.img_picto($langs->trans("Delete"), 'delete').''; } if ($printer) { - $tmpout .= ''.img_picto($langs->trans("PrintFile", $relativepath), 'printer').''; } @@ -1125,7 +1125,7 @@ class FormFile } if ($headershown) { - // Affiche pied du tableau + // end of table $out .= "\n"; $out .= "\n"; if ($genallowed) { diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 7c7bd8a48da..c7a869862c8 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -6862,9 +6862,10 @@ function img_searchclear($titlealt = 'default', $other = '') * @param string $textfordropdown Show a text to click to dropdown the info box. * @param string $picto '' or 'warning' * @param string $textonpictotooltip Text to show in tooltip on picto + * @param string $cssfordropdown An additional css to avoid conflict to manage the dropdown if $textfordropdown is set * @return string String with info text */ -function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss = 'hideonsmartphone', $textfordropdown = '', $picto = '', $textonpictotooltip = '') +function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss = 'hideonsmartphone', $textfordropdown = '', $picto = '', $textonpictotooltip = '', $cssfordropdown = 'info_admin') { global $conf, $langs; @@ -6880,19 +6881,19 @@ function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss if ($picto == 'warning') { $fa = 'exclamation-triangle'; } - $result = ($nodiv ? '' : '
'); + $result = ($nodiv ? '' : '
'); $result .= img_picto(((string) $admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).($textonpictotooltip ? ' : '.$textonpictotooltip : ''), $fa); $result .= ' '; $result .= dol_escape_htmltag($text, 1, 0, 'div,span,b,br,a'); $result .= ($nodiv ? '' : '
'); if ($textfordropdown) { - $tmpresult = '' . $langs->trans($textfordropdown) . ' ' . img_picto($langs->trans($textfordropdown), '1downarrow') . ''; + $tmpresult = '' . $langs->trans($textfordropdown) . ' ' . img_picto($langs->trans($textfordropdown), '1downarrow') . ''; $tmpresult .= ''; diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index b66c7f095cc..3a1c4bece46 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -1390,14 +1390,14 @@ if ($step == 5 && $datatoexport) { $htmltabloflibs .= '
'; print '
'; - print ''.$form->textwithpicto($langs->trans("NowClickToGenerateToBuildExportFile"), $htmltabloflibs, 1, 'help', '', 0, 2, 'helphonformat').''; + print '
'.$form->textwithpicto($langs->trans("NowClickToGenerateToBuildExportFile"), $htmltabloflibs, 1, 'help', '', 0, 2, 'helphonformat').'
'; //print $htmltabloflibs; print '
'; if ($sqlusedforexport && $user->admin) { - print info_admin($langs->trans("SQLUsedForExport").':
'.$sqlusedforexport, 0, 0, '1', '', 'TechnicalInformation').'
'; + print info_admin($langs->trans("SQLUsedForExport").':
'.$sqlusedforexport.'', 0, 0, 'info', '', 'TechnicalInformation').'
'; print '
'; }