Merge pull request #3735 from Spuds/Working

Rework of the theme classes

Author: Spuds

bootstrap.php

@@ -171,14 +171,18 @@ private function loadSettingsFile()
 					$redirec_file = 'install.php';
 				}
 
+				// To early for constants or autoloader
+				require_once($boarddir . '/sources/ElkArte/Server.php');
+				$server = new \ElkArte\Server($_SERVER);
+
 				$version_running = str_replace('ElkArte ', '', FORUM_VERSION);
-				$proto = 'http' . (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) === 'on' ? 's' : '');
-				$port = empty($_SERVER['SERVER_PORT']) || $_SERVER['SERVER_PORT'] === '80' ? '' : ':' . $_SERVER['SERVER_PORT'];
-				$host = empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] . $port : $_SERVER['HTTP_HOST'];
-				$path = strtr(dirname($_SERVER['PHP_SELF']), '\\', '/') == '/' ? '' : strtr(dirname($_SERVER['PHP_SELF']), '\\', '/');
+				$location = $server->supportsSSL() ? 'https://' : 'http://';
+				$location .= $server->getHost();
+				$temp = preg_replace('~/' . preg_quote(basename($boardurl . '/index.php'), '~') . '(/.+)?$~', '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF'])));
+				$location .= ($temp !== '/') ? $temp : '';
 
 				// Too early to use Headers class etc.
-				header('Location:' . $proto . '://' . $host . $path . '/install/' . $redirec_file . '?v=' . $version_running);
+				header('Location:' . $location. '/install/' . $redirec_file . '?v=' . $version_running);
 				die();
 			}
 		}

sources/ElkArte/Server.php

@@ -23,13 +23,11 @@
  */
 class Server extends \ArrayObject
 {
-	/** @var mixed */
+	/** @var array */
 	public $SERVER_SOFTWARE;
-
-	/** @var mixed */
+	/** @var array */
 	public $HTTPS;
-
-	/** @var mixed */
+	/** @var array */
 	public $SERVER_PORT;
 
 	/**
@@ -41,7 +39,7 @@ public function __construct($server = null)
 	{
 		if (!is_array($server))
 		{
-			$server = $_SERVER ?? array();
+			$server = $_SERVER ?? [];
 		}
 
 		parent::__construct($server, \ArrayObject::ARRAY_AS_PROPS);
@@ -211,12 +209,28 @@ public function outPutCompressionEnabled()
 	public function supportsSSL()
 	{
 		return
-			(isset($this->HTTPS) && ($this->HTTPS === 'on' || $this->HTTPS == 1))
+			(isset($this->HTTPS) && ($this->HTTPS === 'on' || (int) $this->HTTPS === 1))
 			|| (isset($this->REQUEST_SCHEME) && $this->REQUEST_SCHEME === 'https')
-			|| (isset($this->SERVER_PORT) && $this->SERVER_PORT == 443)
+			|| (isset($this->SERVER_PORT) && (int) $this->SERVER_PORT === 443)
 			|| (isset($this->HTTP_X_FORWARDED_PROTO) && $this->HTTP_X_FORWARDED_PROTO === 'https');
 	}
 
+	public function getHost()
+	{
+		$host = $this->HTTP_HOST;
+		if (!$host)
+		{
+			$host = $this->SERVER_NAME;
+			$port = (int) $this->SERVER_PORT;
+			if ($port && $port !== 80 && $port !== 443)
+			{
+				$host .= ":$port";
+			}
+		}
+
+		return $host;
+	}
+
 	/**
 	 * Try to determine a FQDN for the server
 	 *