Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* userZen: fixed the issue of login timeout when the account and password are empty.

Browse Source
This commit is contained in:
liugang
2023-12-28 17:16:26 +08:00
parent e3a6937c9f
commit 8fa354ce84
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/user/zen.php
+9 -6
View File
@@ -143,7 +143,7 @@ class userZen extends user
if($this->get->account) $account = trim($this->get->account);
if($this->get->password) $password = trim($this->get->password);
if(!$account) return array();
if(!$account) return $this->responseForLoginFail($viewType);
/* 如果用户被锁定返回相关信息。*/
/* Return related information if the user is locked. */
@@ -372,15 +372,18 @@ class userZen extends user
* @access public
* @return array
*/
public function responseForLoginFail(string $viewType, string $account): array
public function responseForLoginFail(string $viewType, string $account = ''): array
{
if($viewType == 'json') return array('status' => 'failed', 'reason' => $this->lang->user->loginFailed);
$remainTimes = $this->config->user->failTimes - $this->user->failPlus($account);
if($remainTimes <= 0) return array('result' => 'fail', 'message' => sprintf($this->lang->user->loginLocked, $this->config->user->lockMinutes));
if($remainTimes <= 3) return array('result' => 'fail', 'message' => sprintf($this->lang->user->lockWarning, $remainTimes));
if($account)
{
$remainTimes = $this->config->user->failTimes - $this->user->failPlus($account);
if($remainTimes <= 0) return array('result' => 'fail', 'message' => sprintf($this->lang->user->loginLocked, $this->config->user->lockMinutes));
if($remainTimes <= 3) return array('result' => 'fail', 'message' => sprintf($this->lang->user->lockWarning, $remainTimes));
if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
}
return array('result' => 'fail', 'message' => $this->lang->user->loginFailed);
}