Index: branches/5.3.x/core/kernel/utility/http_query.php
===================================================================
diff -u -N -r15974 -r15999
--- branches/5.3.x/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 15974)
+++ branches/5.3.x/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: http_query.php 15974 2013-10-03 12:12:52Z alex $
+* @version	$Id: http_query.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -439,25 +439,13 @@
 		$site_helper = $this->Application->recallObject('SiteHelper');
 		/* @var $site_helper SiteHelper */
 
-		$found = false;
-		$http_referer = $_SERVER['HTTP_REFERER'];
-		preg_match('/^(.*?):\/\/(.*?)(\/|$)/', $http_referer, $regs); // 1 - protocol, 2 - domain
+		$parsed_url = parse_url($_SERVER['HTTP_REFERER']);
 
-		if ($regs[1] == 'https') {
-			$found = $site_helper->getDomainByName('SSLUrl', $http_referer) > 0;
-
-			if (!$found) {
-				// check if referer starts with our ssl url
-				$ssl_url = $this->Application->ConfigValue('SSL_URL');
-				$found = $ssl_url && preg_match('/^' . preg_quote($ssl_url, '/') . '/', $http_referer);
-			}
+		if ( $parsed_url['scheme'] == 'https' ) {
+			$found = $site_helper->compare($parsed_url['host'], 'SSLDomainName', $this->Application->ConfigValue('SSLDomain'));
 		}
 		else {
-			$found = $site_helper->getDomainByName('DomainName', $regs[2]) > 0;
-
-			if (!$found) {
-				$found = $regs[2] == DOMAIN;
-			}
+			$found = $site_helper->compare($parsed_url['host'], 'DomainName', DOMAIN);
 		}
 
 		return $found;
@@ -770,4 +758,4 @@
 		return $headers;
 	}
 
-}
+}
\ No newline at end of file
Index: branches/5.3.x/core/units/helpers/skin_helper.php
===================================================================
diff -u -N -r15928 -r15999
--- branches/5.3.x/core/units/helpers/skin_helper.php	(.../skin_helper.php)	(revision 15928)
+++ branches/5.3.x/core/units/helpers/skin_helper.php	(.../skin_helper.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: skin_helper.php 15928 2013-07-30 10:03:45Z alex $
+* @version	$Id: skin_helper.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -170,7 +170,9 @@
 		protected function _getStylesheetPath($url = false)
 		{
 			if ($url) {
-				return $this->Application->BaseURL( str_replace(DIRECTORY_SEPARATOR, '/', WRITEBALE_BASE) ) . 'user_files';
+				$sub_folder = str_replace(DIRECTORY_SEPARATOR, '/', WRITEBALE_BASE) . '/user_files';
+
+				return $this->Application->BaseURL() . ltrim($sub_folder, '/');
 			}
 
 			return WRITEABLE . DIRECTORY_SEPARATOR . 'user_files';
Index: branches/5.3.x/core/kernel/managers/url_manager.php
===================================================================
diff -u -N -r15974 -r15999
--- branches/5.3.x/core/kernel/managers/url_manager.php	(.../url_manager.php)	(revision 15974)
+++ branches/5.3.x/core/kernel/managers/url_manager.php	(.../url_manager.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: url_manager.php 15974 2013-10-03 12:12:52Z alex $
+* @version	$Id: url_manager.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -135,7 +135,7 @@
 			$session = $this->Application->recallObject('Session');
 			/* @var $session Session */
 
-			$target_url = rtrim($this->Application->BaseURL('', $ssl, false), '/');
+			$target_url = rtrim($this->Application->BaseURL('', $ssl), '/');
 			$cookie_url = trim($session->CookieDomain . $session->CookiePath, '/.');
 
 			// set session to GET_ONLY, to pass sid only if sid is REAL AND session is set
@@ -190,6 +190,12 @@
 			unset($params['__NO_SID__']);
 		}
 
+		$domain = '';
+		if ( isset($params['domain']) ) {
+			$domain = $params['domain'];
+			unset($params['domain']);
+		}
+
 		// append pass through variables to each link to be build
 		$params = array_merge($this->getPassThroughVariables($params), $params);
 
@@ -213,7 +219,11 @@
 			$url = $index_file . '?' . $this->plain->build($t, $params, $pass, $pass_events);
 		}
 
-		return $this->Application->BaseURL($prefix, $ssl) . $url . $map_link;
+		if ( $prefix ) {
+			$prefix = trim($prefix, '/') . '/';
+		}
+
+		return $this->Application->BaseURL($domain, $ssl) . $prefix . $url . $map_link;
 	}
 
 	/**
@@ -235,8 +245,13 @@
 
 		$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : null;
 		list($index_file, $env) = explode('|', $opener_stack->get(kOpenerStack::LAST_ELEMENT, true));
-		$ret = $this->Application->BaseURL($prefix, $ssl) . $index_file . '?' . ENV_VAR_NAME . '=' . $env;
 
+		if ( $prefix ) {
+			$prefix = trim($prefix, '/') . '/';
+		}
+
+		$ret = $this->Application->BaseURL('', $ssl) . $prefix . $index_file . '?' . ENV_VAR_NAME . '=' . $env;
+
 		if ( isset($params['m_opener']) && $params['m_opener'] == 'u' ) {
 			$opener_stack->pop();
 			$opener_stack->save(true);
Index: branches/5.3.x/core/units/helpers/file_helper.php
===================================================================
diff -u -N -r15902 -r15999
--- branches/5.3.x/core/units/helpers/file_helper.php	(.../file_helper.php)	(revision 15902)
+++ branches/5.3.x/core/units/helpers/file_helper.php	(.../file_helper.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: file_helper.php 15902 2013-07-12 15:37:15Z alex $
+* @version	$Id: file_helper.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -379,30 +379,33 @@
 		/**
 		 * Transforms given path to file into it's url, where each each component is encoded (excluding domain and protocol)
 		 *
-		 * @param string $url
+		 * @param string      $path   Path to file.
+		 * @param string|null $domain Alternative domain to use in url.
+		 *
 		 * @return string
 		 * @access public
 		 */
-		public function pathToUrl($url)
+		public function pathToUrl($path, $domain = null)
 		{
-			$url = str_replace(DIRECTORY_SEPARATOR, '/', preg_replace('/^' . preg_quote(FULL_PATH, '/') . '(.*)/', '\\1', $url, 1));
+			$path = str_replace(DIRECTORY_SEPARATOR, '/', preg_replace('/^' . preg_quote(FULL_PATH, '/') . '(.*)/', '\\1', $path, 1));
 
 			// TODO: why?
-			$url = implode('/', array_map('rawurlencode', explode('/', $url)));
+			$path = implode('/', array_map('rawurlencode', explode('/', $path)));
 
-			return rtrim($this->Application->BaseURL(), '/') . $url;
+			return rtrim($this->Application->BaseURL($domain), '/') . $path;
 		}
 
 		/**
 		 * Transforms given url to path to it
 		 *
-		 * @param string $url
+		 * @param string      $url    Url.
+		 * @param string|null $domain Alternative domain to use in url.
+		 *
 		 * @return string
-		 * @access public
 		 */
-		public function urlToPath($url)
+		public function urlToPath($url, $domain = null)
 		{
-			$base_url = rtrim($this->Application->BaseURL(), '/');
+			$base_url = rtrim($this->Application->BaseURL($domain), '/');
 
 			// escape replacement patterns, like "\<number>"
 			$full_path = preg_replace('/(\\\[\d]+)/', '\\\\\1', FULL_PATH);
Index: branches/5.3.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r15974 -r15999
--- branches/5.3.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 15974)
+++ branches/5.3.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: main_processor.php 15974 2013-10-03 12:12:52Z alex $
+* @version	$Id: main_processor.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -960,8 +960,8 @@
 	}
 
 	/**
-	 * Checks if SSL is on and redirects to SSL URL if needed
-	 * If SSL_URL is not defined in config - the tag does not do anything
+	 * Checks if SSL is enabled and redirects to SSL Domain if needed
+	 * If SSLDomain is not defined in config - the tag does not do anything
 	 * If for_logged_in_only="1" exits if user is not logged in.
 	 * If called without params forces https right away. If called with by_config="1" checks the
 	 * Require SSL setting from General Config and if it is ON forces https
@@ -970,15 +970,9 @@
 	 */
 	protected function CheckSSL($params)
 	{
-		$ssl = $this->Application->isAdmin ? $this->Application->ConfigValue('AdminSSL_URL') : false;
+		$ssl_domain = $this->Application->getSecureDomain();
 
-		if ( !$ssl ) {
-			// not in admin or admin ssl url is empty
-			$ssl_url = $this->Application->siteDomainField('SSLUrl');
-			$ssl = $ssl_url !== false ? $ssl_url : $this->Application->ConfigValue('SSL_URL');
-		}
-
-		if ( !$ssl || ($this->Application->TemplatesCache->forceThemeName !== false) ) {
+		if ( !$ssl_domain || ($this->Application->TemplatesCache->forceThemeName !== false) ) {
 			// SSL URL is not set - no way to require SSL
 			// internal parsing (e.g. "TemplateParser::_parseTemplate") -> don't redirect
 			return;
Index: branches/5.3.x/core/units/helpers/fck_helper.php
===================================================================
diff -u -N -r15974 -r15999
--- branches/5.3.x/core/units/helpers/fck_helper.php	(.../fck_helper.php)	(revision 15974)
+++ branches/5.3.x/core/units/helpers/fck_helper.php	(.../fck_helper.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: fck_helper.php 15974 2013-10-03 12:12:52Z alex $
+* @version	$Id: fck_helper.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -476,7 +476,7 @@
 
 		$editor->config = Array (
 			'toolbar' => $toolbar,
-			'baseHref' => $this->Application->BaseURL( rtrim(EDITOR_PATH, '/') ),
+			'baseHref' => $this->Application->BaseURL() . trim(EDITOR_PATH, '/') . '/',
 			'customConfig' => $this->getJavaScriptConfig(),
 			'stylesSet' => 'portal:' . $styles_js,
 			'contentsCss' => $styles_css,
@@ -523,18 +523,18 @@
 	 */
 	protected function getStyles()
 	{
-		$theme_path = $this->Application->GetFrontThemePath() . '/inc';
+		$theme_path = ltrim($this->Application->GetFrontThemePath(), '/') . '/inc';
 
-		if ( file_exists(FULL_PATH . $theme_path . '/style.css') ) {
+		if ( file_exists(FULL_PATH . '/' . $theme_path . '/style.css') ) {
 			$url_params = Array ('events[fck]' => 'OnGetsEditorStyles', 'no_pass_through' => 1, 'pass' => 'm');
 			$styles_css = $this->Application->HREF('index', '_FRONT_END_', $url_params, 'index.php');
 		}
 		else {
-			$theme_path = rtrim(EDITOR_PATH, '/');
-			$styles_css = $this->Application->BaseURL($theme_path) . 'style.css';
+			$theme_path = trim(EDITOR_PATH, '/');
+			$styles_css = $this->Application->BaseURL() . $theme_path . '/style.css';
 		}
 
-		$styles_js = $this->Application->BaseURL($theme_path) . 'styles.js';
+		$styles_js = $this->Application->BaseURL() . $theme_path . '/styles.js';
 
 		return array($styles_css, $styles_js);
 	}
Index: branches/5.3.x/core/install/upgrades.php
===================================================================
diff -u -N -r15956 -r15999
--- branches/5.3.x/core/install/upgrades.php	(.../upgrades.php)	(revision 15956)
+++ branches/5.3.x/core/install/upgrades.php	(.../upgrades.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 15956 2013-08-27 11:07:26Z alex $
+* @version	$Id: upgrades.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2383,6 +2383,8 @@
 				}
 
 				$this->updateDeploymentLog();
+				$this->migrateSSLSettings();
+				$this->migrateSSLSiteDomains();
 			}
 		}
 
@@ -2444,4 +2446,56 @@
 			$sql = 'ALTER TABLE ' . $table_name . ' DROP AppliedDBRevisions';
 			$this->Conn->Query($sql);
 		}
+
+		/**
+		 * Migrates SSL settings to new format.
+		 *
+		 * @return void
+		 */
+		protected function migrateSSLSettings()
+		{
+			$mapping = array(
+				'SSL_URL' => 'SSLDomain',
+				'AdminSSL_URL' => 'AdminSSLDomain',
+			);
+
+			foreach ( $mapping as $old_setting => $new_setting ) {
+				$old_value = $this->Application->ConfigValue($old_setting);
+
+				if ( $old_value ) {
+					$this->Application->SetConfigValue($new_setting, parse_url($old_value, PHP_URL_HOST));
+				}
+
+				$sql = 'DELETE FROM ' . $this->Application->getUnitConfig('conf')->getTableName() . '
+						WHERE VariableName = ' . $this->Conn->qstr($old_setting);
+				$this->Conn->Query($sql);
+			}
+		}
+
+		/**
+		 * Migrates SSL site domains.
+		 *
+		 * @return void
+		 */
+		protected function migrateSSLSiteDomains()
+		{
+			/** @var kDBItem $object */
+			$object = $this->Application->recallObject('site-domain.migrate', null, array('skip_autoload' => true));
+
+			$sql = 'SELECT *
+					FROM ' . $this->Application->getUnitConfig('site-domain')->getTableName() . '
+					WHERE SSLDomainName <> ""';
+			$site_domains = $this->Conn->Query($sql);
+
+			foreach ( $site_domains as $site_domain ) {
+				if ( strpos($site_domain['SSLDomainName'], '//') === false ) {
+					continue;
+				}
+
+				// use object to reset domain cache as well
+				$object->LoadFromHash($site_domain);
+				$object->SetDBField('SSLDomainName', parse_url($site_domain['SSLDomainName'], PHP_URL_HOST));
+				$object->Update();
+			}
+		}
 	}
\ No newline at end of file
Index: branches/5.3.x/core/install/step_templates/security.tpl
===================================================================
diff -u -N -r15962 -r15999
--- branches/5.3.x/core/install/step_templates/security.tpl	(.../security.tpl)	(revision 15962)
+++ branches/5.3.x/core/install/step_templates/security.tpl	(.../security.tpl)	(revision 15999)
@@ -48,7 +48,7 @@
 	$curl_helper = $this->Application->recallObject('CurlHelper');
 	/* @var $curl_helper kCurlHelper */
 
-	$result = $curl_helper->Send($this->Application->BaseURL(WRITEBALE_BASE) . 'install_check.php');
+	$result = $curl_helper->Send($this->Application->BaseURL() . ltrim(WRITEBALE_BASE, '/') . '/install_check.php');
 	unlink(WRITEABLE . '/install_check.php');
 	$execute_check = ($result !== 'OK');
 
Index: branches/5.3.x/core/install/install_schema.sql
===================================================================
diff -u -N -r15986 -r15999
--- branches/5.3.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 15986)
+++ branches/5.3.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 15999)
@@ -1346,8 +1346,8 @@
   DomainId int(11) NOT NULL AUTO_INCREMENT,
   DomainName varchar(255) NOT NULL DEFAULT '',
   DomainNameUsesRegExp tinyint(4) NOT NULL DEFAULT '0',
-  SSLUrl varchar(255) NOT NULL DEFAULT '',
-  SSLUrlUsesRegExp tinyint(4) NOT NULL DEFAULT '0',
+  SSLDomainName varchar(255) NOT NULL DEFAULT '',
+  SSLDomainNameUsesRegExp tinyint(4) NOT NULL DEFAULT '0',
   AdminEmail varchar(255) NOT NULL DEFAULT '',
   DefaultEmailRecipients text,
   Country varchar(3) NOT NULL DEFAULT '',
@@ -1362,8 +1362,8 @@
   PRIMARY KEY (DomainId),
   KEY DomainName (DomainName),
   KEY DomainNameUsesRegExp (DomainNameUsesRegExp),
-  KEY SSLUrl (SSLUrl),
-  KEY SSLUrlUsesRegExp (SSLUrlUsesRegExp),
+  KEY SSLDomainName (SSLDomainName),
+  KEY SSLDomainNameUsesRegExp (SSLDomainNameUsesRegExp),
   KEY AdminEmail (AdminEmail),
   KEY Country (Country),
   KEY PrimaryLanguageId (PrimaryLanguageId),
Index: branches/5.3.x/core/units/site_domains/site_domains_config.php
===================================================================
diff -u -N -r15659 -r15999
--- branches/5.3.x/core/units/site_domains/site_domains_config.php	(.../site_domains_config.php)	(revision 15659)
+++ branches/5.3.x/core/units/site_domains/site_domains_config.php	(.../site_domains_config.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: site_domains_config.php 15659 2013-01-02 17:25:37Z alex $
+* @version	$Id: site_domains_config.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -92,8 +92,8 @@
 			'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
 			'not_null' => 1, 'default' => 0
 		),
-		'SSLUrl' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
-		'SSLUrlUsesRegExp' => Array (
+		'SSLDomainName' => Array ('type' => 'string', 'max_len' => 255, 'not_null' => 1, 'default' => ''),
+		'SSLDomainNameUsesRegExp' => Array (
 			'type' => 'int',
 			'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
 			'not_null' => 1, 'default' => 0
@@ -146,7 +146,7 @@
 			'Fields' => Array (
 				'DomainId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ),
 				'DomainName' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
-				'SSLUrl' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
+				'SSLDomainName' => Array ('filter_block' => 'grid_like_filter', 'width' => 250, ),
 				'Country' => Array ('filter_block' => 'grid_options_filter', 'width' => 250, ),
 				'PrimaryLanguageId' => Array ('title' => 'column:la_fld_Language', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
 				'PrimaryThemeId' => Array ('title' => 'column:la_fld_Theme', 'filter_block' => 'grid_options_filter', 'width' => 250, ),
Index: branches/5.3.x/core/install/english.lang
===================================================================
diff -u -N -r15963 -r15999
--- branches/5.3.x/core/install/english.lang	(.../english.lang)	(revision 15963)
+++ branches/5.3.x/core/install/english.lang	(.../english.lang)	(revision 15999)
@@ -144,7 +144,7 @@
 			<PHRASE Label="la_common_ascending" Module="Core" Type="1">QXNjZW5kaW5n</PHRASE>
 			<PHRASE Label="la_common_descending" Module="Core" Type="1">RGVzY2VuZGluZw==</PHRASE>
 			<PHRASE Label="la_config_AdminConsoleInterface" Module="Core" Type="1">QWRtaW4gQ29uc29sZSBJbnRlcmZhY2U=</PHRASE>
-			<PHRASE Label="la_config_AdminSSL_URL" Module="Core" Type="1">U1NMIEZ1bGwgVVJMIGZvciBBZG1pbmlzdHJhdGl2ZSBDb25zb2xlIChodHRwczovL3d3dy5kb21haW4uY29tL3BhdGgpIA==</PHRASE>
+			<PHRASE Label="la_config_AdminSSLDomain" Module="Core" Type="1">U1NMIERvbWFpbiBmb3IgQWRtaW5pc3RyYXRpdmUgQ29uc29sZSAod3d3LmRvbWFpbi5jb20p</PHRASE>
 			<PHRASE Label="la_config_AllowSelectGroupOnFront" Module="Core" Type="1">QWxsb3cgdG8gc2VsZWN0IG1lbWJlcnNoaXAgZ3JvdXAgb24gRnJvbnQtZW5k</PHRASE>
 			<PHRASE Label="la_config_AutoRefreshIntervals" Module="Core" Type="1">TGlzdCBhdXRvbWF0aWMgcmVmcmVzaCBpbnRlcnZhbHMgKGluIG1pbnV0ZXMp</PHRASE>
 			<PHRASE Label="la_config_backup_path" Module="Core" Type="1">QmFja3VwIFBhdGg=</PHRASE>
@@ -211,7 +211,7 @@
 			<PHRASE Label="la_config_SiteNameSubTitle" Module="Core" Type="1">V2Vic2l0ZSBTdWJ0aXRsZQ==</PHRASE>
 			<PHRASE Label="la_config_site_zone" Module="Core" Type="1">VGltZSB6b25lIG9mIHRoZSBzaXRl</PHRASE>
 			<PHRASE Label="la_config_SoftMaintenanceTemplate" Module="Core" Type="1" Hint="VGhpcyB0ZW1wbGF0ZSB3aWxsIGJlIHNob3duIHRvIHRoZSBGcm9udCBFbmQgdXNlcnMgd2hlbiBTb2Z0IE1haW50ZW5hbmNlIG1vZGUgaXMgYWN0aXZlLg==">VGVtcGxhdGUgZm9yIFNvZnQgTWFpbnRlbmFuY2U=</PHRASE>
-			<PHRASE Label="la_config_ssl_url" Module="Core" Type="1">U1NMIEZ1bGwgVVJMIChodHRwczovL3d3dy5kb21haW4uY29tL3BhdGgp</PHRASE>
+			<PHRASE Label="la_config_SSLDomain" Module="Core" Type="1">U1NMIERvbWFpbiAod3d3LmRvbWFpbi5jb20p</PHRASE>
 			<PHRASE Label="la_config_StickyGridSelection" Module="Core" Type="1">VXNlIFN0aWNreSBHcmlkIFNlbGVjdGlvbg==</PHRASE>
 			<PHRASE Label="la_config_SystemLogNotificationEmail" Module="Core" Type="1" Hint="RW1haWwgYWRkcmVzcyB3aGVyZSBVc2VyLWRlZmluZWQgbWVzc2FnZXMgKG1hbnVhbGx5IHNldHVwIGluIHRoZSBjb2RlKSB3aWxsIGJlIGVtYWlsZWQgdG8uIE5vdGUgdGhhdCBhbGwgZGVmYXVsdCAiU3lzdGVtIExvZyIgbWVzc2FnZXMgKG5vbmUgdXNlci1kZWZpbmVkKSBhcmUgTk9UIGVtYWlsZWQgYnkgZGVmYXVsdC4=">U2VuZCBVc2VyLWRlZmluZWQgIlN5c3RlbSBMb2ciIG1lc3NhZ2VzIHRv</PHRASE>
 			<PHRASE Label="la_config_SystemLogRotationInterval" Module="Core" Type="1" Hint="VGhpcyBzZXR0aW5nIGFsbG93cyB5b3UgdG8gY29udHJvbCBmb3IgaG93IGxvbmcgIlN5c3RlbSBMb2ciIG1lc3NhZ2VzIHdpbGwgYmUgc3RvcmVkIGluIHRoZSBsb2cgYW5kIHRoZW4gYXV0b21hdGljYWxseSBkZWxldGVkLiBVc2Ugb3B0aW9uICJGb3JldmVyIiB3aXRoIGNhdXRpb24gc2luY2UgaXQgd2lsbCBjb21wbGV0ZWx5IGRpc2FibGUgYXV0b21hdGljIGxvZyBjbGVhbnVwIGFuZCBjYW4gbGVhZCB0byBsYXJnZSBzaXplIG9mIGRhdGFiYXNlIHRhYmxlIHRoYXQgc3RvcmVzIGxvZyBtZXNzYWdlcy4=">S2VlcCAiU3lzdGVtIExvZyIgZm9y</PHRASE>
@@ -680,7 +680,7 @@
 			<PHRASE Label="la_fld_SourcePlainTextBody" Module="Core" Type="1" Column="U291cmNlIFRleHQgVmVyc2lvbg==">U291cmNlIFRleHQgVmVyc2lvbiAoZnJvbSAlcyk=</PHRASE>
 			<PHRASE Label="la_fld_SourceSubject" Module="Core" Type="1" Column="U291cmNlIFN1YmplY3Q=">U291cmNlIFN1YmplY3QgKGZyb20gJXMp</PHRASE>
 			<PHRASE Label="la_fld_SourceTranslation" Module="Core" Type="1" Column="U291cmNl">U291cmNlIFBocmFzZSAoZnJvbSAlcyk=</PHRASE>
-			<PHRASE Label="la_fld_SSLUrl" Module="Core" Type="1" Hint="aHR0cHM6Ly93d3cuZG9tYWluLmNvbS9wYXRo" Column="U1NMIFVybA==">U1NMIEZ1bGwgVVJM</PHRASE>
+			<PHRASE Label="la_fld_SSLDomainName" Module="Core" Type="1" Hint="d3d3LmRvbWFpbi5jb20=" Column="U1NMIERvbWFpbiBOYW1l">U1NMIERvbWFpbiBOYW1l</PHRASE>
 			<PHRASE Label="la_fld_StartDate" Module="Core" Type="1" Column="U3RhcnQgRGF0ZQ==">U3RhcnQgRGF0ZQ==</PHRASE>
 			<PHRASE Label="la_fld_State" Module="Core" Type="1" Column="U3RhdGU=">U3RhdGU=</PHRASE>
 			<PHRASE Label="la_fld_StateCountry" Module="Core" Type="1" Column="U3RhdGUgQ291bnRyeQ==">U3RhdGUgQ291bnRyeQ==</PHRASE>
Index: branches/5.3.x/core/admin_templates/site_domains/site_domain_edit.tpl
===================================================================
diff -u -N -r15902 -r15999
--- branches/5.3.x/core/admin_templates/site_domains/site_domain_edit.tpl	(.../site_domain_edit.tpl)	(revision 15902)
+++ branches/5.3.x/core/admin_templates/site_domains/site_domain_edit.tpl	(.../site_domain_edit.tpl)	(revision 15999)
@@ -75,8 +75,8 @@
 	<table class="edit-form">
 		<inp2:m_RenderElement name="subsection" title="la_title_General"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="site-domain" field="DomainId" title="la_fld_Id"/>
-			<inp2:m_RenderElement name="inp_edit_regexp_box" prefix="site-domain" field="DomainName" title="la_fld_DomainName"/>
-			<inp2:m_RenderElement name="inp_edit_regexp_box" prefix="site-domain" field="SSLUrl"/>
+			<inp2:m_RenderElement name="inp_edit_regexp_box" prefix="site-domain" field="DomainName"/>
+			<inp2:m_RenderElement name="inp_edit_regexp_box" prefix="site-domain" field="SSLDomainName"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="site-domain" field="AdminEmail" title="la_fld_AdminEmail"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="site-domain" field="Country" title="la_fld_Country" has_empty="1"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="site-domain" field="PrimaryLanguageId" title="la_fld_Language" has_empty="1"/>
Index: branches/5.3.x/core/install/install_data.sql
===================================================================
diff -u -N -r15976 -r15999
--- branches/5.3.x/core/install/install_data.sql	(.../install_data.sql)	(revision 15976)
+++ branches/5.3.x/core/install/install_data.sql	(.../install_data.sql)	(revision 15999)
@@ -56,8 +56,8 @@
 INSERT INTO SystemSettings VALUES(DEFAULT, 'SessionBrowserSignatureCheck', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSession', 'la_config_SessionBrowserSignatureCheck', 'checkbox', NULL, NULL, 20.04, 0, 1, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'SessionIPAddressCheck', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSession', 'la_config_SessionIPAddressCheck', 'checkbox', NULL, NULL, 20.05, 0, 1, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'UseJSRedirect', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSession', 'la_config_use_js_redirect', 'checkbox', '', '', 20.06, 0, 0, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'SSL_URL', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSSL', 'la_config_ssl_url', 'text', '', '', 30.01, 0, 1, NULL);
-INSERT INTO SystemSettings VALUES(DEFAULT, 'AdminSSL_URL', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSSL', 'la_config_AdminSSL_URL', 'text', '', '', 30.02, 0, 0, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'SSLDomain', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSSL', 'la_config_SSLDomain', 'text', '', '', 30.01, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'AdminSSLDomain', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSSL', 'la_config_AdminSSLDomain', 'text', '', '', 30.02, 0, 0, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'Require_SSL', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSSL', 'la_config_require_ssl', 'checkbox', '', '', 30.03, 0, 1, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'Require_AdminSSL', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSSL', 'la_config_RequireSSLAdmin', 'checkbox', '', '', 30.04, 0, 1, NULL);
 INSERT INTO SystemSettings VALUES(DEFAULT, 'Force_HTTP_When_SSL_Not_Required', '1', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSSL', 'la_config_force_http', 'checkbox', '', '', 30.05, 0, 1, NULL);
Index: branches/5.3.x/core/install.php
===================================================================
diff -u -N -r15962 -r15999
--- branches/5.3.x/core/install.php	(.../install.php)	(revision 15962)
+++ branches/5.3.x/core/install.php	(.../install.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install.php 15962 2013-09-03 15:13:13Z alex $
+* @version	$Id: install.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -476,7 +476,7 @@
 					$curl_helper = $this->Application->recallObject('CurlHelper');
 					/* @var $curl_helper kCurlHelper */
 
-					$output = $curl_helper->Send($this->Application->BaseURL(WRITEBALE_BASE) . 'install_check.php');
+					$output = $curl_helper->Send($this->Application->BaseURL() . ltrim(WRITEBALE_BASE, '/') . '/install_check.php');
 					unlink(WRITEABLE . '/install_check.php');
 					$execute_check = ($output !== 'OK');
 
Index: branches/5.3.x/core/units/helpers/site_helper.php
===================================================================
diff -u -N -r15698 -r15999
--- branches/5.3.x/core/units/helpers/site_helper.php	(.../site_helper.php)	(revision 15698)
+++ branches/5.3.x/core/units/helpers/site_helper.php	(.../site_helper.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: site_helper.php 15698 2013-02-19 11:33:17Z alex $
+* @version	$Id: site_helper.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -106,7 +106,7 @@
 		function getDomainByName($field, $value)
 		{
 			$site_domains = $this->getSiteDomains();
-			$name_fields = Array ('DomainName', 'SSLUrl');
+			$name_fields = Array ('DomainName', 'SSLDomainName');
 
 			foreach ($site_domains as $id => $site_domain) {
 				if ( in_array($field, $name_fields) ) {
@@ -115,7 +115,7 @@
 						$site_domain[$field] = preg_quote($site_domain[$field], '/');
 					}
 
-					if ( $site_domain[$field] && preg_match('/^' . $site_domain[$field] . ($field == 'DomainName' ? '$' : '') . '/', $value) ) {
+					if ( $site_domain[$field] && preg_match('/^' . $site_domain[$field] . '$/', $value) ) {
 						return $id;
 					}
 				}
@@ -144,4 +144,20 @@
 
 			return false;
 		}
+
+		/**
+		 * Compares 2 domains.
+		 *
+		 * @param string $match_domain   Domain to compare with.
+		 * @param string $domain_field   Site domain field to search within.
+		 * @param string $primary_domain Primary domain to use in case if no site domain matches.
+		 *
+		 * @return boolean
+		 */
+		public function compare($match_domain, $domain_field, $primary_domain)
+		{
+			$domain_id = $this->getDomainByName($domain_field, $match_domain);
+
+			return $domain_id > 0 ? true : ($match_domain == $primary_domain);
+		}
 	}
Index: branches/5.3.x/core/kernel/application.php
===================================================================
diff -u -N -r15980 -r15999
--- branches/5.3.x/core/kernel/application.php	(.../application.php)	(revision 15980)
+++ branches/5.3.x/core/kernel/application.php	(.../application.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 15980 2013-10-03 14:36:35Z alex $
+* @version	$Id: application.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1811,39 +1811,52 @@
 	/**
 	 * Returns base part of all urls, build on website
 	 *
-	 * @param string $prefix
-	 * @param bool $ssl
-	 * @param bool $add_port
+	 * @param string  $domain       Domain override.
+	 * @param boolean $ssl_redirect Redirect to/from SSL.
+	 *
 	 * @return string
-	 * @access public
 	 */
-	public function BaseURL($prefix = '', $ssl = null, $add_port = true)
+	public function BaseURL($domain = '', $ssl_redirect = null)
 	{
-		if ( $ssl === null ) {
+		if ( $ssl_redirect === null ) {
 			// stay on same encryption level
-			return PROTOCOL . SERVER_NAME . ($add_port && defined('PORT') ? ':' . PORT : '') . BASE_PATH . $prefix . '/';
+			return PROTOCOL . ($domain ? $domain : SERVER_NAME) . (defined('PORT') ? ':' . PORT : '') . BASE_PATH . '/';
 		}
 
-		if ( $ssl ) {
+		if ( $ssl_redirect ) {
 			// going from http:// to https://
-			$base_url = $this->isAdmin ? $this->ConfigValue('AdminSSL_URL') : false;
+			$protocol = 'https://';
+			$domain = $this->getSecureDomain();
+		}
+		else {
+			// going from https:// to http://
+			$protocol = 'http://';
+			$domain = $this->siteDomainField('DomainName');
 
-			if ( !$base_url ) {
-				$ssl_url = $this->siteDomainField('SSLUrl');
-				$base_url = $ssl_url !== false ? $ssl_url : $this->ConfigValue('SSL_URL');
+			if ( $domain === false ) {
+				$domain = DOMAIN; // not on site domain
 			}
-
-			return rtrim($base_url, '/') . $prefix . '/';
 		}
 
-		// going from https:// to http://
-		$domain = $this->siteDomainField('DomainName');
+		return $protocol . $domain . (defined('PORT') ? ':' . PORT : '') . BASE_PATH . '/';
+	}
 
-		if ( $domain === false ) {
-			$domain = DOMAIN;
+	/**
+	 * Returns secure domain.
+	 *
+	 * @return string
+	 */
+	public function getSecureDomain()
+	{
+		$ret = $this->isAdmin ? $this->ConfigValue('AdminSSLDomain') : false;
+
+		if ( !$ret ) {
+			$ssl_domain = $this->siteDomainField('SSLDomainName');
+
+			return strlen($ssl_domain) ? $ssl_domain : $this->ConfigValue('SSLDomain');
 		}
 
-		return 'http://' . $domain . ($add_port && defined('PORT') ? ':' . PORT : '') . BASE_PATH . $prefix . '/';
+		return $ret;
 	}
 
 	/**
@@ -3044,4 +3057,4 @@
 	{
 		return $this->HttpQuery->getClientIp();
 	}
-}
+}
\ No newline at end of file
Index: branches/5.3.x/core/units/site_domains/site_domain_eh.php
===================================================================
diff -u -N -r15902 -r15999
--- branches/5.3.x/core/units/site_domains/site_domain_eh.php	(.../site_domain_eh.php)	(revision 15902)
+++ branches/5.3.x/core/units/site_domains/site_domain_eh.php	(.../site_domain_eh.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: site_domain_eh.php 15902 2013-07-12 15:37:15Z alex $
+* @version	$Id: site_domain_eh.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -48,11 +48,9 @@
 					$event->setEventParam('raise_warnings', 0);
 				}
 				else {
-					if ( PROTOCOL == 'https://' ) {
-						return $this->querySiteDomain('SSLUrl', rtrim($this->Application->BaseURL(), '/'));
-					}
+					$domain_field = PROTOCOL == 'https://' ? 'SSLDomainName' : 'DomainName';
 
-					return $this->querySiteDomain('DomainName', $_SERVER['HTTP_HOST']);
+					return $this->querySiteDomain($domain_field, $_SERVER['HTTP_HOST']);
 				}
 			}
 
@@ -85,10 +83,8 @@
 				}
 				elseif (($redirect_mode == SITE_DOMAIN_REDIRECT_CURRENT) && ($domain_by_ip != $domain_by_name)) {
 					// redirect to a domain detected by IP (when not already on it)
-					if ((PROTOCOL == 'https://') && !$site_domain['SSLUrlUsesRegExp'] && $site_domain['SSLUrl']) {
-						// need to remove sub folder from ssl url
-						$ssl_url = preg_replace('/^(https:\/\/[^\/]*)(\/.*){0,1}$/', '\\1', $site_domain['SSLUrl']);
-						$this->Application->Redirect('external:' . $ssl_url . $_SERVER['REQUEST_URI']);
+					if ((PROTOCOL == 'https://') && !$site_domain['SSLDomainNameUsesRegExp'] && $site_domain['SSLDomainName']) {
+						$this->Application->Redirect('external:https://' . $site_domain['SSLDomainName'] . $_SERVER['REQUEST_URI']);
 					}
 					elseif ((PROTOCOL == 'http://') && !$site_domain['DomainNameUsesRegExp']) {
 						$this->Application->Redirect('external:http://' . $site_domain['DomainName'] . $_SERVER['REQUEST_URI']);
Index: branches/5.3.x/core/install/upgrades.sql
===================================================================
diff -u -N -r15986 -r15999
--- branches/5.3.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 15986)
+++ branches/5.3.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 15999)
@@ -2994,3 +2994,12 @@
 ALTER TABLE UserGroupRelations DROP PRIMARY KEY;
 ALTER TABLE UserGroupRelations ADD Id int(11) NOT NULL auto_increment FIRST, ADD PRIMARY KEY (Id), ADD UNIQUE KEY UserGroup (PortalUserId, GroupId);
 ALTER TABLE SpamControl ADD Id int(11) NOT NULL auto_increment FIRST, ADD PRIMARY KEY (Id);
+
+INSERT INTO SystemSettings VALUES(DEFAULT, 'SSLDomain', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSSL', 'la_config_SSLDomain', 'text', '', '', 30.01, 0, 1, NULL);
+INSERT INTO SystemSettings VALUES(DEFAULT, 'AdminSSLDomain', '', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsSSL', 'la_config_AdminSSLDomain', 'text', '', '', 30.02, 0, 0, NULL);
+DELETE FROM LanguageLabels WHERE PhraseKey IN ('LA_CONFIG_SSL_URL', 'LA_CONFIG_ADMINSSL_URL', 'LA_FLD_SSLURL');
+
+ALTER TABLE SiteDomains
+	CHANGE SSLUrl SSLDomainName VARCHAR(255) NOT NULL DEFAULT '',
+	CHANGE SSLUrlUsesRegExp SSLDomainNameUsesRegExp TINYINT(4) NOT NULL DEFAULT '0';
+DELETE FROM UserPersistentSessionData WHERE VariableName = 'site-domain[Default]columns_.';
Index: branches/5.3.x/core/units/configuration/configuration_event_handler.php
===================================================================
diff -u -N -r15988 -r15999
--- branches/5.3.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 15988)
+++ branches/5.3.x/core/units/configuration/configuration_event_handler.php	(.../configuration_event_handler.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: configuration_event_handler.php 15988 2013-10-11 09:39:18Z alex $
+* @version	$Id: configuration_event_handler.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -306,7 +306,7 @@
 				$this->Application->SetConfigValue($variable_name, $object->GetDBField('VariableValue'), true);
 			}
 
-			if ( $variable_name == 'Require_AdminSSL' || $variable_name == 'AdminSSL_URL' ) {
+			if ( $variable_name == 'Require_AdminSSL' || $variable_name == 'AdminSSLDomain' ) {
 				// when administrative console is moved to SSL mode, then delete skin
 				if ( in_array($variable_name, $changed) && !$skin_deleted ) {
 					$skin_helper = $this->Application->recallObject('SkinHelper');
Index: branches/5.3.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r15988 -r15999
--- branches/5.3.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 15988)
+++ branches/5.3.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 15999)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_event_handler.php 15988 2013-10-11 09:39:18Z alex $
+* @version	$Id: db_event_handler.php 15999 2013-10-25 15:28:31Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2973,7 +2973,7 @@
 			$export_helper = $this->Application->recallObject('CatItemExportHelper');
 
 			/*list ($index_file, $env) = explode('|', $this->Application->RecallVar('last_template'));
-			$finish_url = $this->Application->BaseURL('/admin') . $index_file . '?' . ENV_VAR_NAME . '=' . $env;
+			$finish_url = $this->Application->BaseURL() . 'admin/' . $index_file . '?' . ENV_VAR_NAME . '=' . $env;
 			$this->Application->StoreVar('export_finish_url', $finish_url);*/
 
 			$redirect_params = Array (
Index: branches/5.3.x/admin/system_presets/simple/site_domains_site-domain.php
===================================================================
diff -u -N -r15902 -r15999
--- branches/5.3.x/admin/system_presets/simple/site_domains_site-domain.php	(.../site_domains_site-domain.php)	(revision 15902)
+++ branches/5.3.x/admin/system_presets/simple/site_domains_site-domain.php	(.../site_domains_site-domain.php)	(revision 15999)
@@ -23,7 +23,7 @@
 
 	// fields to hide
 	$hidden_fields = Array (
-		/*'DomainId', 'DomainName', 'SSLUrl', 'AdminEmail', 'Country', 'PrimaryLanguageId', 'Languages', 'PrimaryThemeId', 'PrimaryThemeId', 'Themes', 'DomainIPRange', 'ExternalUrl', 'RedirectOnIPMatch', 'Priority', */
+		/*'DomainId', 'DomainName', 'SSLDomainName', 'AdminEmail', 'Country', 'PrimaryLanguageId', 'Languages', 'PrimaryThemeId', 'PrimaryThemeId', 'Themes', 'DomainIPRange', 'ExternalUrl', 'RedirectOnIPMatch', 'Priority', */
 	);
 
 	// virtual fields to hide
@@ -33,7 +33,7 @@
 
 	// fields to make required
 	$required_fields = Array (
-		/*'DomainId',*/ 'DomainName', /* 'SSLUrl', 'AdminEmail', 'Country', 'PrimaryLanguageId', 'Languages', 'PrimaryThemeId', 'PrimaryThemeId', 'Themes', 'DomainIPRange', 'ExternalUrl', 'RedirectOnIPMatch', 'Priority', */
+		/*'DomainId',*/ 'DomainName', /* 'SSLDomainName', 'AdminEmail', 'Country', 'PrimaryLanguageId', 'Languages', 'PrimaryThemeId', 'PrimaryThemeId', 'Themes', 'DomainIPRange', 'ExternalUrl', 'RedirectOnIPMatch', 'Priority', */
 	);
 
 	// virtual fields to make required
@@ -48,5 +48,5 @@
 
 	// hide columns in grids
 	$hide_columns = Array (
-//		'Default'	=>	Array ('DomainId', 'DomainName', 'SSLUrl', 'Country', 'PrimaryLanguageId', 'PrimaryThemeId', 'Priority', ),
+//		'Default'	=>	Array ('DomainId', 'DomainName', 'SSLDomainName', 'Country', 'PrimaryLanguageId', 'PrimaryThemeId', 'Priority', ),
 	);