From 7d272e3c96dd2aa142748e3d5dbe4412a4510a35 Mon Sep 17 00:00:00 2001 From: Joris van Eijden Date: Tue, 27 Sep 2016 03:23:56 +0200 Subject: [PATCH] Fix pre-flight port number check. (#2681) --- app/Http/Controllers/SettingsController.php | 27 ++++++--------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index d3e8188225..c7e209b1df 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -52,29 +52,18 @@ class SettingsController extends Controller $protocol = array_key_exists('HTTPS', $_SERVER) && ( $_SERVER['HTTPS'] == "on") ? 'https://' : 'http://'; - - $pageURL = $protocol; - if ($_SERVER["SERVER_PORT"] != "80") { - $main_page = $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"]; - $pageURL .= $main_page.$_SERVER["REQUEST_URI"]; - } else { - $main_page = $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"]; - $pageURL .= $main_page; + $host = $_SERVER['SERVER_NAME']; + if (($protocol === 'http://' && $_SERVER['SERVER_PORT'] != '80') || ($protocol === 'https://' && $_SERVER['SERVER_PORT'] != '443')) { + $host .= ':' . $_SERVER['SERVER_PORT']; } + $pageURL = $protocol . $host . $_SERVER['REQUEST_URI']; - $start_settings['env_location'] = $pageURL.'../.env'; + $start_settings['url_valid'] = (config('app.url').'/setup' === $pageURL); + $start_settings['url_config'] = config('app.url'); + $start_settings['real_url'] = $pageURL; - if (config('app.url').'/setup'!=$pageURL) { - $start_settings['url_valid']= false; - } else { - $start_settings['url_valid']= true; - } - - $start_settings['url_config']= config('app.url'); - $start_settings['real_url']= $pageURL; - - $exposed_env = @file_get_contents($main_page.'/.env'); + $exposed_env = @file_get_contents($protocol . $host.'/.env'); if ($exposed_env) { $start_settings['env_exposed'] = true;