fixed including of module files

This commit is contained in:
Roland Gruber 2004-10-14 14:09:44 +00:00
parent 3216280f16
commit 86bb6297c6
1 changed files with 10 additions and 18 deletions

View File

@ -43,20 +43,12 @@ include_once("ldap.inc");
/** /**
* This includes all module files. * This includes all module files.
*/ */
// Get Lampath, needed 4 includes $modulesINC_dirname = substr(__FILE__, 0, strlen(__FILE__) - 12) . "/modules";
$stay=0; $modulesINC_dir = dir($modulesINC_dirname);
$relative=''; // get module names.
while ($stay<7) { while ($entry = $modulesINC_dir->read())
if (is_dir($relative.'lib/modules')) { if ((substr($entry, strlen($entry) - 4, 4) == '.inc') && is_file($modulesINC_dirname . '/'.$entry)) {
$dir = opendir($relative.'lib/modules'); include_once($modulesINC_dirname . '/'.$entry);
while ($entry = readdir($dir))
if ((substr($entry, strlen($entry) - 4, 4) == '.inc') && is_file($relative.'lib/modules/'.$entry)) include_once ($relative.'lib/modules/'.$entry);
$stay=10;
}
else {
$stay++;
$relative .= '../';
}
} }
/** /**
@ -249,12 +241,12 @@ function check_module_conflicts($selected, $deps) {
* @return array list of possible modules * @return array list of possible modules
*/ */
function getAvailableModules($scope) { function getAvailableModules($scope) {
global $relative; $dirname = substr(__FILE__, 0, strlen(__FILE__) - 12) . "/modules";
$dir = dir($dirname);
$return = array(); $return = array();
// get module names. // get module names.
$dir = opendir($relative . 'lib/modules'); while ($entry = $dir->read())
while ($entry = readdir($dir)) if ((substr($entry, strlen($entry) - 4, 4) == '.inc') && is_file($dirname . '/'.$entry)) {
if ((substr($entry, strlen($entry) - 4, 4) == '.inc') && is_file($relative . 'lib/modules/'.$entry)) {
$entry = substr($entry, 0, strpos($entry, '.')); $entry = substr($entry, 0, strpos($entry, '.'));
$temp = new $entry($scope); $temp = new $entry($scope);
if ($temp->can_manage()) $return[] = $entry; if ($temp->can_manage()) $return[] = $entry;