diff --git a/hwe/c_myBossInfo.php b/hwe/c_myBossInfo.php index f56dba4f..f8c352bf 100644 --- a/hwe/c_myBossInfo.php +++ b/hwe/c_myBossInfo.php @@ -41,17 +41,20 @@ if($meLevel < 5){ if($btn == "임명") { - $query = "select no,nation,level,leader,power,intel from general where no='$genlist'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $general = MYDB_fetch_array($result); + if($genlist !== 0){ + $query = "select no,nation,level,leader,power,intel from general where no='$genlist'"; + $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $general = MYDB_fetch_array($result); - if(!$general){ - header('location:b_myBossInfo.php'); - exit(); + if(!$general){ + header('location:b_myBossInfo.php'); + exit(); + } } + //임명할사람이 군주이면 불가, 내가 수뇌부이어야함, 공석아닌때는 국가가 같아야함 - if($general['level'] == 12 || $meLevel < 5 || ($general['nation'] != $me['nation'] && $genlist != 0)) { + if($meLevel < 5 || ($general['nation'] != $me['nation'] && $genlist != 0) || ($general['level'] == 12 && $genlist != 0)) { header('location:b_myBossInfo.php'); exit(); @@ -74,7 +77,7 @@ if($btn == "임명") { } //나와 대상 장수는 국가가 같아야 함 -if($me['nation'] != $general['nation']){ +if($genlist != 0 && $me['nation'] != $general['nation']){ header('location:b_myBossInfo.php'); exit(); } diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php index f7fc1e1e..56298cbd 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, $this->src->senderID); + $helper = new Engine\Personnel($this->src->nationID, $this->src->generalID); list($result, $reason) = $helper->scoutGeneral($receiverID); @@ -116,9 +116,9 @@ class ScoutMessage extends Message{ "{$this->src->nationName}(으)로 등용 제의 수락", new \DateTime(), new \DateTime('9999-12-31'), - Json::encode([ + [ 'delete'=>$this->id - ]) + ] ); $newMsg->send(true); @@ -137,9 +137,9 @@ class ScoutMessage extends Message{ "{$this->src->nationName}(으)로 등용 제의 거부", new \DateTime(), new \DateTime('9999-12-31'), - Json::encode([ + [ 'delete'=>$this->id - ]) + ] ); $newMsg->send(true);