Index: branches/RC/admin/install_over_kx.php
===================================================================
diff -u -r8929 -r9389
--- branches/RC/admin/install_over_kx.php	(.../install_over_kx.php)	(revision 8929)
+++ branches/RC/admin/install_over_kx.php	(.../install_over_kx.php)	(revision 9389)
@@ -1,30 +1,31 @@
 <?php
+//	die('aa');
 	// new startup: begin
 	define('REL_PATH', 'admin');
 	$relation_level = count( explode('/', REL_PATH) );
 	define('FULL_PATH', realpath(dirname(__FILE__) . str_repeat('/..', $relation_level) ) );
-	
+
 	if (!defined('IS_INSTALL')) define('IS_INSTALL', 1);
 	require_once FULL_PATH.'/kernel/startup.php';
 	// new startup: end
 
 	$application =& kApplication::Instance();
 	$application->Init();
 
-	require_once FULL_PATH.'/admin/install/install_lib.php';
+	require_once FULL_PATH.ADMIN_DIRECTORY.'/install/install_lib.php';
 
 	echo '<strong>In-Portal Installation</strong><br />';
-	
+
 	echo '1. Importing Database<br />';
-  	RunSchemaFile($application->Conn, FULL_PATH.'/admin/install/inportal_schema.sql', 'dbconnection');
-  	RunSQLFile($application->Conn, FULL_PATH.'/admin/install/inportal_data.sql', 'dbconnection');
-  	
+  	RunSchemaFile($application->Conn, FULL_PATH.ADMIN_DIRECTORY.'/install/inportal_schema.sql', 'dbconnection');
+  	RunSQLFile($application->Conn, FULL_PATH.ADMIN_DIRECTORY.'/install/inportal_data.sql', 'dbconnection');
+
 	echo '2. Writing config.php<br />';
   	if (!(isset($ini_file) && $ini_file)) {
 		$ini_file = FULL_PATH.'/config.php';
 		$ini_vars = inst_parse_portal_ini($ini_file, true);
 	}
-		
+
   	$sql = 'SELECT Version FROM '.TABLE_PREFIX.'Modules WHERE Name = '.$application->Conn->qstr('In-Portal');
 	$mod_version = $application->Conn->GetOne($sql);
 
@@ -34,17 +35,17 @@
   	echo '3. Removing Config Cache<br />';
   	$sql = 'DELETE FROM '.TABLE_PREFIX.'Cache WHERE (VarName = "config_files") OR (VarName LIKE "%_parsed")';
 	$application->Conn->Query($sql);
-	
+
 	echo '4. Importing Language Pack<br />';
 	$lang_xml =& $application->recallObjectP('LangXML', null, Array(), false); // false - don't use temp tables
 	/* @var $lang_xml LangXML_Parser */
-	
-	$lang_xml->Parse(FULL_PATH.'/admin/install/langpacks/english.lang', '|0|1|2|', '');
-	
+
+	$lang_xml->Parse(FULL_PATH.ADMIN_DIRECTORY.'/install/langpacks/english.lang', '|0|1|2|', '');
+
 	echo '5. Verifying License Status<br />';
 	$modules_helper =& $application->recallObject('ModulesHelper');
 	/* @var $modules_helper kModulesHelper */
-	
+
 	$modules = $modules_helper->checkLogin();
 	if (in_array('In-Portal', $modules)) {
 		// in-portal is licensed
@@ -53,6 +54,6 @@
 	else {
 		echo '<a href="install.php?install_type=5&state=license&next_step=2">Please Update Your License</a><br />';
 	}
-	
+
 	echo '<strong>Done</strong><br />';
 ?>
\ No newline at end of file