문서 신고시 이유 적을 수 있게 항목 추가

문서 신고시 항목 적을 수 있게 함

modules/document/conf/module.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <module>
 	<grants />
 	<permissions>
@@ -24,6 +24,7 @@
 		<action name="dispDocumentPreview" type="view" />
 		<action name="dispDocumentManageDocument" type="view" />
 		<action name="dispTempSavedList" type="view" />
+		<action name="dispDocumentDeclare" type="view" />
 
 		<action name="getDocumentCategories" type="model" />
 		<action name="getDocumentMenu" type="model" />
@@ -41,6 +42,7 @@
 		<action name="dispDocumentAdminConfig" type="view" />
 		<action name="dispDocumentAdminAlias" type="view" menu_name="document" />
 		<action name="dispDocumentAdminDeclared" type="view" menu_name="document" />
+		<action name="dispDocumentAdminDeclaredLogByDocumentSrl" type="view" menu_name="document" />
 		<action name="dispDocumentAdminTrashList" type="view" menu_name="document" />
 
 		<action name="getDocumentCategoryTplInfo" type="model" />

modules/document/document.admin.view.php

@@ -161,6 +161,53 @@ class documentAdminView extends document
 		$this->setTemplateFile('declared_list');
 	}
 
+	/**
+	 * Display a report list on the admin page
+	 * @return void
+	 */
+	function dispDocumentAdminDeclaredLogByDocumentSrl()
+	{
+		// option for a list
+		$args = new stdClass;
+		$args->page = Context::get('page'); // /< Page
+		$args->list_count = 30; // /< the number of posts to display on a single page
+		$args->page_count = 10; // /< the number of pages that appear in the page navigation
+		$args->document_srl = intval(Context::get('target_srl'));
+
+
+		// get Status name list
+		$oDocumentModel = getModel('document');
+		$oMemberModel = getModel('member');
+		$statusNameList = $oDocumentModel->getStatusNameList();
+		$oDocument = $oDocumentModel->getDocument($args->document_srl);
+
+		$declared_output = executeQuery('document.getDeclaredLogByDocumentSrl', $args);
+		if($declared_output->data && count($declared_output->data))
+		{
+			$reporter_list = array();
+
+			foreach($declared_output->data as $key => $log)
+			{
+				$reporter_list[$log->member_srl] = $oMemberModel->getMemberInfoByMemberSrl($log->member_srl);
+			}
+		}
+
+		// Set values of document_model::getDocumentList() objects for a template
+		Context::set('total_count', $declared_output->total_count);
+		Context::set('total_page', $declared_output->total_page);
+		Context::set('page', $declared_output->page);
+		Context::set('declare_log', $declared_output->data);
+		Context::set('reporter_list', $reporter_list);
+		Context::set('declared_document', $oDocument);
+		Context::set('page_navigation', $declared_output->page_navigation);
+		Context::set('status_name_list', $statusNameList);
+
+		// Set the template
+		$this->setLayoutFile('popup_layout');
+		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplateFile('declared_log');
+	}
+
 	/**
 	 * Display a alias list on the admin page
 	 * @return void

modules/document/document.class.php

@@ -124,6 +124,9 @@ class document extends ModuleObject
 		// 2012. 08. 29 Add a trigger to copy additional setting when the module is copied 
 		if(!$oModuleModel->getTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after')) return true;
 
+		// 2016. 1. 27: Add a column(declare_message) for report
+		if(!$oDB->isColumnExists("document_declared_log","declare_message")) return true;
+
 		return false;
 	}
 
@@ -320,6 +323,12 @@ class document extends ModuleObject
 			$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'document', 'controller', 'triggerCopyModule', 'after');
 		}
 
+		// 2016. 1. 27: Add a column(declare_message) for report
+		if(!$oDB->isColumnExists("document_declared_log","declare_message"))
+		{
+			$oDB->addColumn('document_declared_log',"declare_message","text");
+		}
+
 		return new Object(0,'success_updated');
 	}
 

modules/document/document.controller.php

@@ -192,12 +192,18 @@ class documentController extends document
 	 */
 	function procDocumentDeclare()
 	{
-		if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
+		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
 
 		$document_srl = Context::get('target_srl');
+		$declare_message = Context::get('declare_message');
 		if(!$document_srl) return new Object(-1, 'msg_invalid_request');
 
-		return $this->declaredDocument($document_srl);
+		if(Context::get('success_return_url'))
+		{
+			$this->setRedirectUrl(Context::get('success_return_url'));
+		}
+
+		return $this->declaredDocument($document_srl, $declare_message);
 	}
 
 	/**
@@ -1359,9 +1365,10 @@ class documentController extends document
 	/**
 	 * Report posts
 	 * @param int $document_srl
+	 * @param string $declare_message
 	 * @return void|Object
 	 */
-	function declaredDocument($document_srl)
+	function declaredDocument($document_srl, $declare_message = '')
 	{
 		// Fail if session information already has a reported document
 		if($_SESSION['declared_document'][$document_srl]) return new Object(-1, 'failed_declared');
@@ -1421,6 +1428,7 @@ class documentController extends document
 		}
 
 		$args->document_srl = $document_srl;
+		$args->declare_message = trim(htmlspecialchars($declare_message));
 		$output = executeQuery('document.getDocumentDeclaredLogInfo', $args);
 
 		// Pass after registering a sesson if reported/declared documents are in the logs.
@@ -1438,6 +1446,7 @@ class documentController extends document
 		if($declared_count > 0) $output = executeQuery('document.updateDeclaredDocument', $args);
 		else $output = executeQuery('document.insertDeclaredDocument', $args);
 		if(!$output->toBool()) return $output;
+
 		// Leave logs
 		$output = executeQuery('document.insertDocumentDeclaredLog', $args);
 		if(!$output->toBool())

modules/document/document.model.php

@@ -514,8 +514,8 @@ class documentModel extends document
 			}
 
 			// Adding Report
-			$url = sprintf("doCallModuleAction('document','procDocumentDeclare','%s')", $document_srl);
-			$oDocumentController->addDocumentPopupMenu($url,'cmd_declare','','javascript');
+			$url = getUrl('', 'act', 'dispDocumentDeclare', 'target_srl', $document_srl);
+			$oDocumentController->addDocumentPopupMenu($url,'cmd_declare','','popup');
 
 			// Add Bookmark button
 			$url = sprintf("doCallModuleAction('member','procMemberScrapDocument','%s')", $document_srl);

modules/document/document.view.php

@@ -175,6 +175,35 @@ class documentView extends document
 		$this->setTemplateFile('saved_list_popup');
 	}
 
+	/**
+	 * Document temp saved list
+	 * @return void
+	 */
+	function dispDocumentDeclare()
+	{
+		$this->setLayoutFile('popup_layout');
+		$document_srl = Context::get('target_srl');
+
+		$oMemberModel = getModel('member');
+		// A message appears if the user is not logged-in
+		if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+
+		// Create the document object. If the document module of basic data structures, write it all works .. -_-;
+		$oDocumentModel = getModel('document');
+		// Creates an object for displaying the selected document
+		$oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager, FALSE);
+		if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request');
+		// Check permissions
+		if(!$oDocument->isAccessible()) return new Object(-1,'msg_not_permitted');
+
+		// Browser title settings
+		Context::set('target_document', $oDocument);
+
+		Context::set('target_srl', $document_srl);
+
+		$this->setTemplatePath($this->module_path.'tpl');
+		$this->setTemplateFile('declare_document');
+	}
 }
 /* End of file document.view.php */
 /* Location: ./modules/document/document.view.php */

modules/document/lang/lang.xml

@@ -965,4 +965,20 @@
 			<value xml:lang="vi"><![CDATA[deletes]]></value>
 		</item>
 	</item>
+	<item name="improper_document_declare">
+		<value xml:lang="ko"><![CDATA[불량 게시글 신고]]></value>
+		<value xml:lang="en"><![CDATA[Report an improper document]]></value>
+	</item>
+	<item name="declaring_user">
+		<value xml:lang="ko"><![CDATA[신고자]]></value>
+		<value xml:lang="en"><![CDATA[Reporter]]></value>
+	</item>
+	<item name="improper_document_declare_reason">
+		<value xml:lang="ko"><![CDATA[신고 이유]]></value>
+		<value xml:lang="en"><![CDATA[Reason]]></value>
+	</item>
+	<item name="about_improper_document_declare">
+		<value xml:lang="ko"><![CDATA[게시글 신고 사유를 간단히 적어서 제출해주시면 관리자 검토 후 조치하겠습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Write here the reason you report this article as an improper document.]]></value>
+	</item>
 </lang>

modules/document/queries/getDeclaredLogByDocumentSrl.xml

@@ -0,0 +1,17 @@
+<query id="getDeclaredLogByDocumentSrl" action="select">
+	<tables>
+		<table name="document_declared_log" />
+	</tables>
+	<columns>
+		<column name="*" />
+	</columns>
+	<conditions>
+		<condition operation="equal" column="document_srl" var="document_srl" default="0" filter="number" notnull="notnull" />
+	</conditions>
+	<navigation>
+		<index var="sort_index" default="regdate" order="order_type" />
+		<list_count var="list_count" default="20" />
+		<page_count var="page_count" default="10" />
+		<page var="page" default="1" />
+	</navigation>
+</query>

modules/document/queries/insertDocumentDeclaredLog.xml

@@ -6,6 +6,7 @@
 		<column name="document_srl" var="document_srl" filter="number" default="0" notnull="notnull" />
 		<column name="member_srl" var="member_srl" filter="number" default="0" />
 		<column name="ipaddress" var="ipaddress" default="ipaddress()" />
+		<column name="declare_message" var="declare_message" />
 		<column name="regdate" var="regdate" default="curdate()" />
 	</columns>
 </query>

modules/document/ruleset/insertDeclare.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ruleset version="1.5.0">
+	<customrules>
+	</customrules>
+	<fields>
+		<field name="target_srl" required="true" rule="number" default="0" />
+	</fields>
+</ruleset>

modules/document/schemas/document_declared_log.xml

@@ -2,5 +2,6 @@
 	<column name="document_srl" type="number" size="11" notnull="notnull" index="idx_document_srl" />
 	<column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
 	<column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
+	<column name="declare_message" type="text" />
 	<column name="regdate" type="date" index="idx_regdate" />
 </table>

modules/document/tpl/declare_document.html

@@ -0,0 +1,32 @@
+<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/document/tpl/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<section class="section">
+	<h1>{$lang->improper_document_declare}</h1>
+	<form action="./" method="post" id="fo_component" ruleset="insertDeclare">
+		<input type="hidden" name="module" value="document" />
+		<input type="hidden" name="act" value="procDocumentDeclare" />
+		<input type="hidden" name="target_srl" value="{$target_srl}" />
+		<input type="hidden" name="success_return_url" value="{getUrl('', 'act', $act, 'target_srl', $target_srl)}" />
+		<input type="hidden" name="xe_validator_id" value="modules/document/tpl/1" />
+		<blockquote>
+			<section class="target_article">
+				<h1>{$target_document->getTitleText()}</h1>
+				<p>{$target_document->getSummary(200)}</p>
+			</section>
+		</blockquote>
+		<label class="x_control-label" for="declare_message">{$lang->improper_document_declare_reason}</label>
+		<div class="x_controls">
+			<textarea name="declare_message" id="declare_message"></textarea>
+			<p>{$lang->about_improper_document_declare}<p>
+		</div>
+		<div class="x_clearfix btnArea">
+			<div class="x_pull-right">
+				<button type="submit" class="x_btn x_btn-primary" />{$lang->cmd_submit}</button>
+			</div>
+		</div>
+	</form>
+</section>
+<script>
+	jQuery(window).load(setFixedPopupSize);
+</script>

modules/document/tpl/declared_list.html

@@ -46,7 +46,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 			<tr loop="$document_list => $no,$oDocument">
 				<td class="title"><a href="{getUrl('','document_srl',$oDocument->document_srl)}" target="_blank">{$oDocument->getTitle()}</a></td>
 				<td class="nowr"><a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</a></td>
-				<td class="nowr">{$oDocument->get('declared_count')}</td>
+				<td class="nowr">{$oDocument->get('declared_count')} (<a href="{getUrl('', 'act', 'dispDocumentAdminDeclaredLogByDocumentSrl', 'target_srl',$oDocument->document_srl)}" onclick="popopen(this.href, 'admin_popup');return false">{$lang->improper_document_declare_reason}</a>)</td>
 				<td class="nowr">{$oDocument->get('readed_count')}</td>
 				<td class="nowr">{$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')}</td>
 				<td class="nowr">{$oDocument->getRegdate("Y-m-d H:i")}</td>

modules/document/tpl/declared_log.html

@@ -0,0 +1,71 @@
+<h1>{$lang->improper_document_declare}</h1>
+<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/document/tpl/declared_list/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form id="fo_list" action="./" method="get">
+	<input type="hidden" name="module" value="document" />
+	<input type="hidden" name="page" value="{$page}" />
+	<blockquote>
+		<section>
+			<h1>{$declared_document->getTitleText()}</h1>
+			<p>{$declared_document->getSummary(200)}</p>
+			<address cond="$declared_document->get('member_srl')"><a href="#popup_menu_area" class="member_{$declared_document->get('member_srl')}">{$declared_document->getNickName()}</a></address>
+		</section>
+	</blockquote>
+	<h2>{$lang->improper_document_declare_reason}</h2>
+	<table class="x_table x_table-striped x_table-hover" id="documentListTable">
+		<thead>
+			<tr>
+				<th scope="col" class="nowr">{$lang->declaring_user}</th>
+				<th scope="col" class="nowr">{$lang->improper_document_declare_reason}</th>
+				<th scope="col" class="nowr">{$lang->date}</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr loop="$declare_log => $no,$log">
+				<td class="nowr"><a cond="$log->member_srl" href="#popup_menu_area" class="member_{$log->member_srl}">{$reporter_list[$log->member_srl]->nick_name}</a> ({$log->ipaddress})</td>
+				<td class="nowr">{$log->declare_message}</td>
+				<td class="nowr">{date('Y-m-d H:i:s', strtotime($log->regdate))}</td>
+			</tr>
+		</tbody>
+	</table>
+</form>
+
+<form action="./" class="x_pagination">
+	<input type="hidden" name="error_return_url" value="" />
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
+
+	<ul>
+		<li class="x_disabled"|cond="!$page || $page == 1"><a href="{getUrl('page', '')}">&laquo; {$lang->first_page}</a></li>
+		<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
+		{@$isGoTo = true}
+		<li>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">&hellip;</a>
+			<span cond="$isGoTo" id="goTo" class="x_input-append">
+				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
+				<button type="submit" class="x_add-on">Go</button>
+			</span>
+		</li>
+		</block>
+
+		<!--@while($page_no = $page_navigation->getNextPage())-->
+		{@$last_page = $page_no}
+		<li class="x_active"|cond="$page_no == $page"><a  href="{getUrl('page', $page_no)}">{$page_no}</a></li>
+		<!--@end-->
+
+		<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
+		{@$isGoTo = true}
+		<li>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">&hellip;</a>
+			<span cond="$isGoTo" id="goTo" class="x_input-append">
+				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
+				<button type="submit" class="x_add-on">Go</button>
+			</span>
+		</li>
+		</block>
+		<li class="x_disabled"|cond="$page == $page_navigation->last_page"><a href="{getUrl('page', $page_navigation->last_page)}" title="{$page_navigation->last_page}">{$lang->last_page} &raquo;</a></li>
+	</ul>
+</form>