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

From : %s", $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');