Index: trunk/kernel/include/modules.php =================================================================== diff -u -r141 -r236 --- trunk/kernel/include/modules.php (.../modules.php) (revision 141) +++ trunk/kernel/include/modules.php (.../modules.php) (revision 236) @@ -518,7 +518,6 @@ function _ModuleLicensed($name) { global $i_Keys, $objConfig, $pathtoroot; - $vars = parse_portal_ini($pathtoroot."config.php"); while($key = key($vars)) @@ -859,38 +858,33 @@ if(is_array($mod_prefix)) { - foreach($mod_prefix as $key => $value) + foreach($mod_prefix as $key => $folder_name) { if($FrontEnd==0 || !is_numeric($FrontEnd) || $FrontEnd==2) { $rootURL="http://".ThisDomain().$objConfig->Get("Site_Path"); $admin = $objConfig->Get("AdminDirectory"); - if(!strlen($admin)) - $admin = "admin"; + if( !strlen($admin) ) $admin = "admin"; $adminURL = $rootURL.$admin; $imagesURL = $adminURL."/images"; if(_ModuleLicensed($modules_loaded[$key])) { - - $mod = $pathtoroot.$value."module_init.php"; - if(file_exists($mod)) - require_once($mod); + $mod = $pathtoroot.$folder_name."module_init.php"; + if( file_exists($mod) ) require_once($mod); - $mod = $pathtoroot . $value . "action.php"; - if(file_exists($mod)) - require_once($mod); + $mod = $pathtoroot.$folder_name."action.php"; + if( file_exists($mod) ) require_once($mod); - $mod = $pathtoroot . $value . "searchaction.php"; - if(file_exists($mod)) - require_once($mod); + $mod = $pathtoroot.$folder_name."searchaction.php"; + if( file_exists($mod) ) require_once($mod); } } if($FrontEnd==1 || $FrontEnd==2) { - $mod = $pathtoroot.$value."module_init.php"; + $mod = $pathtoroot.$folder_name."module_init.php"; if(file_exists($mod)) require_once($mod); - $mod = $pathtoroot . $value . "frontaction.php"; + $mod = $pathtoroot.$folder_name."frontaction.php"; if(file_exists($mod)) require_once($mod); }