녹색으로 표시된 예시처럼 사용할 수 있습니다.
+'; $lang->ncenterlite_config_environment_agree = '제공 동의'; $lang->ncenterlite_config_environment_disagree = '제공 안 함'; -$lang->ncenterlite_click_to_open = '클릭하시면 기능설정을 할 수 있습니다.'; $lang->ncenterlite_notice_list = '알림 목록'; $lang->ncenterlite_basic_settings = '기본 기능 설정'; $lang->ncenterlite_warning = '주의!'; @@ -101,3 +119,22 @@ $lang->ncenterlite_commnet_event_noti_all = '글쓴이에게 모든 댓글 알 $lang->ncenterlite_commnet_event_noti_some = '대댓글은 알리지 않음'; $lang->ncenterlite_message_event = '쪽지 알림 설정'; $lang->ncenterlite_message_event_about = '쪽지 알림을 사용하지 않음(XE의 기본 쪽지 알림을 사용)'; +$lang->ncenterlite_mid_use = '알림센터 사용설정'; +$lang->member_menu_view = '회원정보 메뉴노출 설정'; +$lang->member_menu_on = '메뉴에 표시함'; +$lang->member_menu_off = '메뉴에 표시안함'; +$lang->about_member_menu_view = '회원정보보기에서 메뉴 목록에 회원알림센터 설정 및 회원알림목록을 접근할 수잇는 페이지를 노출하거나 노출 시키지 않을 수 있습니다.'; +$lang->ncenterlite_no_notify = '알림의 내역이 없습니다.'; +$lang->ncenterlite_all_delete = '전체 삭제'; +$lang->ncenterlite_month_before_delete = '한 달 이전의 알림 삭제'; +$lang->dont_check_notify_delete = '회원이 확인하지 않은 알림도 삭제됩니다.'; +$lang->send_member = '보낸 사람'; +$lang->resiver_member = '받는 사람'; +$lang->notify_content = '알림 내용'; +$lang->notify_read_check = '알림 읽음 여부'; +$lang->notify_readed = '읽음'; +$lang->notify_dont_readed = '읽지않음'; +$lang->anonymous_nick_name_setting = '익명의 지정 닉네임'; +$lang->about_anonymous_nick_name = '익명게시판에서 고정된 익명닉네임인 \'Anonymous\'를 사용하지 않고 표기할 이름을 지정합니다. 기본값은 \'Anonymous\'입니다.'; +$lang->mention_setting = '맨션 설정'; +$lang->mention_nim = '\'님\'을 붙여 쓸 수 있도록 허용'; diff --git a/modules/ncenterlite/ncenterlite.admin.controller.php b/modules/ncenterlite/ncenterlite.admin.controller.php index 91b15fa10..e95fb983a 100644 --- a/modules/ncenterlite/ncenterlite.admin.controller.php +++ b/modules/ncenterlite/ncenterlite.admin.controller.php @@ -5,47 +5,69 @@ class ncenterliteAdminController extends ncenterlite { $oModuleController = getController('module'); $obj = Context::getRequestVars(); + $config = getModel('ncenterlite')->getConfig(); - $config = new stdClass(); - $config->use = $obj->use; - $config->display_use = $obj->display_use; - - $config->user_config_list = $obj->user_config_list; - $config->mention_format = $obj->mention_format; - $config->mention_names = $obj->mention_names; - $config->document_notify = $obj->document_notify; - $config->message_notify = $obj->message_notify; - $config->hide_module_srls = $obj->hide_module_srls; - $config->android_format = $obj->android_format; - if(!$config->mention_format && !is_array($config->mention_format)) + $config_vars = array( + 'use', + 'display_use', + 'user_config_list', + 'mention_format', + 'mention_names', + 'document_notify', + 'hide_module_srls', + 'mention_format', + 'admin_comment_module_srls', + 'skin', + 'mskin', + 'mcolorset', + 'colorset', + 'zindex', + 'anonymous_name', + 'document_read', + 'layout_srl', + 'mlayout_srl', + 'document_notify' + ); + if(!$obj->use && $obj->disp_act == 'dispNcenterliteAdminConfig') { - $config->mention_format = array(); + $config->use = array(); } - $config->admin_comment_module_srls = $obj->admin_comment_module_srls; - - $config->skin = $obj->skin; - $config->mskin = $obj->mskin; - $config->mcolorset = $obj->mcolorset; - $config->colorset = $obj->colorset; - $config->zindex = $obj->zindex; - $config->anonymous_name = $obj->anonymous_name; - $config->document_read = $obj->document_read; - $config->layout_srl = $obj->layout_srl; - $config->mlayout_srl = $obj->mlayout_srl; - $config->voted_format = $obj->voted_format; - - if(!$config->document_notify) + foreach($config_vars as $val) { - $config->document_notify = 'direct-comment'; + + if($obj->disp_act == 'dispNcenterliteAdminConfig' && !$obj->mention_format) + { + $config->mention_format = array(); + } + if($obj->{$val}) + { + $config->{$val} = $obj->{$val}; + } + if($obj->{$val} == null) + { + $config->{$val} = null; + } + if($obj->disp_act == 'dispNcenterliteAdminSeletedmid' && !$obj->hide_module_srls) + { + $config->hide_module_srls = array(); + } + if($obj->disp_act == 'dispNcenterliteAdminSeletedmid' && !$obj->admin_comment_module_srls) + { + $config->admin_comment_module_srls = array(); + } + } + + $output = $oModuleController->updateModuleConfig('ncenterlite', $config); + if(!$output->toBool()) + { + return new Object(-1, 'message'); } $this->setMessage('success_updated'); - $oModuleController->updateModuleConfig('ncenterlite', $config); - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispNcenterliteAdminConfig'); + $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', $obj->disp_act); header('location: ' . $returnUrl); return; } @@ -132,21 +154,4 @@ class ncenterliteAdminController extends ncenterlite return; } } - - function procNcenterliteAdminEnviromentGatheringAgreement() - { - $vars = Context::getRequestVars(); - $oModuleModel = getModel('module'); - $ncenterlite_module_info = $oModuleModel->getModuleInfoXml('ncenterlite'); - $agreement_file = FileHandler::getRealPath(sprintf('%s%s.txt', './files/ncenterlite/ncenterlite-', $ncenterlite_module_info->version)); - - FileHandler::writeFile($agreement_file, $vars->is_agree); - - if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) - { - $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispNcenterliteAdminConfig'); - header('location: ' . $returnUrl); - return; - } - } } diff --git a/modules/ncenterlite/ncenterlite.admin.view.php b/modules/ncenterlite/ncenterlite.admin.view.php index cd28e11f9..7be649aec 100644 --- a/modules/ncenterlite/ncenterlite.admin.view.php +++ b/modules/ncenterlite/ncenterlite.admin.view.php @@ -4,14 +4,34 @@ class ncenterliteAdminView extends ncenterlite function init() { $this->setTemplatePath($this->module_path.'tpl'); - $this->setTemplateFile(str_replace('dispNcenterliteAdmin', '', $this->act)); + $this->setTemplateFile(lcfirst(str_replace('dispNcenterliteAdmin', '', $this->act))); } function dispNcenterliteAdminConfig() + { + $oNcenterliteModel = getModel('ncenterlite'); + + $config = $oNcenterliteModel->getConfig(); + Context::set('config', $config); + } + + function dispNcenterliteAdminSeletedmid() { $oModuleModel = getModel('module'); $oNcenterliteModel = getModel('ncenterlite'); + $config = $oNcenterliteModel->getConfig(); + + $mid_list = $oModuleModel->getMidList(null, array('module_srl', 'mid', 'browser_title', 'module')); + + Context::set('mid_list', $mid_list); + Context::set('config', $config); + } + + function dispNcenterliteAdminSkinsetting() + { + $oModuleModel = getModel('module'); $oLayoutModel = getModel('layout'); + $oNcenterliteModel = getModel('ncenterlite'); $config = $oNcenterliteModel->getConfig(); Context::set('config', $config); @@ -38,38 +58,6 @@ class ncenterliteAdminView extends ncenterlite $security->encodeHTML('config..'); $security->encodeHTML('skin_list..title'); $security->encodeHTML('colorset_list..name','colorset_list..title'); - - $mid_list = $oModuleModel->getMidList(null, array('module_srl', 'mid', 'browser_title', 'module')); - - Context::set('mid_list', $mid_list); - - // 사용환경정보 전송 확인 - $ncenterlite_module_info = $oModuleModel->getModuleInfoXml('ncenterlite'); - $agreement_file = FileHandler::getRealPath(sprintf('%s%s.txt', './files/ncenterlite/ncenterlite-', $ncenterlite_module_info->version)); - - $agreement_ver_file = FileHandler::getRealPath(sprintf('%s%s.txt', './files/ncenterlite/ncenterlite_ver-', $ncenterlite_module_info->version)); - - if(file_exists($agreement_file)) - { - $agreement = FileHandler::readFile($agreement_file); - Context::set('_ncenterlite_env_agreement', $agreement); - $agreement_ver = FileHandler::readFile($agreement_ver_file); - if($agreement == 'Y') - { - $_ncenterlite_iframe_url = 'http://sosifam.com/index.php?mid=ncenterlite_iframe'; - if(!$agreement_ver) - { - $_host_info = urlencode($_SERVER['HTTP_HOST']) . '-NC' . $ncenterlite_module_info->version . '-PHP' . phpversion() . '-RX' . RX_VERSION; - } - Context::set('_ncenterlite_iframe_url', $_ncenterlite_iframe_url . '&_host='. $_host_info); - Context::set('ncenterlite_module_info', $ncenterlite_module_info); - } - FileHandler::writeFile($agreement_ver_file, 'Y'); - } - else - { - Context::set('_ncenterlite_env_agreement', 'NULL'); - } } function dispNcenterliteAdminList() @@ -87,4 +75,8 @@ class ncenterliteAdminView extends ncenterlite $this->setTemplateFile('ncenter_list'); } + function dispNcenterliteAdminTest() + { + + } } diff --git a/modules/ncenterlite/ncenterlite.controller.php b/modules/ncenterlite/ncenterlite.controller.php index 5935ee658..213aee909 100644 --- a/modules/ncenterlite/ncenterlite.controller.php +++ b/modules/ncenterlite/ncenterlite.controller.php @@ -77,15 +77,11 @@ class ncenterliteController extends ncenterlite $oNcenterliteModel = getModel('ncenterlite'); $config = $oNcenterliteModel->getConfig(); - if($config->use != 'Y') - { - return new Object(); - } $content = strip_tags($obj->title . ' ' . $obj->content); $mention_targets = $this->_getMentionTarget($content); - if(!$mention_targets || !count($mention_targets)) + if(!$mention_targets || !count($mention_targets) || !isset($config->use[mention])) { return new Object(); } @@ -138,10 +134,6 @@ class ncenterliteController extends ncenterlite $oNcenterliteModel = getModel('ncenterlite'); $config = $oNcenterliteModel->getConfig(); - if($config->use != 'Y') - { - return new Object(); - } $logged_info = Context::get('logged_info'); $notify_member_srl = array(); @@ -157,34 +149,42 @@ class ncenterliteController extends ncenterlite // 익명 노티 체크 $is_anonymous = $this->_isAnonymous($this->_TYPE_COMMENT, $obj); - // 멘션 - $mention_targets = $this->_getMentionTarget(strip_tags($obj->content)); - // !TODO 공용 메소드로 분리 - foreach($mention_targets as $mention_member_srl) + // check use the mention option. + if(isset($config->use[mention])) { - $target_member_config = $oNcenterliteModel->getMemberConfig($mention_member_srl); - $notify_member_config = $target_member_config->data; - if($notify_member_config->mention_notify == 'N') + $mention_targets = $this->_getMentionTarget(strip_tags($obj->content)); + // !TODO 공용 메소드로 분리 + foreach($mention_targets as $mention_member_srl) { - continue; - } + $target_member_config = $oNcenterliteModel->getMemberConfig($mention_member_srl); + $notify_member_config = $target_member_config->data; + if($notify_member_config->mention_notify == 'N') + { + continue; + } - $args = new stdClass(); - $args->member_srl = $mention_member_srl; - $args->target_p_srl = $obj->comment_srl; - $args->srl = $obj->document_srl; - $args->target_srl = $obj->comment_srl; - $args->type = $this->_TYPE_COMMENT; - $args->target_type = $this->_TYPE_MENTION; - $args->target_url = getNotEncodedFullUrl('', 'document_srl', $document_srl, '_comment_srl', $comment_srl) . '#comment_' . $comment_srl; - $args->target_summary = cut_str(strip_tags($content), 50); - $args->target_nick_name = $obj->nick_name; - $args->target_email_address = $obj->email_address; - $args->regdate = date('YmdHis'); - $args->target_browser = $module_info->browser_title; - $args->notify = $this->_getNotifyId($args); - $output = $this->_insertNotify($args, $is_anonymous); - $notify_member_srl[] = $mention_member_srl; + $args = new stdClass(); + $args->member_srl = $mention_member_srl; + $args->target_p_srl = $obj->comment_srl; + $args->srl = $obj->document_srl; + $args->target_srl = $obj->comment_srl; + $args->type = $this->_TYPE_COMMENT; + $args->target_type = $this->_TYPE_MENTION; + $args->target_url = getNotEncodedFullUrl('', 'document_srl', $document_srl, '_comment_srl', $comment_srl) . '#comment_' . $comment_srl; + $args->target_summary = cut_str(strip_tags($content), 50); + $args->target_nick_name = $obj->nick_name; + $args->target_email_address = $obj->email_address; + $args->regdate = date('YmdHis'); + $args->target_browser = $module_info->browser_title; + $args->notify = $this->_getNotifyId($args); + $output = $this->_insertNotify($args, $is_anonymous); + $notify_member_srl[] = $mention_member_srl; + } + } + + if(!isset($config->use[comment])) + { + return new Object(); } $admin_list = $oNcenterliteModel->getMemberAdmins(); @@ -242,7 +242,7 @@ class ncenterliteController extends ncenterlite } } // 대댓글이 아니고, 게시글의 댓글을 남길 경우 - if(!$parent_srl || ($parent_srl && $config->document_notify == 'all-comment')) + if(!$parent_srl || ($parent_srl && isset($config->use[comment_comment]))) { $oDocumentModel = getModel('document'); $oDocument = $oDocumentModel->getDocument($document_srl); @@ -280,18 +280,17 @@ class ncenterliteController extends ncenterlite $oNcenterliteModel = getModel('ncenterlite'); $config = $oNcenterliteModel->getConfig(); $communication_config = getModel('communication')->getConfig(); + if($communication_config->enable_message != 'Y') { return new Object(); } - if($config->use != 'Y' && $config->use != 'message') - { - return new Object(); - } - if($config->message_notify == 'N') + + if(!isset($config->use[message])) { return new Object(); } + $messages_member_config = $oNcenterliteModel->getMemberConfig($trigger_obj->receiver_srl); $message_member_config = $messages_member_config->data; @@ -319,14 +318,11 @@ class ncenterliteController extends ncenterlite $oNcenterliteModel = getModel('ncenterlite'); $config = $oNcenterliteModel->getConfig(); - if($config->use != 'Y') - { - return new Object(); - } - if($config->voted_format != 'Y') + if(isset($config->use[vote])) { return new Object(); } + if($obj->point < 0) { return new Object(); @@ -350,10 +346,6 @@ class ncenterliteController extends ncenterlite { $oNcenterliteModel = getModel('ncenterlite'); $config = $oNcenterliteModel->getConfig(); - if($config->use != 'Y') - { - return new Object(); - } $args = new stdClass(); $args->srl = $obj->comment_srl; @@ -389,11 +381,11 @@ class ncenterliteController extends ncenterlite $oNcenterliteModel = getModel('ncenterlite'); $config = $oNcenterliteModel->getConfig(); - if($config->use != 'Y') + // if the array is empty, lets return. + if(empty($config->use)) { return new Object(); } - $this->_hide_ncenterlite = false; if($oModule->module == 'beluxe' && Context::get('is_modal')) { @@ -629,11 +621,12 @@ class ncenterliteController extends ncenterlite $oNcenterliteModel = getModel('ncenterlite'); $config = $oNcenterliteModel->getConfig(); - // 알림센터가 비활성화 되어 있으면 중지 - if($config->use != 'Y' && $config->use != 'message') + // if the array is empty, dose not output the notification. + if(empty($config->use)) { return new Object(); } + if($config->display_use == 'N') { return new Object(); @@ -738,11 +731,9 @@ class ncenterliteController extends ncenterlite function _addFile() { - $oModuleModel = getModel('module'); - $module_info = $oModuleModel->getModuleInfoXml('ncenterlite'); if(file_exists(FileHandler::getRealPath($this->template_path . 'ncenterlite.css'))) { - Context::addCssFile($this->template_path . 'ncenterlite.css', true, 'all', '', 100); + Context::loadFile(array($this->template_path . 'ncenterlite.css', '', '', 100), true); } $oNcenterliteModel = getModel('ncenterlite'); @@ -751,19 +742,19 @@ class ncenterliteController extends ncenterlite { if($config->colorset && file_exists(FileHandler::getRealPath($this->template_path . 'ncenterlite.' . $config->colorset . '.css'))) { - Context::addCssFile($this->template_path . 'ncenterlite.' . $config->colorset . '.css', true, 'all', '', 100); + Context::loadFile(array($this->template_path . 'ncenterlite.' . $config->colorset . '.css', '', '', 100), true); } } elseif(Mobile::isFromMobilePhone()) { if($config->mcolorset && file_exists(FileHandler::getRealPath($this->template_path . 'ncenterlite.' . $config->mcolorset . '.css'))) { - Context::addCssFile($this->template_path . 'ncenterlite.' . $config->mcolorset . '.css', true, 'all', '', 100); + Context::loadFile(array($this->template_path . 'ncenterlite.' . $config->mcolorset . '.css', '', '', 100), true); } Context::loadFile(array('./common/js/jquery.min.js', 'head', '', -100000), true); Context::loadFile(array('./common/js/xe.min.js', 'head', '', -100000), true); - Context::addCssFile($this->template_path . 'ncenterlite.mobile.css', true, 'all', '', 100); + Context::loadFile(array($this->template_path . 'ncenterlite.mobile.css', '', '', 100), true); } if($config->zindex) { @@ -1031,6 +1022,19 @@ class ncenterliteController extends ncenterlite // '님'문자 이후 제거 if(in_array('respect', $config->mention_format)) { + $nick_name = array_unique($matches[2]); + foreach($nick_name as $nick) + { + $nick_member_srl = getModel('member')->getMemberSrlByNickName($nick); + if($nick_member_srl) + { + $list[] = $nick_member_srl; + } + } + if(!empty($list)) + { + return $list; + } foreach($matches[2] as $idx => $item) { $pos = strpos($item, '님'); @@ -1044,7 +1048,6 @@ class ncenterliteController extends ncenterlite } } } - $nicks = array_unique($matches[2]); $oMemberModel = getModel('member'); @@ -1054,12 +1057,10 @@ class ncenterliteController extends ncenterlite { foreach($nicks as $user_id) { - $vars = new stdClass(); - $vars->user_id = $user_id; - $output = executeQuery('ncenterlite.getMemberSrlById', $vars); - if($output->data && $output->data->member_srl) + $id_member_srl = $oMemberModel->getMemberSrlByUserID($user_id); + if($id_member_srl) { - $list[] = $output->data->member_srl; + $list[] = $id_member_srl; } } } @@ -1067,12 +1068,10 @@ class ncenterliteController extends ncenterlite { foreach($nicks as $nick_name) { - $vars = new stdClass(); - $vars->nick_name = $nick_name; - $output = executeQuery('ncenterlite.getMemberSrlByNickName', $vars); - if($output->data && $output->data->member_srl) + $nick_member_srl = $oMemberModel->getMemberSrlByNickName($nick_name); + if($nick_member_srl) { - $list[] = $output->data->member_srl; + $list[] = $nick_member_srl; } } } diff --git a/modules/ncenterlite/ncenterlite.model.php b/modules/ncenterlite/ncenterlite.model.php index 1ce483fd2..afb37578f 100644 --- a/modules/ncenterlite/ncenterlite.model.php +++ b/modules/ncenterlite/ncenterlite.model.php @@ -11,11 +11,13 @@ class ncenterliteModel extends ncenterlite { $oModuleModel = getModel('module'); $config = $oModuleModel->getModuleConfig('ncenterlite'); - if(!$config->use) $config->use = 'Y'; + if(!$config->use) + { + $config->use = array(); + } if(!$config->display_use) $config->display_use = 'Y'; if(!$config->mention_names) $config->mention_names = 'nick_name'; - if(!$config->message_notify) $config->message_notify = 'Y'; if(!$config->mention_format && !is_array($config->mention_format)) $config->mention_format = array('respect'); if(!is_array($config->mention_format)) $config->mention_format = explode('|@|', $config->mention_format); if(!$config->document_notify) $config->document_notify = 'direct-comment'; @@ -25,6 +27,7 @@ class ncenterliteModel extends ncenterlite if(!$config->voted_format) $config->voted_format = 'N'; if(!$config->skin) $config->skin = 'default'; if(!$config->colorset) $config->colorset = 'black'; + if(!$config->zindex) $config->zindex = '9999'; self::$config = $config; } @@ -262,11 +265,13 @@ class ncenterliteModel extends ncenterlite return $output; } - function getMyDispNotifyList($member_srl) + function getMyDispNotifyList($member_srl = null) { - $logged_info = Context::get('logged_info'); - - $member_srl = $logged_info->member_srl; + if(!$member_srl) + { + $logged_info = Context::get('logged_info'); + $member_srl = $logged_info->member_srl; + } $args = new stdClass(); $args->page = Context::get('page'); @@ -279,12 +284,8 @@ class ncenterliteModel extends ncenterlite return $output; } - function getNcenterliteAdminList($member_srl) + function getNcenterliteAdminList() { - $logged_info = Context::get('logged_info'); - - $member_srl = $logged_info->member_srl; - $args = new stdClass(); $args->page = Context::get('page'); $args->list_count = '20'; @@ -315,6 +316,7 @@ class ncenterliteModel extends ncenterlite $member_srl = $logged_info->member_srl; } + $args = new stdClass(); $args->member_srl = $member_srl; $output = executeQuery('ncenterlite.getNotifyNewCount', $args); if(!$output->data) return 0; diff --git a/modules/ncenterlite/ruleset/insertConfig.xml b/modules/ncenterlite/ruleset/insertConfig.xml index 1015ba521..8cebec2e1 100644 --- a/modules/ncenterlite/ruleset/insertConfig.xml +++ b/modules/ncenterlite/ruleset/insertConfig.xml @@ -6,8 +6,8 @@{$lang->ncenterlite_install_version} : Lite v{$ncenterlite_module_info->version}
- -알림이 없습니다.
+{$lang->ncenterlite_no_notify}
| 보낸사람 | -받은사람 | -내용 | -읽음여부 | +{$lang->send_member} | +{$lang->resiver_member} | +{$lang->notify_content} | +{$lang->notify_read_check} | {$lang->date} | {$val->target_nick_name} | {$member_info->nick_name} | 타겟없음 | {$val->text} | -{$val->readed} | ++ {$lang->notify_readed} + {$lang->notify_dont_readed} + |
{zdate($val->regdate,"Y-m-d")}
diff --git a/modules/ncenterlite/tpl/seletedmid.html b/modules/ncenterlite/tpl/seletedmid.html
new file mode 100644
index 000000000..0f33d173e
--- /dev/null
+++ b/modules/ncenterlite/tpl/seletedmid.html
@@ -0,0 +1,42 @@
+
+
{$lang->etc}+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
|---|