From 9978388afbb6048c3f67d03052113015213a4b86 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sat, 14 Sep 2019 20:05:58 +0900 Subject: [PATCH] Generate comment_srl URLs in ncenterlite module --- .../ncenterlite/ncenterlite.controller.php | 44 +++---------------- 1 file changed, 7 insertions(+), 37 deletions(-) diff --git a/modules/ncenterlite/ncenterlite.controller.php b/modules/ncenterlite/ncenterlite.controller.php index 70d6ffb4e..07fba0249 100644 --- a/modules/ncenterlite/ncenterlite.controller.php +++ b/modules/ncenterlite/ncenterlite.controller.php @@ -191,7 +191,7 @@ class ncenterliteController extends ncenterlite $args->target_srl = $obj->comment_srl; $args->type = $this->_TYPE_COMMENT; $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('', '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, 'target_nick_name = $obj->nick_name; $args->target_email_address = $obj->email_address; @@ -225,7 +225,7 @@ class ncenterliteController extends ncenterlite $args->target_srl = $obj->comment_srl; $args->type = $this->_TYPE_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('', '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, 'target_nick_name = $obj->nick_name; $args->target_email_address = $obj->email_address; @@ -293,7 +293,7 @@ class ncenterliteController extends ncenterlite $args->target_srl = $obj->comment_srl; $args->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('', '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, 'target_nick_name = $obj->nick_name; $args->target_email_address = $obj->email_address; @@ -338,7 +338,7 @@ class ncenterliteController extends ncenterlite $args->target_srl = $comment_srl; $args->type = $this->_TYPE_DOCUMENT; $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('', '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, 'target_nick_name = $obj->nick_name; $args->target_email_address = $obj->email_address; @@ -465,7 +465,7 @@ class ncenterliteController extends ncenterlite $args->target_summary = cut_str(trim(utf8_normalize_spaces(strip_tags($content))), 50); $args->regdate = date('YmdHis'); $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('', 'document_srl', $document_srl, 'comment_srl', $obj->comment_srl) . '#comment_' . $obj->comment_srl; $output = $this->_insertNotify($args); if(!$output->toBool()) { @@ -618,7 +618,6 @@ class ncenterliteController extends ncenterlite } else if($oModule->act == 'dispBoardContent') { - $comment_srl = Context::get('_comment_srl'); $document_srl = Context::get('document_srl'); $oDocument = Context::get('oDocument'); $logged_info = Context::get('logged_info'); @@ -634,35 +633,6 @@ class ncenterliteController extends ncenterlite $this->removeFlagFile($args->member_srl); } } - - if($comment_srl && $document_srl && $oDocument) - { - $_comment_list = $oDocument->getComments(); - if($_comment_list) - { - if(array_key_exists($comment_srl, $_comment_list)) - { - $url = getNotEncodedUrl('_comment_srl', '') . '#comment_' . $comment_srl; - } - else - { - $cpage = $oDocument->comment_page_navigation->cur_page; - if($cpage > 1) - { - $url = getNotEncodedUrl('cpage', $cpage - 1) . '#comment_' . $comment_srl; - } - else - { - $url = getNotEncodedUrl('_comment_srl', '', 'cpage', '') . '#comment_' . $comment_srl; - } - } - - $url = str_replace('&', '&', $url); - header('location: ' . $url); - Context::close(); - exit; - } - } } elseif($oModule->act == 'dispCommunicationMessages') { @@ -711,7 +681,7 @@ class ncenterliteController extends ncenterlite $args->target_type = $this->_TYPE_COMMENT; $args->target_srl = $vars->parent_srl; $args->target_p_srl = '1'; - $args->target_url = getNotEncodedUrl('', 'document_srl', $vars->document_srl, '_comment_srl', $vars->parent_srl) . '#comment_' . $vars->parent_srl; + $args->target_url = getNotEncodedUrl('', 'document_srl', $vars->document_srl, 'comment_srl', $vars->parent_srl) . '#comment_' . $vars->parent_srl; $args->target_summary = cut_str(strip_tags($vars->content), 50); $args->target_nick_name = $logged_info->nick_name; $args->target_email_address = $logged_info->email_address; @@ -1447,7 +1417,7 @@ class ncenterliteController extends ncenterlite $args->srl = $obj->document_srl; $args->target_p_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 = $args->target_url = getNotEncodedUrl('', '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, 'config_type = 'mention';