From 81f785004647fcce145b37da1977fd887cf2dd88 Mon Sep 17 00:00:00 2001
From: "zhangqingtian@pxjy.com" <zhangqingtian@pxjy.com>
Date: Thu, 17 May 2018 11:58:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=BB=BA=E5=88=86=E6=94=AF=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=98=E5=8E=9F=E7=AE=A1=E7=90=86=E5=91=98=E9=94=81=E5=AE=9A?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
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, 2 insertions(+), 7 deletions(-)

diff --git a/application/admin/lang/zh-cn/index.php b/application/admin/lang/zh-cn/index.php
index 8855fafd..d96e47a9 100644
--- a/application/admin/lang/zh-cn/index.php
+++ b/application/admin/lang/zh-cn/index.php
@@ -25,7 +25,6 @@ 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 f4e5c42e..0524a353 100644
--- a/application/admin/library/Auth.php
+++ b/application/admin/library/Auth.php
@@ -42,10 +42,6 @@ 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 6098c25d..99a39996 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'), 'locked'=>__('Locked')])}
+            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')])}
         </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 04e372d1..428e9766 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'), 'locked'=>__('Locked')], $row['status'])}
+            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
         </div>
     </div>
     <div class="form-group hidden layer-footer">