aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche/Tools.class.php
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2014-02-03 10:03:41 -0800
committerNicolas Lœuillet <nicolas@loeuillet.org>2014-02-03 10:03:41 -0800
commit38dafee05d52948fba4a06066d7b0343c8e3de9d (patch)
tree2e3f7bd3a58bfdb046742c3e65ff082e31a9859b /inc/poche/Tools.class.php
parentf355d2c87fa441221ca8a9339c426c1c95e7c2ac (diff)
parentfa0bfb775a53a074e0a9d642298685b5ed1af83f (diff)
downloadwallabag-38dafee05d52948fba4a06066d7b0343c8e3de9d.tar.gz
wallabag-38dafee05d52948fba4a06066d7b0343c8e3de9d.tar.zst
wallabag-38dafee05d52948fba4a06066d7b0343c8e3de9d.zip
Merge pull request #427 from wallabag/dev1.4.0
changelog 1.4
Diffstat (limited to 'inc/poche/Tools.class.php')
-rw-r--r--inc/poche/Tools.class.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 63916582..515a08aa 100644
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
@@ -43,7 +43,9 @@ class Tools
43 || (isset($_SERVER["SERVER_PORT"]) 43 || (isset($_SERVER["SERVER_PORT"])
44 && $_SERVER["SERVER_PORT"] == '443') // HTTPS detection. 44 && $_SERVER["SERVER_PORT"] == '443') // HTTPS detection.
45 || (isset($_SERVER["SERVER_PORT"]) //Custom HTTPS port detection 45 || (isset($_SERVER["SERVER_PORT"]) //Custom HTTPS port detection
46 && $_SERVER["SERVER_PORT"] == SSL_PORT); 46 && $_SERVER["SERVER_PORT"] == SSL_PORT)
47 || (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])
48 && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https');
47 49
48 $serverport = (!isset($_SERVER["SERVER_PORT"]) 50 $serverport = (!isset($_SERVER["SERVER_PORT"])
49 || $_SERVER["SERVER_PORT"] == '80' 51 || $_SERVER["SERVER_PORT"] == '80'