From 8064f66636557565c2f12e1a7aa0a1abc94df94e Mon Sep 17 00:00:00 2001 From: devil_gong Date: Thu, 14 Mar 2019 15:44:45 +0800 Subject: [PATCH] =?UTF-8?q?tp=E6=A1=86=E6=9E=B6=E8=AF=86=E5=88=AB=E4=B8=8D?= =?UTF-8?q?=E4=BA=86https=E5=85=BC=E5=AE=B9=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/common.php | 6 ++++++ public/core.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/application/common.php b/application/common.php index 695926d8a..b12ab6a68 100755 --- a/application/common.php +++ b/application/common.php @@ -225,6 +225,12 @@ function MyUrl($path, $params=[]) $url = str_replace('public/', '', $url); } + // tpurl方法是否识别到https + if(__MY_HTTP__ == 'https' && substr($url, 0, 5) != 'https') + { + $url = 'https'.mb_substr($url, 4, null, 'utf-8'); + } + return $url; } diff --git a/public/core.php b/public/core.php index f65cafed5..aa61e042c 100755 --- a/public/core.php +++ b/public/core.php @@ -19,7 +19,7 @@ define('APPLICATION_VERSION', 'v1.4.0'); define('DS', '/'); // HTTP类型 -define('__MY_HTTP__', ((!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') || (!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off')) ? 'https' : 'http'); +define('__MY_HTTP__', ((!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') || (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') || (!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') || (!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443) || (!empty($_SERVER['HTTP_FROM_HTTPS']) && $_SERVER['HTTP_FROM_HTTPS'] !== 'off')) ? 'https' : 'http'); // 根目录 $my_root = empty($_SERVER['SCRIPT_NAME']) ? '' : substr($_SERVER['SCRIPT_NAME'], 1, strrpos($_SERVER['SCRIPT_NAME'], '/')); -- GitLab