diff --git a/modules/ncenterlite/conf/module.xml b/modules/ncenterlite/conf/module.xml index f2a415997..db2506517 100644 --- a/modules/ncenterlite/conf/module.xml +++ b/modules/ncenterlite/conf/module.xml @@ -4,6 +4,9 @@ + + + diff --git a/modules/ncenterlite/lang/ko.php b/modules/ncenterlite/lang/ko.php index a8ecb9f93..9cc2d700f 100644 --- a/modules/ncenterlite/lang/ko.php +++ b/modules/ncenterlite/lang/ko.php @@ -101,3 +101,4 @@ $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 = '알림센터 사용설정'; \ No newline at end of file diff --git a/modules/ncenterlite/ncenterlite.admin.controller.php b/modules/ncenterlite/ncenterlite.admin.controller.php index 7ee8a971e..216319869 100644 --- a/modules/ncenterlite/ncenterlite.admin.controller.php +++ b/modules/ncenterlite/ncenterlite.admin.controller.php @@ -5,45 +5,63 @@ 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->hide_module_srls = $obj->hide_module_srls; - 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', + 'voted_format', + 'document_notify' + ); + foreach($config_vars as $val) { - $config->mention_format = 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($obj->disp_act == 'dispNcenterliteAdminConfig' && !$obj->mention_format) + { + $config->mention_format = array(); + } + if($obj->{$val}) + { + $config->{$val} = $obj->{$val}; + } + + 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(); + } + } + debugPrint($config); if(!$config->document_notify) { $config->document_notify = 'direct-comment'; } - $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; } diff --git a/modules/ncenterlite/ncenterlite.admin.view.php b/modules/ncenterlite/ncenterlite.admin.view.php index adfba2917..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,10 +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); } function dispNcenterliteAdminList() @@ -59,4 +75,8 @@ class ncenterliteAdminView extends ncenterlite $this->setTemplateFile('ncenter_list'); } + function dispNcenterliteAdminTest() + { + + } } 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 @@ - - - + + + diff --git a/modules/ncenterlite/tpl/config.html b/modules/ncenterlite/tpl/config.html index 062e07f7f..68c5d85e1 100644 --- a/modules/ncenterlite/tpl/config.html +++ b/modules/ncenterlite/tpl/config.html @@ -4,10 +4,10 @@
+ -