From d2b8b6fabe6de39ee857dacc511776ff0d21fc4a Mon Sep 17 00:00:00 2001 From: chentao Date: Fri, 12 May 2023 16:35:58 +0800 Subject: [PATCH] * common: replace die with helper::end --- module/common/model.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/module/common/model.php b/module/common/model.php index 9acb3ac8be..5a04943b0a 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -2541,7 +2541,8 @@ EOF; $url = helper::safe64Encode($_SERVER['REQUEST_URI']); $redirectUrl = helper::createLink('index', 'index'); $redirectUrl .= strpos($redirectUrl, '?') === false ? "?open=$url" : "&open=$url"; - die(header("location: $redirectUrl")); + header("location: $redirectUrl"); + helper::end(); } /** @@ -2966,7 +2967,7 @@ EOF; $this->loadModel('action')->create('user', $user->id, 'login'); $this->loadModel('score')->create('user', 'login'); - if($isFreepasswd) die(js::locate($this->config->webRoot)); + if($isFreepasswd) helper::end(js::locate($this->config->webRoot)); $this->session->set('ENTRY_CODE', $this->get->code); $this->session->set('VALID_ENTRY', md5(md5($this->get->code) . helper::getRemoteIp())); @@ -3115,12 +3116,12 @@ EOF; $response->errcode = $this->config->entry->errcode[$reasonPhrase]; $response->errmsg = urlencode($this->lang->entry->errmsg[$reasonPhrase]); - die(urldecode(json_encode($response))); + helper::end(urldecode(json_encode($response))); } else { $response->error = $reasonPhrase; - die(urldecode(json_encode($response))); + helper::end(urldecode(json_encode($response))); } }