Index: branches/5.2.x/core/kernel/startup.php
===================================================================
diff -u -N -r14092 -r14095
--- branches/5.2.x/core/kernel/startup.php	(.../startup.php)	(revision 14092)
+++ branches/5.2.x/core/kernel/startup.php	(.../startup.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: startup.php 14092 2010-11-26 22:43:15Z alex $
+* @version	$Id: startup.php 14095 2010-12-28 17:37:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -16,20 +16,12 @@
 
 	define('KERNEL_PATH', FULL_PATH . '/core/kernel');
 
-	if (!function_exists('getmicrotime')) {
-		function getmicrotime()
-		{
-			list($usec, $sec) = explode(" ", microtime());
-			return ((float)$usec + (float)$sec);
-		}
-	}
-
-	$globals_start = getmicrotime();
-	include_once(KERNEL_PATH . '/globals.php');	// non OOP functions used through kernel, e.g. print_pre
+	$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
-	$globals_end = getmicrotime();
+	$globals_end = microtime(true);
 
-	$vars = parse_portal_ini();
+	$vars = kUtil::getConfigVars();
 
 	$admin_directory = isset($vars['AdminDirectory']) ? $vars['AdminDirectory'] : '/admin';
 	define('ADMIN_DIRECTORY', $admin_directory);
@@ -49,10 +41,10 @@
 	}
 
 	$ps = rtrim(preg_replace('/' . preg_quote(rtrim($relative_path, '/'), '/') . '$/', '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))), '/');
-	safeDefine('BASE_PATH', $ps); // in case in-portal has defined it before
+	define('BASE_PATH', $ps);
 	# New path detection method: end
 
-	if ( array_key_exists('HTTP_HOST', $_SERVER) ) {
+	if ( isset($_SERVER['HTTP_HOST']) ) {
 		// accessed from browser
 		define('SERVER_NAME', $_SERVER['HTTP_HOST']);
 	}
@@ -63,7 +55,7 @@
 	}
 
 	$https_mark = getArrayValue($_SERVER, 'HTTPS');
-	safeDefine('PROTOCOL', ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://');
+	define('PROTOCOL', ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://');
 
 	$port = array_key_exists('HTTP_PORT', $_SERVER) ? $_SERVER['HTTP_PORT'] : false;
 
@@ -72,18 +64,17 @@
         define('PORT', $_SERVER['HTTP_PORT']);
     }
 
-	safeDefine('APPLICATION_CLASS', isset($vars['ApplicationClass']) ? $vars['ApplicationClass'] : 'kApplication');
-	safeDefine('APPLICATION_PATH', isset($vars['ApplicationPath']) ? $vars['ApplicationPath'] : '/core/kernel/application.php');
+	define('APPLICATION_CLASS', isset($vars['ApplicationClass']) ? $vars['ApplicationClass'] : 'kApplication');
+	define('APPLICATION_PATH', isset($vars['ApplicationPath']) ? $vars['ApplicationPath'] : '/core/kernel/application.php');
 
 	if (isset($vars['WriteablePath'])) {
 		define('WRITEABLE', FULL_PATH . $vars['WriteablePath']);
 		define('WRITEBALE_BASE', $vars['WriteablePath']);
 	}
 
-	if ($vars === false || count($vars) == 0) {
-		global $rootURL;
-		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>';
+	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/>';
 		echo '<a href="' . PROTOCOL . SERVER_NAME . rtrim(BASE_PATH, '/') . '/core/install.php">Go to installation script</a><br><br>';
 		flush();
 		exit;
@@ -113,19 +104,21 @@
 	define('GW_CLASS_PATH', MODULES_PATH . '/in-commerce/units/gateways/gw_classes'); // Payment Gateway Classes Path
 	define('SYNC_CLASS_PATH', FULL_PATH . '/sync');	// path for 3rd party user syncronization scripts
 
-	safeDefine('ENV_VAR_NAME','env');
+	define('ENV_VAR_NAME','env');
 
 	define('IMAGES_PATH', WRITEBALE_BASE . '/images/');
 	define('IMAGES_PENDING_PATH', IMAGES_PATH . 'pending/');
-	safeDefine('MAX_UPLOAD_SIZE', min(ini_get('upload_max_filesize'), ini_get('post_max_size'))*1024*1024);
+	define('MAX_UPLOAD_SIZE', min(ini_get('upload_max_filesize'), ini_get('post_max_size'))*1024*1024);
 
-	safeDefine('EDITOR_PATH', isset($vars['EditorPath']) ? $vars['EditorPath'] : '/core/editor/');
+	define('EDITOR_PATH', isset($vars['EditorPath']) ? $vars['EditorPath'] : '/core/editor/');
 
 	// caching types
 	define('CACHING_TYPE_NONE', 0);
 	define('CACHING_TYPE_MEMORY', 1);
 	define('CACHING_TYPE_TEMPORARY', 2);
 
+	unset($vars); // just in case someone will be still using it
+
 	if (ini_get('safe_mode')) {
 		// safe mode will be removed at all in PHP6
 		define('SAFE_MODE', 1);
@@ -134,11 +127,11 @@
 	if (file_exists(WRITEABLE . '/debug.php')) {
 		include_once(WRITEABLE . '/debug.php');
 		if (array_key_exists('DEBUG_MODE', $dbg_options) && $dbg_options['DEBUG_MODE']) {
-			$debugger_start = getmicrotime();
+			$debugger_start = microtime(true);
 			include_once(KERNEL_PATH . '/utility/debugger.php');
-			$debugger_end = getmicrotime();
+			$debugger_end = microtime(true);
 
-			if (isset($debugger) && constOn('DBG_PROFILE_INCLUDES')) {
+			if (isset($debugger) && kUtil::constOn('DBG_PROFILE_INCLUDES')) {
 				$debugger->profileStart('inc_globals', KERNEL_PATH . '/globals.php', $globals_start);
 				$debugger->profileFinish('inc_globals', KERNEL_PATH . '/globals.php', $globals_end);
 				$debugger->profilerAddTotal('includes', 'inc_globals');
@@ -150,9 +143,10 @@
 		}
 	}
 
-	safeDefine('SILENT_LOG', 0);
+	kUtil::safeDefine('SILENT_LOG', 0); // can be set in "debug.php" too
 
 	$includes = Array(
+			KERNEL_PATH . "/interfaces/cacheable.php",
 			KERNEL_PATH . '/application.php',
 			FULL_PATH . APPLICATION_PATH,
 			KERNEL_PATH . '/db/db_connection.php',
@@ -167,7 +161,7 @@
 	);
 
 	foreach ($includes as $a_file) {
-		k4_include_once($a_file);
+		kUtil::includeOnce($a_file);
 	}
 
 	if (defined('DEBUG_MODE') && DEBUG_MODE && isset($debugger)) {