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

改进Request类

Browse Source
This commit is contained in:
thinkphp
2016-05-20 16:14:22 +08:00
parent d4993fa37c
commit 1ad2f7af31
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/think/Request.php
View File

@@ -218,8 +218,12 @@ class Request
$this->url = $url; $this->url = $url;
return; return;
} elseif (!$this->url) { } elseif (!$this->url) {
if (IS_CLI) {
$this->url = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : '';
} else {
$this->url = $_SERVER[Config::get('url_request_uri')]; $this->url = $_SERVER[Config::get('url_request_uri')];
} }
}
return true === $url ? $this->domain() . $this->url : $this->url; return true === $url ? $this->domain() . $this->url : $this->url;
} }
@@ -252,6 +256,8 @@ class Request
$this->baseFile = $file; $this->baseFile = $file;
return; return;
} elseif (!$this->baseFile) { } elseif (!$this->baseFile) {
$url = '';
if (!IS_CLI) {
$script_name = basename($_SERVER['SCRIPT_FILENAME']); $script_name = basename($_SERVER['SCRIPT_FILENAME']);
if (basename($_SERVER['SCRIPT_NAME']) === $script_name) { if (basename($_SERVER['SCRIPT_NAME']) === $script_name) {
$url = $_SERVER['SCRIPT_NAME']; $url = $_SERVER['SCRIPT_NAME'];
@@ -264,6 +270,7 @@ class Request
} elseif (isset($_SERVER['DOCUMENT_ROOT']) && strpos($_SERVER['SCRIPT_FILENAME'], $_SERVER['DOCUMENT_ROOT']) === 0) { } elseif (isset($_SERVER['DOCUMENT_ROOT']) && strpos($_SERVER['SCRIPT_FILENAME'], $_SERVER['DOCUMENT_ROOT']) === 0) {
$url = str_replace('\\', '/', str_replace($_SERVER['DOCUMENT_ROOT'], '', $_SERVER['SCRIPT_FILENAME'])); $url = str_replace('\\', '/', str_replace($_SERVER['DOCUMENT_ROOT'], '', $_SERVER['SCRIPT_FILENAME']));
} }
}
$this->baseFile = $url; $this->baseFile = $url;
} }
return true === $file ? $this->domain() . $this->baseFile : $this->baseFile; return true === $file ? $this->domain() . $this->baseFile : $this->baseFile;