From c2b39338316da3df5d5305173c3de23e5b4f425a Mon Sep 17 00:00:00 2001
From: bnu <bnufactory@gmail.com>
Date: Sat, 23 Nov 2013 19:59:00 +0900
Subject: [PATCH] =?UTF-8?q?#55=20=EC=8A=A4=ED=8C=B8=ED=95=84=ED=84=B0=20?=
 =?UTF-8?q?=EC=B0=A8=EB=8B=A8=20=EC=8B=9C=20=EB=B0=9C=EC=86=A1=EB=90=98?=
 =?UTF-8?q?=EC=97=88=EB=8B=A4=EB=8A=94=20=EB=A9=94=EC=8B=9C=EC=A7=80?=
 =?UTF-8?q?=EB=A1=9C=20=EC=9E=98=EB=AA=BB=20=EB=82=98=EC=98=A4=EB=8A=94=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/communication/communication.controller.php |  7 ++++++-
 modules/spamfilter/spamfilter.controller.php       | 13 ++++---------
 modules/spamfilter/spamfilter.model.php            |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php
index a2ea2fd39..133221fa1 100644
--- a/modules/communication/communication.controller.php
+++ b/modules/communication/communication.controller.php
@@ -114,8 +114,13 @@ class communicationController extends communication
 		// send a message
 		$output = $this->sendMessage($logged_info->member_srl, $receiver_srl, $title, $content);
 
+		if(!$output->toBool())
+		{
+			return $output;
+		}
+
 		// send an e-mail
-		if($output->toBool() && $send_mail == 'Y')
+		if($send_mail == 'Y')
 		{
 			$view_url = Context::getRequestUri();
 			$content = sprintf("%s<br /><br />From : <a href=\"%s\" target=\"_blank\">%s</a>", $content, $view_url, $view_url);
diff --git a/modules/spamfilter/spamfilter.controller.php b/modules/spamfilter/spamfilter.controller.php
index 97e78d05b..719ea7857 100644
--- a/modules/spamfilter/spamfilter.controller.php
+++ b/modules/spamfilter/spamfilter.controller.php
@@ -176,25 +176,20 @@ class spamfilterController extends spamfilter
 	function triggerSendMessage(&$obj)
 	{
 		if($_SESSION['avoid_log']) return new Object();
-		// Check the login status, login information, and permission
-		$is_logged = Context::get('is_logged');
+
 		$logged_info = Context::get('logged_info');
-		// In case logged in, check if it is an administrator
-		if($is_logged)
-		{
-			if($logged_info->is_admin == 'Y') return new Object();
-		}
+		if($logged_info->is_admin == 'Y') return new Object();
 
 		$oFilterModel = getModel('spamfilter');
 		// Check if the IP is prohibited
 		$output = $oFilterModel->isDeniedIP();
 		if(!$output->toBool()) return $output;
 		// Check if there is a ban on the word
-		$text = $obj->title.$obj->content;
+		$text = $obj->title . ' ' . $obj->content;
 		$output = $oFilterModel->isDeniedWord($text);
 		if(!$output->toBool()) return $output;
 		// Check the specified time
-		$output = $oFilterModel->checkLimited();
+		$output = $oFilterModel->checkLimited(TRUE);
 		if(!$output->toBool()) return $output;
 		// Save a log
 		$this->insertLog();
diff --git a/modules/spamfilter/spamfilter.model.php b/modules/spamfilter/spamfilter.model.php
index 3a4822a7c..b3762a13b 100644
--- a/modules/spamfilter/spamfilter.model.php
+++ b/modules/spamfilter/spamfilter.model.php
@@ -120,11 +120,11 @@ class spamfilterModel extends spamfilter
 		{
 			if($isMessage)
 			{
-				$message = sprintf(Context::getLang('msg_alert_limited_by_config'), $interval);
+				$message = sprintf(Context::getLang('msg_alert_limited_message_by_config'), $interval);
 			}
 			else
 			{
-				$message = sprintf(Context::getLang('msg_alert_limited_message_by_config'), $interval);
+				$message = sprintf(Context::getLang('msg_alert_limited_by_config'), $interval);
 			}
 
 			$oSpamFilterController = &getController('spamfilter');