Index: branches/RC/core/install/step_templates/upgrade_modules.tpl =================================================================== diff -u -N -r10832 -r10836 --- branches/RC/core/install/step_templates/upgrade_modules.tpl (.../upgrade_modules.tpl) (revision 10832) +++ branches/RC/core/install/step_templates/upgrade_modules.tpl (.../upgrade_modules.tpl) (revision 10836) @@ -19,7 +19,7 @@ GetVar('modules'); + $selected = $this->GetVar('modules') ? $this->GetVar('modules') : Array (); $modules = $this->GetUpgradableModules(); foreach ($modules as $module_name => $module_params) { $module_name = strtolower($module_name); Index: branches/RC/core/install/step_templates/choose_modules.tpl =================================================================== diff -u -N -r10832 -r10836 --- branches/RC/core/install/step_templates/choose_modules.tpl (.../choose_modules.tpl) (revision 10832) +++ branches/RC/core/install/step_templates/choose_modules.tpl (.../choose_modules.tpl) (revision 10836) @@ -25,11 +25,23 @@ $selected = Array ('kernel', 'proj-base'); } + $modules_helper =& $this->Application->recallObject('ModulesHelper'); + /* @var $modules_helper kModulesHelper */ + + $licensed_modules = array_map('strtolower', $modules_helper->_GetModules()); + $modules = $this->ScanModules(); foreach ($modules as $module) { $module_version = $this->toolkit->GetMaxModuleVersion($module); $prerequisites_errors = $this->toolkit->CheckPrerequisites($module . '/', Array ($module_version), 'install'); + $license_module = $module == 'kernel' ? 'in-portal' : $module; + + if (!in_array(strtolower($license_module), $licensed_modules)) { + // when module isn't licensed user can't install it + array_unshift($prerequisites_errors, 'Module not licensed'); + } + if ($prerequisites_errors) { // disable checkbox, when some of prerequisites not passed $checked = 'disabled';