From a50a26274581820a7e56fd78b5f1c9e63c3c44b9 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Wed, 21 Feb 2024 00:47:07 +0700 Subject: [PATCH] Updated --- common.php | 28 +++++++++++++++------------- library/config.php | 2 +- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/common.php b/common.php index 64f5d3b1..7e8d1ee1 100644 --- a/common.php +++ b/common.php @@ -37,19 +37,6 @@ header('X-Frame-Options: SAMEORIGIN'); header('X-Powered-By: TorrentPier LTS Forever!'); date_default_timezone_set('UTC'); -/** - * isSecure - * @return bool - */ -function isSecure() -{ - if ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') || (!empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') || (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443) || (isset($_SERVER['HTTP_X_FORWARDED_PORT']) && $_SERVER['HTTP_X_FORWARDED_PORT'] == 443) || (isset($_SERVER['REQUEST_SCHEME']) && $_SERVER['REQUEST_SCHEME'] == 'https')) { - return true; - } else { - return false; - } -} - // Cloudflare if (isset($_SERVER['HTTP_CF_CONNECTING_IP'])) { @@ -228,6 +215,21 @@ function short_query ($sql, $esc_html = false) } // Functions +function is_secure() +{ + if ( + (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') + || (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') + || (!empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') + || (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443) + || (isset($_SERVER['HTTP_X_FORWARDED_PORT']) && $_SERVER['HTTP_X_FORWARDED_PORT'] == 443) + || (isset($_SERVER['REQUEST_SCHEME']) && $_SERVER['REQUEST_SCHEME'] == 'https') + ) { + return true; + } + return false; +} + function utime () { return array_sum(explode(' ', microtime())); diff --git a/library/config.php b/library/config.php index 991b9458..a6d48ac2 100644 --- a/library/config.php +++ b/library/config.php @@ -279,7 +279,7 @@ $page_cfg['show_sidebar2'] = array( // укажите на каких стран // Cookie $bb_cfg['cookie_domain'] = in_array($domain_name, array($_SERVER['SERVER_ADDR'], 'localhost')) ? '' : ".$domain_name"; // НЕ НУЖНО менять "localhost" -$bb_cfg['cookie_secure'] = ($domain_ssl ? 1 : (int)isSecure()); +$bb_cfg['cookie_secure'] = ($domain_ssl ? 1 : (int)is_secure()); $bb_cfg['cookie_prefix'] = 'bb_'; // Префикс для cookie файлов ('bb_') // Sessions