Index: trunk/core/kernel/startup.php
===================================================================
diff -u -r932 -r1339
--- trunk/core/kernel/startup.php	(.../startup.php)	(revision 932)
+++ trunk/core/kernel/startup.php	(.../startup.php)	(revision 1339)
@@ -1,50 +1,91 @@
 <?php
 
+define('KERNEL_PATH', FULL_PATH.'/kernel/kernel4');
+
+if (defined('ADMIN') && ADMIN) {
+	define('SPECIAL_TEMPLATES_FOLDER', '/kernel/admin_templates');
+}
+
+define('INPORTAL_ENV', 1);
+
+define('DOC_ROOT', rtrim($_SERVER['DOCUMENT_ROOT'], '/'));
+
+include_once(KERNEL_PATH.'/globals.php');	// non OOP functions used through kernel, e.g. print_pre
+
+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');
+}
+
+$vars = parse_portal_ini(FULL_PATH.'/config.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']);
+
 ini_set('memory_limit', '50M');
 
 safeDefine('INPORTAL_TAGS', true);
 
-define('DOC_ROOT', rtrim($_SERVER['DOCUMENT_ROOT'], '/'));
-define('BASE_PATH', $base_path = ereg_replace('/admin', '', ereg_replace(DOC_ROOT, '', FULL_PATH)));
+$reg = '/'.preg_quote (DOC_ROOT, '/').'/i';
+define('BASE_PATH', $base_path = ereg_replace('/admin', '', preg_replace($reg, '', str_replace('\\', '/', FULL_PATH))));
 
 safeDefine( 'SERVER_NAME', $_SERVER['SERVER_NAME']);
-define( 'KERNEL_PATH', DOC_ROOT.BASE_PATH.'/kernel4');
+safeDefine( 'KERNEL_PATH', DOC_ROOT.BASE_PATH.'/kernel4');
 safeDefine( 'PROTOCOL', 'http://');
-define( 'MODULES_PATH', DOC_ROOT.BASE_PATH.'/modules');
-define( 'THEMES_PATH', ereg_replace(DOC_ROOT.BASE_PATH,'',FULL_PATH). ( defined('ADMIN') ? '/templates' : '/templates'));
 
-safeDefine('ENV_VAR_NAME','kenv');
-
-if( file_exists(FULL_PATH.'/debug.php') )
-{ 
-	include_once(FULL_PATH.'/debug.php');
-	if( defined('DEBUG_MODE')&&DEBUG_MODE )
-	{
-		// if debugging with ZDE, then don't override standart error handler
-		if( isset($_REQUEST['debug_host']) ) define('DBG_HANDLE_ERRORS',0);
-		include_once(KERNEL_PATH.'/utility/debugger.php');
-	}
+define( 'MODULES_PATH', DOC_ROOT.BASE_PATH);
+if ( defined('SPECIAL_TEMPLATES_FOLDER') ) {
+	safeDefine( 'THEMES_PATH', preg_replace('/'.preg_quote(DOC_ROOT.BASE_PATH, '/').'/i','',str_replace('\\', '/', FULL_PATH)). SPECIAL_TEMPLATES_FOLDER );
 }
+else {
+	safeDefine( 'THEMES_PATH', preg_replace('/'.preg_quote(DOC_ROOT.BASE_PATH, '/').'/i','',str_replace('\\', '/', FULL_PATH)). ( defined('ADMIN') ? '/admin/templates' : '/themes/default'));
+}
 
-include_once(KERNEL_PATH.'/db/db_connection.php');
+safeDefine('ENV_VAR_NAME','env');
 
+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', 500000);
 
-include_once(KERNEL_PATH."/application.php");
-include_once(MODULES_PATH."/general/my_application.php");
+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(KERNEL_PATH."/utility/temp_handler.php"); // needed because of static calls from kBase
+// up to here
+
+k4_include_once(KERNEL_PATH.'/application.php');
+k4_include_once(MODULES_PATH.'/in-commerce/units/general/my_application.php');
+
 safeDefine('LOGIN_CONTROLLER', 'LoginController');
 safeDefine('USER_MODEL', 'User');
 
-function print_pre($data, $label='')
-{
-	echo '<b>',$label,'</b><br><pre>',print_r($data,true),'</pre>';
-	//echo var_dump($data);
-}
 
-function safeDefine($const_name, $const_value)
-{
-	if(!defined($const_name)) define($const_name,$const_value);
-}
+// global constants
+define('HAVING_FILTER', 1);
+define('WHERE_FILTER', 2);
 
+define('FLT_TYPE_AND',	'AND');
+define('FLT_TYPE_OR',	'OR');
+
 ?>
\ No newline at end of file