From 4090d6f5d7eb26da9969641b61ba95471215efd9 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 26 Apr 2026 14:55:57 +0900
Subject: [PATCH] Hide friend-related options and error messages if friend
 feature is disabled #2702

---
 modules/communication/communication.controller.php | 9 ++++++++-
 modules/communication/communication.view.php       | 7 +++++++
 modules/communication/skins/default/messages.html  | 2 +-
 3 files changed, 16 insertions(+), 2 deletions(-)

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 @@
 		<input type="hidden" name="act" value="procCommunicationUpdateAllowMessage" />
 		<input type="hidden" name="message_type" value="{$message_type}" />
 		<select name="allow_message" style="margin:0">
-			<option loop="$lang->allow_message_type => $key,$val" value="{$key}" selected="selected"|cond="$logged_info->allow_message==$key">{$val}</option>
+			<option loop="$allow_message_type => $key,$val" value="{$key}" selected="selected"|cond="$logged_info->allow_message==$key">{$val}</option>
 		</select>
 		<input type="submit" value="{$lang->cmd_save}" class="btn">
 	</form>