diff --git a/modules/board/board.view.php b/modules/board/board.view.php index eb40cd2b8..1da409661 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -547,7 +547,13 @@ class BoardView extends Board $args->page = intval(Context::get('page')) ?: null; $args->list_count = $this->list_count; $args->page_count = $this->page_count; - if(Context::get('v_mode') == 'recommended') $args->s_voted_count = Rhymix\Modules\Yeokbox\Models\Config::getVoteCount(); + if(Context::get('v_mode') == 'recommended') { + $args->s_voted_count = Rhymix\Modules\Yeokbox\Models\Config::getVoteCount(); + } + if(Context::get('v_mode') == 'super_recommended') { + $args->s_voted_count = Rhymix\Modules\Yeokbox\Models\Config::getSuperVoteCount(); + $args->s_readed_count = Rhymix\Modules\Yeokbox\Models\Config::getReadCount(); + } if (isset($this->module_info->include_days) && $this->module_info->include_days > 0) { $args->start_regdate = date('YmdHis', time() - ($this->module_info->include_days * 86400)); diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index 31a42fba7..e1dc1bc8c 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -58,6 +58,11 @@ class CommentController extends Comment } } } + $yeokka_member_srl = Rhymix\Modules\Yeokbox\Models\Config::getConfig()->yeokka_member_srl; + if($logged_info->member_srl != $yeokka_member_srl && $oComment->getRegdateTime() < (time() - (86400 * 7))) + { + throw new Rhymix\Framework\Exception('작성 이후 7일 이상이 경과한 댓글은 추천할 수 없습니다.'); + } $point = 1; $allow_same_ip = ($comment_config->allow_vote_from_same_ip ?? 'N') === 'Y'; diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 0265a56ec..3ddcfc128 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -70,6 +70,11 @@ class DocumentController extends Document } } } + $yeokka_member_srl = Rhymix\Modules\Yeokbox\Models\Config::getConfig()->yeokka_member_srl; + if($logged_info->member_srl != $yeokka_member_srl && $oDocument->getRegdateTime() < (time() - (86400 * 7))) + { + throw new Rhymix\Framework\Exception('작성 이후 7일 이상이 경과한 글은 추천할 수 없습니다.'); + } $point = 1; $allow_same_ip = ($document_config->allow_vote_from_same_ip ?? 'N') === 'Y'; diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 446a52fd3..9fdab4e09 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -261,6 +261,7 @@ class DocumentModel extends Document else { self::_setSearchOption($obj, $args, $query_id, $use_division); + debugPrint($args); $output = executeQueryArray($query_id, $args, $args->columnList); } @@ -1430,6 +1431,10 @@ class DocumentModel extends Document { $args->s_voted_count = intval($searchOpt->s_voted_count); } + if (isset($searchOpt->s_readed_count) && $searchOpt->s_readed_count > 0) + { + $args->s_readed_count = intval($searchOpt->s_readed_count); + } // get directly module_srl by mid if(isset($searchOpt->mid) && $searchOpt->mid) diff --git a/modules/document/queries/getDocumentCount.xml b/modules/document/queries/getDocumentCount.xml index 4b064dcc2..94dd60a54 100644 --- a/modules/document/queries/getDocumentCount.xml +++ b/modules/document/queries/getDocumentCount.xml @@ -22,8 +22,8 @@ - - + + diff --git a/modules/document/queries/getDocumentCountByGroupStatus.xml b/modules/document/queries/getDocumentCountByGroupStatus.xml index ec922d296..7398fda36 100644 --- a/modules/document/queries/getDocumentCountByGroupStatus.xml +++ b/modules/document/queries/getDocumentCountByGroupStatus.xml @@ -23,8 +23,8 @@ - - + + diff --git a/modules/document/queries/getDocumentList.xml b/modules/document/queries/getDocumentList.xml index fa6ffd6b3..c11e6c57a 100644 --- a/modules/document/queries/getDocumentList.xml +++ b/modules/document/queries/getDocumentList.xml @@ -26,8 +26,8 @@ - - + + diff --git a/modules/document/queries/getDocumentListExtraSort.xml b/modules/document/queries/getDocumentListExtraSort.xml index 10b86b9e0..6964c8101 100644 --- a/modules/document/queries/getDocumentListExtraSort.xml +++ b/modules/document/queries/getDocumentListExtraSort.xml @@ -32,8 +32,8 @@ - - + + diff --git a/modules/document/queries/getDocumentListPage.xml b/modules/document/queries/getDocumentListPage.xml index c6aed3abb..a1322cc9e 100644 --- a/modules/document/queries/getDocumentListPage.xml +++ b/modules/document/queries/getDocumentListPage.xml @@ -26,8 +26,8 @@ - - + + diff --git a/modules/document/queries/getDocumentListUseIndex.xml b/modules/document/queries/getDocumentListUseIndex.xml index 68a5537bb..77b7015b3 100644 --- a/modules/document/queries/getDocumentListUseIndex.xml +++ b/modules/document/queries/getDocumentListUseIndex.xml @@ -29,8 +29,8 @@ - - + + diff --git a/modules/document/queries/getDocumentListWithExtraVars.xml b/modules/document/queries/getDocumentListWithExtraVars.xml index 25e5f7e36..3034f3932 100644 --- a/modules/document/queries/getDocumentListWithExtraVars.xml +++ b/modules/document/queries/getDocumentListWithExtraVars.xml @@ -35,8 +35,8 @@ - - + + diff --git a/modules/document/queries/getDocumentListWithinExtraVarsExtraSort.xml b/modules/document/queries/getDocumentListWithinExtraVarsExtraSort.xml index 78ac1cc24..888ae9ea2 100644 --- a/modules/document/queries/getDocumentListWithinExtraVarsExtraSort.xml +++ b/modules/document/queries/getDocumentListWithinExtraVarsExtraSort.xml @@ -32,8 +32,8 @@ - - + + diff --git a/modules/document/queries/getDocumentListWithinMember.xml b/modules/document/queries/getDocumentListWithinMember.xml index 08dfd76dd..555fbe5cd 100644 --- a/modules/document/queries/getDocumentListWithinMember.xml +++ b/modules/document/queries/getDocumentListWithinMember.xml @@ -20,8 +20,8 @@ - - + + diff --git a/modules/document/queries/getTrashList.xml b/modules/document/queries/getTrashList.xml index fe13af161..52cb97bbe 100644 --- a/modules/document/queries/getTrashList.xml +++ b/modules/document/queries/getTrashList.xml @@ -31,8 +31,8 @@ - - + + diff --git a/modules/spamfilter/spamfilter.model.php b/modules/spamfilter/spamfilter.model.php index 379cf776c..d19ca740e 100644 --- a/modules/spamfilter/spamfilter.model.php +++ b/modules/spamfilter/spamfilter.model.php @@ -141,7 +141,7 @@ class SpamfilterModel extends Spamfilter if (strpos($custom_message, '%s') !== false) { - $custom_message = sprintf($custom_message, escape($hit, false)); + $custom_message = sprintf($custom_message, substr(sha1($word), 0, 7)); } return new BaseObject(-1, $custom_message); diff --git a/modules/spamfilter/tpl/denied_word_list.html b/modules/spamfilter/tpl/denied_word_list.html index eb51e9bdd..d66aa5eec 100644 --- a/modules/spamfilter/tpl/denied_word_list.html +++ b/modules/spamfilter/tpl/denied_word_list.html @@ -12,8 +12,9 @@ {$lang->word} + 오류코드 {$lang->description} - {$lang->cmd_spamfilter_except_member} + {$lang->cmd_spamfilter_filter_html} {$lang->latest_hit} {$lang->hit} @@ -24,8 +25,9 @@ {$word_info->word} {$lang->cmd_spamfilter_is_regexp} + {substr(sha1($word_info->word), 0, 7)} {$word_info->description} - {$word_info->except_member} + {$word_info->filter_html} {zdate($word_info->latest_hit,'Y-m-d H:i')}- {$word_info->hit}