From e78cb01ce6ea07e3305fb9aa5ba40b6de438a36b Mon Sep 17 00:00:00 2001 From: ldestailleur Date: Thu, 9 Oct 2025 06:51:16 +0200 Subject: [PATCH] Debu v23 --- htdocs/admin/modules.php | 6 +++++- htdocs/admin/remotestore/class/externalModules.class.php | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index d3669e373f4..822a811fd2d 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -169,7 +169,11 @@ if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) { $remotestore = new ExternalModules(); if ($mode == 'marketplace') { // Make remote calls - $remotestore->loadRemoteSources(); + $clearcache = 0; + if (GETPOSTINT('dol_resetcache')) { + dol_delete_file($remotestore->cache_file); + } + $remotestore->loadRemoteSources(false, $clearcache); } $object = new stdClass(); diff --git a/htdocs/admin/remotestore/class/externalModules.class.php b/htdocs/admin/remotestore/class/externalModules.class.php index 5f5a86450b8..431d0866a7a 100644 --- a/htdocs/admin/remotestore/class/externalModules.class.php +++ b/htdocs/admin/remotestore/class/externalModules.class.php @@ -512,6 +512,7 @@ class ExternalModules $html .= '
'; $html .= $version; // Version Dolibarr. No dol_escape_htmltag, it is already escape html $html .= ''; + $html .= ' '; if (empty($product['tms'])) { $html .= img_picto($langs->trans('DateCreation'), 'calendar', 'class="pictofixedwidth"').''.$langs->trans("DateCreation").': '; @@ -519,7 +520,7 @@ class ExternalModules } else { $html .= img_picto($langs->trans('DateModification'), 'calendar', 'class="pictofixedwidth"').''.dol_print_date(dol_stringtotime($product['tms']), 'day').''; } - $html .= '   '.$langs->trans('Ref').' '.dolPrintHTML($product["ref"]); + $html .= '   '.$langs->trans('Ref').' '.dolPrintHTML(preg_replace('/@.*$/', '', $product["ref"])); //$html .= ' - '.dol_escape_htmltag($langs->trans('Id')).': '.((int) $product["id"]); $html .= '
'; //$html .= '
'.$langs->trans('Source').'  
'; @@ -534,10 +535,10 @@ class ExternalModules } //$html .= $product["source"]; $html .= '  '; - if (!empty($product['phpmin'])) { + if (!empty($product['phpmin']) && $product['phpmin'] != 'unknown') { $html .= ' PHP min '.$product['phpmin'].''; } - if (!empty($product['phpmax'])) { + if (!empty($product['phpmax']) && $product['phpmax'] != 'unknown') { $html .= ' PHP max '.$product['phpmax'].''; } if (!empty($product['author'])) {