Fix: Use same algo to scan modules than admin/modules page

Dolibarr · Apr 28, 2012 · 6b9717b · 6b9717b
1 parent 2a19e9d
commit 6b9717b
Showing 1 changed file with 21 additions and 20 deletions.
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
@@ -47,29 +47,30 @@
 $modules_names = array();
 $modules_files = array();
 
+// Search modules dirs
+$modulesdir = array();
 foreach ($conf->file->dol_document_root as $type => $dirroot)
 {
-	$modulesdir[] = $dirroot . "/core/modules/";
-
-	if ($type == 'alt')
-	{	
-		$handle=@opendir($dirroot);
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle))!==false)
-			{
-			    if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
-			    {
-			    	if (is_dir($dirroot . '/' . $file . '/core/modules/'))
-			    	{
-			    		$modulesdir[] = $dirroot . '/' . $file . '/core/modules/';
-			    	}
-			    }
-			}
-			closedir($handle);
-		}
-	}
+    $modulesdir[$dirroot . '/core/modules/'] = $dirroot . '/core/modules/';
+
+    $handle=@opendir($dirroot);
+    if (is_resource($handle))
+    {
+        while (($file = readdir($handle))!==false)
+        {
+            if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
+            {
+                if (is_dir($dirroot . '/' . $file . '/core/modules/'))
+                {
+                    $modulesdir[$dirroot . '/' . $file . '/core/modules/'] = $dirroot . '/' . $file . '/core/modules/';
+                }
+            }
+        }
+        closedir($handle);
+    }
 }
+//var_dump($modulesdir);
+
 
 // Load list of modules
 foreach($modulesdir as $dir)