X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=install%2Findex.php;fp=install%2Findex.php;h=4239f5893f949e84f84a9de47538204cf1f8bbcd;hb=9f7bd151c6623397e35661200ff3f7aa8b3850d8;hp=7da311ffb832c2bbf65d6406529ed395d3b86e12;hpb=1003cb24b99aa72f0d37c93ede4053f9d65849cf;p=tt-rss.git

diff --git a/install/index.php b/install/index.php
index 7da311ff..4239f589 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;
 	}