diff options
| author | Jean-Christophe Saad-Dupuy <saad.dupuy@gmail.com> | 2013-10-07 12:30:40 +0200 |
|---|---|---|
| committer | Jean-Christophe Saad-Dupuy <saad.dupuy@gmail.com> | 2013-10-07 12:30:40 +0200 |
| commit | 125f9ee83842cd6ad6cfcbcbfcaa951ec0396733 (patch) | |
| tree | 842ee6ff06a31e32b662cc89229db628b9e530bd | |
| parent | bf7516112f90ea0392918605acdb9167cf21e516 (diff) | |
| download | wallabag-125f9ee83842cd6ad6cfcbcbfcaa951ec0396733.tar.gz wallabag-125f9ee83842cd6ad6cfcbcbfcaa951ec0396733.tar.zst wallabag-125f9ee83842cd6ad6cfcbcbfcaa951ec0396733.zip | |
Added support for custom ssl port
| -rw-r--r-- | inc/poche/Tools.class.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 8eb988f4..6f2bc6e7 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"]) && isset($SSL_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 | } |