diff --git a/modules/spamfilter/queries/insertDeniedIP.xml b/modules/spamfilter/queries/insertDeniedIP.xml index 6fcdf5a7a..700844ae3 100644 --- a/modules/spamfilter/queries/insertDeniedIP.xml +++ b/modules/spamfilter/queries/insertDeniedIP.xml @@ -4,6 +4,7 @@ + diff --git a/modules/spamfilter/schemas/spamfilter_denied_ip.xml b/modules/spamfilter/schemas/spamfilter_denied_ip.xml index f19b3e87e..eba59c51d 100644 --- a/modules/spamfilter/schemas/spamfilter_denied_ip.xml +++ b/modules/spamfilter/schemas/spamfilter_denied_ip.xml @@ -1,4 +1,5 @@ +
diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php index 40af70329..e30f978ad 100644 --- a/modules/spamfilter/spamfilter.admin.controller.php +++ b/modules/spamfilter/spamfilter.admin.controller.php @@ -32,9 +32,10 @@ **/ function procSpamfilterAdminInsertDeniedIP() { $ipaddress = Context::get('ipaddress'); + $description = Context::get('description'); $oSpamfilterController = &getController('spamfilter'); - return $oSpamfilterController->insertIP($ipaddress); + return $oSpamfilterController->insertIP($ipaddress, $description); } /** diff --git a/modules/spamfilter/spamfilter.class.php b/modules/spamfilter/spamfilter.class.php index c82be8e55..bdec7b821 100644 --- a/modules/spamfilter/spamfilter.class.php +++ b/modules/spamfilter/spamfilter.class.php @@ -50,6 +50,8 @@ if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) return true; if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) return true; + if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) return true; + return false; } @@ -90,6 +92,10 @@ $oDB->addIndex('spamfilter_denied_word','idx_latest_hit', 'latest_hit'); } + if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) { + $oDB->addColumn('spamfilter_denied_ip','description','varchar', 250); + } + return new Object(0,'success_updated'); } diff --git a/modules/spamfilter/spamfilter.controller.php b/modules/spamfilter/spamfilter.controller.php index 30a779ae6..a4b1d9451 100644 --- a/modules/spamfilter/spamfilter.controller.php +++ b/modules/spamfilter/spamfilter.controller.php @@ -132,7 +132,7 @@ // 제목과 블로그이름이 동일할 경우 최근 6시간내의 ip를 조사하여 삭제하고 금지ip로 등록 if($obj->title == $obj->excerpt) { $oTrackbackController->deleteTrackbackSender(60*60*6, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt); - $this->insertIP($ipaddress.'.*'); + $this->insertIP($ipaddress.'.*', 'AUTO-DENIED : trackback.insertTrackback'); return new Object(-1,'msg_alert_trackback_denied'); } @@ -153,8 +153,9 @@ * @brief IP 등록 * 등록된 IP는 스패머로 간주 **/ - function insertIP($ipaddress) { + function insertIP($ipaddress, $description = null) { $args->ipaddress = $ipaddress; + if($description) $args->description = $description; return executeQuery('spamfilter.insertDeniedIP', $args); } diff --git a/modules/spamfilter/spamfilter.model.php b/modules/spamfilter/spamfilter.model.php index 70648d6ee..3f161e404 100644 --- a/modules/spamfilter/spamfilter.model.php +++ b/modules/spamfilter/spamfilter.model.php @@ -104,7 +104,7 @@ // 정해진 시간보다 클 경우 금지 ip로 등록 if($count>=$limit_count) { $oSpamFilterController = &getController('spamfilter'); - $oSpamFilterController->insertIP($ipaddress); + $oSpamFilterController->insertIP($ipaddress, 'AUTO-DENIED : Over limit'); return new Object(-1, 'msg_alert_registered_denied_ip'); } diff --git a/modules/spamfilter/tpl/denied_ip_list.html b/modules/spamfilter/tpl/denied_ip_list.html index 7df4ea4c2..750d0314a 100644 --- a/modules/spamfilter/tpl/denied_ip_list.html +++ b/modules/spamfilter/tpl/denied_ip_list.html @@ -18,6 +18,12 @@

{$lang->about_denied_ip}

+ +
{$lang->description}
+ + + + @@ -33,6 +39,7 @@
{$lang->no}
{$lang->ipaddress}
+
{$lang->description}
{$lang->regdate}
{$lang->cmd_delete}
@@ -41,7 +48,8 @@ {count($ip_list)-$no} - {$val->ipaddress} + {$val->ipaddress} + {$val->description} {zdate($val->regdate,"Y-m-d")} {$lang->cmd_delete}