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

Merge branch 'rhymix:master' into master

Browse source
This commit is contained in:
Lastorder 2025-03-03 10:47:47 +09:00 • committed by GitHub
commit e5b729f8e9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
152 changed files with 2348 additions and 792 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -839,7 +839,10 @@ class CommentController extends Comment
}
}
$this->sendEmailToAdminAfterInsertComment($obj);
if (config('mail.default_from'))
{
$this->sendEmailToAdminAfterInsertComment($obj);
}
$output->add('comment_srl', $obj->comment_srl);
@ -890,10 +893,13 @@ class CommentController extends Comment
Author: " . $member_info->nick_name . "
<br />Author e-mail: " . $member_info->email_address . "
<br />From : <a href=\"" . $url_comment . "\">" . $url_comment . "</a>
<br />
<br />Comment:
<br />\"" . $obj->content . "\"
<br />
<br />Document:
<br />\"" . $oDocument->getContentText(). "\"
<br />\"" . $oDocument->getTitleText(). "\"
<br />\"" . $oDocument->getContentPlainText(). "\"
<br />
<br />
Approve it: <a href=\"" . $url_approve . "\">" . $url_approve . "</a>
@ -908,10 +914,13 @@ class CommentController extends Comment
Author: " . $member_info->nick_name . "
<br />Author e-mail: " . $member_info->email_address . "
<br />From : <a href=\"" . $url_comment . "\">" . $url_comment . "</a>
<br />
<br />Comment:
<br />\"" . $obj->content . "\"
<br />
<br />Document:
<br />\"" . $oDocument->getContentText(). "\"
<br />\"" . $oDocument->getTitleText(). "\"
<br />\"" . $oDocument->getContentPlainText(). "\"
";
}
@ -919,17 +928,11 @@ class CommentController extends Comment
$oMail = new \Rhymix\Framework\Mail();
$oMail->setSubject($mail_title);
$oMail->setBody($mail_content);
$oMail->setFrom(config('mail.default_from') ?: $member_info->email_address, $member_info->nick_name);
if($member_info->email_address)
{
$oMail->setReplyTo($member_info->email_address);
}
foreach (array_map('trim', explode(',', $module_info->admin_mail)) as $email_address)
{
$oMail->addTo($email_address);
}
$oMail->send();
// send email to all admins - STOP
}
$comment_srl_list = array(0 => $obj->comment_srl);
@ -1711,6 +1714,12 @@ class CommentController extends Comment
$output->add('blamed_count', $trigger_obj->after_point);
}
// Prevent session data getting too large
if (count($_SESSION['voted_comment']) > 200)
{
$_SESSION['voted_comment'] = array_slice($_SESSION['voted_comment'], 100, null, true);
}
return $output;
}
@ -1870,6 +1879,12 @@ class CommentController extends Comment
// leave into the session information
$_SESSION['declared_comment'][$comment_srl] = TRUE;
// Prevent session data getting too large
if (count($_SESSION['declared_comment']) > 200)
{
$_SESSION['declared_comment'] = array_slice($_SESSION['declared_comment'], 100, null, true);
}
$this->setMessage('success_declared');
}

6
modules/comment/comment.item.php
View file

@ -241,6 +241,10 @@ class CommentItem extends BaseObject
{
$_SESSION['accessible'][$this->comment_srl] = $this->get('last_update');
}
if(is_array($_SESSION['accessible']) && count($_SESSION['accessible']) > 200)
{
$_SESSION['accessible'] = array_slice($_SESSION['accessible'], 100, null, true);
}
}
function isEditable()
@ -673,7 +677,7 @@ class CommentItem extends BaseObject
return;
}
$file_list = FileModel::getFiles($this->comment_srl, array(), 'file_srl', TRUE);
$file_list = FileModel::getFiles($this->comment_srl, array(), 'file_srl', true, 'com', true);
return $file_list;
}

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

@ -737,7 +737,7 @@ class CommentModel extends Comment
// generate a list
$list[$comment_srl] = $source_list[$i];
if($parent_srl)
if($parent_srl && isset($list[$parent_srl]))
{
$list[$parent_srl]->child[] = &$list[$comment_srl];
}

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

@ -2,14 +2,14 @@
$lang->cmd_comment_do = 'I want to';
$lang->comment_list = 'Comments List';
$lang->cmd_toggle_checked_comment = 'Invert Selection';
$lang->cmd_delete_checked_comment = 'Delete selected item';
$lang->cmd_delete_checked_comment = 'Delete Selected Item';
$lang->trash = 'Recycle Bin';
$lang->cmd_trash = 'Move to Recycle Bin';
$lang->comment_count = 'Number of Comments per Page';
$lang->comment_page_count = 'Number of Pages';
$lang->comment_default_page = 'Default Page';
$lang->comment_default_page_first = 'First page';
$lang->comment_default_page_last = 'Last page';
$lang->comment_default_page_first = 'First Page';
$lang->comment_default_page_last = 'Last Page';
$lang->about_comment_count = 'Set the number of comments to show on each page.';
$lang->about_comment_page_count = 'Set the number of pagination links to show at the bottom.';
$lang->max_thread_depth = 'Maximum Thread Depth';
@ -29,14 +29,14 @@ $lang->search_target_list['last_update'] = 'Last update';
$lang->search_target_list['ipaddress'] = 'IP Address';
$lang->search_target_list['is_secret'] = 'Status';
$lang->no_text_comment = 'No text in this comment.';
$lang->no_text_document = 'No text in this document.';
$lang->no_text_document = 'No text in this post.';
$lang->secret_name_list['Y'] = 'Secret';
$lang->secret_name_list['N'] = 'Public';
$lang->published_name_list[0] = 'Waiting';
$lang->published_name_list[1] = 'Published';
$lang->published_name_list[2] = 'Secret';
$lang->published_name_list[3] = 'Embargo';
$lang->published_name_list[4] = 'Trash';
$lang->published_name_list[4] = 'Recycle Bin';
$lang->published_name_list[5] = 'Blocked';
$lang->published_name_list[6] = 'Blocked';
$lang->published_name_list[7] = 'Deleted';
@ -47,13 +47,15 @@ $lang->published_name_list['N'] = 'Unpublished';
$lang->comment_manager = 'Manage Selected Comment';
$lang->selected_comment = 'Selected Comment';
$lang->cmd_comment_validation = 'Use comment validation';
$lang->about_comment_validation = 'If you want to use comment validation before displaying on your module frontend select USE, otherwise select NOT USE.';
$lang->published = 'Publish status';
$lang->about_comment_validation = 'If you want to use comment validation before displaying on your module frontend, select USE; otherwise, select NOT USE.';
$lang->published = 'Publish Status';
$lang->cmd_publish = 'Publish';
$lang->cmd_unpublish = 'Unpublish';
$lang->select_module = 'Select Module';
$lang->page = 'Page';
$lang->msg_not_selected_comment = 'There are no selected comment.';
$lang->msg_not_selected_comment = 'There are no selected comments.';
$lang->msg_admin_comment_no_delete = 'You cannot delete the superadmin\'s comments.';
$lang->msg_admin_c_comment_no_delete = 'You cannot delete this comment due to the supperadmin reply.';
$lang->improper_comment_declare = 'Report an improper comment';
$lang->declaring_user = 'Reporter';
$lang->improper_comment_declare_reason = 'Reason';
@ -71,4 +73,6 @@ $lang->msg_admin_censored_comment = 'This comment has been hidden by an administ
$lang->msg_deleted_comment = 'This comment has been deleted.';
$lang->msg_admin_deleted_comment = 'This comment has been deleted by an administrator.';
$lang->msg_no_text_comment = 'This comment contains no text.';
$lang->msg_comment_notify_mail = "[%s] A new comment was posted on document: \" %s \"";
$lang->msg_comment_notify_mail = "[%s] A new comment on the post: \" %s \"";
$lang->msg_admin_comment_no_move_to_trash = 'You have no permission to move the superadmin\'s comments to the trash bin.';
$lang->msg_module_srl_not_exists = 'Module serial number not found.';

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

@ -38,7 +38,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<tr>
<th scope="col">{$lang->comment}</th>
<th scope="col" class="nowr">{$lang->writer}</th>
<th scope="col" class="nowr rx_detail_marks">{$lang->cmd_vote}(+/-)</th>
<th scope="col" class="nowr rx_detail_marks">{$lang->cmd_vote} / {$lang->cmd_vote_down}</th>
<th scope="col" class="nowr">{$lang->date}</th>
<th scope="col" class="nowr rx_detail_marks">{$lang->ipaddress}</th>
<th scope="col" class="nowr rx_detail_marks">{$lang->status}</th>