From 922fc2b621422da80dd8ee23d30dca918003f41c Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 3 Apr 2007 09:31:40 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@931
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/member/member.controller.php          | 15 ++++-
 modules/member/queries/setMessageStored.xml   |  2 +-
 modules/member/skins/default/js/member.js     | 28 ++++++++
 .../member/skins/default/member_messages.html | 64 +++++++++----------
 .../member/skins/default/send_message.html    |  6 +-
 5 files changed, 78 insertions(+), 37 deletions(-)

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index a6240469f..47f1055ae 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -99,13 +99,22 @@
         /**
          * @brief 특정 쪽지를 보관함으로 보냄
          **/
-        function procMemberStoreMessage($message_srl) {
+        function procMemberStoreMessage() {
             // 로그인 정보 체크
             if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
             $logged_info = Context::get('logged_info');
 
+            // 변수 체크
+            $message_srl = Context::get('message_srl');
+            if(!$message_srl) return new Object(-1,'msg_invalid_request');
+
+            // 쪽지를 가져옴
+            $oMemberModel = &getModel('member');
+            $message = $oMemberModel->getSelectedMessage($message_srl);
+            if(!$message || $message->message_type != 'R') return new Object(-1,'msg_invalid_request');
+
             $args->message_srl = $message_srl;
-            $args->member_srl = $logged_info->member_srl;
+            $args->receiver_srl = $logged_info->member_srl;
             $output = executeQuery('member.setMessageStored', $args);
             if(!$output->toBool()) return $output;
 
@@ -128,7 +137,7 @@
 
             // 쪽지를 가져옴
             $oMemberModel = &getModel('member');
-            $message = $oMemberModel->getMessage($message_srl);
+            $message = $oMemberModel->getSelectedMessage($message_srl);
             if(!$message) return new Object(-1,'msg_invalid_request');
 
             // 발송인+type=S or 수신인+type=R 검사
diff --git a/modules/member/queries/setMessageStored.xml b/modules/member/queries/setMessageStored.xml
index c3ecdafdc..6cba267b2 100644
--- a/modules/member/queries/setMessageStored.xml
+++ b/modules/member/queries/setMessageStored.xml
@@ -7,6 +7,6 @@
     </columns>
     <conditions>
         <condition operation="equal" column="message_srl" var="message_srl" notnull="notnull" filter="number"/>
-        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" pipe="and" />
+        <condition operation="equal" column="receiver_srl" var="receiver_srl" notnull="notnull" filter="number" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/member/skins/default/js/member.js b/modules/member/skins/default/js/member.js
index 296da97cd..0183413db 100644
--- a/modules/member/skins/default/js/member.js
+++ b/modules/member/skins/default/js/member.js
@@ -87,3 +87,31 @@ function completeSendMessage(ret_obj) {
     alert(ret_obj['message']);
     window.close();
 }
+
+/* 개별 쪽지 삭제 */
+function doDeleteMessage(message_srl) {
+    if(!message_srl) return;
+
+    var params = new Array();
+    params['message_srl'] = message_srl;
+    exec_xml('member', 'procMemberDeleteMessage', params, completeDeleteMessage);
+}
+
+function completeDeleteMessage(ret_obj) {
+    alert(ret_obj['message']);
+    location.href = location.href.setQuery('message_srl','');
+}
+
+/* 개별 쪽지 보관 */
+function doStoreMessage(message_srl) {
+    if(!message_srl) return;
+
+    var params = new Array();
+    params['message_srl'] = message_srl;
+    exec_xml('member', 'procMemberStoreMessage', params, completeStoreMessage);
+}
+
+function completeStoreMessage(ret_obj) {
+    alert(ret_obj['message']);
+    location.href = location.href.setQuery('message_srl','');
+}
diff --git a/modules/member/skins/default/member_messages.html b/modules/member/skins/default/member_messages.html
index 895c20189..7c1114b82 100644
--- a/modules/member/skins/default/member_messages.html
+++ b/modules/member/skins/default/member_messages.html
@@ -1,3 +1,5 @@
+<!--%import("js/member.js")-->
+
 <!-- 정보 -->
 <div>
     <!--@foreach($lang->message_box as $key => $val)-->
@@ -14,37 +16,35 @@
 
 <!-- 내용 -->
 <!--@if($message)-->
-<form action="./" method="get" onsubmit="return false;">
-    <div>
-        <table border="1">
-        <tr>
-            <th>
-                <!--@if($message->message_type == "S")-->
-                {$lang->receiver}
-                <!--@else-->
-                {$lang->sender}
-                <!--@end-->
-            </th>
-            <td><div class="member_{$message->member_srl}">{$message->nick_name} ({$message->user_id})</div></td>
-        </tr>
-        <tr>    
-            <th>{$lang->title}</th>
-            <td>{htmlspecialchars($message->title)}</td>
-        </tr>
-        <tr>
-            <td colspan="2">{$message->content}</td>
-        </tr>
-        <tr>
-            <td colspan="2">
-                <input type="button" value="{$lang->cmd_delete}" />
-                <!--@if($message->message_type != "T")-->
-                <input type="button" value="{$lang->cmd_store}" />
-                <!--@end-->
-            </td>
-        </tr>
-        </table>
-    </div>
-</form>
+<div>
+    <table border="1">
+    <tr>
+        <th>
+            <!--@if($message->message_type == "S")-->
+            {$lang->receiver}
+            <!--@else-->
+            {$lang->sender}
+            <!--@end-->
+        </th>
+        <td><div class="member_{$message->member_srl}">{$message->nick_name} ({$message->user_id})</div></td>
+    </tr>
+    <tr>    
+        <th>{$lang->title}</th>
+        <td>{htmlspecialchars($message->title)}</td>
+    </tr>
+    <tr>
+        <td colspan="2">{$message->content}</td>
+    </tr>
+    <tr>
+        <td colspan="2">
+            <input type="button" value="{$lang->cmd_delete}" onclick="doDeleteMessage('{$message->message_srl}');return false;" />
+            <!--@if($message->message_type == "R")-->
+            <input type="button" value="{$lang->cmd_store}" onclick="doStoreMessage('{$message->message_srl}');return false;" />
+            <!--@end-->
+        </td>
+    </tr>
+    </table>
+</div>
 <!--@end-->
 
 <form action="./" method="get" onsubmit="return false;">
@@ -89,7 +89,7 @@
     <!-- 버튼 -->
     <div>
         <input type="button" value="{$lang->cmd_delete}" />
-        <!--@if($message_type != "T")-->
+        <!--@if($message_type == "R")-->
         <input type="button" value="{$lang->cmd_store}" />
         <!--@end-->
     </div>
diff --git a/modules/member/skins/default/send_message.html b/modules/member/skins/default/send_message.html
index c655fc69c..184e237fd 100644
--- a/modules/member/skins/default/send_message.html
+++ b/modules/member/skins/default/send_message.html
@@ -15,7 +15,7 @@
         </tr>
         <tr>    
             <th>{$lang->title}</th>
-            <td><input type="text" name="title" /></td>
+            <td><input type="text" name="title" id="message_title" /></td>
         </tr>
         <tr>
             <td colspan="2">{$editor}</td>
@@ -29,3 +29,7 @@
         </table>
     </form>
 </div>
+
+<script type="text/javascript">
+    xAddEventListener(window, 'load', function() { xGetElementById("message_title").focus(); });
+</script>