diff --git a/modules/spamfilter/conf/info.xml b/modules/spamfilter/conf/info.xml index caab0c2f7..30d2c7a54 100644 --- a/modules/spamfilter/conf/info.xml +++ b/modules/spamfilter/conf/info.xml @@ -1,11 +1,8 @@ - 스팸필터 - spam filter - - 제로 - zero - 제로보드의 기본 스팸필터입니다. - Default spam filter of zeroboard - + 스팸필터 + + 제로 + 제로보드 XE의 기본 스팸필터입니다. + diff --git a/modules/spamfilter/conf/module.xml b/modules/spamfilter/conf/module.xml index db3432674..e16baa44e 100644 --- a/modules/spamfilter/conf/module.xml +++ b/modules/spamfilter/conf/module.xml @@ -2,14 +2,14 @@ - - - + + + - - - - - + + + + + diff --git a/modules/spamfilter/queries/deleteDeniedIP.xml b/modules/spamfilter/queries/deleteDeniedIP.xml index ad0f65f01..55171ca25 100644 --- a/modules/spamfilter/queries/deleteDeniedIP.xml +++ b/modules/spamfilter/queries/deleteDeniedIP.xml @@ -1,8 +1,8 @@ - - - - - - + +
+ + + + diff --git a/modules/spamfilter/queries/deleteDeniedWord.xml b/modules/spamfilter/queries/deleteDeniedWord.xml index 21f80d6d8..b20002cf1 100644 --- a/modules/spamfilter/queries/deleteDeniedWord.xml +++ b/modules/spamfilter/queries/deleteDeniedWord.xml @@ -1,8 +1,8 @@ - -
- - - - + +
+ + + + diff --git a/modules/spamfilter/queries/getDeniedIPList.xml b/modules/spamfilter/queries/getDeniedIPList.xml index 20415916b..a4317e0cf 100644 --- a/modules/spamfilter/queries/getDeniedIPList.xml +++ b/modules/spamfilter/queries/getDeniedIPList.xml @@ -1,11 +1,11 @@ - -
- - - - - - - + +
+ + + + + + + diff --git a/modules/spamfilter/queries/getDeniedWordList.xml b/modules/spamfilter/queries/getDeniedWordList.xml index 930af0324..febc417b9 100644 --- a/modules/spamfilter/queries/getDeniedWordList.xml +++ b/modules/spamfilter/queries/getDeniedWordList.xml @@ -1,11 +1,11 @@ - -
- - - - - - - + +
+ + + + + + + diff --git a/modules/spamfilter/queries/getLogCount.xml b/modules/spamfilter/queries/getLogCount.xml index 7f93b08a3..ec1b4bfad 100644 --- a/modules/spamfilter/queries/getLogCount.xml +++ b/modules/spamfilter/queries/getLogCount.xml @@ -1,12 +1,12 @@ - -
- - - - - - - - + +
+ + + + + + + + diff --git a/modules/spamfilter/queries/insertDeniedIP.xml b/modules/spamfilter/queries/insertDeniedIP.xml index bd3184d52..6fcdf5a7a 100644 --- a/modules/spamfilter/queries/insertDeniedIP.xml +++ b/modules/spamfilter/queries/insertDeniedIP.xml @@ -1,9 +1,9 @@ - -
- - - - - + +
+ + + + + diff --git a/modules/spamfilter/queries/insertDeniedWord.xml b/modules/spamfilter/queries/insertDeniedWord.xml index b4fb5fea1..0638bbff6 100644 --- a/modules/spamfilter/queries/insertDeniedWord.xml +++ b/modules/spamfilter/queries/insertDeniedWord.xml @@ -1,9 +1,9 @@ - -
- - - - - + +
+ + + + + diff --git a/modules/spamfilter/queries/insertLog.xml b/modules/spamfilter/queries/insertLog.xml index 31aa93e46..e6a684fe1 100644 --- a/modules/spamfilter/queries/insertLog.xml +++ b/modules/spamfilter/queries/insertLog.xml @@ -1,10 +1,10 @@ - -
- - - - - - + +
+ + + + + + diff --git a/modules/spamfilter/queries/isDeniedIP.xml b/modules/spamfilter/queries/isDeniedIP.xml index 3255d6ce7..272537e10 100644 --- a/modules/spamfilter/queries/isDeniedIP.xml +++ b/modules/spamfilter/queries/isDeniedIP.xml @@ -1,11 +1,11 @@ - -
- - - - - - - + +
+ + + + + + + diff --git a/modules/spamfilter/schemas/spamfilter_denied_ip.xml b/modules/spamfilter/schemas/spamfilter_denied_ip.xml index aa3ecdcab..f19b3e87e 100644 --- a/modules/spamfilter/schemas/spamfilter_denied_ip.xml +++ b/modules/spamfilter/schemas/spamfilter_denied_ip.xml @@ -1,4 +1,4 @@
- - + +
diff --git a/modules/spamfilter/schemas/spamfilter_denied_word.xml b/modules/spamfilter/schemas/spamfilter_denied_word.xml index 8ce45e41f..da9b8d9a3 100644 --- a/modules/spamfilter/schemas/spamfilter_denied_word.xml +++ b/modules/spamfilter/schemas/spamfilter_denied_word.xml @@ -1,4 +1,4 @@ - - + +
diff --git a/modules/spamfilter/schemas/spamfilter_log.xml b/modules/spamfilter/schemas/spamfilter_log.xml index f40d469ca..4c4e7f18a 100644 --- a/modules/spamfilter/schemas/spamfilter_log.xml +++ b/modules/spamfilter/schemas/spamfilter_log.xml @@ -1,5 +1,5 @@ - - - + + +
diff --git a/modules/spamfilter/spamfilter.class.php b/modules/spamfilter/spamfilter.class.php index a6f68172b..10e7caba1 100644 --- a/modules/spamfilter/spamfilter.class.php +++ b/modules/spamfilter/spamfilter.class.php @@ -11,6 +11,17 @@ * @brief 설치시 추가 작업이 필요할시 구현 **/ function moduleInstall() { + // action forward에 등록 (관리자 모드에서 사용하기 위함) + $oModuleController = &getController('module'); + $oModuleController->insertActionFoward('spamfilter', 'view', 'dispSpamfilterAdminConfig'); + $oModuleController->insertActionFoward('spamfilter', 'view', 'dispSpamfilterAdminDeniedIPList'); + $oModuleController->insertActionFoward('spamfilter', 'view', 'dispSpamfilterAdminDeniedWordList'); + $oModuleController->insertActionFoward('spamfilter', 'controller', 'procSpamfilterAdminInsertConfig'); + $oModuleController->insertActionFoward('spamfilter', 'controller', 'procSpamfilterAdminInsertDeniedIP'); + $oModuleController->insertActionFoward('spamfilter', 'controller', 'procSpamfilterAdminDeleteDeniedIP'); + $oModuleController->insertActionFoward('spamfilter', 'controller', 'procSpamfilterAdminInsertDeniedWord'); + $oModuleController->insertActionFoward('spamfilter', 'controller', 'procSpamfilterAdminDeleteDeniedWord'); + return new Object(); } diff --git a/modules/spamfilter/spamfilter.controller.php b/modules/spamfilter/spamfilter.controller.php index 3ba508d50..d302935b3 100644 --- a/modules/spamfilter/spamfilter.controller.php +++ b/modules/spamfilter/spamfilter.controller.php @@ -16,7 +16,7 @@ /** * @brief 스팸필터 설정 **/ - function procInsertConfig() { + function procSpamfilterAdminInsertConfig() { // 기본 정보를 받음 $args = Context::gets('interval','limit_count','check_trackback'); if($args->check_trackback!='Y') $args->check_trackback = 'N'; @@ -30,7 +30,7 @@ /** * @brief 금지 IP등록 **/ - function procInsertDeniedIP() { + function procSpamfilterAdminInsertDeniedIP() { $ipaddress = Context::get('ipaddress'); return $this->insertIP($ipaddress); } @@ -39,14 +39,14 @@ * @brief 금지 IP삭제 **/ function procDeleteDeniedIP() { - $ipaddress = Context::get('ipaddress'); + $ipaddresSpamfilterAdmins = Context::get('ipaddress'); return $this->deleteIP($ipaddress); } /** * @brief 금지 Word등록 **/ - function procInsertDeniedWord() { + function procSpamfilterAdminInsertDeniedWord() { $word = Context::get('word'); return $this->insertWord($word); } @@ -54,7 +54,7 @@ /** * @brief 금지 Word삭제 **/ - function procDeleteDeniedWord() { + function procSpamfilterAdminDeleteDeniedWord() { $word = Context::get('word'); return $this->deleteWord($word); } diff --git a/modules/spamfilter/spamfilter.view.php b/modules/spamfilter/spamfilter.view.php index 5cf70668a..ab82f648b 100644 --- a/modules/spamfilter/spamfilter.view.php +++ b/modules/spamfilter/spamfilter.view.php @@ -18,7 +18,7 @@ /** * @brief 스팸필터의 설정 화면 **/ - function dispConfig() { + function dispSpamfilterAdminConfig() { // 설정 정보를 받아옴 (module model 객체를 이용) $oModuleModel = &getModel('module'); $config = $oModuleModel->getModuleConfig('spamfilter'); @@ -31,7 +31,7 @@ /** * @brief 금지 목록 출력 **/ - function dispDeniedIPList() { + function dispSpamfilterAdminDeniedIPList() { // 등록된 금지 IP 목록을 가져옴 $oSpamFilterModel = &getModel('spamfilter'); $ip_list = $oSpamFilterModel->getDeniedIPList(); @@ -45,7 +45,7 @@ /** * @brief 금지 목록 출력 **/ - function dispDeniedWordList() { + function dispSpamfilterAdminDeniedWordList() { // 등록된 금지 Word 목록을 가져옴 $oSpamFilterModel = &getModel('spamfilter'); $word_list = $oSpamFilterModel->getDeniedWordList(); diff --git a/modules/spamfilter/tpl.admin/denied_ip_list.html b/modules/spamfilter/tpl/denied_ip_list.html similarity index 100% rename from modules/spamfilter/tpl.admin/denied_ip_list.html rename to modules/spamfilter/tpl/denied_ip_list.html diff --git a/modules/spamfilter/tpl.admin/denied_word_list.html b/modules/spamfilter/tpl/denied_word_list.html similarity index 100% rename from modules/spamfilter/tpl.admin/denied_word_list.html rename to modules/spamfilter/tpl/denied_word_list.html diff --git a/modules/spamfilter/tpl.admin/filter/delete_denied_ip.xml b/modules/spamfilter/tpl/filter/delete_denied_ip.xml similarity index 100% rename from modules/spamfilter/tpl.admin/filter/delete_denied_ip.xml rename to modules/spamfilter/tpl/filter/delete_denied_ip.xml diff --git a/modules/spamfilter/tpl.admin/filter/delete_denied_word.xml b/modules/spamfilter/tpl/filter/delete_denied_word.xml similarity index 100% rename from modules/spamfilter/tpl.admin/filter/delete_denied_word.xml rename to modules/spamfilter/tpl/filter/delete_denied_word.xml diff --git a/modules/spamfilter/tpl.admin/filter/insert_config.xml b/modules/spamfilter/tpl/filter/insert_config.xml similarity index 100% rename from modules/spamfilter/tpl.admin/filter/insert_config.xml rename to modules/spamfilter/tpl/filter/insert_config.xml diff --git a/modules/spamfilter/tpl.admin/filter/insert_denied_ip.xml b/modules/spamfilter/tpl/filter/insert_denied_ip.xml similarity index 100% rename from modules/spamfilter/tpl.admin/filter/insert_denied_ip.xml rename to modules/spamfilter/tpl/filter/insert_denied_ip.xml diff --git a/modules/spamfilter/tpl.admin/filter/insert_denied_word.xml b/modules/spamfilter/tpl/filter/insert_denied_word.xml similarity index 100% rename from modules/spamfilter/tpl.admin/filter/insert_denied_word.xml rename to modules/spamfilter/tpl/filter/insert_denied_word.xml diff --git a/modules/spamfilter/tpl.admin/header.html b/modules/spamfilter/tpl/header.html similarity index 100% rename from modules/spamfilter/tpl.admin/header.html rename to modules/spamfilter/tpl/header.html diff --git a/modules/spamfilter/tpl.admin/index.html b/modules/spamfilter/tpl/index.html similarity index 100% rename from modules/spamfilter/tpl.admin/index.html rename to modules/spamfilter/tpl/index.html diff --git a/modules/spamfilter/tpl.admin/js/spamfilter.js b/modules/spamfilter/tpl/js/spamfilter.js similarity index 100% rename from modules/spamfilter/tpl.admin/js/spamfilter.js rename to modules/spamfilter/tpl/js/spamfilter.js