Index: trunk/core/kernel/startup.php
===================================================================
diff -u -N -r2750 -r2853
--- trunk/core/kernel/startup.php	(.../startup.php)	(revision 2750)
+++ trunk/core/kernel/startup.php	(.../startup.php)	(revision 2853)
@@ -1,115 +1,106 @@
 <?php
-define('KERNEL_PATH', FULL_PATH.'/kernel/kernel4');
 
-if( defined('ADMIN') && ADMIN )
-{
-	define('SPECIAL_TEMPLATES_FOLDER', '/kernel/admin_templates');
-}
+	define('KERNEL_PATH', FULL_PATH.'/kernel/kernel4');
+	include_once(KERNEL_PATH.'/globals.php');	// non OOP functions used through kernel, e.g. print_pre
 
-define('INPORTAL_ENV', 1);
+	if( defined('ADMIN') && ADMIN )
+	{
+		define('SPECIAL_TEMPLATES_FOLDER', '/kernel/admin_templates');
+	}
 
-# New path detection method
+	define('INPORTAL_ENV', 1);
 
-if (!defined('REL_PATH')) {
-	define('REL_PATH', '/admin');
-}
+	# New path detection method: begin
+	safeDefine('REL_PATH', '/admin');
+	$ps = preg_replace("/".preg_quote(rtrim(REL_PATH, '/'), '/')."$/", '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF'])));
+	safeDefine('BASE_PATH', $ps); // in case in-portal has defined it before
+	# New path detection method: end
 
-$ps = preg_replace("/".preg_quote(rtrim(REL_PATH, '/'), '/')."$/", '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF'])));
+	safeDefine('INPORTAL_TAGS', true);
+	safeDefine('SERVER_NAME', $_SERVER['HTTP_HOST']);
+	safeDefine('KERNEL_PATH', FULL_PATH.'/kernel4');
+	safeDefine('PROTOCOL', isset($_SERVER["HTTPS"]) ? 'https://' : 'http://');
+	
+	$vars = parse_portal_ini(FULL_PATH.'/config.php');
 
-define('BASE_PATH', $ps);
+	if($vars === false)
+	{
+		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 ( !preg_match('/admin/', __FILE__) ) $ins = '/admin';
+	
+		echo '<a href="'.PROTOCOL.SERVER_NAME.BASE_PATH.$ins.'/install.php">Go to installation script</a><br><br>';
+		flush();
+		exit;
+	}
 
-# /New method
+	define('SQL_TYPE', $vars['DBType']);
+	define('SQL_SERVER', $vars['DBHost']);
+	define('SQL_USER', $vars['DBUser']);
+	define('SQL_PASS', $vars['DBUserPassword']);
+	define('SQL_DB', $vars['DBName']);
+	define('TABLE_PREFIX', $vars['TablePrefix']);
+	define('DOMAIN', $vars['Domain']);
 
-include_once(KERNEL_PATH.'/globals.php');	// non OOP functions used through kernel, e.g. print_pre
+	ini_set('memory_limit', '50M');
 
-safeDefine( 'INPORTAL_TAGS', true);
-safeDefine( 'SERVER_NAME', $_SERVER['HTTP_HOST']);
-safeDefine( 'KERNEL_PATH', FULL_PATH.'/kernel4');
-safeDefine( 'PROTOCOL', isset($_SERVER["HTTPS"]) ? 'https://' : 'http://');
+	define('MODULES_PATH', FULL_PATH);
+	define('EXPORT_PATH', FULL_PATH.'/admin/export');
+	define('GW_CLASS_PATH', MODULES_PATH.'/in-commerce/units/gateways/gw_classes'); // Payment Gateway Classes Path
 
-$vars = parse_portal_ini(FULL_PATH.'/config.php');
+	safeDefine('ENV_VAR_NAME','env');
+	
+	k4_include_once(KERNEL_PATH.'/application.php');
+	k4_include_once(MODULES_PATH.'/kernel/units/general/my_application.php');
 
-if($vars === false)
-{
-	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 ( !preg_match('/admin/', __FILE__) ) $ins = '/admin';
+	if( file_exists(FULL_PATH.'/debug.php') )
+	{
+		k4_include_once(FULL_PATH.'/debug.php');
+		if( defined('DEBUG_MODE') && DEBUG_MODE ) include_once(KERNEL_PATH.'/utility/debugger.php');
+	}	
 
-	echo '<a href="'.PROTOCOL.SERVER_NAME.BASE_PATH.$ins.'/install.php">Go to installation script</a><br><br>';
-	flush();
-	exit;
-}
+	k4_include_once(KERNEL_PATH.'/db/db_connection.php');
 
-define('SQL_TYPE', $vars['DBType']);
-define('SQL_SERVER', $vars['DBHost']);
-define('SQL_USER', $vars['DBUser']);
-define('SQL_PASS', $vars['DBUserPassword']);
-define('SQL_DB', $vars['DBName']);
-define('TABLE_PREFIX', $vars['TablePrefix']);
-define('DOMAIN', $vars['Domain']);
+	safeDefine('IMAGES_PATH', '/kernel/images/');
+	safeDefine('IMAGES_PENDING_PATH', IMAGES_PATH.'pending/');
+	safeDefine('CUSTOM_UPLOAD_PATH', '/templates/images/custom/');
+	safeDefine('MAX_UPLOAD_SIZE', min(ini_get('upload_max_filesize'), ini_get('post_max_size'))*1024*1024);
 
-ini_set('memory_limit', '50M');
+	if( ini_get('safe_mode') ) define('SAFE_MODE', 1);
 
-/*echo "FULL_PATH: ".FULL_PATH.'<br>';
-echo "BASE_PATH: ".BASE_PATH.'<br>';*/
+	safeDefine('CACHE_CONFIGS_FILES', 1);
+	safeDefine('EXPERIMENTAL_PRE_PARSE', 1);
+	safeDefine('SILENT_LOG', 0);
+	
+	k4_include_once(KERNEL_PATH."/kbase.php");
+	k4_include_once(KERNEL_PATH.'/utility/event.php');
+	k4_include_once(KERNEL_PATH."/utility/factory.php");
+	k4_include_once(KERNEL_PATH."/languages/phrases_cache.php");
+	
+	// We should get rid of these includes:
+	k4_include_once(KERNEL_PATH."/db/dblist.php");
+	k4_include_once(KERNEL_PATH."/db/dbitem.php");
+	
+	k4_include_once(KERNEL_PATH.'/processors/tag_processor.php');
+	k4_include_once(KERNEL_PATH."/db/db_tag_processor.php");
+	
+	k4_include_once(KERNEL_PATH."/event_handler.php");
+	k4_include_once(KERNEL_PATH.'/db/db_event_handler.php');
+	k4_include_once(MODULES_PATH.'/kernel/units/general/inp_db_event_handler.php');
+	
+	k4_include_once(KERNEL_PATH."/utility/temp_handler.php"); // needed because of static calls from kBase
+	// up to here
 
-define('MODULES_PATH', FULL_PATH);
-define('EXPORT_PATH', FULL_PATH.'/admin/export');
-define('GW_CLASS_PATH', MODULES_PATH.'/in-commerce/units/gateways/gw_classes'); // Payment Gateway Classes Path
+	// global constants
+	define('HAVING_FILTER', 1);
+	define('WHERE_FILTER', 2);
+	
+	define('FLT_TYPE_AND',	'AND');
+	define('FLT_TYPE_OR',	'OR');
+	
+	safeDefine('STATUS_DISABLED', 0);
+	safeDefine('STATUS_ACTIVE', 1);
+	safeDefine('STATUS_PENDING', 2);
 
-safeDefine('ENV_VAR_NAME','env');
-
-k4_include_once(KERNEL_PATH.'/application.php');
-k4_include_once(MODULES_PATH.'/kernel/units/general/my_application.php');
-
-if( file_exists(FULL_PATH.'/debug.php') )
-{
-	k4_include_once(FULL_PATH.'/debug.php');
-	if( defined('DEBUG_MODE') && DEBUG_MODE ) include_once(KERNEL_PATH.'/utility/debugger.php');
-}
-
-k4_include_once(KERNEL_PATH.'/db/db_connection.php');
-
-safeDefine('IMAGES_PATH', '/kernel/images/');
-safeDefine('IMAGES_PENDING_PATH', IMAGES_PATH.'pending/');
-safeDefine('CUSTOM_UPLOAD_PATH', '/templates/images/custom/');
-safeDefine('MAX_UPLOAD_SIZE', min(ini_get('upload_max_filesize'), ini_get('post_max_size'))*1024*1024);
-
-if( ini_get('safe_mode') ) define('SAFE_MODE', 1);
-
-safeDefine('CACHE_CONFIGS_FILES', 1);
-safeDefine('EXPERIMENTAL_PRE_PARSE', 1);
-safeDefine('SILENT_LOG', 0);
-
-k4_include_once(KERNEL_PATH."/kbase.php");
-k4_include_once(KERNEL_PATH.'/utility/event.php');
-k4_include_once(KERNEL_PATH."/utility/factory.php");
-k4_include_once(KERNEL_PATH."/languages/phrases_cache.php");
-
-// We should get rid of these includes:
-k4_include_once(KERNEL_PATH."/db/dblist.php");
-k4_include_once(KERNEL_PATH."/db/dbitem.php");
-
-k4_include_once(KERNEL_PATH.'/processors/tag_processor.php');
-k4_include_once(KERNEL_PATH."/db/db_tag_processor.php");
-
-k4_include_once(KERNEL_PATH."/event_handler.php");
-k4_include_once(KERNEL_PATH.'/db/db_event_handler.php');
-k4_include_once(MODULES_PATH.'/kernel/units/general/inp_db_event_handler.php');
-
-k4_include_once(KERNEL_PATH."/utility/temp_handler.php"); // needed because of static calls from kBase
-// up to here
-
-// global constants
-define('HAVING_FILTER', 1);
-define('WHERE_FILTER', 2);
-
-define('FLT_TYPE_AND',	'AND');
-define('FLT_TYPE_OR',	'OR');
-
-safeDefine('STATUS_DISABLED', 0);
-safeDefine('STATUS_ACTIVE', 1);
-safeDefine('STATUS_PENDING', 2);
-
 ?>
\ No newline at end of file