Index: branches/5.2.x/core/kernel/startup.php
===================================================================
diff -u -N -r16432 -r16435
--- branches/5.2.x/core/kernel/startup.php	(.../startup.php)	(revision 16432)
+++ branches/5.2.x/core/kernel/startup.php	(.../startup.php)	(revision 16435)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: startup.php 16432 2016-11-18 09:30:26Z alex $
+* @version	$Id: startup.php 16435 2016-11-18 10:46:05Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -19,19 +19,26 @@
 	$globals_start = microtime(true);
 	include_once(KERNEL_PATH . '/globals.php');	// some non-OOP functions and kUtil static class used through kernel
 	include_once(KERNEL_PATH . '/utility/multibyte.php');	// emulating multi-byte php extension
+	include_once(KERNEL_PATH . '/utility/system_config.php'); // kSystemConfig class to access system/config.php data
 	$globals_end = microtime(true);
 
-	$vars = kUtil::getConfigVars();
+	try {
+		$vars = kUtil::getSystemConfig()->getData();
+	}
+	catch ( kSystemConfigException $e ) {
+		echo 'In-Portal is probably not installed, or configuration file is missing.<br/>';
+		echo 'Please use the installation script to fix the problem.<br/><br/>';
 
-	$charset = isset($vars['WebsiteCharset']) ? $vars['WebsiteCharset'] : 'utf-8';
-	define('CHARSET', $charset);
+		$base_path = rtrim(str_replace('\\', '/', dirname($_SERVER['PHP_SELF'])), '/');
+		echo '<a href="http://' . $_SERVER['HTTP_HOST'] . $base_path . '/core/install.php">Go to installation script</a><br/><br/>';
+		flush();
+		exit;
+	}
 
-	$admin_directory = isset($vars['AdminDirectory']) ? $vars['AdminDirectory'] : '/admin';
-	define('ADMIN_DIRECTORY', $admin_directory);
+	define('CHARSET', $vars['WebsiteCharset']);
+	define('ADMIN_DIRECTORY', $vars['AdminDirectory']);
+	define('ADMIN_PRESETS_DIRECTORY', $vars['AdminPresetsDirectory']);
 
-	$admin_Presets_directory = isset($vars['AdminPresetsDirectory']) ? $vars['AdminPresetsDirectory'] : ADMIN_DIRECTORY;
-	define('ADMIN_PRESETS_DIRECTORY', $admin_Presets_directory);
-
 	$https_mark = getArrayValue($_SERVER, 'HTTPS');
 	define('PROTOCOL', ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://');
 
@@ -58,16 +65,6 @@
 
 	define('SERVER_NAME', $http_host);
 
-	if (!$vars) {
-		echo 'In-Portal is probably not installed, or configuration file is missing.<br/>';
-		echo 'Please use the installation script to fix the problem.<br/><br/>';
-
-		$base_path = rtrim(preg_replace('/'.preg_quote(rtrim($admin_directory, '/'), '/').'$/', '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))), '/');
-		echo '<a href="' . PROTOCOL . SERVER_NAME . $base_path . '/core/install.php">Go to installation script</a><br><br>';
-		flush();
-		exit;
-	}
-
 	if ( !file_exists(FULL_PATH . '/vendor/autoload.php') ) {
 		echo 'Cannot find an "/vendor/autoload.php" file, have you executed "composer install" command?<br/>';
 		flush();
@@ -77,8 +74,8 @@
 	// variable WebsitePath is auto-detected once during installation/upgrade
 	define('BASE_PATH', $vars['WebsitePath']);
 
-	define('APPLICATION_CLASS', isset($vars['ApplicationClass']) ? $vars['ApplicationClass'] : 'kApplication');
-	define('APPLICATION_PATH', isset($vars['ApplicationPath']) ? $vars['ApplicationPath'] : '/core/kernel/application.php');
+	define('APPLICATION_CLASS', $vars['ApplicationClass']);
+	define('APPLICATION_PATH', $vars['ApplicationPath']);
 
 	if (isset($vars['WriteablePath'])) {
 		define('WRITEABLE', FULL_PATH . $vars['WriteablePath']);
@@ -119,7 +116,7 @@
 	define('IMAGES_PENDING_PATH', IMAGES_PATH . 'pending/');
 	define('MAX_UPLOAD_SIZE', min(ini_get('upload_max_filesize'), ini_get('post_max_size'))*1024*1024);
 
-	define('EDITOR_PATH', isset($vars['EditorPath']) ? $vars['EditorPath'] : '/core/ckeditor/');
+	define('EDITOR_PATH', $vars['EditorPath']);
 
 	// caching types
 	define('CACHING_TYPE_NONE', 0);
@@ -135,12 +132,12 @@
 		static public $domainsParsedRebuildTime;
 	}
 
-	CacheSettings::$unitCacheRebuildTime = isset($vars['UnitCacheRebuildTime']) ? $vars['UnitCacheRebuildTime'] : 10;
-	CacheSettings::$structureTreeRebuildTime = isset($vars['StructureTreeRebuildTime']) ? $vars['StructureTreeRebuildTime'] : 10;
-	CacheSettings::$cmsMenuRebuildTime = isset($vars['CmsMenuRebuildTime']) ? $vars['CmsMenuRebuildTime'] : 10;
-	CacheSettings::$templateMappingRebuildTime = isset($vars['TemplateMappingRebuildTime']) ? $vars['TemplateMappingRebuildTime'] : 5;
-	CacheSettings::$sectionsParsedRebuildTime = isset($vars['SectionsParsedRebuildTime']) ? $vars['SectionsParsedRebuildTime'] : 10;
-	CacheSettings::$domainsParsedRebuildTime = isset($vars['DomainsParsedRebuildTime']) ? $vars['DomainsParsedRebuildTime'] : 2;
+	CacheSettings::$unitCacheRebuildTime = $vars['UnitCacheRebuildTime'];
+	CacheSettings::$structureTreeRebuildTime = $vars['StructureTreeRebuildTime'];
+	CacheSettings::$cmsMenuRebuildTime = $vars['CmsMenuRebuildTime'];
+	CacheSettings::$templateMappingRebuildTime = $vars['TemplateMappingRebuildTime'];
+	CacheSettings::$sectionsParsedRebuildTime = $vars['SectionsParsedRebuildTime'];
+	CacheSettings::$domainsParsedRebuildTime = $vars['DomainsParsedRebuildTime'];
 
 	class MaintenanceMode {
 		const NONE = 0;