From a4b56708e9843aae7770be393d099b0dc046a386 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 9 Apr 2013 23:04:59 +0200
Subject: [PATCH] Better error management

---
 htdocs/admin/system/modules.php | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index bfd1bc5d81f..0baed9e53bc 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -47,9 +47,11 @@ print "<br>\n";
 $modules = array();
 $modules_names = array();
 $modules_files = array();
+$modules_fullpath = array();
 $modulesdir = dolGetModulesDirs();
 
 // Load list of modules
+$i=0;
 foreach($modulesdir as $dir)
 {
 	$handle=@opendir(dol_osencode($dir));
@@ -63,13 +65,25 @@ foreach($modulesdir as $dir)
 
     			if ($modName)
     			{
-    				include_once $dir.$file;
-    				$objMod = new $modName($db);
+    				//print 'xx'.$dir.$file.'<br>';
+					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;
-    				$modules_names[$objMod->numero]=$objMod->name;
-    				$modules_files[$objMod->numero]=$file;
-    				$picto[$objMod->numero]=(isset($objMod->picto) && $objMod->picto)?$objMod->picto:'generic';
+	    				$objMod = new $modName($db);
+
+	    				$modules[$objMod->numero]=$objMod;
+	    				$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='';
 foreach($rights_ids as $right_id)
 {
-	if ($old == $right_id)
-		print "Warning duplicate id on permission : ".$right_id."<br>";
+	if ($old == $right_id) print "Warning duplicate id on permission : ".$right_id."<br>";
 	$old = $right_id;
 }