From 2e8e29e93cbfc29e62fe940d6e2aabcca9855a54 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 23 Jan 2019 01:37:40 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EA=B5=90=EB=A9=94=EC=8B=9C=EC=A7=80?=
 =?UTF-8?q?=20=EC=88=98=EC=8B=A0=20=EA=B8=B0=EC=A4=80=20=EB=B3=80=EA=B2=BD?=
 =?UTF-8?q?=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/css/msg.css      | 2 +-
 hwe/index.php        | 6 ++++--
 hwe/j_basic_info.php | 6 +++++-
 hwe/js/msg.js        | 8 ++------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/hwe/css/msg.css b/hwe/css/msg.css
index ddb00405..d65f109b 100644
--- a/hwe/css/msg.css
+++ b/hwe/css/msg.css
@@ -60,7 +60,7 @@
 }
 
 .diplomacy_message{
-    max-height:667px;
+    height:667px;
 }
 
 .national_message{
diff --git a/hwe/index.php b/hwe/index.php
index ee51383b..c4d6704c 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -312,12 +312,14 @@ else if($session->userGrade == 4){
         <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="private">이전 메시지 불러오기</button>
         </section>
     </div><div style="right:0;" class="board_side bg0">
-        <section class="diplomacy_message">
-        </section>
         <div class="board_header bg0">국가 메시지(최고99자)</div>
         <section class="national_message">
         <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="national">이전 메시지 불러오기</button>
         </section>
+        <div class="board_header bg0">외교 메시지(최고99자)</div>
+        <section class="diplomacy_message">
+        <button type="button" class="load_old_message btn btn-secondary btn-block" data-msg_type="diplomacy">이전 메시지 불러오기</button>
+        </section>
  </div></div>
 <div style="clear:left;"><?=allButton()?><?=banner()?></div>
 </div>
diff --git a/hwe/j_basic_info.php b/hwe/j_basic_info.php
index 3d597164..643a4526 100644
--- a/hwe/j_basic_info.php
+++ b/hwe/j_basic_info.php
@@ -11,14 +11,18 @@ $result = [
 $session = Session::requireGameLogin([])->setReadOnly();
 $userID = Session::getUserID();
 
-$generalInfo = DB::db()->queryFirstRow('SELECT `no`, `nation`, `level` from `general` where `owner`=%i', $userID);
+$generalInfo = DB::db()->queryFirstRow('SELECT `no`, `nation`, `level`, penalty, permission from `general` where `owner`=%i', $userID);
 if(!$generalInfo){
     Json::die($result);
 }
 
+$permission = checkSecretPermission($generalInfo);
+
+
 $result['generalID'] = $generalInfo['no'];
 $result['myNationID'] = $generalInfo['nation'];
 $result['isChief'] = ($generalInfo['level'] == 12);
 $result['generalLevel'] = $generalInfo['level'];
+$result['permission'] = $permission;
 
 Json::die($result);
\ No newline at end of file
diff --git a/hwe/js/msg.js b/hwe/js/msg.js
index 2001786d..e60e4fe1 100644
--- a/hwe/js/msg.js
+++ b/hwe/js/msg.js
@@ -181,11 +181,6 @@ function redrawMsg(deferred, addFront){
                 return true;
             }
 
-            if(msgType == 'diplomacy'){
-                //외교는 항상 새로 그린다
-                $msgBoard.empty();
-            }
-
 
             var needRefreshLastContact = (msgType == 'private');
 
@@ -217,7 +212,7 @@ function redrawMsg(deferred, addFront){
 
                 msg.defaultIcon = pathConfig.sharedIcon+'/default.jpg';
                 if(msgType == 'diplomacy'){
-                    msg.allowButton = myGeneralLevel>4;
+                    msg.allowButton = permissionLevel>=4;
                 }
                 else{
                     msg.allowButton = true;
@@ -465,6 +460,7 @@ function registerGlobal(basicInfo){
     window.myGeneralID = basicInfo.generalID;
     window.isChief = basicInfo.isChief;
     window.myGeneralLevel = basicInfo.generalLevel;
+    window.permissionLevel = basicInfo.permissionLevel;
 }
 
 function activateMessageForm(){