From 81821e781124d37eb6e376116cb216511fa9531b Mon Sep 17 00:00:00 2001 From: Daniel Rudolf Date: Fri, 27 Nov 2015 19:28:48 +0100 Subject: [PATCH] Improve Pico::getBaseUrl() code styling --- lib/Pico.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/Pico.php b/lib/Pico.php index ccc0d55..8714345 100644 --- a/lib/Pico.php +++ b/lib/Pico.php @@ -1214,14 +1214,13 @@ class Pico return $baseUrl; } - if ( - (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off') - || ($_SERVER['SERVER_PORT'] == 443) - || (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') - ) { + $protocol = 'http'; + if (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] !== 'off')) { + $protocol = 'https'; + } elseif ($_SERVER['SERVER_PORT'] == 443) { + $protocol = 'https'; + } elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https')) { $protocol = 'https'; - } else { - $protocol = 'http'; } $this->config['base_url'] =