Fix in setup process

modxcms · Mar 18, 2024 · b501875 · b501875
1 parent 5bc6373
commit b501875
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/setup/includes/config/modconfigreader.class.php b/setup/includes/config/modconfigreader.class.php
@@ -70,12 +70,9 @@ public function loadDefaults(array $config = array()) {
     public function getHttpHost() {
         if (php_sapi_name() != 'cli') {
             $this->config['https_port'] = isset($_POST['httpsport']) ? $_POST['httpsport'] : 443;
-            $isSecureRequest = ((isset($_SERVER['HTTPS']) && !empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') || $_SERVER['SERVER_PORT'] == $this->config['https_port']);
-            $this->config['http_host'] = $_SERVER['HTTP_HOST'];
-            if ($_SERVER['SERVER_PORT'] != 80) {
-                $this->config['http_host'] = str_replace(':' . $_SERVER['SERVER_PORT'], '', $this->config['http_host']);
-            }
-            $this->config['http_host'] .= in_array($_SERVER['SERVER_PORT'], [80, 443]) ? '' : ':' . $_SERVER['SERVER_PORT'];
+            $this->config['http_host'] = parse_url('http://' . $_SERVER['HTTP_HOST'], PHP_URL_HOST);
+            $this->config['http_port'] = parse_url('http://' . $_SERVER['HTTP_HOST'], PHP_URL_PORT);
+            $this->config['http_host'] .= in_array($this->config['http_port'], [null , 80, 443]) ? '' : ':' . $this->config['http_port'];
         } else {
             $this->config['http_host'] = 'localhost';
             $this->config['https_port'] = 443;