diff --git a/htdocs/admin/fournisseur.php b/htdocs/admin/fournisseur.php index fe2d577478cce4694fecfd2d8a4cfe9525cb0d0c..7feb60781533baac9194d9313571e6408ec945d0 100644 --- a/htdocs/admin/fournisseur.php +++ b/htdocs/admin/fournisseur.php @@ -549,7 +549,7 @@ if (is_resource($handle)) print "</tr>\n"; } } - close($handle); + closedir($handle); } print '</table><br/>'; diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php index 7b9a69256d9b077bbfcf0b0b33ba11683969a59a..86c6b0aefa8a13aca4eeb8b9a5d8f37517c595ab 100644 --- a/htdocs/admin/modules.php +++ b/htdocs/admin/modules.php @@ -149,7 +149,8 @@ foreach ($conf->file->dol_document_root as $dirroot) asort($orders); //var_dump($orders); - +//var_dump($categ); +//var_dump($modules); // Affichage debut page @@ -246,6 +247,7 @@ if ($mode != 4) 'technic'=>$langs->trans("ModuleFamilyTechnic"), 'other'=>$langs->trans("ModuleFamilyOther") ); + foreach ($orders as $key => $value) { $tab=explode('_',$value); @@ -253,9 +255,15 @@ if ($mode != 4) $modName = $filename[$key]; $objMod = $modules[$key]; - - if ($objMod->special != $mode) continue; // Discard if not for tab - + //var_dump($objMod); + + if ($objMod->special != $mode) continue; // Discard if not for tab + if (! $objMod->getName()) + { + dol_syslog("Error for module ".$key." - Property name of module looks empty", LOG_WARNING); + continue; + } + $const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i','',get_class($objMod))); // Load all lang files of module diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php index fe25de6f5acdc7d32c7b66bd4a03047657f6f17f..0f5a4cc5f4f29444353ad5ed24e24679adcab81e 100644 --- a/htdocs/compta/paiement/rapport.php +++ b/htdocs/compta/paiement/rapport.php @@ -181,7 +181,7 @@ if ($year) print '<td align="right">'.dol_print_date(dol_filemtime($tfile),"dayhour").'</td></tr>'; } } - close($handle); + closedir($handle); } print '</table>'; } diff --git a/htdocs/includes/modules/export/modules_export.php b/htdocs/includes/modules/export/modules_export.php index 814e45ccdab37ad987fb6ff424af52e42664a8ae..8c5d62a7e3b26aa7592d7bddfcb4067b220bd0ad 100644 --- a/htdocs/includes/modules/export/modules_export.php +++ b/htdocs/includes/modules/export/modules_export.php @@ -92,7 +92,7 @@ class ModeleExports $i++; } } - close($handle); + closedir($handle); } return $this->driverlabel; }