From 9210b373861d936e0b5232145c083a76495d62c3 Mon Sep 17 00:00:00 2001
From: brotherand2 <547996854@qq.com>
Date: Mon, 24 Jan 2022 05:56:13 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E6=B6=88=E6=81=AF-?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5-=E5=8F=B3=E4=B8=8A=E8=A7=92=E7=82=B9?=
 =?UTF-8?q?=E5=8F=89=E5=B1=8F=E8=94=BD=E6=B6=88=E6=81=AF=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/include/misc/misc_ajax.php         |  2 +-
 upload/source/include/spacecp/spacecp_common.php |  3 ++-
 upload/template/default/home/space_notice.htm    | 13 +++++++++++--
 upload/template/default/home/spacecp_common.htm  |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/upload/source/include/misc/misc_ajax.php b/upload/source/include/misc/misc_ajax.php
index 008a24f38..05f21e01f 100644
--- a/upload/source/include/misc/misc_ajax.php
+++ b/upload/source/include/misc/misc_ajax.php
@@ -143,7 +143,7 @@ if($op == 'comment') {
 	}
 	$id = intval($_GET['id']);
 	if($id) {
-		C::t('home_notification')->delete_by_id_uid($id, $uid);
+		C::t('home_notification')->delete_by_id_uid($id, $_G['uid']);
 	}
 	showmessage('do_success');
 
diff --git a/upload/source/include/spacecp/spacecp_common.php b/upload/source/include/spacecp/spacecp_common.php
index 207e3ef88..f5064ff52 100644
--- a/upload/source/include/spacecp/spacecp_common.php
+++ b/upload/source/include/spacecp/spacecp_common.php
@@ -16,6 +16,7 @@ $op = empty($_GET['op'])?'':trim($_GET['op']);
 if($op == 'ignore') {
 
 	$type = empty($_GET['type'])?'':preg_replace("/[^0-9a-zA-Z\_\-\.]/", '', $_GET['type']);
+    $id = empty($_GET['id']) ? 0 : intval($_GET['id']);	
 	if(submitcheck('ignoresubmit')) {
 		$authorid = empty($_POST['authorid']) ? 0 : intval($_POST['authorid']);
 		if($type) {
@@ -26,7 +27,7 @@ if($op == 'ignore') {
 			$space['privacy']['filter_note'][$type_uid] = $type_uid;
 			privacy_update();
 		}
-		showmessage('do_success', dreferer(), array(), array('showdialog'=>1, 'showmsg' => true, 'closetime' => true));
+		showmessage('do_success', dreferer(), array('id' => $id ,'type' => $type ,'uid' => $authorid), array('showdialog'=>1, 'showmsg' => true, 'closetime' => true));
 	}
 	$formid = random(8);
 
diff --git a/upload/template/default/home/space_notice.htm b/upload/template/default/home/space_notice.htm
index cadeb1b4c..6b2067e31 100644
--- a/upload/template/default/home/space_notice.htm
+++ b/upload/template/default/home/space_notice.htm
@@ -54,13 +54,22 @@
 				function errorhandle_pokeignore(msg, values) {
 					deleteQueryNotice(values['uid'], 'pokeQuery');
 				}
+				function succeedhandle_noticeignore(url,msg, values) {
+					if(values['type'] == "poke") {
+						deleteQueryNotice(values['uid'], 'pokeQuery');
+					} else if(values['type'] == "friend" ) {
+						deleteQueryNotice(values['uid'], 'pendingFriend');  
+					} else {
+						deleteQueryNotice(values['id'], 'notice');
+					}
+				}				
 			</script>
 
 			<!--{if $list}-->
 				<div class="xld xlda">
 					<div class="nts">
 						<!--{loop $list $key $value}-->
-							<dl class="cl {if $key==1}bw0{/if}" $value[rowid] notice="$value[id]">
+							<dl class="cl {if $key==1}bw0{/if}" $value[rowid] notice="$value[id]" id="notice_$value[id]">
 								<dd class="m avt mbn">
 									<!--{if $value[authorid]}-->
 									<a href="home.php?mod=space&uid=$value[authorid]"><!--{avatar($value[authorid],small)}--></a>
@@ -69,7 +78,7 @@
 									<!--{/if}-->
 								</dd>
 								<dt>
-									<a class="d b" href="home.php?mod=spacecp&ac=common&op=ignore&authorid=$value[authorid]&type=$value[type]&handlekey=addfriendhk_{$value[authorid]}" id="a_note_$value[id]" onclick="showWindow(this.id, this.href, 'get', 0);" title="{lang shield}">{lang shield}</a>
+									<a class="d b" href="home.php?mod=spacecp&ac=common&op=ignore&authorid=$value[authorid]&type=$value[type]&handlekey=noticeignore" id="a_note_$value[id]" onclick="showWindow('noticeignore', this.href, 'get', 0);" title="{lang shield}">{lang shield}</a>
 									<span class="xg1 xw0"><!--{date($value[dateline], 'u')}--></span>
 								</dt>
 								<dd class="ntc_body" style="$value[style]">
diff --git a/upload/template/default/home/spacecp_common.htm b/upload/template/default/home/spacecp_common.htm
index b66fae862..875459cc2 100644
--- a/upload/template/default/home/spacecp_common.htm
+++ b/upload/template/default/home/spacecp_common.htm
@@ -14,7 +14,7 @@
 		<em id="return_$_GET[handlekey]">{lang shield_notice}</em>
 		<!--{if $_G[inajax]}--><span><a href="javascript:;" onclick="hideWindow('$_GET[handlekey]');" class="flbc" title="{lang close}">{lang close}</a></span><!--{/if}-->
 	</h3>
-	<form method="post" autocomplete="off" id="ignoreform_{$formid}" name="ignoreform_{$formid}" action="home.php?mod=spacecp&ac=common&op=ignore&type=$type" {if $_G[inajax]}onsubmit="ajaxpost(this.id, 'return_$_GET[handlekey]');"{/if}>
+	<form method="post" autocomplete="off" id="ignoreform_{$formid}" name="ignoreform_{$formid}" action="home.php?mod=spacecp&ac=common&op=ignore&type=$type&id=$id" {if $_G[inajax]}onsubmit="ajaxpost(this.id, 'return_$_GET[handlekey]');"{/if}>
 		<!--{if $_G[inajax]}--><input type="hidden" name="handlekey" value="$_GET[handlekey]" /><!--{/if}-->
 		<input type="hidden" name="ignoresubmit" value="true" />
 		<input type="hidden" name="formhash" value="{FORMHASH}" />
-- 
Gitee