molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

内核更新

Browse Source
This commit is contained in:
molong
2016-08-19 11:53:45 +08:00
parent 63f95a8ee9
commit 707ebdf51d
20 changed files with 505 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
core/library/think/Request.php
View File

@@ -128,7 +128,9 @@ class Request
$this->$name = $item;
}
}
$this->filter = Config::get('default_filter');
if (is_null($this->filter)) {
$this->filter = Config::get('default_filter');
}
}
public function __call($method, $args)
@@ -653,11 +655,12 @@ class Request
*/
public function get($name = '', $default = null, $filter = null)
{
if (empty($this->get)) {
$this->get = $_GET;
}
if (is_array($name)) {
$this->param = [];
return $this->get = array_merge($this->get, $name);
} elseif (empty($this->get)) {
$this->get = $_GET;
}
return $this->input($this->get, $name, $default, $filter);
}
@@ -672,11 +675,12 @@ class Request
*/
public function post($name = '', $default = null, $filter = null)
{
if (empty($this->post)) {
$this->post = $_POST;
}
if (is_array($name)) {
$this->param = [];
return $this->post = array_merge($this->post, $name);
} elseif (empty($this->post)) {
$this->post = $_POST;
}
return $this->input($this->post, $name, $default, $filter);
}
@@ -691,10 +695,6 @@ class Request
*/
public function put($name = '', $default = null, $filter = null)
{
if (is_array($name)) {
$this->param = [];
return $this->put = is_null($this->put) ? $name : array_merge($this->put, $name);
}
if (is_null($this->put)) {
$content = file_get_contents('php://input');
if (strpos($content, '":')) {
@@ -703,6 +703,11 @@ class Request
parse_str($content, $this->put);
}
}
if (is_array($name)) {
$this->param = [];
return $this->put = is_null($this->put) ? $name : array_merge($this->put, $name);
}
return $this->input($this->put, $name, $default, $filter);
}
@@ -741,11 +746,12 @@ class Request
*/
public function request($name = '', $default = null, $filter = null)
{
if (empty($this->request)) {
$this->request = $_REQUEST;
}
if (is_array($name)) {
$this->param = [];
return $this->request = array_merge($this->request, $name);
} elseif (empty($this->request)) {
$this->request = $_REQUEST;
}
return $this->input($this->request ?: $_REQUEST, $name, $default, $filter);
}
@@ -760,10 +766,11 @@ class Request
*/
public function session($name = '', $default = null, $filter = null)
{
if (empty($this->session)) {
$this->session = Session::get();
}
if (is_array($name)) {
return $this->session = array_merge($this->session, $name);
} elseif (empty($this->session)) {
$this->session = Session::get();
}
return $this->input($this->session, $name, $default, $filter);
}
@@ -778,10 +785,11 @@ class Request
*/
public function cookie($name = '', $default = null, $filter = null)
{
if (empty($this->cookie)) {
$this->cookie = $_COOKIE;
}
if (is_array($name)) {
return $this->cookie = array_merge($this->cookie, $name);
} elseif (empty($this->cookie)) {
$this->cookie = $_COOKIE;
}
return $this->input($this->cookie, $name, $default, $filter);
}
@@ -796,10 +804,11 @@ class Request
*/
public function server($name = '', $default = null, $filter = null)
{
if (empty($this->server)) {
$this->server = $_SERVER;
}
if (is_array($name)) {
return $this->server = array_merge($this->server, $name);
} elseif (empty($this->server)) {
$this->server = $_SERVER;
}
return $this->input($this->server, false === $name ? false : strtoupper($name), $default, $filter);
}
@@ -812,10 +821,11 @@ class Request
*/
public function file($name = '')
{
if (empty($this->file)) {
$this->file = isset($_FILES) ? $_FILES : [];
}
if (is_array($name)) {
return $this->file = array_merge($this->file, $name);
} elseif (empty($this->file)) {
$this->file = isset($_FILES) ? $_FILES : [];
}
$files = $this->file;
if (!empty($files)) {
@@ -872,10 +882,11 @@ class Request
*/
public function env($name = '', $default = null, $filter = null)
{
if (empty($this->env)) {
$this->env = $_ENV;
}
if (is_array($name)) {
return $this->env = array_merge($this->env, $name);
} elseif (empty($this->env)) {
$this->env = $_ENV;
}
return $this->input($this->env, false === $name ? false : strtoupper($name), $default, $filter);
}
@@ -889,9 +900,7 @@ class Request
*/
public function header($name = '', $default = null)
{
if (is_array($name)) {
return $this->header = array_merge($this->header, $name);
} elseif (empty($this->header)) {
if (empty($this->header)) {
$header = [];
$server = $this->server ?: $_SERVER;
foreach ($server as $key => $val) {
@@ -908,6 +917,9 @@ class Request
}
$this->header = array_change_key_case($header);
}
if (is_array($name)) {
return $this->header = array_merge($this->header, $name);
}
if ('' === $name) {
return $this->header;
}
@@ -1169,7 +1181,8 @@ class Request
*/
public function isAjax()
{
return (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') ? true : false;
$value = $this->server('HTTP_X_REQUESTED_WITH');
return (!is_null($value) && strtolower($value) == 'xmlhttprequest') ? true : false;
}
/**
@@ -1179,7 +1192,7 @@ class Request
*/
public function isPjax()
{
return (isset($_SERVER['HTTP_X_PJAX']) && $_SERVER['HTTP_X_PJAX']) ? true : false;
return !is_null($this->server('HTTP_X_PJAX')) ? true : false;
}
/**