From e20ec2afa1eb585ec0d5e880bde4fb7a191ce21b Mon Sep 17 00:00:00 2001
From: nayuan <nayuan@vip.qq.com>
Date: Wed, 3 Jun 2020 10:04:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7-?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/admincp/admincp_members.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/upload/source/admincp/admincp_members.php b/upload/source/admincp/admincp_members.php
index 60e76b544..1c549c594 100644
--- a/upload/source/admincp/admincp_members.php
+++ b/upload/source/admincp/admincp_members.php
@@ -465,7 +465,7 @@ EOF;
 				if($deleteitem == 'doing') {
 					$doings = array();
 					$query = C::t('home_doing')->fetch_all_by_uid_doid($uids, '', '', 0, $pertask);
-					foreach ($query as $doings) {
+					foreach ($query as $doing) {
 						$doings[] = $doing['doid'];
 					}
 
-- 
Gitee


From 6114773c86480154d228b7171706f901a1f5decf Mon Sep 17 00:00:00 2001
From: nayuan <nayuan@vip.qq.com>
Date: Sun, 28 Jun 2020 17:12:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=8C=E5=B1=95=E7=A4=BA=E6=8B=92=E7=BB=9D?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/admincp/moderate/moderate_reply.php | 2 +-
 upload/source/include/modcp/modcp_moderate.php    | 2 +-
 upload/source/language/lang_notification.php      | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/upload/source/admincp/moderate/moderate_reply.php b/upload/source/admincp/moderate/moderate_reply.php
index d50cb79d5..2f63cc39a 100644
--- a/upload/source/admincp/moderate/moderate_reply.php
+++ b/upload/source/admincp/moderate/moderate_reply.php
@@ -231,7 +231,7 @@ if(!submitcheck('modsubmit') && !$_GET['fast']) {
 			$pm = 'pm_'.$post['pid'];
 			if($post['authorid'] && $post['authorid'] != $_G['uid']) {
 				$pmlist[] = array(
-					'action' => 'modreplies_delete',
+					'action' => $_GET[''.$pm] ? 'modreplies_delete_reason' : 'modreplies_delete',
 					'notevar' => array('pid' => $post['pid'], 'post' => dhtmlspecialchars(cutstr($post['message'], 30)), 'reason' => dhtmlspecialchars($_GET[''.$pm])),
 					'authorid' => $post['authorid'],
 				);
diff --git a/upload/source/include/modcp/modcp_moderate.php b/upload/source/include/modcp/modcp_moderate.php
index c825fc566..62b22547b 100644
--- a/upload/source/include/modcp/modcp_moderate.php
+++ b/upload/source/include/modcp/modcp_moderate.php
@@ -240,7 +240,7 @@ if($op == 'replies') {
 				}
 				if($post['authorid'] && $post['authorid'] != $_G['uid']) {
 					$pmlist[] = array(
-						'act' => 'modreplies_delete',
+						'act' => $_GET['reason'] ? 'modreplies_delete_reason' : 'modreplies_delete',
 						'notevar' => array('reason' => dhtmlspecialchars($_GET['reason']), 'post' => messagecutstr($post['message'], 30)),
 						'authorid' => $post['authorid'],
 					);
diff --git a/upload/source/language/lang_notification.php b/upload/source/language/lang_notification.php
index 48e8f345a..f69e86e9d 100644
--- a/upload/source/language/lang_notification.php
+++ b/upload/source/language/lang_notification.php
@@ -109,6 +109,8 @@ $lang = array
 
 	'modreplies_delete' => '您发表回复未通过审核，现已被删除！ <p class="summary">回复内容：<span>{post}</span></p>',
 
+	'modreplies_delete_reason' => '您发表回复未通过审核，现已被删除！ <p class="summary">回复内容：<span>{post}</span></p><div class="quote"><blockquote>{reason}</blockquote></div>',
+
 	'modreplies_validate' => '您发表的回复已审核通过！ &nbsp; <a href="forum.php?mod=redirect&goto=findpost&pid={pid}&ptid={tid}" target="_blank" class="lit">查看 &rsaquo;</a> <p class="summary">回复内容：<span>{post}</span></p>',
 
 	'transfer' => '您收到一笔来自 {actor} 的积分转账 {credit} &nbsp; <a href="home.php?mod=spacecp&ac=credit&op=log&suboperation=creditslog" target="_blank" class="lit">查看 &rsaquo;</a>
-- 
Gitee