From 986fc2304353f66bcdc485c1d59e85c4353e4483 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 27 Oct 2023 19:32:17 +0900
Subject: [PATCH] Redirect to inbox after sending message

---
 modules/communication/communication.controller.php     | 10 ++++++++--
 .../communication/m.skins/default/send_message.html    |  2 +-
 modules/communication/skins/default/messages.html      |  5 +++++
 modules/communication/skins/default/send_message.html  |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php
index ab651866b..56a5bb351 100644
--- a/modules/communication/communication.controller.php
+++ b/modules/communication/communication.controller.php
@@ -155,8 +155,14 @@ class CommunicationController extends communication
 			else
 			{
 				$this->setMessage('success_sended');
-				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('','act', 'dispCommunicationMessages', 'message_type', 'S');
-				$this->setRedirectUrl($returnUrl);
+				if (Context::get('success_return_url'))
+				{
+					$this->setRedirectUrl(Context::get('success_return_url'));
+				}
+				else
+				{
+					$this->setRedirectUrl(getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationMessages'));
+				}
 			}
 		}
 
diff --git a/modules/communication/m.skins/default/send_message.html b/modules/communication/m.skins/default/send_message.html
index 58331bf84..545c96307 100644
--- a/modules/communication/m.skins/default/send_message.html
+++ b/modules/communication/m.skins/default/send_message.html
@@ -24,7 +24,7 @@
 	<input type="hidden" name="source_content" value="{htmlspecialchars($source_message->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false)}" />
 	<input type="hidden" name="content" value="" />
 	<input type="hidden" name="xe_validator_id" value="modules/communication/m.skins/default/send_message/1" />
-	<input type="hidden" name="success_return_url" value="{getNotEncodedUrl('', 'act', 'dispCommunicationMessages', 'message_type', 'S')}" />
+	<input type="hidden" name="success_return_url" value="{getNotEncodedUrl('', 'mid', $mid, 'act', 'dispCommunicationMessages')}" />
 	<input type="hidden" name="window_type" value="self" />
 	<ul>
 		<li>
diff --git a/modules/communication/skins/default/messages.html b/modules/communication/skins/default/messages.html
index 7d7767927..b7ab60b33 100644
--- a/modules/communication/skins/default/messages.html
+++ b/modules/communication/skins/default/messages.html
@@ -2,6 +2,10 @@
 <load target="filter/delete_checked_message.xml" />
 <load target="filter/update_allow_message.xml" />
 
+<div cond="!empty($XE_VALIDATOR_MESSAGE) && $XE_VALIDATOR_ID == 'modules/communication/skins/default/send_message/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+
 <div class="btnArea">
 	<div style="margin:0;display:block;float:left" class="btn-group">
 		<a loop="$lang->message_box => $key,$val" class="btn" href="{getUrl(['mid' => $mid, 'act' => 'dispCommunicationMessages', 'message_type' => $key])}" style="font-weight:bold"|cond="$message_type == $key">{$val}</a>
@@ -44,6 +48,7 @@
 		</tr>
 	<!--@endif-->
 </table>
+
 <div class="btnArea btn-group" cond="$message" style="margin-bottom:20px">
 	<button class="btn" cond="$message->message_type != 'S' && $message->member_srl != $logged_info->member_srl" type="button" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');">{$lang->cmd_reply_message}</button>
 	<button class="btn" cond="$message->message_type == 'R'" type="button" onclick="doStoreMessage('{$message->message_srl}');">{$lang->cmd_store}</button>
diff --git a/modules/communication/skins/default/send_message.html b/modules/communication/skins/default/send_message.html
index 52c16e0f4..69d07591b 100644
--- a/modules/communication/skins/default/send_message.html
+++ b/modules/communication/skins/default/send_message.html
@@ -26,7 +26,7 @@
 		<input type="hidden" name="content" value="{htmlspecialchars($source_message->content)}" />
 		<input type="hidden" name="receiver_srl" value="{$receiver_info->member_srl}" />
 		<input type="hidden" name="xe_validator_id" value="modules/communication/skins/default/send_message/1" />
-		<input type="hidden" name="success_return_url" value="{getNotEncodedUrl('', 'act', 'dispCommunicationMessages', 'message_type', 'S')}" />
+		<input type="hidden" name="success_return_url" value="{getNotEncodedUrl('', 'mid', $mid, 'act', 'dispCommunicationMessages')}" />
 		<input type="hidden" name="window_type" value="{escape($window_type ?? '')}" />
 		<table class="table table-striped table-hover">
 			<tr>