From 45ccd336eecd6d66f3c7bba8998f9baf8b9ff475 Mon Sep 17 00:00:00 2001
From: "zhangqingtian@pxjy.com" <zhangqingtian@pxjy.com>
Date: Thu, 17 May 2018 11:48:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F=EF=BC=8C?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=EF=BC=8C=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E7=AE=A1=E7=90=86=E7=9A=84=E9=9A=90=E8=97=8F=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=94=B9=E4=B8=BA=E9=94=81=E5=AE=9A=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E9=94=81=E5=AE=9A=E4=BB=A5=E5=90=8E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=86=8D=E7=99=BB=E5=BD=95=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/lang/zh-cn/index.php      | 1 +
 application/admin/library/Auth.php          | 4 ++++
 application/admin/view/auth/admin/add.html  | 2 +-
 application/admin/view/auth/admin/edit.html | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/admin/lang/zh-cn/index.php b/application/admin/lang/zh-cn/index.php
index d96e47a9..8855fafd 100644
--- a/application/admin/lang/zh-cn/index.php
+++ b/application/admin/lang/zh-cn/index.php
@@ -25,6 +25,7 @@ return [
     'Username or password can not be empty'                      => '用户名密码不能为空',
     'Username or password is incorrect'                          => '用户名或密码不正确',
     'Username is incorrect'                                      => '用户名不正确',
+	'Username is locked'                                         => '用户名已锁定，请联系管理员',
     'Password is incorrect'                                      => '密码不正确',
     'Please try again after 1 day'                               => '请于1天后再尝试登录',
     'Login successful'                                           => '登录成功!',
diff --git a/application/admin/library/Auth.php b/application/admin/library/Auth.php
index 0524a353..f4e5c42e 100644
--- a/application/admin/library/Auth.php
+++ b/application/admin/library/Auth.php
@@ -42,6 +42,10 @@ class Auth extends \fast\Auth
         if (!$admin) {
             $this->setError('Username is incorrect');
             return false;
+        }
+		if ($admin->status == 'locked') {
+            $this->setError('Username is locked');
+            return false;
         }
         if (Config::get('fastadmin.login_failure_retry') && $admin->loginfailure >= 10 && time() - $admin->updatetime < 86400) {
             $this->setError('Please try again after 1 day');
diff --git a/application/admin/view/auth/admin/add.html b/application/admin/view/auth/admin/add.html
index 99a39996..6098c25d 100644
--- a/application/admin/view/auth/admin/add.html
+++ b/application/admin/view/auth/admin/add.html
@@ -32,7 +32,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
+            {:build_radios('row[status]', ['normal'=>__('Normal'), 'locked'=>__('Locked')])}
         </div>
     </div>
     <div class="form-group hidden layer-footer">
diff --git a/application/admin/view/auth/admin/edit.html b/application/admin/view/auth/admin/edit.html
index 428e9766..04e372d1 100644
--- a/application/admin/view/auth/admin/edit.html
+++ b/application/admin/view/auth/admin/edit.html
@@ -38,7 +38,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">
-            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
+            {:build_radios('row[status]', ['normal'=>__('Normal'), 'locked'=>__('Locked')], $row['status'])}
         </div>
     </div>
     <div class="form-group hidden layer-footer">