aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche/Tools.class.php
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-10-24 23:51:59 -0700
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-10-24 23:51:59 -0700
commitcd8a3441561fa63b9da1b705c4b28dee787f79b0 (patch)
treee21417394aac2f23060506e120601d74b19ecd29 /inc/poche/Tools.class.php
parent8e76eaad19c32fd9993fcd4c66de80394b55fbe2 (diff)
parent6ae804853f6f2e10d394b6abfb977b7a251ee7e4 (diff)
downloadwallabag-cd8a3441561fa63b9da1b705c4b28dee787f79b0.tar.gz
wallabag-cd8a3441561fa63b9da1b705c4b28dee787f79b0.tar.zst
wallabag-cd8a3441561fa63b9da1b705c4b28dee787f79b0.zip
Merge pull request #289 from inthepoche/dev
1.1.0
Diffstat (limited to 'inc/poche/Tools.class.php')
-rw-r--r--inc/poche/Tools.class.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 8eb988f4..1d092823 100644
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -41,10 +41,14 @@ class Tools
41 $https = (!empty($_SERVER['HTTPS']) 41 $https = (!empty($_SERVER['HTTPS'])
42 && (strtolower($_SERVER['HTTPS']) == 'on')) 42 && (strtolower($_SERVER['HTTPS']) == 'on'))
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
46 && $_SERVER["SERVER_PORT"] == SSL_PORT);
47
45 $serverport = (!isset($_SERVER["SERVER_PORT"]) 48 $serverport = (!isset($_SERVER["SERVER_PORT"])
46 || $_SERVER["SERVER_PORT"] == '80' 49 || $_SERVER["SERVER_PORT"] == '80'
47 || ($https && $_SERVER["SERVER_PORT"] == '443') 50 || ($https && $_SERVER["SERVER_PORT"] == '443')
51 || ($https && $_SERVER["SERVER_PORT"]==SSL_PORT) //Custom HTTPS port detection
48 ? '' : ':' . $_SERVER["SERVER_PORT"]); 52 ? '' : ':' . $_SERVER["SERVER_PORT"]);
49 53
50 $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]); 54 $scriptname = str_replace('/index.php', '/', $_SERVER["SCRIPT_NAME"]);
@@ -243,4 +247,4 @@ class Tools
243 $lang = explode('.', $userlanguage); 247 $lang = explode('.', $userlanguage);
244 return str_replace('_', '-', $lang[0]); 248 return str_replace('_', '-', $lang[0]);
245 } 249 }
246} \ No newline at end of file 250}