diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 735055c0d..7631696cf 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -287,7 +287,7 @@ // message_srl이 있으면 내용 추출 if($message_srl) { $message = $oMemberModel->getSelectedMessage($message_srl); - if($message->message_srl == $message_srl) Context::set('message', $message); + if($message->message_srl == $message_srl && $message->receiver_srl == $logged_info->member_srl) Context::set('message', $message); } // 목록 추출 @@ -360,6 +360,7 @@ **/ function dispMemberSendMessage() { $this->setLayoutFile("popup_layout"); + $oMemberModel = &getModel('member'); // 로그인이 되어 있지 않으면 오류 표시 if(!Context::get('is_logged')) return $this->stop('msg_not_logged'); @@ -369,7 +370,17 @@ $receiver_srl = Context::get('receiver_srl'); if(!$receiver_srl || $logged_info->member_srl == $receiver_srl) return $this->stop('msg_not_logged'); - $oMemberModel = &getModel('member'); + // 답글 쪽지일 경우 원본 메세지의 글번호를 구함 + $message_srl = Context::get('message_srl'); + if($message_srl) { + $source_message = $oMemberModel->getSelectedMessage($message_srl); + if($source_message->message_srl == $message_srl && $source_message->sender_srl == $receiver_srl) { + $source_message->title = "[re] ".$source_message->title; + $source_message->content = "\r\n
\r\n
".trim($source_message->content)."
"; + Context::set('source_message', $source_message); + } + } + $receiver_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl); Context::set('receiver_info', $receiver_info); diff --git a/modules/member/skins/default/js/member.js b/modules/member/skins/default/js/member.js index bd813dbec..ff9bb1775 100644 --- a/modules/member/skins/default/js/member.js +++ b/modules/member/skins/default/js/member.js @@ -134,8 +134,9 @@ function completeSendMessage(ret_obj) { window.close(); } -function doSendMessage(member_srl) { - var url = current_url.setQuery('module','member').setQuery('act','dispMemberSendMessage').setQuery('receiver_srl',member_srl); +function doSendMessage(member_srl, message_srl) { + if(typeof(message_srl)=='undefined') message_srl = 0; + var url = current_url.setQuery('module','member').setQuery('act','dispMemberSendMessage').setQuery('receiver_srl',member_srl).setQuery('message_srl',message_srl); popopen(url, 'sendMessage'); } diff --git a/modules/member/skins/default/member_messages.html b/modules/member/skins/default/member_messages.html index 98f386292..86651c3e6 100644 --- a/modules/member/skins/default/member_messages.html +++ b/modules/member/skins/default/member_messages.html @@ -26,7 +26,7 @@
- {$lang->cmd_reply} + {$lang->cmd_reply} {$lang->cmd_store} diff --git a/modules/member/skins/default/send_message.html b/modules/member/skins/default/send_message.html index e45bf1ab9..f80880033 100644 --- a/modules/member/skins/default/send_message.html +++ b/modules/member/skins/default/send_message.html @@ -9,7 +9,7 @@
- +
@@ -22,7 +22,7 @@ {$lang->title} - + {$lang->cmd_option}