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

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-07-03 19:28:53 +09:00
commit b0eb42c2f9
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
modules/ncenterlite/ncenterlite.controller.php
View file

@ -337,7 +337,7 @@ class ncenterliteController extends ncenterlite
$args->target_srl = $obj->document_srl; $args->target_srl = $obj->document_srl;
$args->type = $this->_TYPE_DOCUMENT; $args->type = $this->_TYPE_DOCUMENT;
$args->target_type = $this->_TYPE_ADMIN_DOCUMENT; $args->target_type = $this->_TYPE_ADMIN_DOCUMENT;
$args->target_url = getNotEncodedUrl('', 'document_srl', $obj->document_srl); $args->target_url = getNotEncodedUrl('', 'mid', $module_info->mid, 'document_srl', $obj->document_srl);
$args->target_summary = cut_str(strip_tags($obj->title), 50); $args->target_summary = cut_str(strip_tags($obj->title), 50);
$args->regdate = date('YmdHis'); $args->regdate = date('YmdHis');
$args->target_browser = $module_info->browser_title; $args->target_browser = $module_info->browser_title;
@ -395,7 +395,7 @@ class ncenterliteController extends ncenterlite
$args->target_srl = $obj->comment_srl; $args->target_srl = $obj->comment_srl;
$args->type = $this->_TYPE_COMMENT; $args->type = $this->_TYPE_COMMENT;
$args->target_type = $this->_TYPE_COMMENT_ALL; $args->target_type = $this->_TYPE_COMMENT_ALL;
$args->target_url = getNotEncodedUrl('', 'document_srl', $document_srl, 'comment_srl', $comment_srl) . '#comment_' . $comment_srl; $args->target_url = getNotEncodedUrl('', 'mid', $module_info->mid, 'document_srl', $document_srl, 'comment_srl', $comment_srl) . '#comment_' . $comment_srl;
$args->target_summary = cut_str(trim(utf8_normalize_spaces(strip_tags($content))), 50) ?: (strpos($content, '<img') !== false ? lang('ncenterlite_content_image') : lang('ncenterlite_content_empty')); $args->target_summary = cut_str(trim(utf8_normalize_spaces(strip_tags($content))), 50) ?: (strpos($content, '<img') !== false ? lang('ncenterlite_content_image') : lang('ncenterlite_content_empty'));
$args->target_nick_name = $obj->nick_name; $args->target_nick_name = $obj->nick_name;
$args->target_email_address = $obj->email_address; $args->target_email_address = $obj->email_address;
@ -431,7 +431,7 @@ class ncenterliteController extends ncenterlite
$args->target_srl = $obj->comment_srl; $args->target_srl = $obj->comment_srl;
$args->type = $this->_TYPE_COMMENT; $args->type = $this->_TYPE_COMMENT;
$args->target_type = $this->_TYPE_ADMIN_COMMENT; $args->target_type = $this->_TYPE_ADMIN_COMMENT;
$args->target_url = getNotEncodedUrl('', 'document_srl', $document_srl, 'comment_srl', $comment_srl) . '#comment_' . $comment_srl; $args->target_url = getNotEncodedUrl('', 'mid', $module_info->mid, 'document_srl', $document_srl, 'comment_srl', $comment_srl) . '#comment_' . $comment_srl;
$args->target_summary = cut_str(trim(utf8_normalize_spaces(strip_tags($content))), 50) ?: (strpos($content, '<img') !== false ? lang('ncenterlite_content_image') : lang('ncenterlite_content_empty')); $args->target_summary = cut_str(trim(utf8_normalize_spaces(strip_tags($content))), 50) ?: (strpos($content, '<img') !== false ? lang('ncenterlite_content_image') : lang('ncenterlite_content_empty'));
$args->target_nick_name = $obj->nick_name; $args->target_nick_name = $obj->nick_name;
$args->target_email_address = $obj->email_address; $args->target_email_address = $obj->email_address;
@ -515,7 +515,7 @@ class ncenterliteController extends ncenterlite
$args->target_srl = $obj->comment_srl; $args->target_srl = $obj->comment_srl;
$args->type = $this->_TYPE_COMMENT; $args->type = $this->_TYPE_COMMENT;
$args->target_type = $this->_TYPE_COMMENT; $args->target_type = $this->_TYPE_COMMENT;
$args->target_url = getNotEncodedUrl('', 'document_srl', $document_srl, 'comment_srl', $comment_srl) . '#comment_' . $comment_srl; $args->target_url = getNotEncodedUrl('', 'mid', $module_info->mid, 'document_srl', $document_srl, 'comment_srl', $comment_srl) . '#comment_' . $comment_srl;
$args->target_summary = cut_str(trim(utf8_normalize_spaces(strip_tags($content))), 50) ?: (strpos($content, '<img') !== false ? lang('ncenterlite_content_image') : lang('ncenterlite_content_empty')); $args->target_summary = cut_str(trim(utf8_normalize_spaces(strip_tags($content))), 50) ?: (strpos($content, '<img') !== false ? lang('ncenterlite_content_image') : lang('ncenterlite_content_empty'));
$args->target_nick_name = $obj->nick_name; $args->target_nick_name = $obj->nick_name;
$args->target_email_address = $obj->email_address; $args->target_email_address = $obj->email_address;
@ -565,7 +565,7 @@ class ncenterliteController extends ncenterlite
$args->target_srl = $comment_srl; $args->target_srl = $comment_srl;
$args->type = $this->_TYPE_DOCUMENT; $args->type = $this->_TYPE_DOCUMENT;
$args->target_type = $this->_TYPE_COMMENT; $args->target_type = $this->_TYPE_COMMENT;
$args->target_url = getNotEncodedUrl('', 'document_srl', $document_srl, 'comment_srl', $comment_srl) . '#comment_' . $comment_srl; $args->target_url = getNotEncodedUrl('', 'mid', $module_info->mid, 'document_srl', $document_srl, 'comment_srl', $comment_srl) . '#comment_' . $comment_srl;
$args->target_summary = cut_str(trim(utf8_normalize_spaces(strip_tags($content))), 50) ?: (strpos($content, '<img') !== false ? lang('ncenterlite_content_image') : lang('ncenterlite_content_empty')); $args->target_summary = cut_str(trim(utf8_normalize_spaces(strip_tags($content))), 50) ?: (strpos($content, '<img') !== false ? lang('ncenterlite_content_image') : lang('ncenterlite_content_empty'));
$args->target_nick_name = $obj->nick_name; $args->target_nick_name = $obj->nick_name;
$args->target_email_address = $obj->email_address; $args->target_email_address = $obj->email_address;
@ -642,6 +642,9 @@ class ncenterliteController extends ncenterlite
return; return;
} }
$oModuleModel = getModel('module');
$module_info = $oModuleModel->getModuleInfoByDocumentSrl($obj->document_srl);
$args = new stdClass(); $args = new stdClass();
$args->config_type = 'scrap'; $args->config_type = 'scrap';
$args->target_member_srl = $obj->member_srl; $args->target_member_srl = $obj->member_srl;
@ -654,7 +657,7 @@ class ncenterliteController extends ncenterlite
$args->target_summary = $obj->title; $args->target_summary = $obj->title;
$args->regdate = date('YmdHis'); $args->regdate = date('YmdHis');
$args->notify = $this->_getNotifyId($args); $args->notify = $this->_getNotifyId($args);
$args->target_url = getNotEncodedUrl('', 'document_srl', $obj->document_srl); $args->target_url = getNotEncodedUrl('', 'mid', $module_info->mid, 'document_srl', $obj->document_srl);
$output = $this->_insertNotify($args); $output = $this->_insertNotify($args);
if(!$output->toBool()) if(!$output->toBool())
{ {
@ -681,6 +684,7 @@ class ncenterliteController extends ncenterlite
$oDocumentModel = getModel('document'); $oDocumentModel = getModel('document');
$oDocument = $oDocumentModel->getDocument($obj->document_srl, false, false); $oDocument = $oDocumentModel->getDocument($obj->document_srl, false, false);
$module_info = getModel('module')->getModuleInfoByDocumentSrl($obj->document_srl);
$args = new stdClass(); $args = new stdClass();
$args->config_type = 'vote'; $args->config_type = 'vote';
@ -693,7 +697,7 @@ class ncenterliteController extends ncenterlite
$args->target_summary = $oDocument->get('title'); $args->target_summary = $oDocument->get('title');
$args->regdate = date('YmdHis'); $args->regdate = date('YmdHis');
$args->notify = $this->_getNotifyId($args); $args->notify = $this->_getNotifyId($args);
$args->target_url = getNotEncodedUrl('', 'document_srl', $obj->document_srl); $args->target_url = getNotEncodedUrl('', 'mid', $module_info->mid, 'document_srl', $obj->document_srl);
$args->module_srl = $obj->module_srl; $args->module_srl = $obj->module_srl;
$this->_insertNotify($args); $this->_insertNotify($args);
} }
@ -749,6 +753,7 @@ class ncenterliteController extends ncenterlite
$content = $oComment->get('content'); $content = $oComment->get('content');
$document_srl = $oComment->get('document_srl'); $document_srl = $oComment->get('document_srl');
$module_info = getModel('module')->getModuleInfoByDocumentSrl($document_srl);
$args = new stdClass(); $args = new stdClass();
$args->config_type = 'vote'; $args->config_type = 'vote';
@ -762,7 +767,7 @@ class ncenterliteController extends ncenterlite
$args->regdate = date('YmdHis'); $args->regdate = date('YmdHis');
$args->module_srl = $obj->module_srl; $args->module_srl = $obj->module_srl;
$args->notify = $this->_getNotifyId($args); $args->notify = $this->_getNotifyId($args);
$args->target_url = getNotEncodedUrl('', 'document_srl', $document_srl, 'comment_srl', $obj->comment_srl) . '#comment_' . $obj->comment_srl; $args->target_url = getNotEncodedUrl('', 'mid', $module_info->mid, 'document_srl', $document_srl, 'comment_srl', $obj->comment_srl) . '#comment_' . $obj->comment_srl;
$this->_insertNotify($args); $this->_insertNotify($args);
} }
@ -1681,7 +1686,7 @@ class ncenterliteController extends ncenterlite
$args->target_p_srl = $obj->document_srl; $args->target_p_srl = $obj->document_srl;
$args->target_srl = $obj->document_srl; $args->target_srl = $obj->document_srl;
$args->target_summary = cut_str(strip_tags($obj->title), 50); $args->target_summary = cut_str(strip_tags($obj->title), 50);
$args->target_url = getNotEncodedUrl('', 'document_srl', $obj->document_srl); $args->target_url = getNotEncodedUrl('', 'mid', $module_info->mid, 'document_srl', $obj->document_srl);
} }
elseif ($type == $this->_TYPE_COMMENT) elseif ($type == $this->_TYPE_COMMENT)
{ {
@ -1696,7 +1701,7 @@ class ncenterliteController extends ncenterlite
$args->srl = $obj->document_srl; $args->srl = $obj->document_srl;
$args->target_p_srl = $obj->comment_srl; $args->target_p_srl = $obj->comment_srl;
$args->target_srl = $obj->comment_srl; $args->target_srl = $obj->comment_srl;
$args->target_url = $args->target_url = getNotEncodedUrl('', 'document_srl', $obj->document_srl, 'comment_srl', $obj->comment_srl) . '#comment_' . $obj->comment_srl; $args->target_url = getNotEncodedUrl('', 'mid', $module_info->mid, 'document_srl', $obj->document_srl, 'comment_srl', $obj->comment_srl) . '#comment_' . $obj->comment_srl;
$args->target_summary = cut_str(trim(utf8_normalize_spaces(strip_tags($obj->content))), 50) ?: (strpos($obj->content, '<img') !== false ? lang('ncenterlite_content_image') : lang('ncenterlite_content_empty')); $args->target_summary = cut_str(trim(utf8_normalize_spaces(strip_tags($obj->content))), 50) ?: (strpos($obj->content, '<img') !== false ? lang('ncenterlite_content_image') : lang('ncenterlite_content_empty'));
} }
$args->config_type = 'mention'; $args->config_type = 'mention';