Index: trunk/admin/install.php =================================================================== diff -u -r449 -r478 --- trunk/admin/install.php (.../install.php) (revision 449) +++ trunk/admin/install.php (.../install.php) (revision 478) @@ -1391,8 +1391,8 @@ if( !isset($objTagList) || !is_object($objTagList) ) $objTagList = new clsTagList(); foreach($doms as $p) { - $filename = $pathtoroot.$p."/admin/install.php"; - if(file_exists($filename)) + $filename = $pathtoroot.$p.'/admin/install.php'; + if(file_exists($filename) ) { include($filename); } Index: trunk/admin/install/install_lib.php =================================================================== diff -u -r437 -r478 --- trunk/admin/install/install_lib.php (.../install_lib.php) (revision 437) +++ trunk/admin/install/install_lib.php (.../install_lib.php) (revision 478) @@ -540,33 +540,33 @@ function inst_GetModuleList() { - global $rootpath,$pathchar,$admin, $pathtoroot; + global $rootpath,$pathchar,$admin, $pathtoroot; - $path = $pathtoroot; - - $new = array(); - if ($dir = @opendir($path)) - { - while (($file = readdir($dir)) !== false) - { - if($file !="." && $file !=".." && substr($file,0,1)!="_") - { - if(is_dir($path."/".$file)) - { - $inst_file = $path.$file."/admin/install.php"; - if(file_exists($inst_file)) - { -// if(inst_ModuleLicensed($file)) -// { - $new[$file] = $inst_file; -// } - } - } - } - } - closedir($dir); - } - return array_keys($new); + $path = $pathtoroot; + + $new = array(); + if ($dir = @opendir($path)) + { + while (($file = readdir($dir)) !== false) + { + if($file !="." && $file !=".." && substr($file,0,1)!="_") + { + if(is_dir($path."/".$file)) + { + $ModuleAdminDir = $path.$file.'/admin/'; + $inst_file = $ModuleAdminDir.'install.php'; + if( file_exists($inst_file) && file_exists($ModuleAdminDir.'install/inportal_schema.sql') ) + { + //if(inst_ModuleLicensed($file)) + $new[$file] = $inst_file; + + } + } + } + } + closedir($dir); + } + return array_keys($new); } function GetDirList ($dirName)