Index: branches/5.2.x/core/kernel/startup.php
===================================================================
diff -u -N -r14560 -r14585
--- branches/5.2.x/core/kernel/startup.php	(.../startup.php)	(revision 14560)
+++ branches/5.2.x/core/kernel/startup.php	(.../startup.php)	(revision 14585)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: startup.php 14560 2011-09-19 21:01:58Z alex $
+* @version	$Id: startup.php 14585 2011-09-24 12:04:17Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -44,26 +44,32 @@
 	define('BASE_PATH', $ps);
 	# New path detection method: end
 
+	$https_mark = getArrayValue($_SERVER, 'HTTPS');
+	safeDefine('PROTOCOL', ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://');
+
 	if ( isset($_SERVER['HTTP_HOST']) ) {
 		// accessed from browser
-		define('SERVER_NAME', $_SERVER['HTTP_HOST']);
+		$http_host = $_SERVER['HTTP_HOST'];
 	}
 	else {
 		// accessed from command line
-		define('SERVER_NAME', $vars['Domain']);
+		$http_host = $vars['Domain'];
 		$_SERVER['HTTP_HOST'] = $vars['Domain'];
 	}
 
-	$https_mark = getArrayValue($_SERVER, 'HTTPS');
-	define('PROTOCOL', ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://');
+	$port = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : false;
 
-	$port = array_key_exists('HTTP_PORT', $_SERVER) ? $_SERVER['HTTP_PORT'] : false;
-
-	if ($port && ((PROTOCOL == 'http://' && $port != '80') || (PROTOCOL == 'https://' && $port != '443'))) {
+	if ($port) {
+		if ( (PROTOCOL == 'http://' && $port != '80') || (PROTOCOL == 'https://' && $port != '443') ) {
 		// if non-standard port is used, then define it
-        define('PORT', $_SERVER['HTTP_PORT']);
+        	define('PORT', $port);
+		}
+
+		$http_host = preg_replace('/:' . $port . '$/', '', $http_host);
     }
 
+	define('SERVER_NAME', $http_host);
+
 	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/>';
@@ -80,6 +86,10 @@
 		define('WRITEBALE_BASE', $vars['WriteablePath']);
 	}
 
+	if ( isset($vars['RestrictedPath']) ) {
+		define('RESTRICTED', FULL_PATH . $vars['RestrictedPath']);
+	}
+
 	define('SQL_TYPE', $vars['DBType']);
 	define('SQL_SERVER', $vars['DBHost']);
 	define('SQL_USER', $vars['DBUser']);