From 44288fcb7808b82f8c2963667866c275d88aea5b Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Thu, 23 Mar 2023 22:05:26 +0900
Subject: [PATCH] Fix #2094 remove page and message_type parameters from links
 in communication module skin

---
 .../m.skins/default/message_box.html            |  2 +-
 .../communication/m.skins/default/messages.html |  4 ++--
 .../m.skins/default/read_message.html           |  2 +-
 .../skins/default/common_header.html            |  2 +-
 .../skins/default/css/communication.css         | 17 +++++++++--------
 .../communication/skins/default/messages.html   |  2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/modules/communication/m.skins/default/message_box.html b/modules/communication/m.skins/default/message_box.html
index e3cc0c69a..8e4afe05b 100644
--- a/modules/communication/m.skins/default/message_box.html
+++ b/modules/communication/m.skins/default/message_box.html
@@ -5,7 +5,7 @@
 	</div>
 	<ul class="gn">
 		<li loop="$lang->message_box=>$key,$val">
-			<a href="{getUrl('act','dispCommunicationMessages','message_type',$key)}">{$lang->message_box[$key]}</a>
+			<a href="{getUrl('','mid',$mid,'act','dispCommunicationMessages','message_type',$key)}">{$lang->message_box[$key]}</a>
 		</li>
 	</ul>
 </div>
diff --git a/modules/communication/m.skins/default/messages.html b/modules/communication/m.skins/default/messages.html
index 19b20461c..6ae13d202 100644
--- a/modules/communication/m.skins/default/messages.html
+++ b/modules/communication/m.skins/default/messages.html
@@ -4,12 +4,12 @@
 </div>
 <ul class="lt">
 	<li loop="$message_list => $no,$val" class="read"|cond="$val->readed == 'Y'" class="unread"|cond="$val->readed != 'Y'">
-		<a href="{getUrl('message_srl', $val->message_srl)}">{$val->title}</a>
+		<a href="{getUrl('message_srl', $val->message_srl, 'message_type', null, 'page', null)}">{$val->title}</a>
 		<span class="memberInfo">{$val->nick_name}  ({zdate($val->regdate,"Y-m-d")})</span>
 	</li>
 </ul>
 <div class="pn">
-	<a cond="$page != 1" href="{getUrl('page',$page-1,'document_srl','')}" class="prev">{$lang->cmd_prev}</a> 
+	<a cond="$page != 1" href="{getUrl('page',$page-1,'document_srl','')}" class="prev">{$lang->cmd_prev}</a>
 	<strong>{$page} / {$page_navigation->last_page}</strong>
 	<a cond="$page != $page_navigation->last_page" href="{getUrl('page',$page+1,'document_srl','')}" class="next">{$lang->cmd_next}</a>
 </div>
diff --git a/modules/communication/m.skins/default/read_message.html b/modules/communication/m.skins/default/read_message.html
index c9b487d0b..da822eb1f 100644
--- a/modules/communication/m.skins/default/read_message.html
+++ b/modules/communication/m.skins/default/read_message.html
@@ -14,7 +14,7 @@
 	<!--@endif-->
 </div>
 <div class="bna">
-	<span class="fl"><a href="{getUrl('message_srl', '')}" class="bn white">{$lang->cmd_list}</a></span>
+	<span class="fl"><a href="{getUrl('message_srl', '', 'message_type', $message->message_type)}" class="bn white">{$lang->cmd_list}</a></span>
 	<span class="fr"><a href="#" onClick="doDeleteMessage('{$message->message_srl}');" class="bn white">{$lang->cmd_delete}</a></span>
 	<span class="fr" cond="$message->sender_srl != $logged_info->member_srl"><a href="{getUrl('act','dispCommunicationSendMessage','receiver_srl',$message->sender_srl,'message_srl',$message->message_srl)}" class="bn white">{$lang->cmd_reply_message}</a></span>
 </div>
diff --git a/modules/communication/skins/default/common_header.html b/modules/communication/skins/default/common_header.html
index 8e504c290..5e09e7e9b 100644
--- a/modules/communication/skins/default/common_header.html
+++ b/modules/communication/skins/default/common_header.html
@@ -3,6 +3,6 @@
 <section class="xc">
 	<ul class="nav nav-tabs" cond="$is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl)">
 		<li loop="$logged_info->menu_list => $key,$val" class="active"|cond="$key==$act">
-			<a href="{getUrl('act',$key)}">{lang($val)}</a>
+			<a href="{getUrl(['mid' => $mid, 'act' => $key])}">{lang($val)}</a>
 		</li>
 	</ul>
diff --git a/modules/communication/skins/default/css/communication.css b/modules/communication/skins/default/css/communication.css
index 0ad29454a..1355dc05b 100644
--- a/modules/communication/skins/default/css/communication.css
+++ b/modules/communication/skins/default/css/communication.css
@@ -84,11 +84,11 @@
 .xc input[type="file"]:focus,
 .xc input[type="radio"]:focus,
 .xc input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}
-.xc input:-moz-placeholder, 
+.xc input:-moz-placeholder,
 .xc textarea:-moz-placeholder {color:#999999}
-.xc input:-ms-input-placeholder, 
+.xc input:-ms-input-placeholder,
 .xc textarea:-ms-input-placeholder {color:#999999}
-.xc input::-webkit-input-placeholder, 
+.xc input::-webkit-input-placeholder,
 .xc textarea::-webkit-input-placeholder {color:#999999}
 .xc input,
 .xc textarea{margin-left:0}
@@ -102,11 +102,11 @@
 .xc input[type="checkbox"][disabled],
 .xc input[type="radio"][readonly],
 .xc input[type="checkbox"][readonly]{background-color:transparent}
-.xc input:focus:invalid, 
-.xc textarea:focus:invalid, 
+.xc input:focus:invalid,
+.xc textarea:focus:invalid,
 .xc select:focus:invalid {color:#b94a48;border-color:#ee5f5b}
-.xc input:focus:invalid:focus, 
-.xc textarea:focus:invalid:focus, 
+.xc input:focus:invalid:focus,
+.xc textarea:focus:invalid:focus,
 .xc select:focus:invalid:focus {border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}
 /* Forms */
 .xc .form-horizontal .control-group{margin-bottom:20px;*zoom:1}
@@ -241,6 +241,7 @@
 .xc textarea,
 .xc select,
 .xc button,
+.xc a.btn,
 .xc table{font-size:13px}
 .xc h1{font-size:22px}
 .xc .nav a,
@@ -249,4 +250,4 @@
 .xc .table>caption{text-align:left;font-weight:bold}
 .xc .table>caption>.pull-right{position:relative;top:-8px}
 .xc .control-group:first-child,
-.xc .control-group:first-of-type{border-top:0}
\ No newline at end of file
+.xc .control-group:first-of-type{border-top:0}
diff --git a/modules/communication/skins/default/messages.html b/modules/communication/skins/default/messages.html
index 7ad2fb4c8..9226d71f1 100644
--- a/modules/communication/skins/default/messages.html
+++ b/modules/communication/skins/default/messages.html
@@ -4,7 +4,7 @@
 
 <div class="btnArea">
 	<div style="margin:0;display:block;float:left" class="btn-group">
-		<button loop="$lang->message_box => $key,$val" class="btn" onclick="location.href=current_url.setQuery('act', 'dispCommunicationMessages').setQuery('message_srl', '').setQuery('message_type', '{$key}'); return false;" style="font-weight:bold"|cond="$message_type == $key">{$val}</button>
+		<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>
 	</div>
 	<form action="./" method="POST" style="margin:0;display:block;float:right">
 		<input type="hidden" name="module" value="communication" />