From 2d1a3f5da9187751e5f0d720504fc080ced5553a Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 20:10:33 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A7=8E=EC=9D=80=20=EB=B2=84=EA=B7=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=BB=A4=EB=A7=A8=EB=93=9C=20=EC=8B=A4?=
 =?UTF-8?q?=ED=96=89=20=EC=A4=91=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20?=
 =?UTF-8?q?=EB=90=9C=20=EA=B2=BD=EC=9A=B0=20=EB=B2=84=EA=B7=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EA=B5=AD=EA=B8=B0=20=EB=B3=80=EA=B2=BD=EC=97=90=20?=
 =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EC=9E=88=EB=8D=98=20=EC=A0=90=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EC=88=98=EB=9D=BD?=
 =?UTF-8?q?=EC=8B=9C=20=EC=86=A1=EC=8B=A0=EC=9E=90=20=EB=AA=85=EC=84=B1=20?=
 =?UTF-8?q?=EC=95=88=20=EB=8A=98=EC=96=B4=EB=82=98=EB=8A=94=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/commandlist.php            |  4 ++++
 hwe/func_command.php           |  2 +-
 hwe/js/msg.js                  |  4 +---
 hwe/processing.php             | 11 +++--------
 hwe/sammo/Engine/Personnel.php |  8 +++++---
 hwe/sammo/ScoutMessage.php     |  6 +++---
 oauth_kakao/j_change_pw.php    |  4 ++--
 oauth_kakao/oauth.php          |  4 ++--
 8 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/hwe/commandlist.php b/hwe/commandlist.php
index 6b8779bd..701e139a 100644
--- a/hwe/commandlist.php
+++ b/hwe/commandlist.php
@@ -80,6 +80,10 @@ function myCommandList() {
     $query = "select no,turntime,term,turn0,turn1,turn2,turn3,turn4,turn5,turn6,turn7,turn8,turn9,turn10,turn11,turn12,turn13,turn14,turn15,turn16,turn17,turn18,turn19,turn20,turn21,turn22,turn23 from general where owner='{$userID}'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $me = MYDB_fetch_array($result);
+    if(!$me){
+        echo "로그인 되어있지 않습니다.";
+        return;
+    }
     $turn = getTurn($me, 2);
 
     echo "<table width=300 height=700 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
diff --git a/hwe/func_command.php b/hwe/func_command.php
index 579bab88..7a9a1741 100644
--- a/hwe/func_command.php
+++ b/hwe/func_command.php
@@ -1,7 +1,7 @@
 <?php
 namespace sammo;
 
-function getTurn($general, $type, $font=1) {
+function getTurn(array $general, $type, $font=1) {
     //TODO: 왜 'Type' 인가. 그냥 count로 하자.
     $str = [];
     $db = DB::db();
diff --git a/hwe/js/msg.js b/hwe/js/msg.js
index aa08edcf..39dfd38f 100644
--- a/hwe/js/msg.js
+++ b/hwe/js/msg.js
@@ -43,7 +43,7 @@ function responseMessage(msgID, response){
 }
 
 function refreshMsg(result){
-    if(!result.result){
+    if(result && !result.result){
         alert(result.reason);
     }
     return redrawMsg(fetchMsg());
@@ -62,8 +62,6 @@ function fetchMsg(){
 }
 
 function redrawMsg(deferred){
-    
-    console.log(deferred);
 
     function registerSequence(obj){
         if(!obj.result){
diff --git a/hwe/processing.php b/hwe/processing.php
index 0e49fdc4..c2ed4bc1 100644
--- a/hwe/processing.php
+++ b/hwe/processing.php
@@ -2769,13 +2769,8 @@ function command_81($turn, $command) {
         if($nation['level'] <= 0){
             continue;
         }
-
-        if(isset($nationcolor[$nation['color']])){
-            $nationcolor[$nation['color']] = 1;
-        }
-        else{
-            $nationcolor[$nation['color']]++;
-        }
+        
+        $colorUsed[$nation['color']]+=1;
     }
 
     $colorUsedCnt = 0;
@@ -2798,7 +2793,7 @@ function command_81($turn, $command) {
 <form name=form1 action=c_double.php method=post>
 색깔 : <select name=double size=1>";
     foreach(GetNationColors() as $idx=>$color) {
-        if($colorUsed[$color] > 0){
+        if($colorUsed[$color]>0){
             continue;
         }
         echo "<option value={$idx} style=background-color:{$color};color:".newColor($color).";>국가명</option>";
diff --git a/hwe/sammo/Engine/Personnel.php b/hwe/sammo/Engine/Personnel.php
index 925b9ec1..d6b2965f 100644
--- a/hwe/sammo/Engine/Personnel.php
+++ b/hwe/sammo/Engine/Personnel.php
@@ -11,6 +11,7 @@ use \sammo\ScoutMessage;
 class Personnel{
 
     protected $nation = null;//TODO: 상속체로 변경.
+    protected $senderID = null;
     public $valid = false;
 
     public $startYear = 0;
@@ -18,7 +19,7 @@ class Personnel{
     public $month = 0;
     public $killturn = 0;
 
-    public function __construct(int $nationID){
+    public function __construct(int $nationID, int $senderID){
         $db = DB::db();
         $nation = $db->queryFirstRow(
             'SELECT nation, `name`, `level`, capital, scout FROM nation WHERE nation=%i',
@@ -29,6 +30,7 @@ class Personnel{
             return;
         }
 
+        $this->senderID = $senderID;
         $this->nation = $nation;
         $this->valid = true;
 
@@ -179,12 +181,12 @@ class Personnel{
             $setValues['dedication'] = $db->sqleval('experience + %i', 100);//XXX: 상수
         }
 
-        if($me['npc'] < 2){
+        if($general['npc'] < 2){
             $setValues['killturn'] = $this->killturn;
         }
 
         $db->update('general', $setValues, 'no=%i', $generalID);
-        $db->update('general', $setSenderValues, 'no=%i', $this->src->generalID);
+        $db->update('general', $setSenderValues, 'no=%i', $this->senderID);
         $db->update('nation', $setOriginalNationValues, 'nation=%i', $general['nation']);
         $db->update('nation', $setScoutNationValues, 'nation=%i', $this->nation['nation']);
         if($setOriginalCityValues){
diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php
index a1e4bf09..f7fc1e1e 100644
--- a/hwe/sammo/ScoutMessage.php
+++ b/hwe/sammo/ScoutMessage.php
@@ -72,7 +72,7 @@ class ScoutMessage extends Message{
             return $result;
         }
 
-        $helper = new Engine\Personnel($this->src->nationID);
+        $helper = new Engine\Personnel($this->src->nationID, $this->src->senderID);
 
         list($result, $reason) = $helper->scoutGeneral($receiverID);
 
@@ -113,7 +113,7 @@ class ScoutMessage extends Message{
             self::MSGTYPE_PRIVATE, 
             $this->src, 
             $this->dest, 
-            "{$scoutNation['name']}(으)로 등용 제의 수락",
+            "{$this->src->nationName}(으)로 등용 제의 수락",
             new \DateTime(),
             new \DateTime('9999-12-31'),
             Json::encode([
@@ -134,7 +134,7 @@ class ScoutMessage extends Message{
             self::MSGTYPE_PRIVATE, 
             $this->src, 
             $this->dest, 
-            "{$scoutNation['name']}(으)로 등용 제의 거부",
+            "{$this->src->nationName}(으)로 등용 제의 거부",
             new \DateTime(),
             new \DateTime('9999-12-31'),
             Json::encode([
diff --git a/oauth_kakao/j_change_pw.php b/oauth_kakao/j_change_pw.php
index 8d7c5155..aa950fd8 100644
--- a/oauth_kakao/j_change_pw.php
+++ b/oauth_kakao/j_change_pw.php
@@ -74,8 +74,8 @@ $sendResult = $restAPI->talk_to_me_default([
   "object_type"=> "text",
   "text"=> "임시 비밀번호는 $newPassword 입니다. 로그인 후 바로 다른 비밀번호로 변경해주세요.",
   "link"=> [
-    "web_url"=> RootDB::getServerBasepath(),
-    "mobile_web_url" => RootDB::getServerBasepath()
+    "web_url"=> ServConfig::getServerBasepath(),
+    "mobile_web_url" => ServConfig::getServerBasepath()
   ],
   "button_title"=> "로그인 페이지 열기"
 ]);
diff --git a/oauth_kakao/oauth.php b/oauth_kakao/oauth.php
index cd358d33..5ddccb65 100644
--- a/oauth_kakao/oauth.php
+++ b/oauth_kakao/oauth.php
@@ -27,7 +27,7 @@ $result = $restAPI->create_access_token($auth_code);
 
 
 if (Util::array_get($result['expires_in'], -1) <= 0) {
-    die('알 수 없는 에러:'.$result['msg']);
+    die('알 수 없는 에러:'.Util::array_get($result['msg'], ''));
 }
 
 $session = Session::getInstance();
@@ -48,7 +48,7 @@ $oauth_mode = 'login';
 
 $me['code'] = Util::array_get($me['code'], 0);
 if($me['code']< 0){
-    switch($me['msg']){
+    switch(Util::array_get($me['msg'])){
     case 'NotRegisteredUserException':
         $oauth_mode = 'join';
         break;