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

This commit is contained in:
Laurent Destailleur 2012-04-28 18:38:15 +02:00
parent 2a19e9d2a1
commit 6b9717b250

View File

@ -47,29 +47,30 @@ $modules = array();
$modules_names = array(); $modules_names = array();
$modules_files = array(); $modules_files = array();
// Search modules dirs
$modulesdir = array();
foreach ($conf->file->dol_document_root as $type => $dirroot) foreach ($conf->file->dol_document_root as $type => $dirroot)
{ {
$modulesdir[] = $dirroot . "/core/modules/"; $modulesdir[$dirroot . '/core/modules/'] = $dirroot . '/core/modules/';
if ($type == 'alt') $handle=@opendir($dirroot);
{ if (is_resource($handle))
$handle=@opendir($dirroot); {
if (is_resource($handle)) while (($file = readdir($handle))!==false)
{ {
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) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') if (is_dir($dirroot . '/' . $file . '/core/modules/'))
{ {
if (is_dir($dirroot . '/' . $file . '/core/modules/')) $modulesdir[$dirroot . '/' . $file . '/core/modules/'] = $dirroot . '/' . $file . '/core/modules/';
{ }
$modulesdir[] = $dirroot . '/' . $file . '/core/modules/'; }
} }
} closedir($handle);
} }
closedir($handle);
}
}
} }
//var_dump($modulesdir);
// Load list of modules // Load list of modules
foreach($modulesdir as $dir) foreach($modulesdir as $dir)