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

fanbinit 0205

Browse source
This commit is contained in:
Lastorder-DC 2026-02-05 18:24:58 +09:00
parent ba8bbda74b
commit f343dff713
16 changed files with 47 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/board/board.view.php
View file

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

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

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

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

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

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

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

4
modules/document/queries/getDocumentCount.xml
View file

@ -22,8 +22,8 @@
<condition operation="like" column="homepage" var="s_homepage" pipe="or" />
<condition operation="like" column="tags" var="s_tags" pipe="or" />
<condition operation="equal" column="member_srl" var="s_member_srl" pipe="and" />
<condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
<condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
<condition operation="more" column="readed_count" var="s_readed_count" pipe="and" />
<condition operation="more" column="voted_count" var="s_voted_count" pipe="and" />
<condition operation="less" column="blamed_count" var="s_blamed_count" pipe="or" />
<condition operation="more" column="comment_count" var="s_comment_count" pipe="or" />
<condition operation="more" column="trackback_count" var="s_trackback_count" pipe="or" />

4
modules/document/queries/getDocumentCountByGroupStatus.xml
View file

@ -23,8 +23,8 @@
<condition operation="like" column="homepage" var="s_homepage" pipe="or" />
<condition operation="like" column="tags" var="s_tags" pipe="or" />
<condition operation="equal" column="member_srl" var="s_member_srl" pipe="and" />
<condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
<condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
<condition operation="more" column="readed_count" var="s_readed_count" pipe="and" />
<condition operation="more" column="voted_count" var="s_voted_count" pipe="and" />
<condition operation="less" column="blamed_count" var="s_blamed_count" pipe="or" />
<condition operation="more" column="comment_count" var="s_comment_count" pipe="or" />
<condition operation="more" column="trackback_count" var="s_trackback_count" pipe="or" />

4
modules/document/queries/getDocumentList.xml
View file

@ -26,8 +26,8 @@
<condition operation="like" column="homepage" var="s_homepage" pipe="or" />
<condition operation="like" column="tags" var="s_tags" pipe="or" />
<condition operation="equal" column="member_srl" var="s_member_srl" pipe="or" />
<condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
<condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
<condition operation="more" column="readed_count" var="s_readed_count" pipe="and" />
<condition operation="more" column="voted_count" var="s_voted_count" pipe="and" />
<condition operation="less" column="blamed_count" var="s_blamed_count" pipe="or" />
<condition operation="more" column="comment_count" var="s_comment_count" pipe="or" />
<condition operation="more" column="trackback_count" var="s_trackback_count" pipe="or" />

4
modules/document/queries/getDocumentListExtraSort.xml
View file

@ -32,8 +32,8 @@
<condition operation="like" column="d.tags" var="s_tags" pipe="or" />
<condition operation="equal" column="d.is_secret" var="s_is_secret" pipe="or" />
<condition operation="equal" column="d.member_srl" var="s_member_srl" pipe="or" />
<condition operation="more" column="d.readed_count" var="s_readed_count" pipe="or" />
<condition operation="more" column="d.voted_count" var="s_voted_count" pipe="or" />
<condition operation="more" column="d.readed_count" var="s_readed_count" pipe="and" />
<condition operation="more" column="d.voted_count" var="s_voted_count" pipe="and" />
<condition operation="less" column="d.blamed_count" var="s_blamed_count" pipe="or" />
<condition operation="more" column="d.comment_count" var="s_comment_count" pipe="or" />
<condition operation="more" column="d.trackback_count" var="s_trackback_count" pipe="or" />

4
modules/document/queries/getDocumentListPage.xml
View file

@ -26,8 +26,8 @@
<condition operation="like" column="homepage" var="s_homepage" pipe="or" />
<condition operation="like" column="tags" var="s_tags" pipe="or" />
<condition operation="equal" column="member_srl" var="s_member_srl" pipe="or" />
<condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
<condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
<condition operation="more" column="readed_count" var="s_readed_count" pipe="and" />
<condition operation="more" column="voted_count" var="s_voted_count" pipe="and" />
<condition operation="less" column="blamed_count" var="s_blamed_count" pipe="or" />
<condition operation="more" column="comment_count" var="s_comment_count" pipe="or" />
<condition operation="more" column="trackback_count" var="s_trackback_count" pipe="or" />

4
modules/document/queries/getDocumentListUseIndex.xml
View file

@ -29,8 +29,8 @@
<condition operation="like" column="homepage" var="s_homepage" pipe="or" />
<condition operation="like" column="tags" var="s_tags" pipe="or" />
<condition operation="equal" column="member_srl" var="s_member_srl" pipe="or" />
<condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
<condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
<condition operation="more" column="readed_count" var="s_readed_count" pipe="and" />
<condition operation="more" column="voted_count" var="s_voted_count" pipe="and" />
<condition operation="less" column="blamed_count" var="s_blamed_count" pipe="or" />
<condition operation="more" column="comment_count" var="s_comment_count" pipe="or" />
<condition operation="more" column="trackback_count" var="s_trackback_count" pipe="or" />

4
modules/document/queries/getDocumentListWithExtraVars.xml
View file

@ -35,8 +35,8 @@
<condition operation="like" column="documents.homepage" var="s_homepage" pipe="or" />
<condition operation="like" column="documents.tags" var="s_tags" pipe="or" />
<condition operation="equal" column="documents.member_srl" var="s_member_srl" pipe="or" />
<condition operation="more" column="documents.readed_count" var="s_readed_count" pipe="or" />
<condition operation="more" column="documents.voted_count" var="s_voted_count" pipe="or" />
<condition operation="more" column="documents.readed_count" var="s_readed_count" pipe="and" />
<condition operation="more" column="documents.voted_count" var="s_voted_count" pipe="and" />
<condition operation="less" column="documents.blamed_count" var="s_blamed_count" pipe="or" />
<condition operation="more" column="documents.comment_count" var="s_comment_count" pipe="or" />
<condition operation="more" column="documents.trackback_count" var="s_trackback_count" pipe="or" />

4
modules/document/queries/getDocumentListWithinExtraVarsExtraSort.xml
View file

@ -32,8 +32,8 @@
<condition operation="like" column="d.tags" var="s_tags" pipe="or" />
<condition operation="equal" column="d.is_secret" var="s_is_secret" pipe="or" />
<condition operation="equal" column="d.member_srl" var="s_member_srl" pipe="or" />
<condition operation="more" column="d.readed_count" var="s_readed_count" pipe="or" />
<condition operation="more" column="d.voted_count" var="s_voted_count" pipe="or" />
<condition operation="more" column="d.readed_count" var="s_readed_count" pipe="and" />
<condition operation="more" column="d.voted_count" var="s_voted_count" pipe="and" />
<condition operation="less" column="d.blamed_count" var="s_blamed_count" pipe="or" />
<condition operation="more" column="d.comment_count" var="s_comment_count" pipe="or" />
<condition operation="more" column="d.trackback_count" var="s_trackback_count" pipe="or" />

4
modules/document/queries/getDocumentListWithinMember.xml
View file

@ -20,8 +20,8 @@
<condition operation="like" column="documents.tags" var="s_tags" pipe="or" />
<condition operation="equal" column="documents.is_notice" var="s_is_notice" pipe="or" />
<condition operation="equal" column="documents.member_srl" var="s_member_srl" pipe="or" />
<condition operation="more" column="documents.readed_count" var="s_readed_count" pipe="or" />
<condition operation="more" column="documents.voted_count" var="s_voted_count" pipe="or" />
<condition operation="more" column="documents.readed_count" var="s_readed_count" pipe="and" />
<condition operation="more" column="documents.voted_count" var="s_voted_count" pipe="and" />
<condition operation="less" column="documents.blamed_count" var="s_blamed_count" pipe="or" />
<condition operation="more" column="documents.comment_count" var="s_comment_count" pipe="or" />
<condition operation="more" column="documents.trackback_count" var="s_trackback_count" pipe="or" />

4
modules/document/queries/getTrashList.xml
View file

@ -31,8 +31,8 @@
<condition operation="like" column="documents.tags" var="s_tags" pipe="or" />
<condition operation="equal" column="documents.is_secret" var="s_is_secret" pipe="or" />
<condition operation="equal" column="documents.member_srl" var="s_member_srl" pipe="or" />
<condition operation="more" column="documents.readed_count" var="s_readed_count" pipe="or" />
<condition operation="more" column="documents.voted_count" var="s_voted_count" pipe="or" />
<condition operation="more" column="documents.readed_count" var="s_readed_count" pipe="and" />
<condition operation="more" column="documents.voted_count" var="s_voted_count" pipe="and" />
<condition operation="less" column="documents.blamed_count" var="s_blamed_count" pipe="or" />
<condition operation="more" column="documents.comment_count" var="s_comment_count" pipe="or" />
<condition operation="more" column="documents.trackback_count" var="s_trackback_count" pipe="or" />

2
modules/spamfilter/spamfilter.model.php
View file

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

6
modules/spamfilter/tpl/denied_word_list.html
View file

@ -12,8 +12,9 @@
<thead>
<tr>
<th scope="col">{$lang->word}</th>
<th scope="col">오류코드</th>
<th scope="col">{$lang->description}</th>
<th scope="col">{$lang->cmd_spamfilter_except_member}</th>
<!-- th scope="col">{$lang->cmd_spamfilter_except_member}</th -->
<th scope="col">{$lang->cmd_spamfilter_filter_html}</th>
<th scope="col"><a href="{getUrl('sort_index', 'latest_hit')}">{$lang->latest_hit} <!--@if($sort_index === 'latest_hit')-->▼<!--@endif--></a></th>
<th scope="col"><a href="{getUrl('sort_index', 'hit')}">{$lang->hit} <!--@if($sort_index === 'hit' || !$sort_index)-->▼<!--@endif--></a></th>
@ -24,8 +25,9 @@
<tbody>
<tr loop="$word_list => $word_info">
<td>{$word_info->word} <!--@if(preg_match('#^/.+/$#', $word_info->word))--><span class="is_regexp">{$lang->cmd_spamfilter_is_regexp}</span><!--@end--></td>
<td>{substr(sha1($word_info->word), 0, 7)}</td>
<td>{$word_info->description}</td>
<td><a class="denied_word_toggle_except_member" href="#" data-word="{$word_info->word}">{$word_info->except_member}</a></td>
<!-- td><a class="denied_word_toggle_except_member" href="#" data-word="{$word_info->word}">{$word_info->except_member}</a></td -->
<td><a class="denied_word_toggle_filter_html" href="#" data-word="{$word_info->word}">{$word_info->filter_html}</a></td>
<td><!--@if($word_info->latest_hit)-->{zdate($word_info->latest_hit,'Y-m-d H:i')}<!--@else-->-<!--@end--></td>
<td>{$word_info->hit}</td>