From 4b73c23bd494545ea57da7112660789cb589f494 Mon Sep 17 00:00:00 2001
From: tianya <yanghuxiao@vip.qq.com>
Date: Fri, 2 Jun 2023 02:01:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=86=E7=A0=81=E6=89=BE?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/user/inc/inc_pwd_functions.php   | 4 ++--
 src/user/resetpassword.php           | 2 +-
 src/user/templets/resetpassword2.htm | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/user/inc/inc_pwd_functions.php b/src/user/inc/inc_pwd_functions.php
index e75c07d5..d9558595 100755
--- a/src/user/inc/inc_pwd_functions.php
+++ b/src/user/inc/inc_pwd_functions.php
@@ -86,7 +86,7 @@ function newmail($mid, $userid, $mailto, $type, $send)
                 sendmail($mailto, $mailtitle, $mailbody, $headers);
                 return ShowMsg('验证码已经发送到原来的邮箱，请注意查收', 'login.php', '', '5000');
             } else if ($send == 'N') {
-                return ShowMsg('稍后前往修改页', $cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&amp;id=".$mid."&amp;key=".$randval);
+                return ShowMsg('稍后前往修改页', $cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid."&key=".$randval);
             }
         } else {
             return ShowMsg('修改失败，请联系管理员', 'login.php');
@@ -99,7 +99,7 @@ function newmail($mid, $userid, $mailto, $type, $send)
                 sendmail($mailto, $mailtitle, $mailbody, $headers);
                 ShowMsg('修改验证码已经发送到原来的邮箱请查收', 'login.php');
             } elseif ($send === 'N') {
-                return ShowMsg('稍后前往修改页', $cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&amp;id=".$mid."&amp;key=".$randval);
+                return ShowMsg('稍后前往修改页', $cfg_basehost.$cfg_memberurl."/resetpassword.php?dopost=getpasswd&id=".$mid."&key=".$randval);
             }
         } else {
             ShowMsg('修改失败，请与管理员联系', 'login.php');
diff --git a/src/user/resetpassword.php b/src/user/resetpassword.php
index 5226235c..f6517e13 100755
--- a/src/user/resetpassword.php
+++ b/src/user/resetpassword.php
@@ -65,7 +65,7 @@ if ($dopost == "") {
         sn($mid, $row['userid'], $row['email'], 'N');
         exit();
     } else {
-        ShowMsg("您的安全问题或答案回答错误", "-1");
+        ShowMsg("您的安全问题或答案回答错误", "login.php");
         exit();
     }
 } else if ($dopost == "getpasswd") {
diff --git a/src/user/templets/resetpassword2.htm b/src/user/templets/resetpassword2.htm
index ebe8d49c..a1d9a8df 100755
--- a/src/user/templets/resetpassword2.htm
+++ b/src/user/templets/resetpassword2.htm
@@ -32,7 +32,6 @@
 						</div>
 						<?php } else {?>
 						<div class="form-group">
-							<label>验证码</label>
 							<input name="key" type="hidden" value="<?php echo $key;?>" placeholder="请输入验证码">
 						</div>
 						<?php }?>