From 8e76eaad19c32fd9993fcd4c66de80394b55fbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 17 Oct 2013 11:39:19 +0200 Subject: [PATCH 1/2] Update CONTRIBUTING.md --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 85132e6..c89411f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,4 +8,4 @@ To fix the bug quickly, we need some infos: * the link you want to poche and which causes problem ## You want to fix a bug or to add a feature -Please fork poche and work with the dev branch. Do not work on master branch. \ No newline at end of file +Please fork poche and work with **the dev branch** only. Do not work on master branch. From 45e9e0f5653993d5f463209691953e7a41527267 Mon Sep 17 00:00:00 2001 From: Dmitry Sandalov Date: Tue, 5 Nov 2013 12:13:55 +0300 Subject: [PATCH 2/2] fix #270 access from remote machine Replacing SERVER_NAME with HTTP_HOST allows me to use Poche on remote machines --- inc/poche/Tools.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 1d09282..030d75b 100644 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php @@ -53,12 +53,12 @@ class Tools $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]); - if (!isset($_SERVER["SERVER_NAME"])) { + if (!isset($_SERVER["HTTP_HOST"])) { return $scriptname; } return 'http' . ($https ? 's' : '') . '://' - . $_SERVER["SERVER_NAME"] . $serverport . $scriptname; + . $_SERVER["HTTP_HOST"] . $serverport . $scriptname; } public static function redirect($url = '')