From 79024eb004bfb9de77ec60d648315888e70033ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Thu, 29 May 2014 18:32:55 +0200
Subject: fix #344 FQDN with non-standard ports broken

---
 inc/poche/Tools.class.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'inc/poche/Tools.class.php')

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 7f064020..8073a3fe 100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -60,6 +60,10 @@ class Tools
         }
 
         $host = (isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME']));
+
+        if (strpos($host, ':') !== false) {
+            $serverport = '';
+        }
         
         return 'http' . ($https ? 's' : '') . '://'
             . $host . $serverport . $scriptname;
-- 
cgit v1.2.3


From 752cd4a8ef7bbc8ebd6c481ed890e0d8e46819a8 Mon Sep 17 00:00:00 2001
From: Maryana Rozhankivska <mariroz@mr.lviv.ua>
Date: Mon, 2 Jun 2014 18:00:09 +0300
Subject: error reporting level set in E_ALL & ~E_NOTICE by default, can be
 overriden in config

---
 inc/poche/Tools.class.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'inc/poche/Tools.class.php')

diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 8073a3fe..1ef875c9 100755
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -18,8 +18,6 @@ class Tools
             die(_('Oops, it seems you don\'t have PHP 5.'));
         }
 
-        error_reporting(E_ALL);
-
         function stripslashesDeep($value) {
             return is_array($value)
                 ? array_map('stripslashesDeep', $value)
@@ -64,7 +62,7 @@ class Tools
         if (strpos($host, ':') !== false) {
             $serverport = '';
         }
-        
+
         return 'http' . ($https ? 's' : '') . '://'
             . $host . $serverport . $scriptname;
     }
-- 
cgit v1.2.3