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

Merge branch 'rhymix:master' into master
Some checks failed
PHP Lint & Codeception / PHP 7.4 (push) Has been cancelled
PHP Lint & Codeception / PHP 8.0 (push) Has been cancelled
PHP Lint & Codeception / PHP 8.1 (push) Has been cancelled
PHP Lint & Codeception / PHP 8.2 (push) Has been cancelled
PHP Lint & Codeception / PHP 8.3 (push) Has been cancelled
PHP Lint & Codeception / PHP 8.4 (push) Has been cancelled

Browse source
This commit is contained in:
Lastorder 2025-06-02 21:32:36 +09:00 • committed by GitHub
commit 7fec210203
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
53 changed files with 1133 additions and 909 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -571,7 +571,7 @@ class CommentController extends Comment
$obj->comment_srl = intval($obj->comment_srl);
$obj->module_srl = intval($obj->module_srl);
$obj->document_srl = intval($obj->document_srl);
$obj->parent_srl = intval($obj->parent_srl);
$obj->parent_srl = intval($obj->parent_srl ?? 0);
// Only managers can customize dates.
$grant = Context::get('grant');
@ -615,7 +615,7 @@ class CommentController extends Comment
}
// even for manual_inserted if password exists, hash it.
if($obj->password)
if(!empty($obj->password))
{
$obj->password = \Rhymix\Framework\Password::hashPassword($obj->password, \Rhymix\Framework\Password::getBackwardCompatibleAlgorithm());
}
@ -876,7 +876,7 @@ class CommentController extends Comment
$module_info = ModuleModel::getModuleInfoByDocumentSrl($obj->document_srl);
// If there is no problem to register comment then send an email to all admin were set in module admin panel
if($module_info->admin_mail && $member_info->is_admin != 'Y')
if(isset($module_info->admin_mail) && $module_info->admin_mail && $member_info->is_admin != 'Y')
{
$browser_title = Context::replaceUserLang($module_info->browser_title);
$mail_title = sprintf(lang('msg_comment_notify_mail'), $browser_title, cut_str($oDocument->getTitleText(), 20, '...'));
@ -1007,12 +1007,12 @@ class CommentController extends Comment
return new BaseObject(-1, 'msg_not_permitted');
}
if($obj->password)
if(!empty($obj->password))
{
$obj->password = \Rhymix\Framework\Password::hashPassword($obj->password, \Rhymix\Framework\Password::getBackwardCompatibleAlgorithm());
}
if($obj->homepage)
if(!empty($obj->homepage))
{
$obj->homepage = escape($obj->homepage);
if(!preg_match('/^[a-z]+:\/\//i',$obj->homepage))
@ -1021,7 +1021,7 @@ class CommentController extends Comment
}
}
if(!$obj->content)
if(!isset($obj->content) || !$obj->content)
{
$obj->content = $source_obj->get('content');
}
@ -1521,12 +1521,12 @@ class CommentController extends Comment
}
// get a list of comments and then execute a trigger(way to reduce the processing cost for delete all)
$commentSrlList = array();
$args = new stdClass();
$args->document_srl = $document_srl;
$comments = executeQueryArray('comment.getAllComments', $args);
if($comments->data)
{
$commentSrlList = array();
foreach($comments->data as $comment)
{
$commentSrlList[] = $comment->comment_srl;