Index: branches/RC/core/units/general/helpers/modules.php
===================================================================
diff -u -N -r11702 -r11711
--- branches/RC/core/units/general/helpers/modules.php	(.../modules.php)	(revision 11702)
+++ branches/RC/core/units/general/helpers/modules.php	(.../modules.php)	(revision 11711)
@@ -148,7 +148,7 @@
 		    }
 
 		    $modules = Array();
-		    $vars = parse_portal_ini(FULL_PATH . '/config.php');
+		    $vars = parse_portal_ini(FULL_PATH . DIRECTORY_SEPARATOR . 'config.php');
 		    $license = array_key_exists('License', $vars) ? base64_decode($vars['License']) : false;
 		    if ($license) {
 			    list ( , , $i_Keys) = $this->_ParseLicense($license);
@@ -163,13 +163,14 @@
 			        }
 			    }
 			    else {
+			    	// all already installed modules are licensed for localhost
 			        $modules = array_keys($this->Application->ModuleInfo);
 			    }
 		    }
 
 		    // all modules starting from "in-" doesn't require license
 		    $base_modules = Array ('Core', 'In-Portal', 'Custom');
-		    $modules = array_merge($modules, $base_modules, $this->_getFreeModules());
+		    $modules = array_merge($modules, $base_modules, $this->_getFreeModules($vars));
 		    $modules = array_unique( array_map('strtolower', $modules) );
 
 		    return $modules;
@@ -180,9 +181,15 @@
 		 *
 		 * @return Array
 		 */
-		function _getFreeModules()
+		function _getFreeModules($vars)
 		{
-			$skip_modules = Array ('.', '..', 'in-commerce', 'in-auction');
+			$skip_modules = Array ('.', '..');
+			$domain = $this->_GetDomain($vars);
+
+		    if (!$this->_IsLocalSite($domain)) {
+		    	array_push($skip_modules, 'in-commerce', 'in-auction');
+		    }
+
 			$folder = dir(MODULES_PATH);
 
 			$ret = Array ();