fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 01:01:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into fuxml/no-xml-lang

Browse source 
Conflicts:
	modules/comment/lang/lang.xml
	modules/document/lang/lang.xml
	modules/member/lang/lang.xml
This commit is contained in:
Kijin Sung 2016-01-31 16:13:03 +09:00
commit 4797e858b8
46 changed files with 1230 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

35
common/css/xe.css
View file

@ -63,14 +63,16 @@ a img {
/* Popup Menu Area */
#popup_menu_area {
position: absolute;
z-index:9999;
margin: 10px 0;
padding: 10px;
border: 1px solid #e9e9e9;
border-radius: 3px;
padding: 0;
border: 1px solid #eeeeee;
border-radius: 2px;
font-size: 12px;
box-shadow: 0 0 6px #666;
filter: progid: DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5);
box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23);
background: #fff;
min-width:80px;
outline:none;
}
#popup_menu_area ul {
margin: 0;
@ -80,20 +82,31 @@ a img {
#popup_menu_area li {
margin: 0;
padding: 0;
line-height: 1.25;
line-height: 1.5;
}
#popup_menu_area a {
display: block;
padding: 1px 3px;
border-radius: 2px;
padding: 5px;
text-decoration: none;
color: #333;
color: #212121;
}
#popup_menu_area a:hover,
#popup_menu_area a:active,
#popup_menu_area a:focus {
color: #fff;
background: #666;
background: #eeeeee;
}
@media screen and (max-width: 400px) {
#popup_menu_area {
min-width:120px;
max-width:95%;
font-size: 13px;
}
#popup_menu_area a {
display: block;
padding: 10px;
text-decoration: none;
color: #212121;
}
}
/* Message */

2
common/js/common.js
View file

@ -945,7 +945,7 @@ jQuery(function($){
// display popup menu that contains member actions and document actions
$(document).on('click', function(evt) {
var $area = $('#popup_menu_area');
if(!$area.length) $area = $('<div id="popup_menu_area" tabindex="0" style="display:none;z-index:9999" />').appendTo(document.body);
if(!$area.length) $area = $('<div id="popup_menu_area" tabindex="0" style="display:none;" />').appendTo(document.body);
// 이전에 호출되었을지 모르는 팝업메뉴 숨김
$area.hide();

2
common/js/xml_handler.js
View file

@ -11,7 +11,7 @@
/**
* Set this variable to false to hide the "do you want to leave the page?" dialog.
*/
window.show_leaving_warning = false;
window.show_leaving_warning = true;
/**
* This variable stores the .wfsr jQuery object.

6
modules/board/board.controller.php
View file

@ -148,6 +148,12 @@ class boardController extends board
{
$oModuleModel = getModel('module');
$member_config = $oModuleModel->getModuleConfig('member');
$is_logged = Context::get('is_logged');
if(!$is_logged && !$member_config->webmaster_email)
{
$obj->email_address = $this->module_info->admin_mail;
}
$oMail = new Mail();
$oMail->setTitle($obj->title);

44
modules/comment/comment.admin.view.php
View file

@ -140,6 +140,50 @@ class commentAdminView extends comment
$this->setTemplateFile('declared_list');
}
/**
* Display a reported comment and log of reporting
* @return void
*/
function dispCommentAdminDeclaredLogByCommentSrl()
{
// 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->comment_srl = intval(Context::get('target_srl'));
// get Status name list
$oCommentModel = getModel('comment');
$oMemberModel = getModel('member');
$oComment = $oCommentModel->getComment($args->comment_srl);
$declared_output = executeQuery('comment.getDeclaredLogByCommentSrl', $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_comment', $oComment);
Context::set('page_navigation', $declared_output->page_navigation);
// Set the template
$this->setLayoutFile('popup_layout');
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile('declared_log');
}
}
/* End of file comment.admin.view.php */
/* Location: ./modules/comment/comment.admin.view.php */

12
modules/comment/comment.class.php
View file

@ -101,6 +101,12 @@ class comment extends ModuleObject
return TRUE;
}
// 2016. 1. 29: Add a column(declare_message) for report
if(!$oDB->isColumnExists("comment_declared_log","declare_message"))
{
return true;
}
return FALSE;
}
@ -175,6 +181,12 @@ class comment extends ModuleObject
$oModuleController->insertTrigger('module.procModuleAdminCopyModule', 'comment', 'controller', 'triggerCopyModule', 'after');
}
// 2016. 1. 29: Add a column(declare_message) for report
if(!$oDB->isColumnExists("comment_declared_log","declare_message"))
{
$oDB->addColumn('comment_declared_log',"declare_message","text");
}
return new Object(0, 'success_updated');
}

41
modules/comment/comment.controller.php
View file

@ -205,7 +205,19 @@ class commentController extends comment
return new Object(-1, 'msg_invalid_request');
}
return $this->declaredComment($comment_srl);
// if an user select message from options, message would be the option.
$message_option = strval(Context::get('message_option'));
$improper_comment_reasons = Context::getLang('improper_comment_reasons');
$declare_message = ($message_option !== 'others' && isset($improper_comment_reasons[$message_option]))?
$improper_comment_reasons[$message_option] : trim(Context::get('declare_message'));
// if there is return url, set that.
if(Context::get('success_return_url'))
{
$this->setRedirectUrl(Context::get('success_return_url'));
}
return $this->declaredComment($comment_srl, $declare_message);
}
/**
@ -616,6 +628,7 @@ class commentController extends comment
$oDocument = $oDocumentModel->getDocument($obj->document_srl);
$oMemberModel = getModel("member");
$is_logged = Context::get('is_logged');
if(isset($obj->member_srl) && !is_null($obj->member_srl))
{
$member_info = $oMemberModel->getMemberInfoByMemberSrl($obj->member_srl);
@ -639,7 +652,12 @@ class commentController extends comment
if($module_info->admin_mail && $member_info->is_admin != 'Y')
{
$oMail = new Mail();
$oMail->setSender($obj->email_address, $obj->email_address);
if($is_logged)
{
$oMail->setSender($obj->email_address, $obj->email_address);
}
$mail_title = "[Rhymix - " . Context::get('mid') . "] A new comment was posted on document: \"" . $oDocument->getTitleText() . "\"";
$oMail->setTitle($mail_title);
$url_comment = getFullUrl('','document_srl',$obj->document_srl).'#comment_'.$obj->comment_srl;
@ -712,7 +730,10 @@ class commentController extends comment
{
continue;
}
if(!$is_logged)
{
$oMail->setSender($email_address, $email_address);
}
$oMail->setReceiptor($email_address, $email_address);
$oMail->send();
}
@ -1304,9 +1325,10 @@ class commentController extends comment
/**
* Report a blamed comment
* @param $comment_srl
* @param string $declare_message
* @return void
*/
function declaredComment($comment_srl)
function declaredComment($comment_srl, $declare_message)
{
// Fail if session information already has a reported document
if($_SESSION['declared_comment'][$comment_srl])
@ -1322,6 +1344,7 @@ class commentController extends comment
{
return $output;
}
$declared_count = ($output->data->declared_count) ? $output->data->declared_count : 0;
$trigger_obj = new stdClass();
@ -1370,7 +1393,9 @@ class commentController extends comment
{
$args->ipaddress = $_SERVER['REMOTE_ADDR'];
}
$args->comment_srl = $comment_srl;
$args->declare_message = trim(htmlspecialchars($declare_message));
$log_output = executeQuery('comment.getCommentDeclaredLogInfo', $args);
// session registered if log info contains report log.
@ -1402,6 +1427,13 @@ class commentController extends comment
// leave the log
$output = executeQuery('comment.insertCommentDeclaredLog', $args);
if(!$output->toBool())
{
$oDB->rollback();
return $output;
}
$this->add('declared_count', $declared_count + 1);
// Call a trigger (after)
$trigger_obj->declared_count = $declared_count + 1;
@ -1412,6 +1444,7 @@ class commentController extends comment
return $trigger_output;
}
// commit
$oDB->commit();
// leave into the session information

4
modules/comment/comment.model.php
View file

@ -69,8 +69,8 @@ class commentModel extends comment
}
// Add the report feature against abused posts
$url = sprintf("doCallModuleAction('comment','procCommentDeclare','%s')", $comment_srl);
$oCommentController->addCommentPopupMenu($url, 'cmd_declare', '', 'javascript');
$url = getUrl('', 'act', 'dispCommentDeclare', 'target_srl', $comment_srl);
$oCommentController->addCommentPopupMenu($url, 'cmd_declare', '', 'popup');
}
// call a trigger (after)

38
modules/comment/comment.view.php
View file

@ -60,6 +60,44 @@ class commentView extends comment
return new Object();
}
/**
* Report an improper comment
* @return void
*/
function dispCommentDeclare()
{
$this->setLayoutFile('popup_layout');
$comment_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 comment object.
$oCommentModel = getModel('comment');
// Creates an object for displaying the selected comment
$oComment = $oCommentModel->getComment($comment_srl);
if(!$oComment->isExists())
{
return new Object(-1,'msg_invalid_request');
}
// Check permissions
if(!$oComment->isAccessible())
{
return new Object(-1,'msg_not_permitted');
}
// Browser title settings
Context::set('target_comment', $oComment);
Context::set('target_srl', $comment_srl);
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile('declare_comment');
}
}
/* End of file comment.view.php */
/* Location: ./modules/comment/comment.view.php */

10
modules/comment/conf/module.xml
View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<module>
<grants />
<permissions>
@ -8,17 +8,25 @@
</permissions>
<actions>
<action name="getCommentMenu" type="model" />
<action name="dispCommentAdminList" type="view" admin_index="true" menu_name="comment" menu_index="true" />
<action name="dispCommentAdminDeclared" type="view" menu_name="comment" />
<action name="dispCommentAdminDeclaredLogByCommentSrl" type="view" menu_name="comment" />
<action name="dispCommentDeclare" type="view" />
<action name="procCommentVoteUp" type="controller" />
<action name="procCommentVoteDown" type="controller" />
<action name="procCommentDeclare" type="controller" />
<action name="getCommentVotedMemberList" type="model" />
<action name="procCommentInsertModuleConfig" type="controller" ruleset="insertCommentModuleConfig" />
<action name="procCommentAdminDeleteChecked" type="controller" ruleset="deleteChecked" />
<action name="procCommentAdminChangeStatus" type="controller"/>
<action name="procCommentAdminChangePublishedStatusChecked" type="controller" />
<action name="isModuleUsingPublishValidation" type="controller" />
<action name="procCommentAdminCancelDeclare" type="controller" />
<action name="procCommentAdminAddCart" type="controller" />
<action name="procCommentGetList" type="controller" />

12
modules/comment/lang/en.php
View file

@ -35,3 +35,15 @@ $lang->cmd_unpublish = 'Unpublish';
$lang->select_module = 'Select Module';
$lang->page = 'Page';
$lang->msg_not_selected_comment = 'There are no selected comment.';
$lang->improper_comment_declare = 'Report an improper comment';
$lang->declaring_user = 'Reporter';
$lang->improper_comment_declare_reason = 'Reason';
$lang->improper_comment_reasons['advertisement'] = 'Advertisements that do not fit the topics or themes.';
$lang->improper_comment_reasons['theme'] = 'Comments that do not fit the topics or themes.';
$lang->improper_comment_reasons['bad_word'] = 'Too much bad words.';
$lang->improper_comment_reasons['violence'] = 'Violence.';
$lang->improper_comment_reasons['racism'] = 'Racism.';
$lang->improper_comment_reasons['pornography'] = 'Pornography.';
$lang->improper_comment_reasons['privacy'] = 'Privacy issue.';
$lang->improper_comment_reasons['others'] = 'Others (Write your own)';
$lang->about_improper_comment_declare = 'Write here why you report this comment as an improper thing.';

12
modules/comment/lang/ko.php
View file

@ -39,3 +39,15 @@ $lang->page = '페이지';
$lang->msg_not_selected_comment = '선택한 댓글이 없습니다.';
$lang->msg_admin_comment_no_delete = '최고관리자의 댓글을 삭제 할 수 없습니다.';
$lang->msg_admin_c_comment_no_delete = '이 댓글에 최고관리자의 댓글이 있어 삭제할 수 없습니다.';
$lang->improper_comment_declare = '불량 댓글 신고';
$lang->declaring_user = '신고자';
$lang->improper_comment_declare_reason = '신고 이유';
$lang->improper_comment_reasons['advertisement'] = '본문 주제나 흐름에 맞지 않는 광고 글입니다.';
$lang->improper_comment_reasons['theme'] = '주제에 맞지 않는 글입니다.';
$lang->improper_comment_reasons['bad_word'] = '과도한 욕설을 담고 있습니다.';
$lang->improper_comment_reasons['violence'] = '폭력적인 내용을 담고 있습니다.';
$lang->improper_comment_reasons['racism'] = '인종차별적인 내용을 담고 있습니다.';
$lang->improper_comment_reasons['pornography'] = '음란물을 포함하고 있습니다.';
$lang->improper_comment_reasons['privacy'] = '민감한 개인정보가 노출 되어있습니다.';
$lang->improper_comment_reasons['others'] = '기타(직접작성)';
$lang->about_improper_comment_declare = '댓글을 신고하신 이유를 간단히 적어서 제출해주시면 관리자 검토 후 조치하겠습니다.';

377
modules/comment/lang/lang.xml Normal file
View file

@ -0,0 +1,377 @@
<?xml version='1.0' encoding='UTF-8'?>
<lang>
<item name="cmd_comment_do">
<value xml:lang="ko"><![CDATA[이 댓글을]]></value>
<value xml:lang="en"><![CDATA[I want to]]></value>
<value xml:lang="jp"><![CDATA[このコメントを…]]></value>
<value xml:lang="zh-CN"><![CDATA[将把此评论..]]></value>
<value xml:lang="zh-TW"><![CDATA[將此回覆..]]></value>
<value xml:lang="fr"><![CDATA[Vous voudriez]]></value>
<value xml:lang="ru"><![CDATA[Эту запись]]></value>
<value xml:lang="es"><![CDATA[Usted ]]></value>
<value xml:lang="tr"><![CDATA[Şunu yap]]></value>
<value xml:lang="vi"><![CDATA[Bình chọn / Phê bình]]></value>
</item>
<item name="comment_list">
<value xml:lang="ko"><![CDATA[댓글 목록]]></value>
<value xml:lang="en"><![CDATA[Comments List]]></value>
<value xml:lang="jp"><![CDATA[コメントリスト]]></value>
<value xml:lang="zh-CN"><![CDATA[评论列表]]></value>
<value xml:lang="zh-TW"><![CDATA[回覆列表]]></value>
<value xml:lang="fr"><![CDATA[Liste des Commentaires]]></value>
<value xml:lang="ru"><![CDATA[Список записей]]></value>
<value xml:lang="es"><![CDATA[Comentarios Lista]]></value>
<value xml:lang="tr"><![CDATA[Yorum Listesi]]></value>
<value xml:lang="vi"><![CDATA[Danh sách bình luận]]></value>
</item>
<item name="cmd_toggle_checked_comment">
<value xml:lang="ko"><![CDATA[선택항목 반전]]></value>
<value xml:lang="en"><![CDATA[Invert Selection]]></value>
<value xml:lang="jp"><![CDATA[選択項目の反転]]></value>
<value xml:lang="zh-CN"><![CDATA[反选]]></value>
<value xml:lang="zh-TW"><![CDATA[反向選擇]]></value>
<value xml:lang="fr"><![CDATA[Renverser les choisis]]></value>
<value xml:lang="ru"><![CDATA[Изменить выбранное]]></value>
</item>
<item name="cmd_delete_checked_comment">
<value xml:lang="ko"><![CDATA[선택항목 삭제]]></value>
<value xml:lang="en"><![CDATA[Delete selected item]]></value>
<value xml:lang="jp"><![CDATA[選択項目削除]]></value>
<value xml:lang="zh-CN"><![CDATA[删除所选]]></value>
<value xml:lang="zh-TW"><![CDATA[刪除所選]]></value>
<value xml:lang="fr"><![CDATA[Supprimer les choisis]]></value>
<value xml:lang="ru"><![CDATA[Удалить выбранное]]></value>
<value xml:lang="es"><![CDATA[Eliminar lo seleccionado]]></value>
<value xml:lang="tr"><![CDATA[Seçili parçayı sil]]></value>
<value xml:lang="vi"><![CDATA[Xóa những bình luận đã chọn]]></value>
</item>
<item name="trash">
<value xml:lang="ko"><![CDATA[휴지통]]></value>
<value xml:lang="en"><![CDATA[Recycle Bin]]></value>
<value xml:lang="jp"><![CDATA[ゴミ箱]]></value>
<value xml:lang="zh-TW"><![CDATA[回收桶]]></value>
</item>
<item name="cmd_trash">
<value xml:lang="ko"><![CDATA[휴지통으로 이동]]></value>
<value xml:lang="en"><![CDATA[Move to Recycle Bin]]></value>
<value xml:lang="jp"><![CDATA[ゴミ箱へ移動]]></value>
<value xml:lang="zh-TW"><![CDATA[移至回收桶]]></value>
</item>
<item name="comment_count">
<value xml:lang="ko"><![CDATA[댓글 수]]></value>
<value xml:lang="en"><![CDATA[Number of Comments]]></value>
<value xml:lang="jp"><![CDATA[コメント数]]></value>
<value xml:lang="zh-CN"><![CDATA[每页评论数]]></value>
<value xml:lang="zh-TW"><![CDATA[每頁回覆數]]></value>
<value xml:lang="fr"><![CDATA[Limite de Commentaires]]></value>
<value xml:lang="de"><![CDATA[Kommentare]]></value>
<value xml:lang="ru"><![CDATA[Количество ответов]]></value>
<value xml:lang="tr"><![CDATA[Yorum Sayısı]]></value>
<value xml:lang="vi"><![CDATA[Số bình luận]]></value>
<value xml:lang="mn"><![CDATA[Комментын тоо]]></value>
</item>
<item name="about_comment_count">
<value xml:lang="ko"><![CDATA[댓글을 정해진 수 만큼만 표시하고, 그 이상일 경우 페이지 번호를 표시해서 이동할 수 있게 합니다.]]></value>
<value xml:lang="en"><![CDATA[Display comments and if the number of them is over a specified number, move to the comment list.]]></value>
<value xml:lang="jp"><![CDATA[コメントを指定した数だけ表示し、それ以上はリスト化します。]]></value>
<value xml:lang="zh-CN"><![CDATA[可以指定要显示的每页评论数。]]></value>
<value xml:lang="zh-TW"><![CDATA[可以指定要顯示的每頁回覆數。]]></value>
<value xml:lang="fr"><![CDATA[Quand il y a plus de commentaires, ils seront bougés sur le liste.]]></value>
<value xml:lang="ru"><![CDATA[Отображается указанное количество ответов, после превышения этого количества производится переход к списку.]]></value>
<value xml:lang="tr"><![CDATA[Yorumları, kullanıcının girdiği rakam kadar gösterin. Eğer yorum sayısı belirlenen sayıyı aşarsa, yorum Liste'ye taşınır.]]></value>
<value xml:lang="vi"><![CDATA[Hiển thị số bình luận được gửi, và nó sẽ tạo một danh sách nếu có nhiều bình luận.]]></value>
</item>
<item name="msg_comment_voted_cancel_not">
<value xml:lang="ko"><![CDATA[추천수가 0이하일 경우 추천캔슬을 사용할 수 없습니다.]]></value>
</item>
<item name="msg_comment_blamed_cancel_not">
<value xml:lang="ko"><![CDATA[추천수가 0이하일 경우 비추천캔슬을 사용할 수 없습니다.]]></value>
</item>
<item name="msg_cart_is_null">
<value xml:lang="ko"><![CDATA[삭제할 글을 선택해주세요.]]></value>
<value xml:lang="en"><![CDATA[Please select an article to delete.]]></value>
<value xml:lang="jp"><![CDATA[削除するコメントを選択してください。]]></value>
<value xml:lang="zh-CN"><![CDATA[请选择要删除的评论。]]></value>
<value xml:lang="zh-TW"><![CDATA[請選擇要刪除的回覆。]]></value>
<value xml:lang="fr"><![CDATA[Choisissez un article à supprimer, S.V.P.]]></value>
<value xml:lang="ru"><![CDATA[Пожалуйста, выберите записи для удаления.]]></value>
<value xml:lang="es"><![CDATA[Selecciona el commentario que desea eliminar]]></value>
<value xml:lang="tr"><![CDATA[Lütfen silinecek makaleyi seçiniz]]></value>
<value xml:lang="vi"><![CDATA[Xin hãy chọn một bài viết để xóa.]]></value>
</item>
<item name="msg_checked_comment_is_deleted">
<value xml:lang="ko"><![CDATA[%d개의 댓글을 삭제했습니다.]]></value>
<value xml:lang="en"><![CDATA[%d comment(s) is(are) successfully deleted.]]></value>
<value xml:lang="jp"><![CDATA[%d個のコメントを削除しました。]]></value>
<value xml:lang="zh-CN"><![CDATA[已删除%d个评论。]]></value>
<value xml:lang="zh-TW"><![CDATA[已刪除 %d 個回覆。]]></value>
<value xml:lang="fr"><![CDATA[%d commentaire(s) est(sont) supprimé(s) avec succés.]]></value>
<value xml:lang="ru"><![CDATA[%d записьуспешно удалена]]></value>
<value xml:lang="es"><![CDATA[%d comentario eliminado correctamente.]]></value>
<value xml:lang="tr"><![CDATA[%d yorum başarıyla silindi.]]></value>
<value xml:lang="vi"><![CDATA[%d bình luận đã được xóa.]]></value>
</item>
<item name="search_target_list" type="array">
<item name="content">
<value xml:lang="ko"><![CDATA[내용]]></value>
<value xml:lang="en"><![CDATA[Content]]></value>
<value xml:lang="jp"><![CDATA[内容]]></value>
<value xml:lang="zh-CN"><![CDATA[内容]]></value>
<value xml:lang="zh-TW"><![CDATA[內容]]></value>
<value xml:lang="fr"><![CDATA[Contenu]]></value>
<value xml:lang="ru"><![CDATA[Содержание]]></value>
<value xml:lang="es"><![CDATA[Contenido]]></value>
<value xml:lang="tr"><![CDATA[İçerik]]></value>
<value xml:lang="vi"><![CDATA[Nội dung]]></value>
</item>
<item name="user_id">
<value xml:lang="ko"><![CDATA[아이디]]></value>
<value xml:lang="en"><![CDATA[ID]]></value>
<value xml:lang="jp"><![CDATA[ユーザID]]></value>
<value xml:lang="zh-CN"><![CDATA[I D]]></value>
<value xml:lang="zh-TW"><![CDATA[帳號]]></value>
<value xml:lang="fr"><![CDATA[Compte]]></value>
<value xml:lang="vi"><![CDATA[ID người gửi]]></value>
</item>
<item name="user_name">
<value xml:lang="ko"><![CDATA[이름]]></value>
<value xml:lang="en"><![CDATA[Name]]></value>
<value xml:lang="jp"><![CDATA[名前]]></value>
<value xml:lang="zh-CN"><![CDATA[姓名]]></value>
<value xml:lang="zh-TW"><![CDATA[姓名]]></value>
<value xml:lang="fr"><![CDATA[Nom]]></value>
<value xml:lang="ru"><![CDATA[Имя]]></value>
<value xml:lang="es"><![CDATA[Nombre]]></value>
<value xml:lang="tr"><![CDATA[İsim]]></value>
<value xml:lang="vi"><![CDATA[Tên]]></value>
</item>
<item name="nick_name">
<value xml:lang="ko"><![CDATA[닉네임]]></value>
<value xml:lang="en"><![CDATA[Nickname]]></value>
<value xml:lang="jp"><![CDATA[ニックネーム]]></value>
<value xml:lang="zh-CN"><![CDATA[昵称]]></value>
<value xml:lang="zh-TW"><![CDATA[暱稱]]></value>
<value xml:lang="fr"><![CDATA[Surnom]]></value>
<value xml:lang="ru"><![CDATA[Ник]]></value>
<value xml:lang="es"><![CDATA[Apodo]]></value>
<value xml:lang="tr"><![CDATA[Takma Ad]]></value>
</item>
<item name="member_srl">
<value xml:lang="ko"><![CDATA[회원 번호]]></value>
<value xml:lang="en"><![CDATA[Member Serial]]></value>
<value xml:lang="jp"><![CDATA[会員番号]]></value>
<value xml:lang="zh-CN"><![CDATA[会员编号]]></value>
<value xml:lang="zh-TW"><![CDATA[會員編號]]></value>
<value xml:lang="fr"><![CDATA[Numéro de Série du Membre]]></value>
<value xml:lang="ru"><![CDATA[Номер пользователя]]></value>
<value xml:lang="tr"><![CDATA[Üye Dizisi]]></value>
<value xml:lang="vi"><![CDATA[Mã số người gửi]]></value>
</item>
<item name="email_address">
<value xml:lang="ko"><![CDATA[이메일 주소]]></value>
<value xml:lang="en"><![CDATA[Email]]></value>
<value xml:lang="jp"><![CDATA[メールアドレス]]></value>
<value xml:lang="zh-CN"><![CDATA[电子信箱]]></value>
<value xml:lang="zh-TW"><![CDATA[電子信箱]]></value>
<value xml:lang="fr"><![CDATA[Mél]]></value>
<value xml:lang="ru"><![CDATA[Email адрес]]></value>
<value xml:lang="es"><![CDATA[Correo Electrónico]]></value>
<value xml:lang="tr"><![CDATA[E-posta]]></value>
</item>
<item name="homepage">
<value xml:lang="ko"><![CDATA[홈페이지]]></value>
<value xml:lang="en"><![CDATA[Homepage]]></value>
<value xml:lang="jp"><![CDATA[ホームページURL]]></value>
<value xml:lang="zh-CN"><![CDATA[主页]]></value>
<value xml:lang="zh-TW"><![CDATA[主頁]]></value>
<value xml:lang="fr"><![CDATA[Page d'Accueil]]></value>
<value xml:lang="ru"><![CDATA[Домашняя страница]]></value>
<value xml:lang="es"><![CDATA[Página web]]></value>
<value xml:lang="tr"><![CDATA[Anasayfa]]></value>
<value xml:lang="vi"><![CDATA[Trang chủ]]></value>
</item>
<item name="regdate">
<value xml:lang="ko"><![CDATA[등록일]]></value>
<value xml:lang="en"><![CDATA[Date]]></value>
<value xml:lang="jp"><![CDATA[登録日]]></value>
<value xml:lang="zh-CN"><![CDATA[日期]]></value>
<value xml:lang="zh-TW"><![CDATA[日期]]></value>
<value xml:lang="fr"><![CDATA[Jour]]></value>
<value xml:lang="ru"><![CDATA[Дата регистрации]]></value>
<value xml:lang="es"><![CDATA[Fecha del registro]]></value>
<value xml:lang="tr"><![CDATA[Tarih]]></value>
<value xml:lang="vi"><![CDATA[Ngày]]></value>
</item>
<item name="last_update">
<value xml:lang="ko"><![CDATA[최근수정일 ]]></value>
<value xml:lang="en"><![CDATA[Last update]]></value>
<value xml:lang="jp"><![CDATA[最終更新日 ]]></value>
<value xml:lang="zh-CN"><![CDATA[最后更新 ]]></value>
<value xml:lang="zh-TW"><![CDATA[最後更新]]></value>
<value xml:lang="fr"><![CDATA[Mise à Jour]]></value>
<value xml:lang="ru"><![CDATA[Дата последнего обновления]]></value>
<value xml:lang="es"><![CDATA[Ultima actualización]]></value>
<value xml:lang="tr"><![CDATA[Son Güncelleştirme]]></value>
<value xml:lang="vi"><![CDATA[Cập nhật lần cuối]]></value>
</item>
<item name="ipaddress">
<value xml:lang="ko"><![CDATA[IP 주소]]></value>
<value xml:lang="en"><![CDATA[IP Address]]></value>
<value xml:lang="jp"><![CDATA[IPアドレス]]></value>
<value xml:lang="zh-CN"><![CDATA[IP 地址]]></value>
<value xml:lang="zh-TW"><![CDATA[IP 位址]]></value>
<value xml:lang="fr"><![CDATA[Adresse IP]]></value>
<value xml:lang="ru"><![CDATA[IP-адрес]]></value>
<value xml:lang="es"><![CDATA[Dirección IP]]></value>
<value xml:lang="tr"><![CDATA[IP Adresi]]></value>
<value xml:lang="vi"><![CDATA[IP]]></value>
</item>
<item name="is_secret">
<value xml:lang="ko"><![CDATA[상태]]></value>
<value xml:lang="en"><![CDATA[Status]]></value>
<value xml:lang="jp"><![CDATA[状態]]></value>
<value xml:lang="zh-TW"><![CDATA[狀態]]></value>
</item>
</item>
<item name="no_text_comment">
<value xml:lang="ko"><![CDATA[글자가 없는 댓글입니다.]]></value>
<value xml:lang="en"><![CDATA[No text in this comment.]]></value>
<value xml:lang="jp"><![CDATA[テキストがないコメントです。]]></value>
<value xml:lang="zh-TW"><![CDATA[此回覆無內容。]]></value>
<value xml:lang="tr"><![CDATA[Bu yorumda herhangi bir metin yok.]]></value>
</item>
<item name="secret_name_list" type="array">
<item name="Y">
<value xml:lang="ko"><![CDATA[비밀]]></value>
<value xml:lang="en"><![CDATA[Secret]]></value>
<value xml:lang="jp"><![CDATA[非公開]]></value>
<value xml:lang="zh-TW"><![CDATA[秘密]]></value>
</item>
<item name="N">
<value xml:lang="ko"><![CDATA[공개]]></value>
<value xml:lang="en"><![CDATA[Public]]></value>
<value xml:lang="jp"><![CDATA[公開]]></value>
<value xml:lang="zh-TW"><![CDATA[公開]]></value>
</item>
</item>
<item name="published_name_list" type="array">
<item name="Y">
<value xml:lang="en"><![CDATA[Published]]></value>
<value xml:lang="ko"><![CDATA[발행완료]]></value>
<value xml:lang="jp"><![CDATA[発行完了]]></value>
</item>
<item name="N">
<value xml:lang="en"><![CDATA[Unpublished]]></value>
<value xml:lang="ko"><![CDATA[발행대기]]></value>
<value xml:lang="jp"><![CDATA[発行待機]]></value>
</item>
</item>
<item name="comment_manager">
<value xml:lang="ko"><![CDATA[선택한 댓글 관리]]></value>
<value xml:lang="en"><![CDATA[Manage Selected Comment]]></value>
<value xml:lang="jp"><![CDATA[選択したコメントを管理]]></value>
<value xml:lang="zh-TW"><![CDATA[管理所選回覆]]></value>
</item>
<item name="selected_comment">
<value xml:lang="ko"><![CDATA[선택한 댓글]]></value>
<value xml:lang="en"><![CDATA[Selected Comment]]></value>
<value xml:lang="jp"><![CDATA[選択したコメント]]></value>
<value xml:lang="zh-TW"><![CDATA[已選回覆]]></value>
</item>
<item name="cmd_comment_validation">
<value xml:lang="ko"><![CDATA[승인 후 공개]]></value>
<value xml:lang="en"><![CDATA[Use comment validation]]></value>
<value xml:lang="jp"><![CDATA[承認後公開]]></value>
</item>
<item name="about_comment_validation">
<value xml:lang="ko"><![CDATA[관리자 승인 후 댓글을 공개합니다.]]></value>
<value xml:lang="en"><![CDATA[If you want to use comment validation before displaying on your module frontend select USE, otherwise select NOT USE.]]></value>
<value xml:lang="jp"><![CDATA[管理者承認後コメントを公開します。]]></value>
</item>
<item name="published">
<value xml:lang="en"><![CDATA[Publish status]]></value>
<value xml:lang="ko"><![CDATA[발행 상태]]></value>
<value xml:lang="jp"><![CDATA[発行状態]]></value>
</item>
<item name="cmd_publish">
<value xml:lang="en"><![CDATA[Publish]]></value>
<value xml:lang="ko"><![CDATA[발행]]></value>
<value xml:lang="jp"><![CDATA[発行]]></value>
</item>
<item name="cmd_unpublish">
<value xml:lang="en"><![CDATA[Unpublish]]></value>
<value xml:lang="ko"><![CDATA[발행 중지]]></value>
<value xml:lang="jp"><![CDATA[発行中止]]></value>
</item>
<item name="select_module">
<value xml:lang="ko"><![CDATA[모듈 선택]]></value>
<value xml:lang="en"><![CDATA[Select Module]]></value>
<value xml:lang="jp"><![CDATA[モジュール選択]]></value>
</item>
<item name="page">
<value xml:lang="ko"><![CDATA[페이지]]></value>
<value xml:lang="en"><![CDATA[Page]]></value>
<value xml:lang="jp"><![CDATA[ページ]]></value>
</item>
<item name="msg_not_selected_comment">
<value xml:lang="ko"><![CDATA[선택한 댓글이 없습니다.]]></value>
<value xml:lang="en"><![CDATA[There are no selected comment.]]></value>
<value xml:lang="jp"><![CDATA[選択したコメントがありません。]]></value>
</item>
<item name="msg_admin_comment_no_delete">
<value xml:lang="ko"><![CDATA[최고관리자의 댓글을 삭제 할 수 없습니다.]]></value>
</item>
<item name="msg_admin_c_comment_no_delete">
<value xml:lang="ko"><![CDATA[이 댓글에 최고관리자의 댓글이 있어 삭제할 수 없습니다.]]></value>
</item>
<item name="improper_comment_declare">
<value xml:lang="ko"><![CDATA[불량 댓글 신고]]></value>
<value xml:lang="en"><![CDATA[Report an improper comment]]></value>
</item>
<item name="declaring_user">
<value xml:lang="ko"><![CDATA[신고자]]></value>
<value xml:lang="en"><![CDATA[Reporter]]></value>
</item>
<item name="improper_comment_declare_reason">
<value xml:lang="ko"><![CDATA[신고 이유]]></value>
<value xml:lang="en"><![CDATA[Reason]]></value>
</item>
<item name="improper_comment_reasons" type="array">
<item name="advertisement">
<value xml:lang="ko"><![CDATA[본문 주제나 흐름에 맞지 않는 광고 글입니다.]]></value>
<value xml:lang="en"><![CDATA[Advertisements that do not fit the topics or themes.]]></value>
</item>
<item name="theme">
<value xml:lang="ko"><![CDATA[주제에 맞지 않는 글입니다.]]></value>
<value xml:lang="en"><![CDATA[Comments that do not fit the topics or themes.]]></value>
</item>
<item name="bad_word">
<value xml:lang="ko"><![CDATA[과도한 욕설을 담고 있습니다.]]></value>
<value xml:lang="en"><![CDATA[Too much bad words.]]></value>
</item>
<item name="violence">
<value xml:lang="ko"><![CDATA[폭력적인 내용을 담고 있습니다.]]></value>
<value xml:lang="en"><![CDATA[Violence.]]></value>
</item>
<item name="racism">
<value xml:lang="ko"><![CDATA[인종차별적인 내용을 담고 있습니다.]]></value>
<value xml:lang="en"><![CDATA[Racism.]]></value>
</item>
<item name="pornography">
<value xml:lang="ko"><![CDATA[음란물을 포함하고 있습니다.]]></value>
<value xml:lang="en"><![CDATA[Pornography.]]></value>
</item>
<item name="privacy">
<value xml:lang="ko"><![CDATA[민감한 개인정보가 노출 되어있습니다.]]></value>
<value xml:lang="en"><![CDATA[Privacy issue.]]></value>
</item>
<item name="others">
<value xml:lang="ko"><![CDATA[기타(직접작성)]]></value>
<value xml:lang="en"><![CDATA[Others (Write your own)]]></value>
</item>
</item>
<item name="about_improper_comment_declare">
<value xml:lang="ko"><![CDATA[댓글을 신고하신 이유를 간단히 적어서 제출해주시면 관리자 검토 후 조치하겠습니다.]]></value>
<value xml:lang="en"><![CDATA[Write here why you report this comment as an improper thing.]]></value>
</item>
</lang>

17
modules/comment/queries/getDeclaredLogByCommentSrl.xml Normal file
View file

@ -0,0 +1,17 @@
<query id="getDeclaredLogByCommentSrl" action="select">
<tables>
<table name="comment_declared_log" />
</tables>
<columns>
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="comment_srl" var="comment_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>

19
modules/comment/queries/insertCommentDeclaredLog.xml
View file

@ -1,11 +1,12 @@
<query id="insertCommentDeclaredLog" action="insert">
<tables>
<table name="comment_declared_log" />
</tables>
<columns>
<column name="comment_srl" var="comment_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="regdate" var="regdate" default="curdate()" />
</columns>
<tables>
<table name="comment_declared_log" />
</tables>
<columns>
<column name="comment_srl" var="comment_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>

8
modules/comment/ruleset/insertDeclare.xml Normal file
View file

@ -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>

9
modules/comment/schemas/comment_declared_log.xml
View file

@ -1,6 +1,7 @@
<table name="comment_declared_log">
<column name="comment_srl" type="number" size="11" notnull="notnull" index="idx_comment_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="regdate" type="date" index="idx_regdate" />
<column name="comment_srl" type="number" size="11" notnull="notnull" index="idx_comment_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>

19
modules/comment/tpl/css/declare_comment.css Normal file
View file

@ -0,0 +1,19 @@
@charset "UTF-8";
div.xe_mobile {
display:none!important;
}
section.declare_comment{
display:block;
}
section.declare_comment label{
font-weight: bold;
}
section.declare_comment select,section.declare_comment textarea{
box-sizing:border-box;
height:auto;
width: 100%;
padding:7px;
font-size: 11pt;
line-height: normal;
display:block;
}

56
modules/comment/tpl/declare_comment.html Normal file
View file

@ -0,0 +1,56 @@
{@Context::addMetaTag('viewport', 'width=device-width, user-scalable=no', FALSE);}
<load target="./css/declare_comment.css" />
<script cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/comment/tpl/1'">
alert("{$XE_VALIDATOR_MESSAGE}");
window.close();
</script>
<section class="declare_comment">
<h1>{$lang->improper_comment_declare}</h1>
<form action="./" method="post" id="fo_component" ruleset="insertDeclare">
<input type="hidden" name="module" value="comment" />
<input type="hidden" name="act" value="procCommentDeclare" />
<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/comment/tpl/1" />
<blockquote>
<section class="target_article">
<h1>{$lang->replies}</h1>
<p>{$target_comment->getSummary(200)}</p>
</section>
</blockquote>
<label class="x_control-label" for="message_option">{$lang->improper_comment_declare_reason}</label>
<div class="x_controls">
<select name="message_option" id="message_option">
<option loop="$lang->improper_comment_reasons => $key,$text" value="{$key}">{$text}</option>
</select>
<textarea name="declare_message" id="declare_message"></textarea>
<p>{$lang->about_improper_comment_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>
(function($){
var msg_area = $('textarea[name="declare_message"]');
$('select[name="message_option"]').change(function(){
var option = {
duration:200,
complete: function(){setFixedPopupSize();}
}
if ($(this).val()==='others') {
msg_area.slideDown(option);
}
else {
msg_area.slideUp(option);
setFixedPopupSize();
}
});
msg_area.hide();
$(document).load(setFixedPopupSize);
})(jQuery);
</script>

2
modules/comment/tpl/declared_list.html
View file

@ -45,7 +45,7 @@
<td><a href="{getUrl('','document_srl',$oComment->get('document_srl'))}#comment_{$oComment->get('comment_srl')}" onclick="window.open(this.href);return false;">{$oComment->getSummary(100)}</a></td>
<td><span class="member_{$oComment->getMemberSrl()}">{$oComment->getNickName()}</span></td>
<td>{$oComment->getRegdate("Y-m-d")}</td>
<td><strong>{$oComment->get('declared_count')}</strong></td>
<td><strong>{$oComment->get('declared_count')} (<a href="{getUrl('', 'act', 'dispCommentAdminDeclaredLogByCommentSrl', 'target_srl',$oComment->get('comment_srl'))}" onclick="popopen(this.href, 'admin_popup');return false">{$lang->improper_comment_declare_reason}</a>)</strong></td>
<td>{$oComment->get('ipaddress')}</td>
<td><input type="checkbox" name="cart[]" value="{$oComment->get('comment_srl')}" /></td>
</tr>

71
modules/comment/tpl/declared_log.html Normal file
View file

@ -0,0 +1,71 @@
<h1>{$lang->improper_comment_declare}</h1>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/comment/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="comment" />
<input type="hidden" name="page" value="{$page}" />
<blockquote>
<section>
<h1>{$lang->replies}</h1>
<p>{$declared_comment->getSummary(200)}</p>
<address cond="$declared_comment->get('member_srl')"><a href="#popup_menu_area" class="member_{$declared_comment->get('member_srl')}">{$declared_comment->getNickName()}</a></address>
</section>
</blockquote>
<h2>{$lang->improper_comment_declare_reason}</h2>
<table class="x_table x_table-striped x_table-hover" id="commentListTable">
<thead>
<tr>
<th scope="col" class="nowr">{$lang->declaring_user}</th>
<th scope="col" class="nowr">{$lang->improper_comment_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>

118
modules/document/conf/module.xml
View file

@ -1,71 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<module>
<grants />
<permissions>
<permission action="dispDocumentAdminList" target="manager" />
<grants />
<permissions>
<permission action="dispDocumentAdminList" target="manager" />
<permission action="dispDocumentManageDocument" target="member" />
<permission action="getDocumentCategories" target="member" />
<permission action="getDocumentCategoryTplInfo" target="member" />
<permission action="procDocumentAddCart" target="member" />
<permission action="dispDocumentManageDocument" target="member" />
<permission action="getDocumentCategories" target="member" />
<permission action="getDocumentCategoryTplInfo" target="member" />
<permission action="procDocumentAddCart" target="member" />
<permission action="procDocumentInsertCategory" target="member" />
<permission action="procDocumentManageCheckedDocument" target="member" />
<permission action="procDocumentMoveCategory" target="member" />
<permission action="procDocumentDeleteCategory" target="member" />
<permission action="procDocumentMakeXmlFile" target="member" />
<permission action="procDocumentAdminMoveToTrash" target="member" />
<permission action="procDocumentInsertCategory" target="member" />
<permission action="procDocumentManageCheckedDocument" target="member" />
<permission action="procDocumentMoveCategory" target="member" />
<permission action="procDocumentDeleteCategory" target="member" />
<permission action="procDocumentMakeXmlFile" target="member" />
<permission action="procDocumentAdminMoveToTrash" target="member" />
<permission action="procDocumentAdminInsertExtraVar" target="manager" />
<permission action="procDocumentAdminDeleteExtraVar" target="manager" />
</permissions>
<actions>
<action name="dispDocumentPrint" type="view" />
<action name="dispDocumentPreview" type="view" />
<action name="dispDocumentManageDocument" type="view" />
<action name="dispTempSavedList" type="view" />
<permission action="procDocumentAdminInsertExtraVar" target="manager" />
<permission action="procDocumentAdminDeleteExtraVar" target="manager" />
</permissions>
<actions>
<action name="dispDocumentPrint" type="view" />
<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" />
<action name="getDocumentCategories" type="model" />
<action name="getDocumentMenu" type="model" />
<action name="procDocumentVoteUp" type="controller" />
<action name="procDocumentVoteUpCancel" type="controller" />.
<action name="procDocumentVoteDown" type="controller" />
<action name="procDocumentVoteDownCancel" type="controller" />
<action name="procDocumentDeclare" type="controller" />
<action name="procDocumentAddCart" type="controller" />
<action name="procDocumentManageCheckedDocument" type="controller" />
<action name="procDocumentInsertModuleConfig" type="controller" />
<action name="procDocumentVoteUp" type="controller" />
<action name="procDocumentVoteUpCancel" type="controller" />.
<action name="procDocumentVoteDown" type="controller" />
<action name="procDocumentVoteDownCancel" type="controller" />
<action name="procDocumentDeclare" type="controller" />
<action name="procDocumentAddCart" type="controller" />
<action name="procDocumentManageCheckedDocument" type="controller" />
<action name="procDocumentInsertModuleConfig" type="controller" />
<action name="dispDocumentAdminList" type="view" admin_index="true" menu_name="document" menu_index="true" />
<action name="dispDocumentAdminConfig" type="view" />
<action name="dispDocumentAdminAlias" type="view" menu_name="document" />
<action name="dispDocumentAdminDeclared" type="view" menu_name="document" />
<action name="dispDocumentAdminTrashList" type="view" menu_name="document" />
<action name="dispDocumentAdminList" type="view" admin_index="true" menu_name="document" menu_index="true" />
<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" />
<action name="getDocumentVotedMemberList" type="model" />
<action name="getDocumentCategoryTplInfo" type="model" />
<action name="getDocumentVotedMemberList" type="model" />
<action name="procDocumentInsertCategory" type="controller" ruleset="insertCategory" />
<action name="procDocumentDeleteCategory" type="controller" />
<action name="procDocumentMoveCategory" type="controller" />
<action name="procDocumentMakeXmlFile" type="controller" />
<action name="procDocumentTempSave" type="controller" />
<action name="procDocumentGetList" type="controller" />
<action name="procDocumentInsertCategory" type="controller" ruleset="insertCategory" />
<action name="procDocumentDeleteCategory" type="controller" />
<action name="procDocumentMoveCategory" type="controller" />
<action name="procDocumentMakeXmlFile" type="controller" />
<action name="procDocumentTempSave" type="controller" />
<action name="procDocumentGetList" type="controller" />
<action name="procDocumentAdminInsertAlias" type="controller" ruleset="insertAlias" />
<action name="procDocumentAdminDeleteAlias" type="controller" ruleset="deleteAlias" />
<action name="procDocumentAdminRestoreTrash" type="controller" />
<action name="procDocumentAdminMoveExtraVar" type="controller" />
<action name="procDocumentAdminInsertAlias" type="controller" ruleset="insertAlias" />
<action name="procDocumentAdminDeleteAlias" type="controller" ruleset="deleteAlias" />
<action name="procDocumentAdminRestoreTrash" type="controller" />
<action name="procDocumentAdminMoveExtraVar" type="controller" />
<action name="procDocumentAdminInsertExtraVar" type="controller" ruleset="insertExtraVar" />
<action name="procDocumentAdminDeleteExtraVar" type="controller" />
<action name="procDocumentAdminDeleteChecked" type="controller" />
<action name="procDocumentAdminInsertConfig" type="controller" />
<action name="procDocumentAdminDeleteAllThumbnail" type="controller" />
<action name="procDocumentAdminCancelDeclare" type="controller" />
<action name="procDocumentAdminMoveToTrash" type="controller" />
</actions>
<action name="procDocumentAdminInsertExtraVar" type="controller" ruleset="insertExtraVar" />
<action name="procDocumentAdminDeleteExtraVar" type="controller" />
<action name="procDocumentAdminDeleteChecked" type="controller" />
<action name="procDocumentAdminInsertConfig" type="controller" />
<action name="procDocumentAdminDeleteAllThumbnail" type="controller" />
<action name="procDocumentAdminCancelDeclare" type="controller" />
<action name="procDocumentAdminMoveToTrash" type="controller" />
</actions>
<menus>
<menu name="document">
<title xml:lang="en">Document</title>
@ -81,4 +83,4 @@
<title xml:lang="tr">Document</title>
</menu>
</menus>
</module>
</module>

45
modules/document/document.admin.view.php
View file

@ -161,6 +161,51 @@ class documentAdminView extends document
$this->setTemplateFile('declared_list');
}
/**
* Display a reported post and log of reporting
* @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');
$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);
// 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

9
modules/document/document.class.php
View file

@ -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');
}

67
modules/document/document.controller.php
View file

@ -192,12 +192,30 @@ 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');
if(!$document_srl) return new Object(-1, 'msg_invalid_request');
$document_srl = intval(Context::get('target_srl'));
if(!$document_srl)
{
return new Object(-1, 'msg_invalid_request');
}
return $this->declaredDocument($document_srl);
// if an user select message from options, message would be the option.
$message_option = strval(Context::get('message_option'));
$improper_document_reasons = Context::getLang('improper_document_reasons');
$declare_message = ($message_option !== 'others' && isset($improper_document_reasons[$message_option]))?
$improper_document_reasons[$message_option] : trim(Context::get('declare_message'));
// if there is return url, set that.
if(Context::get('success_return_url'))
{
$this->setRedirectUrl(Context::get('success_return_url'));
}
return $this->declaredDocument($document_srl, $declare_message);
}
/**
@ -316,8 +334,8 @@ class documentController extends document
if(!$obj->email_address) $obj->email_address = '';
if(!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR'];
// can modify regdate only manager
$grant = Context::get('grant');
// can modify regdate only manager
$grant = Context::get('grant');
if(!$grant->manager)
{
unset($obj->regdate);
@ -1359,18 +1377,25 @@ 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');
if($_SESSION['declared_document'][$document_srl])
{
return new Object(-1, 'failed_declared');
}
// Check if previously reported
$args = new stdClass();
$args->document_srl = $document_srl;
$output = executeQuery('document.getDeclaredDocument', $args);
if(!$output->toBool()) return $output;
if(!$output->toBool())
{
return $output;
}
$declared_count = ($output->data->declared_count) ? $output->data->declared_count : 0;
@ -1390,7 +1415,8 @@ class documentController extends document
$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
// Pass if the author's IP address is as same as visitor's.
if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR'])
{
$_SESSION['declared_document'][$document_srl] = true;
return new Object(-1, 'failed_declared');
}
@ -1421,6 +1447,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.
@ -1435,9 +1462,21 @@ class documentController extends document
$oDB->begin();
// Add the declared document
if($declared_count > 0) $output = executeQuery('document.updateDeclaredDocument', $args);
else $output = executeQuery('document.insertDeclaredDocument', $args);
if(!$output->toBool()) return $output;
if($declared_count > 0)
{
$output = executeQuery('document.updateDeclaredDocument', $args);
}
else
{
$output = executeQuery('document.insertDeclaredDocument', $args);
}
if(!$output->toBool())
{
$oDB->rollback();
return $output;
}
// Leave logs
$output = executeQuery('document.insertDocumentDeclaredLog', $args);
if(!$output->toBool())
@ -1446,7 +1485,7 @@ class documentController extends document
return $output;
}
$this->add('declared_count', $declared_count+1);
$this->add('declared_count', $declared_count + 1);
// Call a trigger (after)
$trigger_obj->declared_count = $declared_count + 1;

4
modules/document/document.model.php
View file

@ -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);

38
modules/document/document.view.php
View file

@ -175,6 +175,44 @@ class documentView extends document
$this->setTemplateFile('saved_list_popup');
}
/**
* Report an improper post
* @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 */

1
modules/document/lang/de.php Normal file
View file

@ -0,0 +1 @@
<?php

12
modules/document/lang/en.php
View file

@ -91,3 +91,15 @@ $lang->default_message_verbs['move'] = 'moves';
$lang->default_message_verbs['copy'] = 'copies';
$lang->default_message_verbs['delete'] = 'deletes';
$lang->default_message_verbs['trash'] = 'deletes';
$lang->improper_document_declare = 'Report an improper document';
$lang->declaring_user = 'Reporter';
$lang->improper_document_declare_reason = 'Reason';
$lang->improper_document_reasons['advertisement'] = 'Advertisements that do not fit the topics or themes.';
$lang->improper_document_reasons['theme'] = 'Posts that do not fit the topics or themes.';
$lang->improper_document_reasons['bad_word'] = 'Too much bad words.';
$lang->improper_document_reasons['violence'] = 'Violence.';
$lang->improper_document_reasons['racism'] = 'Racism.';
$lang->improper_document_reasons['pornography'] = 'Pornography.';
$lang->improper_document_reasons['privacy'] = 'Privacy issue.';
$lang->improper_document_reasons['others'] = 'Others (Write your own)';
$lang->about_improper_document_declare = 'Write here why you report this article as an improper document.';

12
modules/document/lang/ko.php
View file

@ -99,3 +99,15 @@ $lang->default_message_verbs['move'] = '이동';
$lang->default_message_verbs['copy'] = '복사';
$lang->default_message_verbs['delete'] = '삭제';
$lang->default_message_verbs['trash'] = '삭제';
$lang->improper_document_declare = '불량 게시글 신고';
$lang->declaring_user = '신고자';
$lang->improper_document_declare_reason = '신고 이유';
$lang->improper_document_reasons['advertisement'] = '주제나 흐름에 맞지 않는 광고 글입니다.';
$lang->improper_document_reasons['theme'] = '주제에 맞지 않는 글입니다.';
$lang->improper_document_reasons['bad_word'] = '과도한 욕설을 담고 있습니다.';
$lang->improper_document_reasons['violence'] = '폭력적인 내용을 담고 있습니다.';
$lang->improper_document_reasons['racism'] = '인종차별적인 내용을 담고 있습니다.';
$lang->improper_document_reasons['pornography'] = '음란물을 포함하고 있습니다.';
$lang->improper_document_reasons['privacy'] = '민감한 개인정보가 노출 되어있습니다.';
$lang->improper_document_reasons['others'] = '기타(직접작성)';
$lang->about_improper_document_declare = '게시글을 신고하신 이유를 간단히 적어서 제출해주시면 관리자 검토 후 조치하겠습니다.';

1
modules/document/lang/mn.php Normal file
View file

@ -0,0 +1 @@
<?php

17
modules/document/queries/getDeclaredLogByDocumentSrl.xml Normal file
View file

@ -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>

19
modules/document/queries/insertDocumentDeclaredLog.xml
View file

@ -1,11 +1,12 @@
<query id="insertDocumentDeclaredLog" action="insert">
<tables>
<table name="document_declared_log" />
</tables>
<columns>
<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="regdate" var="regdate" default="curdate()" />
</columns>
<tables>
<table name="document_declared_log" />
</tables>
<columns>
<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>

18
modules/document/queries/updateDeclaredDocument.xml
View file

@ -1,11 +1,11 @@
<query id="updateDeclaredDocument" action="update">
<tables>
<table name="document_declared" />
</tables>
<columns>
<column name="declared_count" default="plus(1)" />
</columns>
<conditions>
<condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
</conditions>
<tables>
<table name="document_declared" />
</tables>
<columns>
<column name="declared_count" default="plus(1)" />
</columns>
<conditions>
<condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
</conditions>
</query>

8
modules/document/ruleset/insertDeclare.xml Normal file
View file

@ -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>

4
modules/document/schemas/document_declared.xml
View file

@ -1,4 +1,4 @@
<table name="document_declared">
<column name="document_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
<column name="declared_count" type="number" size="11" default="0" notnull="notnull" index="idx_declared_count" />
<column name="document_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
<column name="declared_count" type="number" size="11" default="0" notnull="notnull" index="idx_declared_count" />
</table>

9
modules/document/schemas/document_declared_log.xml
View file

@ -1,6 +1,7 @@
<table name="document_declared_log">
<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="regdate" type="date" index="idx_regdate" />
<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>

19
modules/document/tpl/css/declare_document.css Normal file
View file

@ -0,0 +1,19 @@
@charset "UTF-8";
div.xe_mobile {
display:none!important;
}
section.declare_document{
display:block;
}
section.declare_document label{
font-weight: bold;
}
section.declare_document select,section.declare_document textarea{
box-sizing:border-box;
height:auto;
width: 100%;
padding:7px;
font-size: 11pt;
line-height: normal;
display:block;
}

56
modules/document/tpl/declare_document.html Normal file
View file

@ -0,0 +1,56 @@
{@Context::addMetaTag('viewport', 'width=device-width, user-scalable=no', FALSE);}
<load target="./css/declare_document.css" />
<script cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/document/tpl/1'">
alert("{$XE_VALIDATOR_MESSAGE}");
window.close();
</script>
<section class="declare_document">
<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="message_option">{$lang->improper_document_declare_reason}</label>
<div class="x_controls">
<select name="message_option" id="message_option">
<option loop="$lang->improper_document_reasons => $key,$text" value="{$key}">{$text}</option>
</select>
<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>
(function($){
var msg_area = $('textarea[name="declare_message"]');
$('select[name="message_option"]').change(function(){
var option = {
duration:200,
complete: function(){setFixedPopupSize();}
}
if ($(this).val()==='others') {
msg_area.slideDown(option);
}
else {
msg_area.slideUp(option);
setFixedPopupSize();
}
});
msg_area.hide();
$(document).load(setFixedPopupSize);
})(jQuery);
</script>

2
modules/document/tpl/declared_list.html
View file

@ -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>

71
modules/document/tpl/declared_log.html Normal file
View file

@ -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>

2
modules/member/lang/en.php
View file

@ -261,6 +261,8 @@ $lang->cmd_show_super_admin_member = 'Super Admin';
$lang->cmd_show_site_admin_member = 'Site Admin';
$lang->approval = 'Approval';
$lang->denied = 'Denied';
$lang->refused_reason = 'Reason for account refusing';
$lang->about_refused_reason = 'Describe the reason why you refuse this account. Something you write in this field would be displayed when this user signs in.';
$lang->use_group_image_mark = 'Use group image mark';
$lang->usable_group_image_mark_list = ' Usable list of group image mark';
$lang->add_group_image_mark = 'Add group image mark';

2
modules/member/lang/ko.php
View file

@ -270,6 +270,8 @@ $lang->cmd_show_super_admin_member = '최고 관리자';
$lang->cmd_show_site_admin_member = '사이트 관리자';
$lang->approval = '승인';
$lang->denied = '거부';
$lang->refused_reason = '계정 거부 사유';
$lang->about_refused_reason = '계정이 정지된 이유를 적어주세요. 이 항목에 기록된 내용은 해당 회원에게 로그인 후 화면을 통해 안내됩니다.';
$lang->use_group_image_mark = '그룹 이미지 마크 사용';
$lang->usable_group_image_mark_list = '사용가능한 그룹 이미지 마크 목록';
$lang->add_group_image_mark = '그룹 이미지 마크 추가';

6
modules/member/member.admin.controller.php
View file

@ -24,12 +24,12 @@ class memberAdminController extends member
// if(Context::getRequestMethod() == "GET") return new Object(-1, "msg_invalid_request");
// Extract the necessary information in advance
$logged_info = Context::get('logged_info');
if($logged_info->is_admin != 'Y' || !checkCSRF())
if($logged_info->is_admin !== 'Y' || !checkCSRF())
{
return new Object(-1, 'msg_invalid_request');
}
$args = Context::gets('member_srl','email_address','find_account_answer', 'allow_mailing','allow_message','denied','is_admin','description','group_srl_list','limit_date');
$args = new stdClass;
$oMemberModel = &getModel ('member');
$config = $oMemberModel->getMemberConfig ();
$getVars = array();
@ -47,7 +47,7 @@ class memberAdminController extends member
{
$args->{$val} = Context::get($val);
}
$args->member_srl = Context::get('member_srl');
$args = Context::gets('member_srl','email_address','find_account_answer', 'allow_mailing', 'allow_message', 'denied', 'is_admin', 'description', 'group_srl_list', 'limit_date');
if(Context::get('reset_password'))
$args->password = Context::get('reset_password');
else unset($args->password);

2
modules/member/member.controller.php
View file

@ -1751,7 +1751,7 @@ class memberController extends member
$redirectUrl = getUrl('', 'act', 'dispMemberResendAuthMail');
return $this->setRedirectUrl($redirectUrl, new Object(-1,'msg_user_not_confirmed'));
}
return new Object(-1,'msg_user_denied');
return new Object(-1, ($this->memberInfo->refused_reason)? Context::getLang('msg_user_denied') . "\n" . $this->memberInfo->refused_reason : 'msg_user_denied');
}
// Notify if denied_date is less than the current time
if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd")) return new Object(-9,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));

35
modules/member/tpl/insert_member.html
View file

@ -77,6 +77,13 @@
<label class="x_inline" for="deny"><input type="radio" name="denied" id="deny" value="Y" checked="checked"|cond="$member_info->denied == 'Y'" > {$lang->denied}</label>
</div>
</div>
<div class="x_control-group div_refused_reason">
<label class="x_control-label">{$lang->refused_reason}</label>
<div class="x_controls">
<textarea name="refused_reason" id="refused_reason" rows="2" cols="42" style="vertical-align:top">{$member_info->refused_reason}</textarea>
<span class="x_help-inline">{$lang->about_refused_reason}</span>
</div>
</div>
<div class="x_control-group" cond="$member_srl">
<label class="x_control-label" for="until">{$lang->limit_date}</label>
<div class="x_controls">
@ -116,16 +123,32 @@
</form>
<script>
(function($){
$(function(){
var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', dateFormat:'yy-mm-dd', onSelect:function(){
$(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
};
$.extend(option,$.datepicker.regional['{$lang_type}']);
$(".inputDate").datepicker(option);
$(function(){
var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', dateFormat:'yy-mm-dd', onSelect:function(){
$(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
};
$.extend(option,$.datepicker.regional['{$lang_type}']);
$(".inputDate").datepicker(option);
$(".dateRemover").click(function() {
$(this).prevAll('input').val('');
return false;
});
});
var refused_reason_division = $('.div_refused_reason');
if(!$('#deny').is(':checked'))
{
refused_reason_division.hide();
}
$('#deny').change(function(){
if($(this).is(':checked')){
refused_reason_division.slideDown(200);
}
});
$('#appoval').change(function(){
if($(this).is(':checked')){
refused_reason_division.slideUp(200);
}
});
})(jQuery);
</script>