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

改进

Browse Source
This commit is contained in:
thinkphp
2017-07-07 11:35:47 +08:00
parent 4f92dbc170
commit 37527368b4
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/response/Redirect.php
View File

@@ -67,7 +67,7 @@ class Redirect extends Response
*/ */
public function getTargetUrl() public function getTargetUrl()
{ {
if (strpos($this->data, '://') || (strpos($this->data, '/') && empty($this->params))) { if (strpos($this->data, '://') || (0 === strpos($this->data, '/') && empty($this->params))) {
return $this->data; return $this->data;
} else { } else {
return Url::build($this->data, $this->params); return Url::build($this->data, $this->params);

14
library/traits/controller/Jump.php
View File

@@ -36,18 +36,13 @@ trait Jump
*/ */
protected function success($msg = '', $url = null, $data = '', $wait = 3, array $header = []) protected function success($msg = '', $url = null, $data = '', $wait = 3, array $header = [])
{ {
$code = 1;
if (is_numeric($msg)) {
$code = $msg;
$msg = '';
}
if (is_null($url) && isset($_SERVER["HTTP_REFERER"])) { if (is_null($url) && isset($_SERVER["HTTP_REFERER"])) {
$url = $_SERVER["HTTP_REFERER"]; $url = $_SERVER["HTTP_REFERER"];
} elseif ('' !== $url) { } elseif ('' !== $url) {
$url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url); $url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url);
} }
$result = [ $result = [
'code' => $code, 'code' => 1,
'msg' => $msg, 'msg' => $msg,
'data' => $data, 'data' => $data,
'url' => $url, 'url' => $url,
@@ -75,18 +70,13 @@ trait Jump
*/ */
protected function error($msg = '', $url = null, $data = '', $wait = 3, array $header = []) protected function error($msg = '', $url = null, $data = '', $wait = 3, array $header = [])
{ {
$code = 0;
if (is_numeric($msg)) {
$code = $msg;
$msg = '';
}
if (is_null($url)) { if (is_null($url)) {
$url = Request::instance()->isAjax() ? '' : 'javascript:history.back(-1);'; $url = Request::instance()->isAjax() ? '' : 'javascript:history.back(-1);';
} elseif ('' !== $url) { } elseif ('' !== $url) {
$url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url); $url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url);
} }
$result = [ $result = [
'code' => $code, 'code' => 0,
'msg' => $msg, 'msg' => $msg,
'data' => $data, 'data' => $data,
'url' => $url, 'url' => $url,