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

Merge branch 'rhymix:master' into master

Browse source
This commit is contained in:
Lastorder 2026-04-01 12:04:22 +09:00 • committed by GitHub
commit dd8fc890f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
39 changed files with 396 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -237,7 +237,8 @@ class CommentAdminController extends Comment
$module_infos[$module_srl] = ModuleModel::getModuleInfoByModuleSrl($module_srl)->comment_delete_message ?? '';
}
if($module_infos[$module_srl] === 'yes')
$policy = $module_infos[$module_srl];
if ($policy === 'yes' && !in_array($comment->get('status'), [\RX_STATUS_DELETED, \RX_STATUS_DELETED_BY_ADMIN]))
{
$output = $oCommentController->updateCommentByDelete($comment, true);
if(!$output->toBool() && $output->error !== -2)
@ -246,7 +247,7 @@ class CommentAdminController extends Comment
return $output;
}
}
elseif(starts_with('only_comm', $module_infos[$module_srl]))
elseif (starts_with('only_comm', $policy) && !in_array($comment->get('status'), [\RX_STATUS_DELETED, \RX_STATUS_DELETED_BY_ADMIN]))
{
$childs = CommentModel::getChildComments($comment_srl);
if(count($childs) > 0)

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

@ -29,13 +29,12 @@ class CommentAdminView extends Comment
{
// option to get a list
$args = new stdClass();
$args->page = Context::get('page'); // /< Page
$args->list_count = 30; // / the number of postings to appear on a single page
$args->page_count = 5; // / the number of pages to appear on the page navigation
$args->list_count = intval(Context::get('list_count')) ?: 20;
$args->page_count = 5;
$args->page = max(1, intval(Context::get('page')));
$args->sort_index = 'list_order'; // /< Sorting values
$args->module_srl = Context::get('module_srl');
/*
$search_target = Context::get('search_target');
$search_keyword = Context::get('search_keyword');
@ -118,10 +117,10 @@ class CommentAdminView extends Comment
{
// option to get a blacklist
$args = new stdClass();
$args->page = Context::get('page'); // /< Page
$args->list_count = 30; // /< the number of comment postings to appear on a single page
$args->page_count = 10; // /< the number of pages to appear on the page navigation
$args->order_type = 'desc'; // /< sorted value
$args->list_count = intval(Context::get('list_count')) ?: 20;
$args->page_count = 5;
$args->page = max(1, intval(Context::get('page')));
$args->order_type = 'desc';
// select sort method
$sort_index = Context::get('sort_index');
@ -214,11 +213,10 @@ class CommentAdminView extends Comment
{
// 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'));
$args->list_count = intval(Context::get('list_count')) ?: 20;
$args->page_count = 5;
$args->page = max(1, intval(Context::get('page')));
// get Status name list
$oCommentModel = getModel('comment');