게시판에서 상담 기능과 익명글 기능을 동시 사용 시 문제 고침

xpressengine/xe-core#2140
rhymix · Jan 10, 2018 · 61bad46 · 61bad46
1 parent af2452b
commit 61bad46
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 14 deletions.
diff --git a/modules/board/board.view.php b/modules/board/board.view.php
@@ -270,7 +270,7 @@ function dispBoardContentView(){
 				if($this->consultation && !$oDocument->isNotice())
 				{
 					$logged_info = Context::get('logged_info');
-					if($oDocument->get('member_srl')!=$logged_info->member_srl)
+					if(abs($oDocument->get('member_srl')) != $logged_info->member_srl)
 					{
 						$oDocument = $oDocumentModel->getDocument(0);
 					}
@@ -543,11 +543,20 @@ function dispBoardContentList(){
 		if($this->consultation)
 		{
 			$logged_info = Context::get('logged_info');
-			$args->member_srl = $logged_info->member_srl;
+
+			if($this->module_info->use_anonymous === 'Y')
+			{
+				$args->member_srl = array($logged_info->member_srl, $logged_info->member_srl * -1);
+			}
+			else
+			{
+				$args->member_srl = $logged_info->member_srl;
+			}
 		}
 
 		// setup the list config variable on context
 		Context::set('list_config', $this->listConfig);
+
 		// setup document list variables on context
 		$output = $oDocumentModel->getDocumentList($args, $this->except_notice, TRUE, $this->columnList);
 		Context::set('document_list', $output->data);

diff --git a/modules/document/document.model.php b/modules/document/document.model.php
@@ -1325,7 +1325,7 @@ function _setSearchOption($searchOpt, &$args, &$query_id, &$use_division)
 		$args->page_count = $searchOpt->page_count?$searchOpt->page_count:10;
 		$args->start_date = $searchOpt->start_date?$searchOpt->start_date:null;
 		$args->end_date = $searchOpt->end_date?$searchOpt->end_date:null;
-		$args->member_srl = $searchOpt->member_srl;
+		$args->member_srl = $searchOpt->member_srl ?: ($searchOpt->member_srls ?: null);
 
 		$logged_info = Context::get('logged_info');
 

diff --git a/modules/document/queries/getDocumentListExtraSort.xml b/modules/document/queries/getDocumentListExtraSort.xml
@@ -14,7 +14,7 @@
         <condition operation="notin" column="d.module_srl" var="exclude_module_srl" filter="number" pipe="and" />
         <condition operation="in" column="d.category_srl" var="category_srl" pipe="and" />
         <condition operation="equal" column="d.is_notice" var="s_is_notice" pipe="and" />
-        <condition operation="equal" column="d.member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="in" column="d.member_srl" var="member_srl" filter="number" pipe="and" />
         <condition operation="in" column="d.status" var="statusList" pipe="and" />
         <group pipe="and">
             <condition operation="more" column="d.list_order" var="division" pipe="and" />

diff --git a/modules/document/queries/getDocumentListPage.xml b/modules/document/queries/getDocumentListPage.xml
@@ -10,7 +10,7 @@
         <condition operation="notin" column="module_srl" var="exclude_module_srl" filter="number" pipe="and" />
         <condition operation="in" column="category_srl" var="category_srl" pipe="and" />
         <condition operation="equal" column="is_notice" var="s_is_notice" pipe="and" />
-        <condition operation="equal" column="member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="in" column="member_srl" var="member_srl" filter="number" pipe="and" />
         <condition operation="in" column="status" var="statusList" pipe="and" />
         <group pipe="and">
             <condition operation="more" column="list_order" var="division" pipe="and" />

diff --git a/modules/document/queries/getDocumentListUseIndex.xml b/modules/document/queries/getDocumentListUseIndex.xml
@@ -13,7 +13,7 @@
         <condition operation="notin" column="module_srl" var="exclude_module_srl" filter="number" pipe="and" />
         <condition operation="in" column="category_srl" var="category_srl" pipe="and" />
         <condition operation="equal" column="is_notice" var="s_is_notice" pipe="and" />
-        <condition operation="equal" column="member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="in" column="member_srl" var="member_srl" filter="number" pipe="and" />
         <condition operation="in" column="status" var="statusList" pipe="and" />
         <group pipe="and">
             <condition operation="more" column="list_order" var="division" pipe="and" />

diff --git a/modules/document/queries/getDocumentListWithExtraVars.xml b/modules/document/queries/getDocumentListWithExtraVars.xml
@@ -9,7 +9,7 @@
     <conditions>
         <condition operation="in" column="documents.module_srl" var="module_srl" filter="number" />
         <condition operation="in" column="documents.category_srl" var="category_srl" filter="number" pipe="and" />
-        <condition operation="equal" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="in" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
         <condition operation="equal" column="extra_vars.module_srl" default="documents.module_srl" pipe="and" />
         <condition operation="equal" column="extra_vars.document_srl" default="documents.document_srl" pipe="and" />
         <condition operation="equal" column="extra_vars.var_idx" var="var_idx" notnull="notnull" pipe="and" />

diff --git a/modules/document/queries/getDocumentListWithExtraVarsPage.xml b/modules/document/queries/getDocumentListWithExtraVarsPage.xml
@@ -9,7 +9,7 @@
     <conditions>
         <condition operation="in" column="documents.module_srl" var="module_srl" filter="number" />
         <condition operation="in" column="documents.category_srl" var="category_srl" filter="number" pipe="and" />
-        <condition operation="equal" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="in" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
         <condition operation="equal" column="extra_vars.module_srl" default="documents.module_srl" pipe="and" />
         <condition operation="equal" column="extra_vars.document_srl" default="documents.document_srl" pipe="and" />
         <condition operation="equal" column="extra_vars.var_idx" var="var_idx" notnull="notnull" pipe="and" />

diff --git a/modules/document/queries/getDocumentListWithinComment.xml b/modules/document/queries/getDocumentListWithinComment.xml
@@ -12,7 +12,7 @@
         <condition operation="notin" column="documents.module_srl" var="exclude_module_srl" filter="number" pipe="and" />
         <condition operation="equal" column="documents.category_srl" var="category_srl" pipe="and" />
         <condition operation="equal" column="documents.document_srl" default="comments.document_srl" notnull="notnull" pipe="and" />
-        <condition operation="equal" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="in" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
         <condition operation="in" column="documents.status" var="statusList" pipe="and" />
         <group pipe="and">
             <condition operation="more" column="documents.list_order" var="division" pipe="and" />

diff --git a/modules/document/queries/getDocumentListWithinCommentPage.xml b/modules/document/queries/getDocumentListWithinCommentPage.xml
@@ -11,7 +11,7 @@
         <condition operation="notin" column="documents.module_srl" var="exclude_module_srl" filter="number" pipe="and" />
         <condition operation="equal" column="documents.category_srl" var="category_srl" pipe="and" />
         <condition operation="equal" column="documents.document_srl" default="comments.document_srl" notnull="notnull" pipe="and" />
-        <condition operation="equal" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="in" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
         <condition operation="in" column="documents.status" var="statusList" pipe="and" />
         <group pipe="and">
             <condition operation="more" column="documents.list_order" var="division" pipe="and" />

diff --git a/modules/document/queries/getDocumentListWithinExtraVars.xml b/modules/document/queries/getDocumentListWithinExtraVars.xml
@@ -9,7 +9,7 @@
     <conditions>
         <condition operation="in" column="documents.module_srl" var="module_srl" filter="number" />
         <condition operation="in" column="documents.category_srl" var="category_srl" filter="number" pipe="and" />
-        <condition operation="equal" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="in" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
         <condition operation="equal" column="extra_vars.module_srl" default="documents.module_srl" pipe="and" />
         <condition operation="equal" column="extra_vars.document_srl" default="documents.document_srl" pipe="and" />
         <condition operation="in" column="documents.status" var="statusList" pipe="and" />

diff --git a/modules/document/queries/getDocumentListWithinExtraVarsExtraSort.xml b/modules/document/queries/getDocumentListWithinExtraVarsExtraSort.xml
@@ -15,7 +15,7 @@
     <condition operation="notin" column="d.module_srl" var="exclude_module_srl" filter="number" pipe="and" />
     <condition operation="in" column="d.category_srl" var="category_srl" pipe="and" />
     <condition operation="equal" column="d.is_notice" var="s_is_notice" pipe="and" />
-    <condition operation="equal" column="d.member_srl" var="member_srl" filter="number" pipe="and" />
+    <condition operation="in" column="d.member_srl" var="member_srl" filter="number" pipe="and" />
     <condition operation="in" column="d.status" var="statusList" pipe="and" />
     <group pipe="and">
       <condition operation="more" column="d.list_order" var="division" pipe="and" />

diff --git a/modules/document/queries/getDocumentListWithinTag.xml b/modules/document/queries/getDocumentListWithinTag.xml
@@ -12,7 +12,7 @@
         <condition operation="notin" column="documents.module_srl" var="exclude_module_srl" filter="number" pipe="and" />
         <condition operation="equal" column="documents.document_srl" default="tags.document_srl" notnull="notnull" pipe="and" />
         <condition operation="in" column="documents.category_srl" var="category_srl" filter="number" pipe="and" />
-        <condition operation="equal" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="in" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
         <condition operation="like" column="tags.tag" var="s_tags" notnull="notnull" pipe="and" />
         <condition operation="in" column="documents.status" var="statusList" pipe="and" />
     </conditions>

diff --git a/modules/document/queries/getDocumentListWithinTagPage.xml b/modules/document/queries/getDocumentListWithinTagPage.xml
@@ -11,7 +11,7 @@
         <condition operation="notin" column="documents.module_srl" var="exclude_module_srl" filter="number" pipe="and" />
         <condition operation="equal" column="documents.document_srl" default="tags.document_srl" notnull="notnull" pipe="and" />
         <condition operation="in" column="documents.category_srl" var="category_srl" filter="number" pipe="and" />
-        <condition operation="equal" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="in" column="documents.member_srl" var="member_srl" filter="number" pipe="and" />
         <condition operation="like" column="tags.tag" var="s_tags" notnull="notnull" pipe="and" />
 		<group pipe="and">
 			<condition operation="less" column="documents.list_order" var="list_order" filter="number" pipe="and" />