mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 07:12:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #149 from leunggamciu/enhance-url

Browse Source 
使用Request来获取请求
This commit is contained in:
ThinkPHP
2016-06-21 19:20:42 +08:00
committed by GitHub
parent d95ef85e86 53db5d0a7a
commit 73bd3201be
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
library/think/Url.php
View File

@@ -153,9 +153,10 @@ class Url
protected static function parseDomain(&$url, $domain) protected static function parseDomain(&$url, $domain)
{ {
if ($domain) { if ($domain) {
$request = Request::instance();
if (true === $domain) { if (true === $domain) {
// 自动判断域名 // 自动判断域名
$domain = $_SERVER['HTTP_HOST']; $domain = $request->host();
if (Config::get('url_domain_deploy')) { if (Config::get('url_domain_deploy')) {
// 根域名 // 根域名
$urlDomainRoot = Config::get('url_domain_root'); $urlDomainRoot = Config::get('url_domain_root');
@@ -184,9 +185,9 @@ class Url
} }
} }
} else { } else {
$domain .= strpos($domain, '.') ? '' : strstr($_SERVER['HTTP_HOST'], '.'); $domain .= strpos($domain, '.') ? '' : strstr($request->host(), '.');
} }
$domain = (self::isSsl() ? 'https://' : 'http://') . $domain; $domain = ($request->isSsl() ? 'https://' : 'http://') . $domain;
} else { } else {
$domain = ''; $domain = '';
} }
@@ -217,20 +218,6 @@ class Url
return (empty($suffix) || 0 === strpos($suffix, '.')) ? $suffix : '.' . $suffix; return (empty($suffix) || 0 === strpos($suffix, '.')) ? $suffix : '.' . $suffix;
} }
/**
* 判断是否SSL协议
* @return boolean
*/
public static function isSsl()
{
if (isset($_SERVER['HTTPS']) && ('1' == $_SERVER['HTTPS'] || 'on' == strtolower($_SERVER['HTTPS']))) {
return true;
} elseif (isset($_SERVER['SERVER_PORT']) && ('443' == $_SERVER['SERVER_PORT'])) {
return true;
}
return false;
}
// 匹配路由地址 // 匹配路由地址
public static function getRouteUrl($alias, &$vars = []) public static function getRouteUrl($alias, &$vars = [])
{ {