From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 28 Mar 2013 06:10:55 +0000 (+0400)
Subject: sanity check: better suggestion for SELF_URL_PATH
X-Git-Tag: 1.7.6~216
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=24ff3b44d2713b5e7444a3065476fd9274953aea;p=tt-rss.git

sanity check: better suggestion for SELF_URL_PATH
---

diff --git a/include/sanity_check.php b/include/sanity_check.php
index b2cb8ab4..1610cfeb 100644
--- a/include/sanity_check.php
+++ b/include/sanity_check.php
@@ -2,6 +2,12 @@
 	// WARNING: Don't ask for help on tt-rss.org forums or the bugtracker if you have
 	// modified this file.
 
+	function make_self_url_path() {
+		$url_path = ($_SERVER['HTTPS'] != "on" ? 'http://' :  'https://') . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
+
+		return $url_path;
+	}
+
 	function initial_sanity_check($link) {
 
 		$errors = array();
@@ -69,12 +75,10 @@
 			}
 
 			if (SELF_URL_PATH == "http://yourserver/tt-rss/") {
-				if ($_SERVER['HTTP_REFERER']) {
-					array_push($errors,
-						"Please set SELF_URL_PATH to the correct value for your server (possible value: <b>" . $_SERVER['HTTP_REFERER'] . "</b>)");
-				} else {
-					array_push($errors, "Please set SELF_URL_PATH to the correct value for your server.");
-				}
+				$urlpath = preg_replace("/\w+\.php$/", "", make_self_url_path());
+
+				array_push($errors,
+						"Please set SELF_URL_PATH to the correct value for your server (possible value: <b>$urlpath</b>)");
 			}
 
 			if (!is_writable(ICONS_DIR)) {