git-svn-id: http://xe-core.googlecode.com/svn/trunk@245 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/spamfilter/lang/ko.lang.php

@@ -10,10 +10,14 @@
     $lang->cmd_denied_word = "금지단어 목록";
 
     // 일반 단어
+    $lang->denied_ip = "금지 IP";
     $lang->interval = "스팸 처리 간격";
+    $lang->word = "단어";
 
     // 설명문
     $lang->about_interval = "지정된 시간내에 다시 글이 등록이 되면 스팸으로 간주가 됩니다";
+    $lang->about_denied_ip = "127.0.0.* 와 같이 * 로 정해진 패턴의 IP 대역을 모두 금지 시킬 수 있습니다";
+    $lang->about_denied_word = "금지 단어로 등록되면 해당 단어가 있는 글은 등록을 금지 시킬 수 있습니다";
 
     // 메세지 출력용
     $lang->msg_alert_registered_spamer = '스패머로 등록되셨습니다';

modules/spamfilter/spamfilter.controller.php

@@ -62,9 +62,7 @@
          * @brief IP 등록
          * 등록된 IP는 스패머로 간주
          **/
-        function insertIP($ipaddress = '') {
-            if(!$ipaddress) $ipaddress = $_SERVER['REMOTE_ADDR'];
-
+        function insertIP($ipaddress) {
             $oDB = &DB::getInstance();
             $args->ipaddress = $ipaddress;
             return $oDB->executeQuery('spamfilter.insertDeniedIP', $args);

modules/spamfilter/tpl.admin/denied_ip_list.html

@@ -1,8 +1,9 @@
 <!--#include("header.html")-->
+<!--%import("filter/insert_denied_ip.xml")-->
 
 <!-- 스패머 정보 -->
 <div>
-  {$lang->total_count} : {number_format($total_count)}
+  {$lang->total_count} : {count($ip_list)}
 </div>
 
 
@@ -15,9 +16,9 @@
     <th>{$lang->regdate}</th>
     <th>{$lang->cmd_delete}</th>
   </tr>
-  <!--@foreach($spammer_list as $no => $val)-->
+  <!--@foreach($ip_list as $no => $val)-->
   <tr>
-    <td>{$no}</td>
+    <td>{count($ip_list)-$no}</td>
     <td>{$val->ipaddress}</td>
     <td>{zdate($val->regdate,"Y-m-d")}</td>
     <td><a href="{getUrl('act','dispAdminDeleteBoard','ipaddress', $val->ipaddress)}">{$lang->cmd_delete}</a></td>
@@ -26,8 +27,17 @@
   </table>
 </div>
 
-<!-- 버튼 -->
+<!-- 수동 추가 -->
 <div>
-  [<a href="{getUrl('act','dispAdminInsertBoard','module_srl','')}">{$lang->cmd_insert}</a>]
+  <form action="./" method="get" onsubmit="return procFilter(this, insert_denied_ip)">
+    <div>
+      {$lang->denied_ip}
+      <input type="text" name="ipaddress" value="" />
+      <input type="submit" value="{$lang->cmd_insert}" />
+    </div>
+    <div>
+      {$lang->about_denied_ip}
+    </div>
+  </form>
 </div>
 

modules/spamfilter/tpl.admin/denied_word_list.html

@@ -1,8 +1,9 @@
 <!--#include("header.html")-->
+<!--%import("filter/insert_denied_word.xml")-->
 
 <!-- 스패머 정보 -->
 <div>
-  {$lang->total_count} : {number_format($total_count)}
+  {$lang->total_count} : {count($word_list)}
 </div>
 
 
@@ -11,23 +12,33 @@
   <table border="1">
   <tr>
     <th>{$lang->no}</th>
-    <th>{$lang->ipaddress}</th>
+    <th>{$lang->word}</th>
     <th>{$lang->regdate}</th>
     <th>{$lang->cmd_delete}</th>
   </tr>
-  <!--@foreach($spammer_list as $no => $val)-->
+  <!--@foreach($word_list as $no => $val)-->
   <tr>
-    <td>{$no}</td>
-    <td>{$val->ipaddress}</td>
+    <td>{count($word_list)-$no}</td>
+    <td>{$val->word}</td>
     <td>{zdate($val->regdate,"Y-m-d")}</td>
-    <td><a href="{getUrl('act','dispAdminDeleteBoard','ipaddress', $val->ipaddress)}">{$lang->cmd_delete}</a></td>
+    <td><a href="{getUrl('act','dispAdminDeleteWord','word', $val->word)}">{$lang->cmd_delete}</a></td>
   </tr>
   <!--@end-->
   </table>
 </div>
 
-<!-- 버튼 -->
+<!-- 수동 추가 -->
 <div>
-  [<a href="{getUrl('act','dispAdminInsertBoard','module_srl','')}">{$lang->cmd_insert}</a>]
+  <form action="./" method="get" onsubmit="return procFilter(this, insert_denied_word)">
+    <div>
+      {$lang->word}
+      <input type="text" name="word" value="" />
+      <input type="submit" value="{$lang->cmd_insert}" />
+    </div>
+    <div>
+      {$lang->about_denied_word}
+    </div>
+  </form>
 </div>
 
+

modules/spamfilter/tpl.admin/filter/insert_denied_ip.xml

@@ -0,0 +1,12 @@
+<filter name="insert_denied_ip" module="spamfilter" act="procInsertDeniedIP" confirm_msg_code="confirm_submit">
+  <form>
+    <node target="ipaddress" required="true" minlength="4" maxlength="250" />
+  </form>
+  <parameter>
+    <param param="ipaddress" target="ipaddress" />
+  </parameter>
+  <response>
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>

modules/spamfilter/tpl.admin/filter/insert_denied_word.xml

@@ -0,0 +1,12 @@
+<filter name="insert_denied_word" module="spamfilter" act="procInsertDeniedWord" confirm_msg_code="confirm_submit">
+  <form>
+    <node target="word" required="true" minlength="4" maxlength="250" />
+  </form>
+  <parameter>
+    <param param="word" target="word" />
+  </parameter>
+  <response>
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>

modules/spamfilter/tpl.admin/index.html

@@ -1,4 +1,5 @@
 <!--#include("header.html")-->
+<!--%import("filter/insert_config.xml")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
   <table border="1">