diff --git a/hwe/func_process_personnel.php b/hwe/func_process_personnel.php index b809cfb8..93c483b7 100644 --- a/hwe/func_process_personnel.php +++ b/hwe/func_process_personnel.php @@ -568,7 +568,7 @@ function process_46(&$general) { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $gencount = MYDB_num_rows($result); - $query = "select nation from nation where name='{$general['makenation']}'"; + $query = "select nation from nation where nation!={$general['nation']} AND name='{$general['makenation']}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $nationcount = MYDB_num_rows($result); diff --git a/hwe/j_msg_decide_opt.php b/hwe/j_msg_decide_opt.php index 466159de..d0e438ef 100644 --- a/hwe/j_msg_decide_opt.php +++ b/hwe/j_msg_decide_opt.php @@ -44,16 +44,16 @@ if($msg === null){ 'reason'=>'올바르지 않은 메시지' ]); } - +$reason = 'success'; if($msgResponse){ - $result = $msg->agreeMessage($general['no']); + $result = $msg->agreeMessage($general['no'], $reason); } else{ - $result = $msg->declineMessage($general['no']); + $result = $msg->declineMessage($general['no'], $reason); } Json::die([ 'result' => $result===DiplomaticMessage::ACCEPTED, - 'reason' => 'result' + 'reason' => $reason ]); \ No newline at end of file diff --git a/hwe/js/msg.js b/hwe/js/msg.js index 0af6eeef..aa08edcf 100644 --- a/hwe/js/msg.js +++ b/hwe/js/msg.js @@ -42,7 +42,10 @@ function responseMessage(msgID, response){ }).then(refreshMsg); } -function refreshMsg(){ +function refreshMsg(result){ + if(!result.result){ + alert(result.reason); + } return redrawMsg(fetchMsg()); } diff --git a/hwe/sammo/DiplomaticMessage.php b/hwe/sammo/DiplomaticMessage.php index 101893bd..10c9e4d7 100644 --- a/hwe/sammo/DiplomaticMessage.php +++ b/hwe/sammo/DiplomaticMessage.php @@ -215,7 +215,7 @@ class DiplomaticMessage extends Message{ /** * @return int 수행 결과 반환, ACCEPTED(등용장 소모), DECLINED(등용장 소모), INVALID 중 반환 */ - public function agreeMessage(int $receiverID):int{ + public function agreeMessage(int $receiverID, string &$reason):int{ //NOTE: 올바른 유저가 agreeMessage() 호출을 한건지는 외부에서 체크 필요(Session->userID 등) if(!$this->id){ @@ -318,7 +318,7 @@ class DiplomaticMessage extends Message{ return self::DECLINED; } - public function declineMessage(int $receiverID):int{ + public function declineMessage(int $receiverID, string &$reason):int{ if(!$this->id){ throw \RuntimeException('전송되지 않은 메시지에 거절 진행 중'); } diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php index 4decb80f..a1e4bf09 100644 --- a/hwe/sammo/ScoutMessage.php +++ b/hwe/sammo/ScoutMessage.php @@ -55,7 +55,7 @@ class ScoutMessage extends Message{ /** * @return int 수행 결과 반환, ACCEPTED(등용장 소모), DECLINED(등용장 소모), INVALID 중 반환 */ - public function agreeMessage(int $receiverID):int{ + public function agreeMessage(int $receiverID, string &$reason):int{ //NOTE: 올바른 유저가 agreeMessage() 호출을 한건지는 외부에서 체크 필요(Session->userID 등) if(!$this->id){ @@ -146,7 +146,7 @@ class ScoutMessage extends Message{ return self::DECLINED; } - public function declineMessage(int $receiverID):int{ + public function declineMessage(int $receiverID, string &$reason):int{ if(!$this->id){ throw \RuntimeException('전송되지 않은 메시지에 거절 진행 중'); }