From 3e97f2537d5de95c98461a8df2df3e9c3ffbb675 Mon Sep 17 00:00:00 2001
From: tianya <yanghuxiao@vip.qq.com>
Date: Thu, 1 Dec 2022 21:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=80=81=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=97=A0=E6=B3=95=E7=99=BB=E5=BD=95=E7=9A=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/api.php                | 20 +-------------------
 src/system/common.func.php       | 18 ++++++++++++++++++
 src/system/memberlogin.class.php |  3 +++
 src/system/userlogin.class.php   |  3 +++
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/admin/api.php b/src/admin/api.php
index f55dd73e..1254570d 100644
--- a/src/admin/api.php
+++ b/src/admin/api.php
@@ -17,24 +17,6 @@ AjaxHead();
 helper('cache');
 $action = isset($action) && in_array($action, array('is_need_check_code', 'has_new_version', 'get_changed_files', 'update_backup', 'get_update_versions', 'update')) ? $action  : '';
 $curDir = dirname(GetCurUrl()); //当前目录
-/**
- * 表中是否存在某个字段
- *
- * @param  mixed $tablename 表名称
- * @param  mixed $field 字段名
- * @return void
- */
-function TableHasField($tablename,$field)
-{
-    global $dsql;
-    $dsql->GetTableFields($tablename,"tfd");
-    while ($r = $dsql->GetFieldObject("tfd")) {
-        if ($r->name === $field) {
-            return true;
-        }
-    }
-    return false;
-}
 /**
  * 登录鉴权
  *
@@ -87,7 +69,7 @@ if ($action === 'is_need_check_code') {
     if (!TableHasField("#@__arctype", "cnoverview")) {
         $unQueryVer[] = "6.1.10";
     }
-    if (!TableHasField("#@__admin", "loginerr")) {
+    if (!TableHasField("#@__admin", "loginerr") || !TableHasField("#@__member", "loginerr")) {
         $unQueryVer[] = "6.2.0";
     }
     if (count($unQueryVer) > 0) {
diff --git a/src/system/common.func.php b/src/system/common.func.php
index 37a4fa7b..242a09f5 100755
--- a/src/system/common.func.php
+++ b/src/system/common.func.php
@@ -372,6 +372,24 @@ function ShowMsg($msg, $gourl, $onlymsg = 0, $limittime = 0)
     }
     echo $msg;
 }
+/**
+ * 表中是否存在某个字段
+ *
+ * @param  mixed $tablename 表名称
+ * @param  mixed $field 字段名
+ * @return void
+ */
+function TableHasField($tablename,$field)
+{
+    global $dsql;
+    $dsql->GetTableFields($tablename,"tfd");
+    while ($r = $dsql->GetFieldObject("tfd")) {
+        if ($r->name === $field) {
+            return true;
+        }
+    }
+    return false;
+}
 /**
  *  获取验证码的session值
  *
diff --git a/src/system/memberlogin.class.php b/src/system/memberlogin.class.php
index 5054ace5..bfc7c599 100755
--- a/src/system/memberlogin.class.php
+++ b/src/system/memberlogin.class.php
@@ -465,6 +465,9 @@ class MemberLogin
         if ($rs != 'ok') {
             return -1;
         }
+        if (!TableHasField("#@__member", "loginerr")) {
+            return 0;
+        }
         $row = $dsql->GetOne("SELECT loginerr,logintime FROM `#@__member` WHERE userid LIKE '$loginuser'");
         if (is_array($row)) {
             //1分钟内如果输错3次则需要验证码
diff --git a/src/system/userlogin.class.php b/src/system/userlogin.class.php
index 130577cc..12681ccb 100755
--- a/src/system/userlogin.class.php
+++ b/src/system/userlogin.class.php
@@ -266,6 +266,9 @@ class userLogin
     function getLoginError($username)
     {
         global $dsql;
+        if (!TableHasField("#@__admin", "loginerr")) {
+            return 0;
+        }
         $this->userName = preg_replace("/[^0-9a-zA-Z_@!\.-]/", '', $username);
         $row = $dsql->GetOne("SELECT loginerr,logintime FROM `#@__admin` WHERE userid LIKE '$this->userName'");
         if (is_array($row)) {