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