diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php index 72ff49fa9..fe9c1e369 100644 --- a/modules/communication/communication.controller.php +++ b/modules/communication/communication.controller.php @@ -117,7 +117,14 @@ class CommunicationController extends communication { if(!$oCommunicationModel->isFriend($receiver_member_info->member_srl)) { - throw new Rhymix\Framework\Exception('msg_allow_message_to_friend'); + if ($config->enable_friend === 'Y') + { + throw new Rhymix\Framework\Exception('msg_allow_message_to_friend'); + } + else + { + throw new Rhymix\Framework\Exception('msg_disallow_message'); + } } } else if($receiver_member_info->allow_message == 'N') diff --git a/modules/communication/communication.view.php b/modules/communication/communication.view.php index 22b90a54c..11bbca94b 100644 --- a/modules/communication/communication.view.php +++ b/modules/communication/communication.view.php @@ -127,6 +127,13 @@ class CommunicationView extends communication $page = max(1, intval(Context::get('page'))); $output = $oCommunicationModel->getMessages($message_type, $columnList, $search_target, $search_keyword, $page); + $allow_message_type = lang('allow_message_type')->getArrayCopy(); + if ($this->config->allow_friend === 'N') + { + unset($allow_message_type['F']); + } + Context::set('allow_message_type', $allow_message_type); + // set a template file Context::set('total_count', $output->total_count); Context::set('total_page', $output->total_page); diff --git a/modules/communication/skins/default/messages.html b/modules/communication/skins/default/messages.html index b7ab60b33..149d783b9 100644 --- a/modules/communication/skins/default/messages.html +++ b/modules/communication/skins/default/messages.html @@ -15,7 +15,7 @@