From 0ee833d7aec56a5df834e0ebb44dbf345b11a8da Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 11 Jul 2018 22:17:03 +0900
Subject: [PATCH] =?UTF-8?q?list=20=EC=9D=BC=EB=B6=80=20=EC=88=98=EC=A0=95.?=
 =?UTF-8?q?=20tfoot=20=EC=95=88=EC=97=90=20tr=20td=EC=97=86=EB=8A=94?=
 =?UTF-8?q?=EA=B1=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/_119.php                   | 2 +-
 hwe/_admin2_submit.php         | 2 +-
 hwe/b_diplomacy.php            | 4 ++--
 hwe/b_troop.php                | 5 ++---
 hwe/sammo/CityConst.php        | 4 ++--
 hwe/sammo/Engine/Diplomacy.php | 4 ++--
 hwe/sammo/Engine/Personnel.php | 4 ++--
 hwe/sammo/ResetHelper.php      | 2 +-
 8 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/hwe/_119.php b/hwe/_119.php
index 870940a5..7e8362c9 100644
--- a/hwe/_119.php
+++ b/hwe/_119.php
@@ -30,7 +30,7 @@ $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
 $connect=$db->get();
 
-list($turntime, $tnmt_time) = $gameStor->getValuesAsArray(['turntime','tnmt_time']);
+[$turntime, $tnmt_time] = $gameStor->getValuesAsArray(['turntime','tnmt_time']);
 
 $query = "select plock from plock";
 $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
diff --git a/hwe/_admin2_submit.php b/hwe/_admin2_submit.php
index c61a7410..c0815d36 100644
--- a/hwe/_admin2_submit.php
+++ b/hwe/_admin2_submit.php
@@ -99,7 +99,7 @@ switch($btn) {
         ], '`no` IN %li', $genlist);
         break;
     case "특기 부여":
-        list($year, $month) = $gameStor->getValuesAsArray(['year', 'month']);
+        [$year, $month] = $gameStor->getValuesAsArray(['year', 'month']);
         $text = "특기 부여!";
 
         foreach($db->query("SELECT `no`,leader,power,intel,dex0,dex10,dex20,dex30,dex40 FROM general WHERE `no` IN %li", $genlist) as $general){    
diff --git a/hwe/b_diplomacy.php b/hwe/b_diplomacy.php
index b3c2f9f4..32104161 100644
--- a/hwe/b_diplomacy.php
+++ b/hwe/b_diplomacy.php
@@ -45,11 +45,11 @@ for($i=0; $i < $nationcount; $i++) {
 }
 
 $realConflict = [];
-foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE conflict!=%s', '{}') as list(
+foreach ($db->queryAllLists('SELECT city, `name`, conflict FROM city WHERE conflict!=%s', '{}') as [
     $cityID, 
     $cityName, 
     $rawConflict
-))
+])
 {
     $conflict = Json::decode($rawConflict);
     if (count($conflict)<2) {
diff --git a/hwe/b_troop.php b/hwe/b_troop.php
index fe058254..e5195ce7 100644
--- a/hwe/b_troop.php
+++ b/hwe/b_troop.php
@@ -125,12 +125,11 @@ for($i=0; $i < $troopcount; $i++) {
         echo "
         </td>
     </tr>
-    <tr><td align=center><font size=2>【턴】".substr($turntime, 14)."</font></td><td align=center><font size=1>$name</font></td></tr>
-    <tr><td colspan=5>";
+    <tr><td align=center><font size=2>【턴】".substr($turntime, 14)."</font></td><td align=center><font size=1>$name</font></td></tr>";
     }
 }
 echo "</tbody>
-<tfoot>";
+<tfoot><tr><td>";
 if ($troopcount == 0) {
 }
 else if($me['troop'] == 0) {
diff --git a/hwe/sammo/CityConst.php b/hwe/sammo/CityConst.php
index de75f8af..0d33c31f 100644
--- a/hwe/sammo/CityConst.php
+++ b/hwe/sammo/CityConst.php
@@ -186,7 +186,7 @@ class CityConst{
         }
 
         foreach(static::$initCity as $rawCity){
-            list(
+            [
                 $id,
                 $name,
                 $level,
@@ -198,7 +198,7 @@ class CityConst{
                 $wall,
                 $region,
                 $path
-            ) = $rawCity;
+            ] = $rawCity;
 
             $level = static::$levelMap[$level];
             $population *= 100;
diff --git a/hwe/sammo/Engine/Diplomacy.php b/hwe/sammo/Engine/Diplomacy.php
index 7721a2fe..54ba46f2 100644
--- a/hwe/sammo/Engine/Diplomacy.php
+++ b/hwe/sammo/Engine/Diplomacy.php
@@ -300,7 +300,7 @@ class Diplomacy{
         $chk = $this->checkValidNation();
         $chk = $this->checkNonAggressionTreaty($chk);
 
-        list($result, $reason) = $chk;
+        [$result, $reason] = $chk;
         if($result !== DiplomaticMessage::ACCEPTED){
             return $chk;
         }
@@ -322,7 +322,7 @@ class Diplomacy{
         $chk = $this->checkValidNation();
         $chk = $this->checkInWar($chk);
 
-        list($result, $reason) = $chk;
+        [$result, $reason] = $chk;
         if($result !== DiplomaticMessage::ACCEPTED){
             return $chk;
         }
diff --git a/hwe/sammo/Engine/Personnel.php b/hwe/sammo/Engine/Personnel.php
index 1d130097..d50f431e 100644
--- a/hwe/sammo/Engine/Personnel.php
+++ b/hwe/sammo/Engine/Personnel.php
@@ -37,12 +37,12 @@ class Personnel{
         $this->nation = $nation;
         $this->valid = true;
 
-        list(
+        [
             $this->startYear,
             $this->year, 
             $this->month, 
             $this->killturn
-        ) = $gameStor->getValuesAsArray(['startyear', 'year', 'month', 'killturn']);
+        ] = $gameStor->getValuesAsArray(['startyear', 'year', 'month', 'killturn']);
 
     }
 
diff --git a/hwe/sammo/ResetHelper.php b/hwe/sammo/ResetHelper.php
index 2447a7fb..8306240a 100644
--- a/hwe/sammo/ResetHelper.php
+++ b/hwe/sammo/ResetHelper.php
@@ -154,7 +154,7 @@ class ResetHelper{
             $year = $startyear;
         } else {
             // 현재 시간과 동기화
-            list($starttime, $yearPulled, $month) = cutDay($turntime, $turnterm);
+            [$starttime, $yearPulled, $month] = cutDay($turntime, $turnterm);
             if($yearPulled){
                 $year = $startyear-1;
             }