From 5e50a89993fc16e8c6ef577d63aca254e6a95156 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 2 Apr 2007 03:15:03 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@871
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/comment/comment.controller.php               | 3 ++-
 modules/module/tpl/filter/insert_shortcut.xml        | 2 +-
 modules/module/tpl/header.html                       | 2 +-
 modules/spamfilter/spamfilter.controller.php         | 4 ++--
 modules/spamfilter/tpl/filter/insert_denied_word.xml | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index 538fe4753..2c4188130 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -30,7 +30,8 @@
                 $comment_srl = trim($comment_srl_list[$i]);
                 if(!$comment_srl) continue;
 
-                $this->deleteComment($comment_srl, true);
+                $output = $this->deleteComment($comment_srl, true);
+                if(!$output->toBool()) return $output;
             }
 
             $this->setMessage( sprintf(Context::getLang('msg_checked_comment_is_deleted'), $comment_count) );
diff --git a/modules/module/tpl/filter/insert_shortcut.xml b/modules/module/tpl/filter/insert_shortcut.xml
index 030b33b06..9d8006f4e 100644
--- a/modules/module/tpl/filter/insert_shortcut.xml
+++ b/modules/module/tpl/filter/insert_shortcut.xml
@@ -1,4 +1,4 @@
-<filter name="insert_shortcut" module="admin" act="procModuleAdminInsertShortCut" confirm_msg_code="confirm_submit">
+<filter name="insert_shortcut" module="admin" act="procAdminInsertShortCut" confirm_msg_code="confirm_submit">
     <form>
         <node target="module" required="true" />
     </form>
diff --git a/modules/module/tpl/header.html b/modules/module/tpl/header.html
index 4d2a4240d..d7bd97f14 100644
--- a/modules/module/tpl/header.html
+++ b/modules/module/tpl/header.html
@@ -1,4 +1,4 @@
-<!--%import("js/member_admin.js")-->
+<!--%import("js/module_admin.js")-->
 
 <div style="margin-bottom:20px;">
     <span <!--@if($act=='dispModuleAdminContent')-->style="font-weight:bold"<!--@end-->>[<a href="{getUrl('act','dispModuleAdminContent')}">{$lang->module_index}</a>]</span>
diff --git a/modules/spamfilter/spamfilter.controller.php b/modules/spamfilter/spamfilter.controller.php
index 98b5d0a32..82345d792 100644
--- a/modules/spamfilter/spamfilter.controller.php
+++ b/modules/spamfilter/spamfilter.controller.php
@@ -38,8 +38,8 @@
         /**
          * @brief 금지 IP삭제
          **/
-        function procDeleteDeniedIP() {
-            $ipaddresSpamfilterAdmins = Context::get('ipaddress');
+        function procSpamfilterAdminDeleteDeniedIP() {
+            $ipaddress = Context::get('ipaddress');
             return $this->deleteIP($ipaddress);
         }
         
diff --git a/modules/spamfilter/tpl/filter/insert_denied_word.xml b/modules/spamfilter/tpl/filter/insert_denied_word.xml
index b42a90b29..b6067f9c8 100644
--- a/modules/spamfilter/tpl/filter/insert_denied_word.xml
+++ b/modules/spamfilter/tpl/filter/insert_denied_word.xml
@@ -1,4 +1,4 @@
-<filter name="insert_denied_word" module="spamfilter" act="procInsertDeniedWord" confirm_msg_code="confirm_submit">
+<filter name="insert_denied_word" module="spamfilter" act="procSpamfilterAdminInsertDeniedWord" confirm_msg_code="confirm_submit">
   <form>
     <node target="word" required="true" minlength="4" maxlength="250" />
   </form>