lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better error management

Browse Source
This commit is contained in:
Laurent Destailleur 2013-04-09 23:04:59 +02:00
parent 2ab5c2029d
commit a4b56708e9
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/admin/system/modules.php
View File

@ -47,9 +47,11 @@ print "<br>\n";
$modules = array(); $modules = array();
$modules_names = array(); $modules_names = array();
$modules_files = array(); $modules_files = array();
$modules_fullpath = array();
$modulesdir = dolGetModulesDirs(); $modulesdir = dolGetModulesDirs();
// Load list of modules // Load list of modules
$i=0;
foreach($modulesdir as $dir) foreach($modulesdir as $dir)
{ {
$handle=@opendir(dol_osencode($dir)); $handle=@opendir(dol_osencode($dir));
@ -63,13 +65,25 @@ foreach($modulesdir as $dir)
if ($modName) if ($modName)
{ {
include_once $dir.$file; //print 'xx'.$dir.$file.'<br>';
$objMod = new $modName($db); if (in_array($file, $modules_files))
{
// File duplicate
print "Warning duplicate file found : ".$file." (Found ".$dir.$file.", already found ".$modules_fullpath[$file].")<br>";
}
else
{
// File to load
include_once $dir.$file;
$modules[$objMod->numero]=$objMod; $objMod = new $modName($db);
$modules_names[$objMod->numero]=$objMod->name;
$modules_files[$objMod->numero]=$file; $modules[$objMod->numero]=$objMod;
$picto[$objMod->numero]=(isset($objMod->picto) && $objMod->picto)?$objMod->picto:'generic'; $modules_names[$objMod->numero]=$objMod->name;
$modules_files[$objMod->numero]=$file;
$modules_fullpath[$file]=$dir.$file;
$picto[$objMod->numero]=(isset($objMod->picto) && $objMod->picto)?$objMod->picto:'generic';
}
} }
} }
} }
@ -127,8 +141,7 @@ sort($rights_ids);
$old=''; $old='';
foreach($rights_ids as $right_id) foreach($rights_ids as $right_id)
{ {
if ($old == $right_id) if ($old == $right_id) print "Warning duplicate id on permission : ".$right_id."<br>";
print "Warning duplicate id on permission : ".$right_id."<br>";
$old = $right_id; $old = $right_id;
} }