Index: branches/5.2.x/core/kernel/startup.php
===================================================================
diff -u -N -r13840 -r14092
--- branches/5.2.x/core/kernel/startup.php	(.../startup.php)	(revision 13840)
+++ branches/5.2.x/core/kernel/startup.php	(.../startup.php)	(revision 14092)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: startup.php 13702 2010-06-09 14:51:13Z alex $
+* @version	$Id: startup.php 14092 2010-11-26 22:43:15Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -34,6 +34,9 @@
 	$admin_directory = isset($vars['AdminDirectory']) ? $vars['AdminDirectory'] : '/admin';
 	define('ADMIN_DIRECTORY', $admin_directory);
 
+	$admin_Presets_directory = isset($vars['AdminPresetsDirectory']) ? $vars['AdminPresetsDirectory'] : ADMIN_DIRECTORY;
+	define('ADMIN_PRESETS_DIRECTORY', $admin_Presets_directory);
+
 	# New path detection method: begin
 	if (defined('REL_PATH')) {
 		// location of index.php relatively to site base folder
@@ -49,7 +52,15 @@
 	safeDefine('BASE_PATH', $ps); // in case in-portal has defined it before
 	# New path detection method: end
 
-	safeDefine('SERVER_NAME', $_SERVER['HTTP_HOST'] ? $_SERVER['HTTP_HOST'] : $vars['Domain']);
+	if ( array_key_exists('HTTP_HOST', $_SERVER) ) {
+		// accessed from browser
+		define('SERVER_NAME', $_SERVER['HTTP_HOST']);
+	}
+	else {
+		// accessed from command line
+		define('SERVER_NAME', $vars['Domain']);
+		$_SERVER['HTTP_HOST'] = $vars['Domain'];
+	}
 
 	$https_mark = getArrayValue($_SERVER, 'HTTPS');
 	safeDefine('PROTOCOL', ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://');