From 3a472506cf03f6044fca6e0ce37a67ef389116f6 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 13 Apr 2018 01:35:47 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B2=84=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/b_currentCity.php | 77 +++++++++++++++++++++----------------------
 hwe/b_genList.php     |  5 ++-
 hwe/func_command.php  |  2 +-
 hwe/process_war.php   |  9 +----
 4 files changed, 43 insertions(+), 50 deletions(-)

diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php
index f3837237..bbe29353 100644
--- a/hwe/b_currentCity.php
+++ b/hwe/b_currentCity.php
@@ -3,6 +3,9 @@ namespace sammo;
 
 include "lib.php";
 include "func.php";
+
+$citylist = Util::getReq('citylist', 'int');
+
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -42,7 +45,9 @@ $myNation = MYDB_fetch_array($result);
             <form name=cityselect method=get>도시선택 :
                 <select name=citylist size=1 style=color:white;background-color:black;width:798;>
 <?php
-if(!array_key_exists('citylist', $_REQUEST) || $_REQUEST['citylist'] == '') { $_REQUEST['citylist'] = $me['city']; }
+if(!$citylist){
+    $citylist = $me['city'];
+}
 
 // 재야일때는 현재 도시만
 $valid = 0;
@@ -52,7 +57,7 @@ if($me['level'] == 0) {
     $city = MYDB_fetch_array($cityresult);
     echo "
                     <option value={$city['city']}";
-    if($city['city'] == $_REQUEST['citylist']) { echo " selected"; $valid = 1; }
+    if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
     echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
     if($city['nation'] == 0) echo "공백지";
     elseif($me['nation'] == $city['nation']) echo "본국==";
@@ -68,7 +73,7 @@ if($me['level'] == 0) {
         $city = MYDB_fetch_array($cityresult);
         echo "
                         <option value={$city['city']}";
-        if($city['city'] == $_REQUEST['citylist']) { echo " selected"; $valid = 1; }
+        if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
         echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
         if($city['nation'] == 0) echo "공백지";
         elseif($me['nation'] == $city['nation']) echo "본국==";
@@ -85,7 +90,7 @@ if($me['level'] == 0) {
         $city = MYDB_fetch_array($cityresult);
         echo "
                         <option value={$city['city']}";
-        if($city['city'] == $_REQUEST['citylist']) { echo " selected"; $valid = 1; }
+        if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
         echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
         if($city['nation'] == 0) echo "공백지";
         elseif($me['nation'] == $city['nation']) echo "본국==";
@@ -111,7 +116,7 @@ if($myNation['level'] > 0) {
         $city = MYDB_fetch_array($cityresult);
         echo "
                         <option value={$city['city']}";
-        if($city['city'] == $_REQUEST['citylist']) { echo " selected"; $valid = 1; }
+        if($city['city'] == $citylist) { echo " selected"; $valid = 1; }
         echo ">==================================================【".StringUtil::padString($city['name'], 4, '_')."】";
         if($city['nation'] == 0) echo "공백지";
         elseif($me['nation'] == $city['nation']) echo "본국==";
@@ -131,28 +136,21 @@ echo "
 </table>
 <br>";
 
+unset($city);
+
 // 첩보된 도시까지만 허용
 if($valid == 0 && $session->userGrade < 5) {
-    $_REQUEST['citylist'] = $me['city'];
+    $citylist = $me['city'];
 }
 
-$query = "select * from city where city='{$_REQUEST['citylist']}'"; // 도시 이름 목록
-$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$city = MYDB_fetch_array($cityresult);
 
+$city = $db->queryFirstRow('SELECT * FROM city WHERE city=%i', $citylist);
 $nation = getNationStaticInfo($city['nation']);
 
-$query = "select name from general where no='{$city['gen1']}'"; // 태수 이름
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gen1 = MYDB_fetch_array($genresult);
-
-$query = "select name from general where no='{$city['gen2']}'"; // 군사 이름
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gen2 = MYDB_fetch_array($genresult);
-
-$query = "select name from general where no='{$city['gen3']}'"; // 시중 이름
-$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gen3 = MYDB_fetch_array($genresult);
+//태수, 군사, 시중
+$gen1 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $city['gen1']);
+$gen2 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $city['gen2']);
+$gen3 = $db->queryFirstRow('SELECT `name`, npc FROM general WHERE `no`=%i', $city['gen3']);
 
 if($city['trade'] == 0) {
     $city['trade'] = "- ";
@@ -163,44 +161,43 @@ if($city['trade'] == 0) {
     <tr><td><?=backButton()?></td></tr>
 </table>
 
-<?php
-echo "
 <table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg2>
     <tr>
-        <td colspan=12 align=center style=color:".newColor($nation['color'])."; bgcolor={$nation['color']}>【 ".CityConst::$regionMap[$city['region']]." | ".CityConst::$levelMap[$city['level']]." 】 {$city['name']}</td>
+        <td colspan=12 align=center style=color:"<?=newColor($nation['color'])?>"; bgcolor=<?=$nation['color']?>>【 <?=CityConst::$regionMap[$city['region']]?> | <?=CityConst::$levelMap[$city['level']]?> 】 <?=$city['name']?></td>
     </tr>
     <tr>
         <td align=center width=48 id=bg1>주민</td>
-        <td align=center width=112>{$city['pop']}/{$city['pop2']}</td>
+        <td align=center width=112><?=$city['pop']?>/<?=$city['pop2']?></td>
         <td align=center width=48 id=bg1>농업</td>
-        <td align=center width=108>{$city['agri']}/{$city['agri2']}</td>
+        <td align=center width=108><?=$city['agri']?>/<?=$city['agri2']?></td>
         <td align=center width=48 id=bg1>상업</td>
-        <td align=center width=108>{$city['comm']}/{$city['comm2']}</td>
+        <td align=center width=108><?=$city['comm']?>/<?=$city['comm2']?></td>
         <td align=center width=48 id=bg1>치안</td>
-        <td align=center width=108>{$city['secu']}/{$city['secu2']}</td>
+        <td align=center width=108><?=$city['secu']?>/<?=$city['secu2']?></td>
         <td align=center width=48 id=bg1>수비</td>
-        <td align=center width=108>{$city['def']}/{$city['def2']}</td>
+        <td align=center width=108><?=$city['def']?>/<?=$city['def2']?></td>
         <td align=center width=48 id=bg1>성벽</td>
-        <td align=center width=108>{$city['wall']}/{$city['wall2']}</td>
+        <td align=center width=108><?=$city['wall']?>/<?=$city['wall2']?></td>
     </tr>
     <tr>
         <td align=center id=bg1>민심</td>
-        <td align=center>{$city['rate']}</td>
+        <td align=center><?=$city['rate']?></td>
         <td align=center id=bg1>시세</td>
-        <td align=center>{$city['trade']}%</td>
+        <td align=center><?=$city['trade']?>%</td>
         <td align=center id=bg1>인구</td>
-        <td align=center>".round($city['pop']/$city['pop2']*100, 2)." %</td>
+        <td align=center><?=round($city['pop']/$city['pop2']*100, 2)?>%</td>
         <td align=center id=bg1>태수</td>
-        <td align=center>";echo $gen1['name']==''?"-":"{$gen1['name']}";echo "</td>
+        <td align=center><?=$gen1['name']??'-'?></td>
         <td align=center id=bg1>군사</td>
-        <td align=center>";echo $gen2['name']==''?"-":"{$gen2['name']}";echo "</td>
+        <td align=center><?=$gen2['name']??'-'?></td>
         <td align=center id=bg1>시중</td>
-        <td align=center>";echo $gen3['name']==''?"-":"{$gen3['name']}";echo "</td>
+        <td align=center><?=$gen3['name']??'-'?></td>
     </tr>
     <tr>
         <td align=center id=bg1>장수</td>
-        <td colspan=11>";
-    $query = "select name from general where city='{$city['city']}' and nation='{$city['nation']}'";    // 장수 목록
+        <td colspan=11>
+<?php
+    $query = "select name, npc from general where city='{$city['city']}' and nation='{$city['nation']}'";    // 장수 목록
     $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $gencount = MYDB_num_rows($genresult);
     if($gencount == 0) echo "-";
@@ -208,11 +205,11 @@ echo "
         $general = MYDB_fetch_array($genresult);
         echo "{$general['name']}, ";
     }
-    echo "
+?>
         </td>
     </tr>
-</table>";
-
+</table>
+<?php
 $query = "select npc,mode,no,picture,imgsvr,name,injury,leader,power,intel,level,nation,crewtype,crew,train,atmos,term,turn0,turn1,turn2,turn3,turn4,turn5 from general where city='{$city['city']}' order by dedication desc";    // 장수 목록
 $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
 $gencount = MYDB_num_rows($genresult);
diff --git a/hwe/b_genList.php b/hwe/b_genList.php
index cd018893..957239f3 100644
--- a/hwe/b_genList.php
+++ b/hwe/b_genList.php
@@ -3,6 +3,9 @@ namespace sammo;
 
 include "lib.php";
 include "func.php";
+
+$type = Util::getReq('type', 'int');
+
 //로그인 검사
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -116,7 +119,7 @@ echo"
 for ($j=0; $j < $gencount; $j++) {
     $general = MYDB_fetch_array($genresult);
     $city = CityConst::byID($general['city'])->name;
-    $troop = $troopName[$general['troop']] == "" ? "-" : $troopName[$general['troop']];
+    $troop = $troopName[$general['troop']]??'-';
 
     if ($general['level'] == 12) {
         $lbonus = $nation['level'] * 2;
diff --git a/hwe/func_command.php b/hwe/func_command.php
index 90cb98ce..349bfed9 100644
--- a/hwe/func_command.php
+++ b/hwe/func_command.php
@@ -14,9 +14,9 @@ function getTurn($general, $type, $font=1) {
         $turn[2] = $general["turn2"];
         $turn[3] = $general["turn3"];
         $turn[4] = $general["turn4"];
-        $turn[5] = $general["turn5"];
     }
     if($type >= 2) {
+        $turn[5] = $general["turn5"];
         $turn[6] = $general["turn6"];
         $turn[7] = $general["turn7"];
         $turn[8] = $general["turn8"];
diff --git a/hwe/process_war.php b/hwe/process_war.php
index 5cf4089d..cad21178 100644
--- a/hwe/process_war.php
+++ b/hwe/process_war.php
@@ -1691,7 +1691,7 @@ function DeleteConflict($nation) {
         if(!$conflict || !is_array($conflict)){
             continue;
         }
-        if(!key_exists(!$nation)){
+        if(!key_exists($nation, $conflict)){
             continue;
         }
 
@@ -1705,10 +1705,6 @@ function DeleteConflict($nation) {
 
 function getConquerNation($city) : int {
     $conflict = Json::decode($city['conflict']);
-    if(!$conflict){
-        //FIXME: 사실 이건 이상한 상황이다.
-        return 0;
-    }
     return Util::array_first_key($conflict);
 }
 
@@ -1907,9 +1903,6 @@ function ConquerCity($game, $general, $city, $nation, $destnation) {
     if($general['atmos'] > $_maximumatmos) { $general['atmos'] = $_maximumatmos; }
 
     $conquerNation = getConquerNation($city);
-    if(!$conquerNation){
-        $conquerNation = $general['nation'];
-    }
 
     if($conquerNation == $general['nation']) {
         // 이동 및 사기 변경