diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-09-02 13:54:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-02 13:54:38 +0200 |
commit | 96a1c79456b27892b9221707803f29585565b9dc (patch) | |
tree | 8e8203592cb66fe83b6885b07d817ea1a0dc7a5e /application | |
parent | ea71536ed76a439ace794a1db3685827ab323c2a (diff) | |
parent | 206c45bd05a79b5e6d0c51452a6ac69e85cca0b2 (diff) | |
download | Shaarli-96a1c79456b27892b9221707803f29585565b9dc.tar.gz Shaarli-96a1c79456b27892b9221707803f29585565b9dc.tar.zst Shaarli-96a1c79456b27892b9221707803f29585565b9dc.zip |
Merge pull request #939 from ArthurHoaro/hotfix/firefox-social-title
Firefox Social title: Use document.title instead of RainTPL variable
Diffstat (limited to 'application')
-rw-r--r-- | application/HttpUtils.php | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/application/HttpUtils.php b/application/HttpUtils.php index 88a1efdb..00835966 100644 --- a/application/HttpUtils.php +++ b/application/HttpUtils.php | |||
@@ -401,3 +401,31 @@ function getIpAddressFromProxy($server, $trustedIps) | |||
401 | 401 | ||
402 | return array_pop($ips); | 402 | return array_pop($ips); |
403 | } | 403 | } |
404 | |||
405 | /** | ||
406 | * Returns true if Shaarli's currently browsed in HTTPS. | ||
407 | * Supports reverse proxies (if the headers are correctly set). | ||
408 | * | ||
409 | * @param array $server $_SERVER. | ||
410 | * | ||
411 | * @return bool true if HTTPS, false otherwise. | ||
412 | */ | ||
413 | function is_https($server) | ||
414 | { | ||
415 | |||
416 | if (isset($server['HTTP_X_FORWARDED_PORT'])) { | ||
417 | // Keep forwarded port | ||
418 | if (strpos($server['HTTP_X_FORWARDED_PORT'], ',') !== false) { | ||
419 | $ports = explode(',', $server['HTTP_X_FORWARDED_PORT']); | ||
420 | $port = trim($ports[0]); | ||
421 | } else { | ||
422 | $port = $server['HTTP_X_FORWARDED_PORT']; | ||
423 | } | ||
424 | |||
425 | if ($port == '443') { | ||
426 | return true; | ||
427 | } | ||
428 | } | ||
429 | |||
430 | return ! empty($server['HTTPS']); | ||
431 | } | ||