Always return https:// if an SSL proxy server is used

contao · Sep 26, 2013 · 6a1db2a · 6a1db2a
1 parent 354b8ce
commit 6a1db2a
Showing 1 changed file with 4 additions and 30 deletions.
diff --git a/system/modules/core/library/Contao/Environment.php b/system/modules/core/library/Contao/Environment.php
@@ -308,29 +308,15 @@ protected static function ssl()
 	protected static function url()
 	{
 		$host = static::get('httpHost');
-
-		// HTTP request
-		if (!static::get('ssl'))
-		{
-			return 'http://' . $host;
-		}
-
 		$xhost = static::get('httpXForwardedHost');
 
 		// SSL proxy
-		if ($xhost != '' && $GLOBALS['TL_CONFIG']['sslProxyDomain'] != '')
+		if ($xhost != '' && $xhost == $GLOBALS['TL_CONFIG']['sslProxyDomain'])
 		{
-			if ($host == $GLOBALS['TL_CONFIG']['sslProxyDomain'])
-			{
-				$host = $host . '/' . $xhost;
-			}
-			elseif ($xhost == $GLOBALS['TL_CONFIG']['sslProxyDomain'])
-			{
-				$host = $xhost . '/' . $host;
-			}
+			return 'https://' .  $xhost . '/' . $host;
 		}
 
-		return 'https://' . $host;
+		return (static::get('ssl') ? 'https://' : 'http://') . $host;
 	}
 
 
@@ -473,19 +459,7 @@ protected static function base()
 	 */
 	protected static function host()
 	{
-		$host = static::get('httpHost');
-		$xhost = static::get('httpXForwardedHost');
-
-		// SSL proxy
-		if ($xhost != '' && $GLOBALS['TL_CONFIG']['sslProxyDomain'] != '')
-		{
-			if ($host == $GLOBALS['TL_CONFIG']['sslProxyDomain'])
-			{
-				$host = $xhost;
-			}
-		}
-
-		return $host;
+		return static::get('httpHost');
 	}