Index: branches/5.2.x/core/units/helpers/modules_helper.php
===================================================================
diff -u -N -r16277 -r16435
--- branches/5.2.x/core/units/helpers/modules_helper.php	(.../modules_helper.php)	(revision 16277)
+++ branches/5.2.x/core/units/helpers/modules_helper.php	(.../modules_helper.php)	(revision 16435)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: modules_helper.php 16277 2015-09-27 10:45:05Z alex $
+* @version	$Id: modules_helper.php 16435 2016-11-18 10:46:05Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -182,11 +182,12 @@
 		    }
 
 		    $modules = Array();
-		    $vars = kUtil::getConfigVars();
-		    $license = array_key_exists('License', $vars) ? base64_decode($vars['License']) : false;
+			$system_config = kUtil::getSystemConfig();
+		    $license = $system_config->get('License') ? base64_decode($system_config->get('License')) : false;
+
 		    if ($license) {
 			    list ( , , $i_Keys) = $this->_ParseLicense($license);
-			    $domain = $this->_GetDomain($vars);
+			    $domain = $this->_GetDomain($system_config);
 			    if (!$this->_IsLocalSite($domain)) {
 			        for ($x = 0; $x < count($i_Keys); $x++) {
 			            $key = $i_Keys[$x];
@@ -204,7 +205,7 @@
 
 		    // all modules starting from "in-" doesn't require license
 		    $base_modules = Array ('Core', 'In-Portal', 'Custom');
-		    $modules = array_merge($modules, $base_modules, $this->_getFreeModules($vars));
+		    $modules = array_merge($modules, $base_modules, $this->_getFreeModules($system_config));
 		    $modules = array_unique( array_map('strtolower', $modules) );
 
 		    return $modules;
@@ -213,11 +214,11 @@
 		/**
 		 * Get all modules, that don't require licensing
 		 *
-		 * @param Array $vars
+		 * @param kSystemConfig $system_config
 		 * @return Array
 		 * @access protected
 		 */
-		protected function _getFreeModules($vars)
+		protected function _getFreeModules(kSystemConfig $system_config)
 		{
 			return array_map('strtolower', $this->getModules());
 		}
@@ -237,12 +238,12 @@
 		/**
 		 * Returns domain from licences (and direct in case of install script)
 		 *
-		 * @param Array $vars
+		 * @param kSystemConfig $system_config
 		 * @return string
 		 */
-		function _GetDomain($vars)
+		function _GetDomain(kSystemConfig $system_config)
 		{
-			return isset($vars['Domain']) ? $vars['Domain'] : SERVER_NAME;
+			return $system_config->get('Domain', SERVER_NAME);
 		}
 
 		function _keyED($txt, $encrypt_key)