From 9f7bd151c6623397e35661200ff3f7aa8b3850d8 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 10 Jul 2017 16:20:40 +0300 Subject: hopefully unify handling of server HTTPS variables where needed, use scheme based on SELF_URL_PATH otherwise --- install/index.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'install') diff --git a/install/index.php b/install/index.php index 7da311ffb..4239f5893 100755 --- a/install/index.php +++ b/install/index.php @@ -22,7 +22,7 @@ $password = ""; $possible = "0123456789abcdfghjkmnpqrstvwxyzABCDFGHJKMNPQRSTVWXYZ*%+^"; - $i = 0; + $i = 0; while ($i < $length) { $char = substr($possible, mt_rand(0, strlen($possible)-1), 1); @@ -179,8 +179,12 @@ } } + function is_server_https() { + return $_SERVER['HTTPS'] == 'on' || $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https'; + } + function make_self_url_path() { - $url_path = ((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") ? 'http://' : 'https://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH); + $url_path = (is_server_https() ? 'https://' : 'http://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH); return $url_path; } -- cgit v1.2.3