From 0bffdaa5fcd5df3ed4241fb5fcc36745f8976b99 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 30 Jan 2019 00:02:28 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EA=B5=90=20=EB=A9=94=EC=8B=9C?=
 =?UTF-8?q?=EC=A7=80=20=EA=B3=BC=EA=B1=B0=20=EA=B6=8C=ED=95=9C=20=EB=AC=B8?=
 =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/j_msg_get_old.php    | 21 ++++++++++++---------
 hwe/j_msg_get_recent.php |  4 +---
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/hwe/j_msg_get_old.php b/hwe/j_msg_get_old.php
index 19439110..1747b285 100644
--- a/hwe/j_msg_get_old.php
+++ b/hwe/j_msg_get_old.php
@@ -50,20 +50,18 @@ if($delayTime){
 }
 $session->setReadOnly();
 
-list($generalID, $nationID, $generalName) = DB::db()->queryFirstList(
-    'select `no`, `nation`, `name` from `general` where owner = %i',
-    $userID
-);
+$me = $db->queryFirstRow('SELECT `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr`,penalty,permission FROM general WHERE `owner`=%i', $userID);
 
-
-
-if($nationID === null){
+if($me === null){
     Json::die([
         'result'=>false,
         'reason'=>'장수가 사망했습니다.'
     ]);
 }
 
+[$generalID, $nationID, $generalName] = [$me['no'], $me['nation'], $me['name']];
+$permission = checkSecretPermission($me);
+
 $result = [
     'private'=>[],
     'public'=>[],
@@ -104,11 +102,16 @@ else if($reqType == 'national'){
     }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_NATIONAL, $reqTo, 20));
 }
 else{
-    $result['diplomacy'] = array_map(function(Message $msg)use (&$nextSequence){
+    $result['diplomacy'] = array_map(function(Message $msg)use (&$nextSequence, $permission){
         if($msg->id > $nextSequence){
             $nextSequence = $msg->id;
         }
-        return $msg->toArray();
+        $values = $msg->toArray();
+        if($msg->dest->nationID != 0 && $permission < 3){
+            $values['text'] = '(외교 메시지입니다)';//TODO: 외교서신이라 읽을 수 없음을 보여줘야함
+            $values['option']['invalid'] = true;
+        }
+        return $values;
     }, Message::getMessagesFromMailBoxOld(Message::MAILBOX_NATIONAL + $nationID, Message::MSGTYPE_DIPLOMACY, $reqTo, 20));
 }
 
diff --git a/hwe/j_msg_get_recent.php b/hwe/j_msg_get_recent.php
index 92ba94b3..5e167c68 100644
--- a/hwe/j_msg_get_recent.php
+++ b/hwe/j_msg_get_recent.php
@@ -47,9 +47,7 @@ if($me === null){
     ]);
 }
 
-$generalID = $me['no'];
-$nationID = $me['nation'];
-$generalName = $me['name'];
+[$generalID, $nationID, $generalName] = [$me['no'], $me['nation'], $me['name']];
 $permission = checkSecretPermission($me);
 
 $result = [];