From 712cb9906c1f5e0cc62b0ab4b0ebd33abb80d032 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 30 Mar 2007 07:16:39 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@822
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/spamfilter/conf/info.xml              | 13 +++++-------
 modules/spamfilter/conf/module.xml            | 16 +++++++--------
 modules/spamfilter/queries/deleteDeniedIP.xml | 12 +++++------
 .../spamfilter/queries/deleteDeniedWord.xml   | 12 +++++------
 .../spamfilter/queries/getDeniedIPList.xml    | 18 ++++++++---------
 .../spamfilter/queries/getDeniedWordList.xml  | 18 ++++++++---------
 modules/spamfilter/queries/getLogCount.xml    | 20 +++++++++----------
 modules/spamfilter/queries/insertDeniedIP.xml | 14 ++++++-------
 .../spamfilter/queries/insertDeniedWord.xml   | 14 ++++++-------
 modules/spamfilter/queries/insertLog.xml      | 16 +++++++--------
 modules/spamfilter/queries/isDeniedIP.xml     | 18 ++++++++---------
 .../schemas/spamfilter_denied_ip.xml          |  4 ++--
 .../schemas/spamfilter_denied_word.xml        |  4 ++--
 modules/spamfilter/schemas/spamfilter_log.xml |  6 +++---
 modules/spamfilter/spamfilter.class.php       | 11 ++++++++++
 modules/spamfilter/spamfilter.controller.php  | 10 +++++-----
 modules/spamfilter/spamfilter.view.php        |  6 +++---
 .../{tpl.admin => tpl}/denied_ip_list.html    |  0
 .../{tpl.admin => tpl}/denied_word_list.html  |  0
 .../filter/delete_denied_ip.xml               |  0
 .../filter/delete_denied_word.xml             |  0
 .../filter/insert_config.xml                  |  0
 .../filter/insert_denied_ip.xml               |  0
 .../filter/insert_denied_word.xml             |  0
 .../spamfilter/{tpl.admin => tpl}/header.html |  0
 .../spamfilter/{tpl.admin => tpl}/index.html  |  0
 .../{tpl.admin => tpl}/js/spamfilter.js       |  0
 27 files changed, 110 insertions(+), 102 deletions(-)
 rename modules/spamfilter/{tpl.admin => tpl}/denied_ip_list.html (100%)
 rename modules/spamfilter/{tpl.admin => tpl}/denied_word_list.html (100%)
 rename modules/spamfilter/{tpl.admin => tpl}/filter/delete_denied_ip.xml (100%)
 rename modules/spamfilter/{tpl.admin => tpl}/filter/delete_denied_word.xml (100%)
 rename modules/spamfilter/{tpl.admin => tpl}/filter/insert_config.xml (100%)
 rename modules/spamfilter/{tpl.admin => tpl}/filter/insert_denied_ip.xml (100%)
 rename modules/spamfilter/{tpl.admin => tpl}/filter/insert_denied_word.xml (100%)
 rename modules/spamfilter/{tpl.admin => tpl}/header.html (100%)
 rename modules/spamfilter/{tpl.admin => tpl}/index.html (100%)
 rename modules/spamfilter/{tpl.admin => tpl}/js/spamfilter.js (100%)

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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module version="0.1">
-  <title xml:lang="ko">스팸필터</title>
-  <title xml:lang="en">spam filter</title>
-  <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
-    <name xml:lang="ko">제로</name>
-    <name xml:lang="en">zero</name>
-    <description xml:lang="ko">제로보드의 기본 스팸필터입니다.</description>
-    <description xml:lang="en">Default spam filter of zeroboard</description>
-  </author>
+    <title xml:lang="ko">스팸필터</title>
+    <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
+        <name xml:lang="ko">제로</name>
+        <description xml:lang="ko">제로보드 XE의 기본 스팸필터입니다.</description>
+    </author>
 </module>
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 @@
 <module>
     <grants />
     <actions>
-        <action name="dispConfig" type="view" admin_index="true" standalone="true" />
-        <action name="dispDeniedIPList" type="view" standalone="true" />
-        <action name="dispDeniedWordList" type="view" standalone="true" />
+        <action name="dispSpamfilterAdminConfig" type="view" admin_index="true" standalone="true" />
+        <action name="dispSpamfilterAdminDeniedIPList" type="view" standalone="true" />
+        <action name="dispSpamfilterAdminDeniedWordList" type="view" standalone="true" />
 
-        <action name="procInsertConfig" type="controller" standalone="true" />
-        <action name="procInsertDeniedIP" type="controller" standalone="true" />
-        <action name="procDeleteDeniedIP" type="controller" standalone="true" />
-        <action name="procInsertDeniedWord" type="controller" standalone="true" />
-        <action name="procDeleteDeniedWord" type="controller" standalone="true" />
+        <action name="procSpamfilterAdminInsertConfig" type="controller" standalone="true" />
+        <action name="procSpamfilterAdminInsertDeniedIP" type="controller" standalone="true" />
+        <action name="procSpamfilterAdminDeleteDeniedIP" type="controller" standalone="true" />
+        <action name="procSpamfilterAdminInsertDeniedWord" type="controller" standalone="true" />
+        <action name="procSpamfilterAdminDeleteDeniedWord" type="controller" standalone="true" />
     </actions>
 </module>
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 @@
 <query id="deleteDeniedIP" action="delete">
-  <tables>
-    <table name="spamfilter_denied_ip" />
-  </tables>
-  <conditions>
-    <condition operation="equal" column="ipaddress" var="ipaddress" filter="number" notnull="notnull" />
-  </conditions>
+    <tables>
+        <table name="spamfilter_denied_ip" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="ipaddress" var="ipaddress" filter="number" notnull="notnull" />
+    </conditions>
 </query>
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 @@
 <query id="deleteDeniedWord" action="delete">
-  <tables>
-    <table name="spamfilter_denied_word" />
-  </tables>
-  <conditions>
-    <condition operation="equal" column="word" var="word" filter="number" notnull="notnull" />
-  </conditions>
+    <tables>
+        <table name="spamfilter_denied_word" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="word" var="word" filter="number" notnull="notnull" />
+    </conditions>
 </query>
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 @@
 <query id="getDeniedIPList" action="select">
-  <tables>
-    <table name="spamfilter_denied_ip" />
-  </tables>
-  <columns>
-    <column name="*" />
-  </columns>
-  <navigation>
-    <index var="sort_index" order="desc" />
-  </navigation>
+    <tables>
+        <table name="spamfilter_denied_ip" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <navigation>
+        <index var="sort_index" order="desc" />
+    </navigation>
 </query>
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 @@
 <query id="getDeniedWordList" action="select">
-  <tables>
-    <table name="spamfilter_denied_word" />
-  </tables>
-  <columns>
-    <column name="*" />
-  </columns>
-  <navigation>
-    <index var="sort_index" order="desc" />
-  </navigation>
+    <tables>
+        <table name="spamfilter_denied_word" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <navigation>
+        <index var="sort_index" order="desc" />
+    </navigation>
 </query>
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 @@
 <query id="getLogCount" action="select">
-  <tables>
-    <table name="spamfilter_log" />
-  </tables>
-  <columns>
-    <column name="count(*)" alias="count" />
-  </columns>
-  <conditions>
-    <condition operation="equal" column="ipaddress" var="ipaddress" filter="number" notnull="notnull" />
-    <condition operation="more" column="regdate" var="regdate" notnull="notnull" pipe="and" />
-  </conditions>
+    <tables>
+        <table name="spamfilter_log" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="ipaddress" var="ipaddress" filter="number" notnull="notnull" />
+        <condition operation="more" column="regdate" var="regdate" notnull="notnull" pipe="and" />
+    </conditions>
 </query>
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 @@
 <query id="insertDeniedIP" action="insert">
-  <tables>
-    <table name="spamfilter_denied_ip" />
-  </tables>
-  <columns>
-    <column name="ipaddress" var="ipaddress" notnull="notnull" />
-    <column name="regdate" var="regdate" default="curdate()" />
-  </columns>
+    <tables>
+        <table name="spamfilter_denied_ip" />
+    </tables>
+    <columns>
+        <column name="ipaddress" var="ipaddress" notnull="notnull" />
+        <column name="regdate" var="regdate" default="curdate()" />
+    </columns>
 </query>
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 @@
 <query id="insertDeniedIP" action="insert">
-  <tables>
-    <table name="spamfilter_denied_word" />
-  </tables>
-  <columns>
-    <column name="word" var="word" notnull="notnull" />
-    <column name="regdate" var="regdate" default="curdate()" />
-  </columns>
+    <tables>
+        <table name="spamfilter_denied_word" />
+    </tables>
+    <columns>
+        <column name="word" var="word" notnull="notnull" />
+        <column name="regdate" var="regdate" default="curdate()" />
+    </columns>
 </query>
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 @@
 <query id="insertLog" action="insert">
-  <tables>
-    <table name="spamfilter_log" />
-  </tables>
-  <columns>
-    <column name="spamfilter_log_srl" default="sequence()"  />
-    <column name="ipaddress" default="ipaddress()" />
-    <column name="regdate" var="regdate" default="curdate()" />
-  </columns>
+    <tables>
+        <table name="spamfilter_log" />
+    </tables>
+    <columns>
+        <column name="spamfilter_log_srl" default="sequence()"/>
+        <column name="ipaddress" default="ipaddress()" />
+        <column name="regdate" var="regdate" default="curdate()" />
+    </columns>
 </query>
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 @@
 <query id="isDeniedIP" action="select">
-  <tables>
-    <table name="spamfilter_denied_ip" />
-  </tables>
-  <columns>
-    <column name="count(*)" alias="count" />
-  </columns>
-  <conditions>
-    <condition operation="equal" column="ipaddress" var="ipaddress" filter="number" notnull="notnull" />
-  </conditions>
+    <tables>
+        <table name="spamfilter_denied_ip" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="ipaddress" var="ipaddress" filter="number" notnull="notnull" />
+    </conditions>
 </query>
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 @@
 <table name="spamfilter_denied_ip">
-  <column name="ipaddress" type="varchar" size="250" notnull="notnull" primary_key="primary_key" />
-  <column name="regdate" type="date" index="idx_regdate" />
+    <column name="ipaddress" type="varchar" size="250" notnull="notnull" primary_key="primary_key" />
+    <column name="regdate" type="date" index="idx_regdate" />
 </table>
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 @@
 <table name="spamfilter_denied_word">
-  <column name="word" type="varchar" size="250" notnull="notnull" primary_key="primary_key" />
-  <column name="regdate" type="date" index="idx_regdate" />
+    <column name="word" type="varchar" size="250" notnull="notnull" primary_key="primary_key" />
+    <column name="regdate" type="date" index="idx_regdate" />
 </table>
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 @@
 <table name="spamfilter_log">
-  <column name="spamfilter_log_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
-  <column name="ipaddress" type="varchar" size="250" notnull="notnull" index="idx_ipaddress" />
-  <column name="regdate" type="date" index="idx_regdate" />
+    <column name="spamfilter_log_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
+    <column name="ipaddress" type="varchar" size="250" notnull="notnull" index="idx_ipaddress" />
+    <column name="regdate" type="date" index="idx_regdate" />
 </table>
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