aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche/Tools.class.php
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-10-08 13:38:03 +0200
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-10-08 13:38:03 +0200
commit3ae9190e78e4ee341fe58a1243cd2ac388e29049 (patch)
tree96ed24eb3953c952fb1578bf63d2fa34eb5b73dc /inc/poche/Tools.class.php
parente231f3f023e41cd6694ed01e95e22d2d4b9fc441 (diff)
parent2502e1359c1a81c1f9a1822459c0d904c6a7da43 (diff)
downloadwallabag-3ae9190e78e4ee341fe58a1243cd2ac388e29049.tar.gz
wallabag-3ae9190e78e4ee341fe58a1243cd2ac388e29049.tar.zst
wallabag-3ae9190e78e4ee341fe58a1243cd2ac388e29049.zip
Merge branch 'dev' of https://github.com/inthepoche/poche into dev
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}