From f57cf5ce80cde432e735199d20f258d9ae0deed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=A1=E5=AE=85=E7=94=B7=28YznCMS=E5=AE=98=E6=96=B9=29?=
<530765310@qq.com>
Date: Thu, 19 Sep 2024 02:42:28 +0000
Subject: [PATCH 1/5] =?UTF-8?q?update=20application/common/library/Auth.ph?=
=?UTF-8?q?p.=20=E6=AD=A4=E5=A4=84=E6=B2=A1=E6=9C=89=E7=94=A8return=20fals?=
=?UTF-8?q?e;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/common/library/Auth.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/application/common/library/Auth.php b/application/common/library/Auth.php
index f3ed90f6..17e95586 100644
--- a/application/common/library/Auth.php
+++ b/application/common/library/Auth.php
@@ -224,6 +224,7 @@ class Auth
if ($user->loginfailure >= 10 && time() - $user->loginfailuretime < 86400) {
$this->setError('Please try again after 1 day');
+ return false;
}
if ($user->password != $this->getEncryptPassword($password, $user->salt)) {
From a5025fd1b15c5e0acfe59da172dd2fd68dc445fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=A1=E5=AE=85=E7=94=B7=28YznCMS=E5=AE=98=E6=96=B9=29?=
<530765310@qq.com>
Date: Thu, 19 Sep 2024 02:47:53 +0000
Subject: [PATCH 2/5] =?UTF-8?q?update=20application/index/lang/zh-cn/user.?=
=?UTF-8?q?php.=20=E7=99=BB=E5=BD=95=E6=AC=A1=E6=95=B0=E5=A4=9A=E8=AF=AD?=
=?UTF-8?q?=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: 御宅男(YznCMS官方) <530765310@qq.com>
---
application/index/lang/zh-cn/user.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/application/index/lang/zh-cn/user.php b/application/index/lang/zh-cn/user.php
index 26d1efd7..b471c8f4 100755
--- a/application/index/lang/zh-cn/user.php
+++ b/application/index/lang/zh-cn/user.php
@@ -57,11 +57,12 @@ return [
'Change password successful' => '修改密码成功',
'Password and confirm password don\'t match' => '两次输入的密码不一致',
'Captcha is incorrect' => '验证码不正确',
+ 'Please try again after 1 day' => '请于1天后再尝试登录',
'Logged in successful' => '登录成功',
'Logout successful' => '退出成功',
'User center already closed' => '会员中心已经关闭',
'Don\'t have an account? Sign up' => '还没有账号？点击注册',
- 'Already have an account? Sign in' => '已经有账号？点击登录',
+ 'Already have an account? Sign in' => '已经有账号？点击登录',
'Operation failed' => '操作失败',
'Invalid parameters' => '参数不正确',
'Change password failure' => '修改密码失败',
From f01d11d02bd8c7e053bdd074cc0d4373b234609e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=A1=E5=AE=85=E7=94=B7=28YznCMS=E5=AE=98=E6=96=B9=29?=
<530765310@qq.com>
Date: Fri, 27 Sep 2024 05:33:05 +0000
Subject: [PATCH 3/5] =?UTF-8?q?update=20application/admin/controller/auth/?=
=?UTF-8?q?Adminlog.php.=20=E5=88=A0=E9=99=A4=E6=AE=8B=E7=95=99=E7=9A=84?=
=?UTF-8?q?=E6=97=A7=E7=9A=84=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: 御宅男(YznCMS官方) <530765310@qq.com>
---
application/admin/controller/auth/Adminlog.php | 8 --------
1 file changed, 8 deletions(-)
diff --git a/application/admin/controller/auth/Adminlog.php b/application/admin/controller/auth/Adminlog.php
index 1d8cc810..67ec10b1 100644
--- a/application/admin/controller/auth/Adminlog.php
+++ b/application/admin/controller/auth/Adminlog.php
@@ -18,21 +18,13 @@ class Adminlog extends Backend
* @var \app\admin\model\AdminLog
*/
protected $model = null;
- protected $childrenGroupIds = [];
protected $childrenAdminIds = [];
public function _initialize()
{
parent::_initialize();
$this->model = model('AdminLog');
-
$this->childrenAdminIds = $this->auth->getChildrenAdminIds(true);
- $this->childrenGroupIds = $this->auth->getChildrenGroupIds(true);
-
- $groupName = AuthGroup::where('id', 'in', $this->childrenGroupIds)
- ->column('id,name');
-
- $this->view->assign('groupdata', $groupName);
}
/**
From d6635c1cd66612dd3cd4355167848ccb9fdf9486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=A1=E5=AE=85=E7=94=B7=28YznCMS=E5=AE=98=E6=96=B9=29?=
<530765310@qq.com>
Date: Tue, 29 Oct 2024 05:37:27 +0000
Subject: [PATCH 4/5] update application/common/view/tpl/dispatch_jump.tpl.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: 御宅男(YznCMS官方) <530765310@qq.com>
---
application/common/view/tpl/dispatch_jump.tpl | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/application/common/view/tpl/dispatch_jump.tpl b/application/common/view/tpl/dispatch_jump.tpl
index 64ed63dd..4426893e 100755
--- a/application/common/view/tpl/dispatch_jump.tpl
+++ b/application/common/view/tpl/dispatch_jump.tpl
@@ -41,18 +41,19 @@
{:__('Go back')}
{if $url}
- {:__('Jump now')}
+ {:__('Jump now')}
{/if}
{if $url}
{/if}
-