diff --git a/dev/build/phpstan/phpstan-baseline.neon b/dev/build/phpstan/phpstan-baseline.neon index 8fc43ff3b1a..f3c820921ee 100644 --- a/dev/build/phpstan/phpstan-baseline.neon +++ b/dev/build/phpstan/phpstan-baseline.neon @@ -948,12 +948,6 @@ parameters: count: 1 path: ../../../htdocs/admin/system/dolibarr.php - - - message: '#^Call to function is_array\(\) with non\-empty\-list\ will always evaluate to true\.$#' - identifier: function.alreadyNarrowedType - count: 1 - path: ../../../htdocs/admin/system/filecheck.php - - message: '#^If condition is always true\.$#' identifier: if.alwaysTrue diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php index aa04c6021c6..2d492302262 100644 --- a/htdocs/adherents/agenda.php +++ b/htdocs/adherents/agenda.php @@ -6,7 +6,7 @@ * Copyright (C) 2007 Patrick Raguin * Copyright (C) 2010 Juanjo Menent * Copyright (C) 2024 Alexandre Spangaro - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -158,7 +158,7 @@ if ($object->id > 0) { $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref); diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php index f6a9ec4a95a..2cff6014731 100644 --- a/htdocs/adherents/card.php +++ b/htdocs/adherents/card.php @@ -1881,7 +1881,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php index 88505e566bb..4bd03721b6f 100644 --- a/htdocs/adherents/document.php +++ b/htdocs/adherents/document.php @@ -5,7 +5,7 @@ * Copyright (C) 2010 Juanjo Menent * Copyright (C) 2013 Cédric Salvador * Copyright (C) 2024 Alexandre Spangaro - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -150,7 +150,7 @@ if ($id > 0) { $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref); diff --git a/htdocs/adherents/messaging.php b/htdocs/adherents/messaging.php index de637315753..d41d8ac2085 100644 --- a/htdocs/adherents/messaging.php +++ b/htdocs/adherents/messaging.php @@ -6,7 +6,7 @@ * Copyright (C) 2007 Patrick Raguin * Copyright (C) 2010 Juanjo Menent * Copyright (C) 2015 Marcos García - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 Alexandre Spangaro * * This program is free software; you can redistribute it and/or modify @@ -147,7 +147,7 @@ print dol_get_fiche_head($head, 'agenda', $langs->trans("Member"), -1, 'user'); $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; -$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); +$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref); diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index 65360e09c51..396fd4c7adc 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -1,7 +1,7 @@ * Copyright (C) 2004-2014 Laurent Destailleur - * Copyright (C) 2015-2024 Frédéric France + * Copyright (C) 2015-2025 Frédéric France * Copyright (C) 2024 Alexandre Spangaro * Copyright (C) 2024 MDW * @@ -131,7 +131,7 @@ if (is_object($adht)) { $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref); diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php index c8b5b8ab936..44b32c55d9a 100644 --- a/htdocs/adherents/subscription.php +++ b/htdocs/adherents/subscription.php @@ -496,7 +496,7 @@ print dol_get_fiche_head($head, 'subscription', $langs->trans("Member"), -1, 'us $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; -$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); +$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref); diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php index fa31433680e..29a39e2c695 100644 --- a/htdocs/admin/system/perf.php +++ b/htdocs/admin/system/perf.php @@ -91,7 +91,7 @@ print ''.$langs->trans("XDebug").'
'; print '
'; $test = !function_exists('xdebug_is_debugger_active'); if ($test) { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("NotInstalled").' '.$langs->trans("NotSlowedDownByThis").''; + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("NotInstalled").' '.$langs->trans("NotSlowedDownByThis").''; } else { print img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("ModuleActivated", $langs->transnoentities("XDebug")); print ' - '.$langs->trans("MoreInformation").' XDebug admin page'; @@ -106,12 +106,12 @@ print ''.$langs->trans("Syslog").'
'; print '
'; $test = !isModEnabled('syslog'); if ($test) { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("NotInstalled").' '.$langs->trans("NotSlowedDownByThis").''; + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("NotInstalled").' '.$langs->trans("NotSlowedDownByThis").''; } else { if (getDolGlobalInt('SYSLOG_LEVEL') > LOG_NOTICE) { print img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("ModuleActivatedWithTooHighLogLevel", $langs->transnoentities("Syslog")); } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("ModuleSyslogActivatedButLevelNotTooVerbose", $langs->transnoentities("Syslog"), getDolGlobalInt('SYSLOG_LEVEL')); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("ModuleSyslogActivatedButLevelNotTooVerbose", $langs->transnoentities("Syslog"), getDolGlobalInt('SYSLOG_LEVEL')); } //print ' '.$langs->trans("MoreInformation").' XDebug admin page'; } @@ -125,7 +125,7 @@ print ''.$langs->trans("DebugBar").'
'; print '
'; $test = !isModEnabled('debugbar'); if ($test) { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("NotInstalled").' '.$langs->trans("NotSlowedDownByThis").''; + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("NotInstalled").' '.$langs->trans("NotSlowedDownByThis").''; } else { print img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("ModuleActivated", $langs->transnoentities("DebugBar")); //print ' '.$langs->trans("MoreInformation").' XDebug admin page'; @@ -162,18 +162,18 @@ $foundcache = 0; $test = function_exists('xcache_info'); if (!$foundcache && $test) { $foundcache++; - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("PHPModuleLoaded", "XCache"); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("PHPModuleLoaded", "XCache"); print ' '.$langs->trans("MoreInformation").' Xcache admin page'; } $test = function_exists('eaccelerator_info'); if (!$foundcache && $test) { $foundcache++; - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("PHPModuleLoaded", "Eaccelerator"); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("PHPModuleLoaded", "Eaccelerator"); } $test = function_exists('opcache_get_status'); if (!$foundcache && $test) { $foundcache++; - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("PHPModuleLoaded", "ZendOPCache"); // Should be by default starting with PHP 5.5 + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("PHPModuleLoaded", "ZendOPCache"); // Should be by default starting with PHP 5.5 //$tmp=opcache_get_status(); //var_dump($tmp); } @@ -182,7 +182,7 @@ if (!$foundcache && $test) { //var_dump(apc_cache_info()); if (ini_get('apc.enabled')) { $foundcache++; - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("PHPModuleLoaded", "APCCache"); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("PHPModuleLoaded", "APCCache"); } else { print img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("APCCacheInstalledButDisabled"); } @@ -460,19 +460,19 @@ print $form->textwithpicto($langs->trans("CacheByServer"), $langs->trans("CacheB print '
'; print '
'; // No cache on PHP -//print '
'.img_picto('','warning.png').' '.$langs->trans("FilesOfTypeNotCompressed",'php (.php)').'
'; -//print '
'.img_picto('','tick.png').' '.$langs->trans("FilesOfTypeNotCached",'php (.php)').'
'; +//print '
'.img_picto('','warning').' '.$langs->trans("FilesOfTypeNotCompressed",'php (.php)').'
'; +//print '
'.img_picto('','tick').' '.$langs->trans("FilesOfTypeNotCached",'php (.php)').'
'; // Cache on rest -print '
'.img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCached", 'css (.css)').'
'; -print '
'.img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCached", 'css (.css)').'
'; -print '
'.img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCached", 'css (.css.php)').'
'; -print '
'.img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCached", 'css (.css.php)').'
'; -print '
'.img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCached", 'img (.png)').'
'; -print '
'.img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCached", 'img (.png)').'
'; -print '
'.img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCached", 'javascript (.js)').'
'; -print '
'.img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCached", 'javascript (.js)').'
'; -print '
'.img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCached", 'javascript (.js.php)').'
'; -print '
'.img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCached", 'javascript (.js.php)').'
'; +print '
'.img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCached", 'css (.css)').'
'; +print '
'.img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCached", 'css (.css)').'
'; +print '
'.img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCached", 'css (.css.php)').'
'; +print '
'.img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCached", 'css (.css.php)').'
'; +print '
'.img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCached", 'img (.png)').'
'; +print '
'.img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCached", 'img (.png)').'
'; +print '
'.img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCached", 'javascript (.js)').'
'; +print '
'.img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCached", 'javascript (.js)').'
'; +print '
'.img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCached", 'javascript (.js.php)').'
'; +print '
'.img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCached", 'javascript (.js.php)').'
'; print '
'; @@ -493,19 +493,19 @@ print ''; print '
'; print '
'; // on PHP -print '
'.img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCompressed", 'php (.php)').'
'; -print '
'.img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCompressed", 'php (.php)').'
'; +print '
'.img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCompressed", 'php (.php)').'
'; +print '
'.img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCompressed", 'php (.php)').'
'; // on rest -print '
'.img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCompressed", 'css (.css)').'
'; -print '
'.img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCompressed", 'css (.css)').'
'; -print '
'.img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCompressed", 'css (.css.php)').'
'; -print '
'.img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCompressed", 'css (.css.php)').'
'; -//print '
'.img_picto('','tick.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCompressed",'img (.png)').'
'; -//print '
'.img_picto('','warning.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCompressed",'img (.png)').'
'; -print '
'.img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCompressed", 'javascript (.js)').'
'; -print '
'.img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCompressed", 'javascript (.js)').'
'; -print '
'.img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCompressed", 'javascript (.js.php)').'
'; -print '
'.img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCompressed", 'javascript (.js.php)').'
'; +print '
'.img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCompressed", 'css (.css)').'
'; +print '
'.img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCompressed", 'css (.css)').'
'; +print '
'.img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCompressed", 'css (.css.php)').'
'; +print '
'.img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCompressed", 'css (.css.php)').'
'; +//print '
'.img_picto('','tick', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCompressed",'img (.png)').'
'; +//print '
'.img_picto('','warning', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCompressed",'img (.png)').'
'; +print '
'.img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCompressed", 'javascript (.js)').'
'; +print '
'.img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCompressed", 'javascript (.js)').'
'; +print '
'.img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeCompressed", 'javascript (.js.php)').'
'; +print '
'.img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("FilesOfTypeNotCompressed", 'javascript (.js.php)').'
'; print '
'; // Database driver @@ -517,9 +517,9 @@ print '
'; if ($conf->db->type == 'mysql' || $conf->db->type == 'mysqli') { $test = ($conf->db->type == 'mysqli'); if ($test) { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("YouUseBestDriver", $conf->db->type); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("YouUseBestDriver", $conf->db->type); } else { - print img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("YouDoNotUseBestDriver", $conf->db->type, 'mysqli'); + print img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("YouDoNotUseBestDriver", $conf->db->type, 'mysqli'); } print '
'; } @@ -541,12 +541,12 @@ if ($resql) { $nb = (int) $obj->nb; if ($nb > $limitforoptim) { if (!getDolGlobalString('PRODUIT_USE_SEARCH_TO_SELECT')) { - print img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUIT_USE_SEARCH_TO_SELECT'); + print img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUIT_USE_SEARCH_TO_SELECT'); } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUIT_USE_SEARCH_TO_SELECT', getDolGlobalString('PRODUIT_USE_SEARCH_TO_SELECT')); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUIT_USE_SEARCH_TO_SELECT', getDolGlobalString('PRODUIT_USE_SEARCH_TO_SELECT')); } } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ProductsOrServices")); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ProductsOrServices")); } print '
'; $db->free($resql); @@ -562,12 +562,12 @@ if ($resql) { $nb = (int) $obj->nb; if ($nb > $limitforoptim) { if (!getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT')) { - print img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_USE_SEARCH_TO_SELECT'); + print img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_USE_SEARCH_TO_SELECT'); } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_USE_SEARCH_TO_SELECT', getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT')); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_USE_SEARCH_TO_SELECT', getDolGlobalString('COMPANY_USE_SEARCH_TO_SELECT')); } } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ThirdParties")); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ThirdParties")); } print '
'; $db->free($resql); @@ -583,12 +583,12 @@ if ($resql) { $nb = (int) $obj->nb; if ($nb > $limitforoptim) { if (!getDolGlobalString('CONTACT_USE_SEARCH_TO_SELECT')) { - print img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("Contacts"), 'CONTACT_USE_SEARCH_TO_SELECT'); + print img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("Contacts"), 'CONTACT_USE_SEARCH_TO_SELECT'); } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("Contacts"), 'CONTACT_USE_SEARCH_TO_SELECT', getDolGlobalString('CONTACT_USE_SEARCH_TO_SELECT')); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("Contacts"), 'CONTACT_USE_SEARCH_TO_SELECT', getDolGlobalString('CONTACT_USE_SEARCH_TO_SELECT')); } } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("Contacts")); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("Contacts")); } print '
'; $db->free($resql); @@ -604,12 +604,12 @@ if ($resql) { $nb = (int) $obj->nb; if ($nb > $limitforoptim) { if (!getDolGlobalString('PROJECT_USE_SEARCH_TO_SELECT')) { - print img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("Projects"), 'PROJECT_USE_SEARCH_TO_SELECT'); + print img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectUseComboOptim", $nb, $langs->transnoentitiesnoconv("Projects"), 'PROJECT_USE_SEARCH_TO_SELECT'); } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("Projects"), 'PROJECT_USE_SEARCH_TO_SELECT', getDolGlobalString('PROJECT_USE_SEARCH_TO_SELECT')); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("Projects"), 'PROJECT_USE_SEARCH_TO_SELECT', getDolGlobalString('PROJECT_USE_SEARCH_TO_SELECT')); } } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("Projects")); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("Projects")); } print '
'; $db->free($resql); @@ -633,13 +633,13 @@ if ($resql) { $nb = (int) $obj->nb; if ($nb > $limitforoptim) { if (!getDolGlobalString('PRODUCT_DONOTSEARCH_ANYWHERE')) { - print img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUCT_DONOTSEARCH_ANYWHERE'); + print img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUCT_DONOTSEARCH_ANYWHERE'); print $langs->trans("YouHaveXObjectUseSearchOptimDesc"); } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUCT_DONOTSEARCH_ANYWHERE', getDolGlobalString('PRODUCT_DONOTSEARCH_ANYWHERE')); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ProductsOrServices"), 'PRODUCT_DONOTSEARCH_ANYWHERE', getDolGlobalString('PRODUCT_DONOTSEARCH_ANYWHERE')); } } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ProductsOrServices")); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ProductsOrServices")); } print '
'; $db->free($resql); @@ -656,13 +656,13 @@ if ($resql) { $nb = (int) $obj->nb; if ($nb > $limitforoptim) { if (!getDolGlobalString('COMPANY_DONOTSEARCH_ANYWHERE')) { - print img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_DONOTSEARCH_ANYWHERE'); + print img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectUseSearchOptim", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_DONOTSEARCH_ANYWHERE'); print $langs->trans("YouHaveXObjectUseSearchOptimDesc"); } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_DONOTSEARCH_ANYWHERE', getDolGlobalString('COMPANY_DONOTSEARCH_ANYWHERE')); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveXObjectAndSearchOptimOn", $nb, $langs->transnoentitiesnoconv("ThirdParties"), 'COMPANY_DONOTSEARCH_ANYWHERE', getDolGlobalString('COMPANY_DONOTSEARCH_ANYWHERE')); } } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ThirdParties")); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("NbOfObjectIsLowerThanNoPb", $nb, $langs->transnoentitiesnoconv("ThirdParties")); } print '
'; $db->free($resql); @@ -671,9 +671,9 @@ if ($resql) { // Perf advice on max size on list $MAXRECOMMENDED = 20; if (getDolGlobalInt('MAIN_SIZE_LISTE_LIMIT') > $MAXRECOMMENDED) { - print img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveALargeAmountOfRecordOnLists", getDolGlobalInt('MAIN_SIZE_LISTE_LIMIT'), $MAXRECOMMENDED); + print img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("YouHaveALargeAmountOfRecordOnLists", getDolGlobalInt('MAIN_SIZE_LISTE_LIMIT'), $MAXRECOMMENDED); } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("MaxNbOfRecordOnListIsOk", getDolGlobalInt('MAIN_SIZE_LISTE_LIMIT'), $MAXRECOMMENDED); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("MaxNbOfRecordOnListIsOk", getDolGlobalInt('MAIN_SIZE_LISTE_LIMIT'), $MAXRECOMMENDED); } print '
'; @@ -686,9 +686,9 @@ print img_picto('', 'folder', 'class="pictofixedwidth"'); print ''.$langs->trans("Browser").'
'; print '
'; if (!in_array($conf->browser->name, array('chrome', 'opera', 'safari', 'firefox'))) { - print img_picto('', 'warning.png', 'class="pictofixedwidth"').' '.$langs->trans("BrowserIsKO", $conf->browser->name); + print img_picto('', 'warning', 'class="pictofixedwidth"').' '.$langs->trans("BrowserIsKO", $conf->browser->name); } else { - print img_picto('', 'tick.png', 'class="pictofixedwidth"').' '.$langs->trans("BrowserIsOK", $conf->browser->name); + print img_picto('', 'tick', 'class="pictofixedwidth"').' '.$langs->trans("BrowserIsOK", $conf->browser->name); } print '
'; print '
'; @@ -699,7 +699,7 @@ print img_picto('', 'folder', 'class="pictofixedwidth"'); print ''.$langs->trans("Options").'
'; print '
'; if (getDolGlobalInt('MAIN_ACTIVATE_FILECACHE')) { - print img_picto('', 'tick.png', 'class="pictofixedwidth"'); + print img_picto('', 'tick', 'class="pictofixedwidth"'); } else { print img_picto('', 'minus', 'class="pictofixedwidth"'); } @@ -709,7 +709,7 @@ print yn(getDolGlobalInt('MAIN_ACTIVATE_FILECACHE')); print '
'; if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) { - print img_picto('', 'tick.png', 'class="pictofixedwidth"'); + print img_picto('', 'tick', 'class="pictofixedwidth"'); } else { print img_picto('', 'minus', 'class="pictofixedwidth"'); } @@ -720,14 +720,14 @@ print '
'; if (getDolGlobalInt('MAIN_CACHE_COUNT')) { - print img_picto('', 'tick.png', 'class="pictofixedwidth"'); + print img_picto('', 'tick', 'class="pictofixedwidth"'); } else { print img_picto('', 'minus', 'class="pictofixedwidth"'); } print $form->textwithpicto($langs->trans('MAIN_CACHE_COUNT'), $langs->trans("Option").' MAIN_CACHE_COUNT'); print ': '; print yn(getDolGlobalInt('MAIN_CACHE_COUNT')); -//.' '.img_picto('', 'warning.png'); +//.' '.img_picto('', 'warning'); print '
'; print '
'; @@ -740,7 +740,7 @@ print img_picto('', 'folder', 'class="pictofixedwidth"'); print ''.$langs->trans("OtherSetup").' ('.$langs->trans("Experimental").')
'; print '
'; if (getDolGlobalInt('MAIN_DO_FETCH_IN_ONE_SQL_REQUEST')) { - print img_picto('', 'tick.png', 'class="pictofixedwidth"'); + print img_picto('', 'tick', 'class="pictofixedwidth"'); } else { print img_picto('', 'minus', 'class="pictofixedwidth"'); } diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php index 783d19fa3bc..7a43df0ce2a 100644 --- a/htdocs/barcode/codeinit.php +++ b/htdocs/barcode/codeinit.php @@ -2,7 +2,7 @@ /* Copyright (C) 2014-2022 Laurent Destailleur * Copyright (C) 2018 Ferran Marcet * Copyright (C) 2024 MDW - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -295,7 +295,7 @@ if ($action == 'initbarcodeproducts' && $user->hasRight('produit', 'lire')) { llxHeader('', $langs->trans("MassBarcodeInit"), '', '', 0, 0, '', '', '', 'mod-barcode page-codeinit'); if (!GETPOST('dol_openinpopup', 'aZ')) { - print load_fiche_titre($langs->trans("MassBarcodeInit"), '', 'title_setup.png'); + print load_fiche_titre($langs->trans("MassBarcodeInit"), '', 'title_setup'); print '
'; } diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php index e63952a8341..084482579db 100644 --- a/htdocs/comm/mailing/card.php +++ b/htdocs/comm/mailing/card.php @@ -4,7 +4,7 @@ * Copyright (C) 2005-2016 Regis Houssin * Copyright (C) 2021 Waël Almoman * Copyright (C) 2024-2025 MDW - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -1533,7 +1533,7 @@ if ($action == 'create') { // aaa foreach ($listofpaths as $key => $val) { $out .= '
'; $out .= img_mime($listofpaths[$key]['name']).' '.$listofpaths[$key]['name']; - $out .= ' '; + $out .= ' '; $out .= '
'; } } else { diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php index 1609d6a1f16..5340c9cb02e 100644 --- a/htdocs/compta/facture/card.php +++ b/htdocs/compta/facture/card.php @@ -5653,7 +5653,7 @@ if ($action == 'create') { } else { $form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, (string) $object->retained_warranty_fk_cond_reglement, 'none'); if (!$displayWarranty) { - print img_picto($langs->trans('RetainedWarrantyNeed100Percent'), 'warning.png', 'class="pictowarning valignmiddle" '); + print img_picto($langs->trans('RetainedWarrantyNeed100Percent'), 'warning', 'class="pictowarning valignmiddle" '); } } print ''; diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php index 91442e551be..2853f39b99b 100644 --- a/htdocs/contact/agenda.php +++ b/htdocs/contact/agenda.php @@ -235,7 +235,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $morehtmlref .= '
'; diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php index 185ec41005d..a73467912a6 100644 --- a/htdocs/contact/consumption.php +++ b/htdocs/contact/consumption.php @@ -5,7 +5,7 @@ * Copyright (C) 2015 Marcos García * Copyright (C) 2015-2017 Ferran Marcet * Copyright (C) 2024 Alexandre Spangaro - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024-2025 MDW * * This program is free software; you can redistribute it and/or modify @@ -139,7 +139,7 @@ print dol_get_fiche_head($head, 'consumption', $langs->trans("ContactsAddresses" $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; -$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); +$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $morehtmlref .= '
'; diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php index 3450bfe81e9..9de46e65b88 100644 --- a/htdocs/contact/document.php +++ b/htdocs/contact/document.php @@ -144,7 +144,7 @@ if ($object->id) { $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $morehtmlref .= '
'; diff --git a/htdocs/contact/messaging.php b/htdocs/contact/messaging.php index cc5c160e40a..d45473dc42b 100644 --- a/htdocs/contact/messaging.php +++ b/htdocs/contact/messaging.php @@ -8,7 +8,7 @@ * Copyright (C) 2013-2024 Alexandre Spangaro * Copyright (C) 2014 Juanjo Menent * Copyright (C) 2015 Jean-François Ferry - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -233,7 +233,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) { $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $morehtmlref .= '
'; diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php index 4a10306005f..150a75b763d 100644 --- a/htdocs/contact/note.php +++ b/htdocs/contact/note.php @@ -5,7 +5,7 @@ * Copyright (C) 2010 Juanjo Menent * Copyright (C) 2013 Florian Henry * Copyright (C) 2024 Alexandre Spangaro - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -109,7 +109,7 @@ if ($id > 0) { $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $morehtmlref .= '
'; diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php index 5e0b71f4995..f3ec8f8c421 100644 --- a/htdocs/contact/perso.php +++ b/htdocs/contact/perso.php @@ -2,7 +2,7 @@ /* Copyright (C) 2004 Rodolphe Quiedeville * Copyright (C) 2004-2011 Laurent Destailleur * Copyright (C) 2005-2012 Regis Houssin - * Copyright (C) 2018-2024 Frédéric France + * Copyright (C) 2018-2025 Frédéric France * Copyright (C) 2024 MDW * Copyright (C) 2024 Alexandre Spangaro * @@ -246,7 +246,7 @@ if ($action == 'edit') { $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $morehtmlref .= '
'; diff --git a/htdocs/contact/project.php b/htdocs/contact/project.php index 9ced6d21a10..0247dfa32f6 100644 --- a/htdocs/contact/project.php +++ b/htdocs/contact/project.php @@ -1,7 +1,7 @@ * Copyright (C) 2024 Alexandre Spangaro - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -94,7 +94,7 @@ if ($id) { $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $morehtmlref .= '
'; diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php index 5cb9f13dc39..0e9573aba58 100644 --- a/htdocs/core/class/html.formfile.class.php +++ b/htdocs/core/class/html.formfile.class.php @@ -1062,7 +1062,7 @@ class FormFile if ($printer) { $out .= ''.img_picto($langs->trans("PrintFile", $relativepath), 'printer.png').''; + $out .= '">'.img_picto($langs->trans("PrintFile", $relativepath), 'printer').''; } if ($morepicto) { $morepicto = preg_replace('/__FILENAMEURLENCODED__/', urlencode($relativepath), $morepicto); diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 338c944674d..367bfceec3f 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -757,8 +757,6 @@ function GETPOSTISSET($paramname) } $relativepathstring = ltrim($relativepathstring, '/'); $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring); - //var_dump($relativepathstring); - //var_dump($user->default_values); // Code for search criteria persistence. // Retrieve values if restore_lastsearch_values @@ -882,8 +880,6 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null } $relativepathstring = ltrim($relativepathstring, '/'); $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring); - //var_dump($relativepathstring); - //var_dump($user->default_values); // Code for search criteria persistence. // Retrieve saved values if restore_lastsearch_values is set @@ -940,7 +936,6 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null if (!$foundintru) { $qualified = 1; } - //var_dump($defkey.'-'.$qualified); } else { $qualified = 1; } @@ -977,7 +972,6 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null if (!$foundintru) { $qualified = 1; } - //var_dump($defkey.'-'.$qualified); } else { $qualified = 1; } @@ -1017,7 +1011,6 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null if (!$foundintru) { $qualified = 1; } - //var_dump($defkey.'-'.$qualified); } else { $qualified = 1; } @@ -3912,7 +3905,6 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs = array('T', 'Z', '__a__', '__A__', '__b__', '__B__'), $ret ); - //var_dump($ret);exit; } else { $ret = 'Bad value ' . $time . ' for date'; } @@ -4101,13 +4093,11 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = 'auto', if (empty($localtz)) { $localtz = new DateTimeZone('UTC'); } - //var_dump($localtz); - //var_dump($year.'-'.$month.'-'.$day.'-'.$hour.'-'.$minute); $dt = new DateTime('now', $localtz); $dt->setDate((int) $year, (int) $month, (int) $day); $dt->setTime((int) $hour, (int) $minute, (int) $second); $date = $dt->getTimestamp(); // should include daylight saving time - //var_dump($date); + return $date; } @@ -5430,7 +5420,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco } } else { // $picto can not be null since replaced with 'generic' in that case - //$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', (is_null($picto) ? '' : $picto)); + // $pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', (is_null($picto) ? '' : $picto)); $pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto); $pictowithouttext = str_replace('object_', '', $pictowithouttext); $pictowithouttext = str_replace('_nocolor', '', $pictowithouttext); @@ -6234,7 +6224,7 @@ function img_delete($titlealt = 'default', $other = 'class="pictodelete"', $more $titlealt = $langs->trans('Delete'); } - return img_picto($titlealt, 'delete.png', $other, 0, 0, 0, '', $morecss); + return img_picto($titlealt, 'delete', $other, 0, 0, 0, '', $morecss); } /** @@ -6250,7 +6240,7 @@ function img_printer($titlealt = "default", $other = '') if ($titlealt == "default") { $titlealt = $langs->trans("Print"); } - return img_picto($titlealt, 'printer.png', $other); + return img_picto($titlealt, 'printer', $other); } /** @@ -6268,7 +6258,7 @@ function img_split($titlealt = 'default', $other = 'class="pictosplit"') $titlealt = $langs->trans('Split'); } - return img_picto($titlealt, 'split.png', $other); + return img_picto($titlealt, 'split', $other); } /** @@ -6290,7 +6280,7 @@ function img_help($usehelpcursor = 1, $usealttitle = 1) } } - return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"'); + return img_picto($usealttitle, 'info', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"'); } /** @@ -6401,7 +6391,7 @@ function img_down($titlealt = 'default', $selected = 0, $moreclass = '') $titlealt = $langs->trans('Down'); } - return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"'); + return img_picto($titlealt, ($selected ? '1downarrow_selected' : '1downarrow'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"'); } /** @@ -6420,7 +6410,7 @@ function img_up($titlealt = 'default', $selected = 0, $moreclass = '') $titlealt = $langs->trans('Up'); } - return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"'); + return img_picto($titlealt, ($selected ? '1uparrow_selected' : '1uparrow'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"'); } /** @@ -6439,7 +6429,7 @@ function img_left($titlealt = 'default', $selected = 0, $moreatt = '') $titlealt = $langs->trans('Left'); } - return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt); + return img_picto($titlealt, ($selected ? '1leftarrow_selected' : '1leftarrow'), $moreatt); } /** @@ -6458,7 +6448,7 @@ function img_right($titlealt = 'default', $selected = 0, $moreatt = '') $titlealt = $langs->trans('Right'); } - return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt); + return img_picto($titlealt, ($selected ? '1rightarrow_selected' : '1rightarrow'), $moreatt); } /** @@ -7096,7 +7086,7 @@ function print_barre_liste($title, $page, $file, $options = '', $sortfield = '', $page = (int) $page; if ($picto == 'setup') { - $picto = 'title_setup.png'; + $picto = 'title_setup'; } if (($conf->browser->name == 'ie') && $picto == 'generic') { $picto = 'title.gif'; @@ -7217,7 +7207,6 @@ function print_barre_liste($title, $page, $file, $options = '', $sortfield = '', $pagelist .= ''; } } else { - //var_dump($page.' '.$cpt.' '.$nbpages); $query['page'] = ($nbpages - 1); $pagelist .= ''; } diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php index cf0f2513ace..c63a4b0bdeb 100644 --- a/htdocs/core/tpl/bloc_comment.tpl.php +++ b/htdocs/core/tpl/bloc_comment.tpl.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2024-2025 Frédéric France */ /** @@ -128,12 +128,12 @@ if (!empty($object->comments)) { } else { if ($fk_user == $user->id || $user->admin == 1) { print ''; - print img_picto('', 'edit.png'); + print img_picto('', 'edit'); print ''; } if (($first && $fk_user == $user->id) || $user->admin == 1) { print ''; - print img_picto('', 'delete.png'); + print img_picto('', 'delete'); print ''; } } diff --git a/htdocs/core/tpl/bloc_showhide.tpl.php b/htdocs/core/tpl/bloc_showhide.tpl.php index 57deb7b1d4a..162971cf061 100644 --- a/htdocs/core/tpl/bloc_showhide.tpl.php +++ b/htdocs/core/tpl/bloc_showhide.tpl.php @@ -1,7 +1,7 @@ * Copyright (C) 2013 Laurent Destailleur - * Copyright (C) 2018-2024 Frédéric France + * Copyright (C) 2018-2025 Frédéric France * Copyright (C) 2024 MDW * * This program is free software; you can redistribute it and/or modify @@ -69,9 +69,9 @@ print '});'."\n"; print ''."\n"; print '
'.img_picto('', '1uparrow.png').'
'."\n"; +print ' class="linkobject'.($hide ? ' hideobject' : '').'">'.img_picto('', '1uparrow').'
'."\n"; print '
'.img_picto('', '1downarrow.png').'
'."\n"; +print ' class="linkobject'.($hide ? '' : ' hideobject').'">'.img_picto('', '1downarrow').'
'."\n"; print '
'.$title.'
'."\n"; print '
'."\n"; diff --git a/htdocs/expedition/dispatch.php b/htdocs/expedition/dispatch.php index 0dec1fe0976..cbbcbcb336f 100644 --- a/htdocs/expedition/dispatch.php +++ b/htdocs/expedition/dispatch.php @@ -1073,7 +1073,7 @@ if ($object->id > 0 || !empty($object->ref)) { print ''; print ''; if ($can_update_stock) { - print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'-'.$child_line_id.'\')"'); + print img_picto($langs->trans('AddStockLocationLine'), 'split', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'-'.$child_line_id.'\')"'); } print ''; @@ -1233,10 +1233,10 @@ if ($object->id > 0 || !empty($object->ref)) { print ''; if ($is_mod_batch_enabled && $objp->tobatch > 0) { $type = 'batch'; - print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"'); + print img_picto($langs->trans('AddStockLocationLine'), 'split', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"'); } else { $type = 'dispatch'; - print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"'); + print img_picto($langs->trans('AddStockLocationLine'), 'split', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"'); } print ''; diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php index 00ffc0c1df9..0f829bce955 100644 --- a/htdocs/fourn/commande/dispatch.php +++ b/htdocs/fourn/commande/dispatch.php @@ -7,7 +7,7 @@ * Copyright (C) 2014 Cedric Gross * Copyright (C) 2016 Florian Henry * Copyright (C) 2017-2022 Ferran Marcet - * Copyright (C) 2018-2024 Frédéric France + * Copyright (C) 2018-2025 Frédéric France * Copyright (C) 2019-2020 Christophe Battarel * Copyright (C) 2024-2025 MDW * @@ -906,7 +906,7 @@ if ($id > 0 || !empty($ref)) { print ''; print ''; // Qty to dispatch print ''; - //print img_picto($langs->trans('AddDispatchBatchLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"'); + //print img_picto($langs->trans('AddDispatchBatchLine'), 'split', 'class="splitbutton" onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"'); print ''; // Dispatch column print ''; // Warehouse column @@ -969,7 +969,7 @@ if ($id > 0 || !empty($ref)) { print ''; print ''; // Qty to dispatch print ''; - //print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"'); + //print img_picto($langs->trans('AddStockLocationLine'), 'split', 'class="splitbutton" onClick="addDispatchLine(' . $i . ',\'' . $type . '\')"'); print ''; // Dispatch column print ''; // Warehouse column @@ -1022,10 +1022,10 @@ if ($id > 0 || !empty($ref)) { print ''; if (isModEnabled('productbatch') && $objp->tobatch > 0) { $type = 'batch'; - print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"'); + print img_picto($langs->trans('AddStockLocationLine'), 'split', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"'); } else { $type = 'dispatch'; - print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"'); + print img_picto($langs->trans('AddStockLocationLine'), 'split', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"'); } print ''; diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php index ae76fe6387c..4e7206d0338 100644 --- a/htdocs/hrm/skill_tab.php +++ b/htdocs/hrm/skill_tab.php @@ -4,7 +4,7 @@ * Copyright (C) 2021 Greg Rastklan * Copyright (C) 2021 Jean-Pascal BOUDET * Copyright (C) 2021 Grégory BLEMAND - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024 Alexandre Spangaro * Copyright (C) 2024 MDW * @@ -397,7 +397,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea $linkback = '' . $langs->trans("BackToList") . ''; $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id); diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php index 0bf9f217872..41632babee9 100644 --- a/htdocs/mrp/mo_production.php +++ b/htdocs/mrp/mo_production.php @@ -1481,13 +1481,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea // Split $type = 'batch'; print ''; - print ' '.img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.((int) $line->id).', \''.dol_escape_js($type).'\', \'qtymissingconsume\')"'); + print ' '.img_picto($langs->trans('AddStockLocationLine'), 'split', 'class="splitbutton" onClick="addDispatchLine('.((int) $line->id).', \''.dol_escape_js($type).'\', \'qtymissingconsume\')"'); print ''; // Split All print ''; if (($action == 'consumeorproduce' || $action == 'consumeandproduceall') && $tmpproduct->status_batch == 2) { - print img_picto($langs->trans('SplitAllQuantity'), 'split.png', 'class="splitbutton splitallbutton field-error-icon" data-max-qty="1" onClick="addDispatchLine('.$line->id.', \'batch\', \'allmissingconsume\')"'); + print img_picto($langs->trans('SplitAllQuantity'), 'split', 'class="splitbutton splitallbutton field-error-icon" data-max-qty="1" onClick="addDispatchLine('.$line->id.', \'batch\', \'allmissingconsume\')"'); } print ''; @@ -1922,12 +1922,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea if ($tmpproduct->status_batch) { $type = 'batch'; print ''; - print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$line->id.', \''.$type.'\', \'qtymissing\')"'); + print img_picto($langs->trans('AddStockLocationLine'), 'split', 'class="splitbutton" onClick="addDispatchLine('.$line->id.', \''.$type.'\', \'qtymissing\')"'); print ''; print ''; if (($action == 'consumeorproduce' || $action == 'consumeandproduceall') && $tmpproduct->status_batch == 2) { - print img_picto($langs->trans('SplitAllQuantity'), 'split.png', 'class="splitbutton splitallbutton field-error-icon" onClick="addDispatchLine('.$line->id.', \'batch\', \'alltoproduce\')"'); + print img_picto($langs->trans('SplitAllQuantity'), 'split', 'class="splitbutton splitallbutton field-error-icon" onClick="addDispatchLine('.$line->id.', \'batch\', \'alltoproduce\')"'); } // print ''; } else { diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php index d56903db292..86a01234918 100644 --- a/htdocs/opensurvey/card.php +++ b/htdocs/opensurvey/card.php @@ -1,7 +1,7 @@ * Copyright (C) 2014 Marcos García - * Copyright (C) 2018-2024 Frédéric France + * Copyright (C) 2018-2025 Frédéric France * Copyright (C) 2024-2025 MDW * * This program is free software; you can redistribute it and/or modify @@ -427,7 +427,7 @@ $comments = $object->getComments(); if (!empty($comments)) { foreach ($comments as $comment) { if ($user->hasRight('opensurvey', 'write')) { - print ' '.img_picto('', 'delete.png', '', 0, 0, 0, '', '', 0).' '; + print ' '.img_picto('', 'delete', '', 0, 0, 0, '', '', 0).' '; } print dol_htmlentities($comment->usercomment).': '.dol_nl2br(dol_htmlentities($comment->comment))."
"; diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php index 932d5d0b882..af9e3b7d82f 100644 --- a/htdocs/opensurvey/results.php +++ b/htdocs/opensurvey/results.php @@ -1,7 +1,7 @@ * Copyright (C) 2014 Marcos García - * Copyright (C) 2018-2024 Frédéric France + * Copyright (C) 2018-2025 Frédéric France * Copyright (C) 2024-2025 MDW * * This program is free software; you can redistribute it and/or modify @@ -702,7 +702,7 @@ print ''."\n"; // loop to show the delete link if ($user->hasRight('opensurvey', 'write')) { for ($i = 0; isset($toutsujet[$i]); $i++) { - print ''."\n"; + print ''."\n"; } } @@ -849,7 +849,7 @@ while ($compteur < $num) { print ''."\n"; if ($user->hasRight('opensurvey', 'write')) { - print ''."\n"; + print ''."\n"; } // Name diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php index 876d36a3d8a..0d630ab5cce 100644 --- a/htdocs/printing/index.php +++ b/htdocs/printing/index.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2014-2025 Frédéric France * Copyright (C) 2016 Laurent Destailleur * Copyright (C) 2024 MDW * @@ -56,7 +56,7 @@ if (!$user->admin) { llxHeader("", $langs->trans("Printing")); -print_barre_liste($langs->trans("Printing"), 0, $_SERVER["PHP_SELF"], '', '', '', ''.$langs->trans("Refresh").'', 0, 0, 'title_setup.png'); +print_barre_liste($langs->trans("Printing"), 0, $_SERVER["PHP_SELF"], '', '', '', ''.$langs->trans("Refresh").'', 0, 0, 'title_setup'); print $langs->trans("DirectPrintingJobsDesc").'

'; diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php index 8f8630126f5..f1e94595c99 100644 --- a/htdocs/public/opensurvey/studs.php +++ b/htdocs/public/opensurvey/studs.php @@ -2,7 +2,7 @@ /* Copyright (C) 2013-2015 Laurent Destailleur * Copyright (C) 2014 Marcos García * Copyright (C) 2024-2025 MDW - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -848,7 +848,7 @@ if ($comments) { print '
'; if (in_array($obj->usercomment, $listofvoters)) { - print ' '.img_picto('', 'delete.png', '', 0, 0, 0, '', 'nomarginleft').' '; + print ' '.img_picto('', 'delete', '', 0, 0, 0, '', 'nomarginleft').' '; } //else print img_picto('', 'ellipsis-h', '', 0, 0, 0, '', 'nomarginleft').' '; print img_picto('', 'user', 'class="pictofixedwidth"').dol_htmlentities($obj->usercomment).': '.dol_nl2br(dol_htmlentities($obj->comment))."
"; diff --git a/htdocs/reception/dispatch.php b/htdocs/reception/dispatch.php index 7907fde140a..6a236cbd80e 100644 --- a/htdocs/reception/dispatch.php +++ b/htdocs/reception/dispatch.php @@ -7,7 +7,7 @@ * Copyright (C) 2014 Cedric Gross * Copyright (C) 2016 Florian Henry * Copyright (C) 2017-2022 Ferran Marcet - * Copyright (C) 2018-2024 Frédéric France + * Copyright (C) 2018-2025 Frédéric France * Copyright (C) 2019-2020 Christophe Battarel * Copyright (C) 2024-2025 MDW * @@ -822,10 +822,10 @@ if ($id > 0 || !empty($ref)) { print ''; if (isModEnabled('productbatch') && $objp->tobatch > 0) { $type = 'batch'; - print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" '.($numd != $j + 1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"'); + print img_picto($langs->trans('AddStockLocationLine'), 'split', 'class="splitbutton" '.($numd != $j + 1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"'); } else { $type = 'dispatch'; - print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" '.($numd != $j + 1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"'); + print img_picto($langs->trans('AddStockLocationLine'), 'split', 'class="splitbutton" '.($numd != $j + 1 ? 'style="display:none"' : '').' onClick="addDispatchLine('.$i.', \''.$type.'\')"'); } print ''; @@ -995,10 +995,10 @@ if ($id > 0 || !empty($ref)) { print ''; if (isModEnabled('productbatch') && $objp->tobatch > 0) { $type = 'batch'; - print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"'); + print img_picto($langs->trans('AddStockLocationLine'), 'split', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"'); } else { $type = 'dispatch'; - print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"'); + print img_picto($langs->trans('AddStockLocationLine'), 'split', 'class="splitbutton" onClick="addDispatchLine('.$i.', \''.$type.'\')"'); } print ''; diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index e69c12f67be..bb97bbdeeb5 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -2922,7 +2922,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($canvasdisplayactio $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', $morehtmlref); diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php index 98e814ea288..f10a853669d 100644 --- a/htdocs/societe/contact.php +++ b/htdocs/societe/contact.php @@ -10,7 +10,7 @@ * Copyright (C) 2015 Jean-François Ferry * Copyright (C) 2015 Marcos García * Copyright (C) 2015 Raphaël Doursenaud - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024-2025 MDW * * This program is free software; you can redistribute it and/or modify @@ -207,7 +207,7 @@ print dol_get_fiche_head($head, 'contact', $langs->trans("ThirdParty"), 0, 'comp $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; -$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); +$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', $morehtmlref, '', 0, '', '', 1); diff --git a/htdocs/user/agenda.php b/htdocs/user/agenda.php index 704f14f52af..d3887a6adf8 100644 --- a/htdocs/user/agenda.php +++ b/htdocs/user/agenda.php @@ -1,7 +1,7 @@ * Copyright (C) 2005-2015 Regis Houssin - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -142,7 +142,7 @@ if ($user->hasRight('user', 'user', 'lire') || $user->admin) { } $morehtmlref = ''; -$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); +$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id); diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php index 7b7f901d2f5..a8e6f365c94 100644 --- a/htdocs/user/agenda_extsites.php +++ b/htdocs/user/agenda_extsites.php @@ -2,7 +2,7 @@ /* Copyright (C) 2008-2016 Laurent Destailleur * Copyright (C) 2011-2014 Juanjo Menent * Copyright (C) 2024 MDW - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -186,7 +186,7 @@ if ($user->hasRight('user', 'user', 'lire') || $user->admin) { } $morehtmlref = ''; -$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); +$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id); diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php index 42d2a71f95a..56e87cb3ca1 100644 --- a/htdocs/user/bank.php +++ b/htdocs/user/bank.php @@ -372,7 +372,7 @@ if ($action != 'edit' && $action != 'create') { // If not bank account yet, $ac } $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id); diff --git a/htdocs/user/card.php b/htdocs/user/card.php index b2060d33963..4e8076444ba 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1639,7 +1639,7 @@ if ($action == 'create' || $action == 'adduserldap') { print dol_get_fiche_head($head, 'user', $title, -1, 'user', 0, '', '', 0, '', 1); $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard").' ('.$langs->trans("AddToContacts").')', 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard").' ('.$langs->trans("AddToContacts").')', 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id); diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php index d64c8e52759..226fd509486 100644 --- a/htdocs/user/clicktodial.php +++ b/htdocs/user/clicktodial.php @@ -2,7 +2,7 @@ /* Copyright (C) 2005 Rodolphe Quiedeville * Copyright (C) 2005-2012 Laurent Destailleur * Copyright (C) 2012 Regis Houssin - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -129,7 +129,7 @@ if ($id > 0) { } $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id); diff --git a/htdocs/user/document.php b/htdocs/user/document.php index 873f7d34d5d..524b97578c5 100644 --- a/htdocs/user/document.php +++ b/htdocs/user/document.php @@ -164,7 +164,7 @@ if ($object->id) { } $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id); diff --git a/htdocs/user/messaging.php b/htdocs/user/messaging.php index 81f57ec4bbc..d404b16cbe4 100644 --- a/htdocs/user/messaging.php +++ b/htdocs/user/messaging.php @@ -6,7 +6,7 @@ * Copyright (C) 2007 Patrick Raguin * Copyright (C) 2010 Juanjo Menent * Copyright (C) 2015 Marcos García - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -157,7 +157,7 @@ if ($user->hasRight('user', 'user', 'lire') || $user->admin) { } $morehtmlref = ''; -$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); +$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id); diff --git a/htdocs/user/note.php b/htdocs/user/note.php index c6f6f0fe5d9..a59cd9829ea 100644 --- a/htdocs/user/note.php +++ b/htdocs/user/note.php @@ -2,7 +2,7 @@ /* Copyright (C) 2004 Rodolphe Quiedeville * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2005-2015 Regis Houssin - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -108,7 +108,7 @@ if ($id) { } $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id); diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php index 76b541eae67..9f95ac210d5 100644 --- a/htdocs/user/notify/card.php +++ b/htdocs/user/notify/card.php @@ -171,7 +171,7 @@ if ($result > 0) { $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id); diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php index a5d574ad70c..3e104e8fd5a 100644 --- a/htdocs/user/param_ihm.php +++ b/htdocs/user/param_ihm.php @@ -3,7 +3,7 @@ * Copyright (C) 2010-2015 Regis Houssin * Copyright (C) 2013 Florian Henry * Copyright (C) 2018 Ferran Marcet - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * Copyright (C) 2024-2025 MDW * * This program is free software; you can redistribute it and/or modify @@ -502,7 +502,7 @@ if ($action == 'edit') { $linkback = ''.$langs->trans("BackToList").''; $morehtmlref = ''; - $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); + $morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id); diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index 7ac8be06174..42b2794b1c5 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -7,7 +7,7 @@ * Copyright (C) 2012 Juanjo Menent * Copyright (C) 2020 Tobias Sekan * Copyright (C) 2024 MDW - * Copyright (C) 2024 Frédéric France + * Copyright (C) 2024-2025 Frédéric France * * 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 @@ -275,7 +275,7 @@ if ($user->hasRight("user", "user", "read") || $user->admin) { } $morehtmlref = ''; -$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"'); +$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard', 'class="valignmiddle marginleftonly paddingrightonly"'); $morehtmlref .= ''; $urltovirtualcard = '/user/virtualcard.php?id='.((int) $object->id);