From 8e4f237b67eadb4cdb7b2319729196cfcd85222e Mon Sep 17 00:00:00 2001
From: conory <conorycom@gmail.com>
Date: Tue, 22 Dec 2015 09:22:38 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B6=88=EC=95=88=EC=A0=95=ED=95=9C=20?=
 =?UTF-8?q?=EC=8A=A4=ED=8C=B8=ED=9A=8C=EC=9B=90=EA=B4=80=EB=A6=AC=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=A0=9C=EA=B1=B0=20(=EA=B0=9C=EC=84=A0=EC=98=88?=
 =?UTF-8?q?=EC=A0=95)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../queries/deleteMessagesMember.xml          |  4 +-
 modules/member/member.admin.controller.php    | 81 +------------------
 modules/member/tpl/member_list.html           |  4 +-
 3 files changed, 4 insertions(+), 85 deletions(-)

diff --git a/modules/communication/queries/deleteMessagesMember.xml b/modules/communication/queries/deleteMessagesMember.xml
index 6d55754f7..87aba25df 100644
--- a/modules/communication/queries/deleteMessagesMember.xml
+++ b/modules/communication/queries/deleteMessagesMember.xml
@@ -5,8 +5,8 @@
   <conditions>
     <condition operation="equal" column="message_type" var="message_type" />
     <group pipe="and">
-      <condition operation="equal" column="sender_srl" var="sender_srl" />
-      <condition operation="equal" column="receiver_srl" var="receiver_srl" pipe="or" />
+		<condition operation="equal" column="sender_srl" var="sender_srl" />
+		<condition operation="equal" column="receiver_srl" var="receiver_srl" pipe="or" />
     </group>
   </conditions>
 </query>
diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 2c5f738d3..b6a89a27e 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -865,18 +865,7 @@ class memberAdminController extends member
 						}
 						$this->setMessage('success_updated');
 						break;
-					}
-				case 'spam':
-					{
-						$output = $this->spammerManage($member_srl);
-						if(!$output->toBool())
-						{
-							$oDB->rollback();
-							return $output;
-						}
-						$this->setMessage('success_deleted');
-						break;
-					}		
+					}	
 				case 'delete':
 					{
 						$oMemberController->memberInfo = null;
@@ -1535,74 +1524,6 @@ class memberAdminController extends member
 
 		return new Object();
 	}
-	
-	/**
-	* Delete spammer's Activity
-	* @param int $member_srl
-	* @return Object
-	*/
-	function spammerManage($member_srl)
-	{
-		// 스팸 유저가 쓴 모든 글 자동 삭제
-		$oDocumentModel = &getModel('document');
-		$oDocumentController = &getController('document');
-		$obj->member_srl = $member_srl;
-		$obj->list_count = '99999999999';
-		$columnList = array('document_srl','ipaddress');
-		$document_list = $oDocumentModel->getDocumentList($obj,false,true,$columnList);
-		foreach($document_list->data as $key_document => $val_document)
-		{
-			// 회원 IP 스팸에 등록
-			$args_spam->ipaddress = $val_document->get('ipaddress');
-			if($args_spam->ipaddress && ($ipaddress_bk != $args_spam->ipaddress ))
-			{
-				$output_spam = executeQuery('spamfilter.isDeniedIP', $args_spam);
-				if(!$output_spam->data->count)
-				{
-				$ipaddress_bk = $args_spam->ipaddress;
-				executeQuery('spamfilter.insertDeniedIP', $args_spam);
-				}
-			}
-			// 글 삭제
-			$oDocumentController->deleteDocument($val_document->document_srl);
-		}
-		
-		// 스팸 유저가 쓴 모든 댓글 자동 삭제
-		$oCommentModel = &getModel('comment');
-		$obj->search_target = 'member_srl';
-		$obj->search_keyword = $member_srl;
-		$comment_list = $oCommentModel->getTotalCommentList($obj);
-		$oCommentController = &getController('comment');
-		foreach($comment_list->data as $key_comment => $val_comment)
-		{
-			// 회원 IP 스팸에 등록
-			$args_spam->ipaddress = $val_comment->get('ipaddress');
-			if($args_spam->ipaddress && ($ipaddress_bk != $args_spam->ipaddress ))
-			{
-				$output_spam = executeQuery('spamfilter.isDeniedIP', $args_spam);
-				if(!$output_spam->data->count)
-				{
-					$ipaddress_bk = $args_spam->ipaddress;
-					executeQuery('spamfilter.insertDeniedIP', $args_spam);
-				}
-			}
-			$oCommentController->deleteComment($val_comment->comment_srl);
-		}
-		
-		// 쪽지 삭제
-		$args_message->sender_srl = $obj->member_srl;
-		$args_message->receiver_srl = $obj->member_srl;
-		$output_message = executeQuery('communication.deleteMessagesMember', $args_message);
-		
-		// 회원정보 삭제
-		$oMemberController = &getController('member');
-		$oMemberController->memberInfo = null;
-		$oMemberController = &getController('member');
-		$output = $oMemberController->deleteMember($obj->member_srl);
-	
-		return $output;
-	}	
-	
 }
 /* End of file member.admin.controller.php */
 /* Location: ./modules/member/member.admin.controller.php */
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index 738f30935..606073ab2 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -24,7 +24,6 @@
 				<a class="x_btn x_btn-inverse" href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert')}">{$lang->msg_new_member}</a>
 				<a href="#listManager" data-value="modify" class="modalAnchor _member x_btn">{$lang->modify}</a>
 				<a href="#listManager" data-value="delete" class="modalAnchor _member x_btn">{$lang->delete}</a>
-				<a href="#listManager" data-value="spam" class="modalAnchor _member x_btn">{$lang->cmd_spammer}</a>
 			</div>
 		</caption>
 		<thead>
@@ -113,7 +112,6 @@
 		<a class="x_btn x_btn-inverse" href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert')}">{$lang->msg_new_member}</a>
 		<a href="#listManager" data-value="modify" class="modalAnchor _member x_btn">{$lang->modify}</a>
 		<a href="#listManager" data-value="delete" class="modalAnchor _member x_btn">{$lang->delete}</a>
-		<a href="#listManager" data-value="spam" class="modalAnchor _member x_btn">{$lang->cmd_spammer}</a>
 	</div>
 </div>
 <form action="./" method="get" class="search center x_input-append" no-error-return-url="true">
@@ -171,7 +169,7 @@
 		<div class="x_modal-footer">
 			<button type="button" class="x_btn x_pull-left" data-hide="#listManager">{$lang->cmd_close}</button>
 			<span class="x_btn-group x_pull-right">
-				<button type="submit" name="type" value="modify|delete|spam" class="x_btn x_btn-inverse">{$lang->confirm}</button>
+				<button type="submit" name="type" value="modify|delete" class="x_btn x_btn-inverse">{$lang->confirm}</button>
 			</span>
 		</div>
 	</form>