From 711600403f06d0fd6e17e11959664a9c8c008ccf Mon Sep 17 00:00:00 2001
From: revofpla <revofpla@naver.com>
Date: Wed, 17 Jan 2018 23:48:12 +0900
Subject: [PATCH] =?UTF-8?q?[php5=5Fdebug]=20=EB=AA=85=EC=9E=A5=EC=9D=BC?=
 =?UTF-8?q?=EB=9E=8C=20=EB=94=94=EC=8A=A4=ED=94=8C=EB=A0=88=EC=9D=B4=20?=
 =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 twe/a_bestGeneral.php | 56 +++++++++++++++++++++++++++++++------------
 twe/func.php          |  3 ++-
 2 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/twe/a_bestGeneral.php b/twe/a_bestGeneral.php
index e81b0910..9fd1d0ad 100644
--- a/twe/a_bestGeneral.php
+++ b/twe/a_bestGeneral.php
@@ -40,8 +40,11 @@ if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
 </table>
 <table align=center width=1000 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13;word-break:break-all; id=bg0>
 <?php
-if($btn == "NPC 보기") { $sel = "npc>=2"; }
-else { $sel = "npc<2"; }
+if(isset($btn) && $btn == "NPC 보기") {
+    $sel = "npc>=2";
+} else {
+    $sel = "npc<2";
+}
 
 $query = "select nation,name,color from nation";
 $nationresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -109,12 +112,21 @@ for($i=0; $i < 21; $i++) {
 
     for($k=0; $k < 10; $k++) {
         $gen = MYDB_fetch_array($result);
+
         if($i != 2) {
-            $name[$k]   = $gen['name'];
-            $nation[$k] = $nationName[$gen['nation']];
-            $data[$k]   = $gen['data'];
-            $color[$k]  = $nationColor[$gen['nation']];
-            $pic[$k]    = $gen['picture'];
+            if(isset($gen)) {
+                $name[$k] = $gen['name'];
+                $nation[$k] = $gen['nation'] == 0 ? "재야" : $nationName[$gen['nation']];
+                $data[$k] = $gen['data'];
+                $color[$k] = $gen['nation'] == 0 ? "FFFFFF" : $nationColor[$gen['nation']];
+                $pic[$k] = $gen['picture'];
+            }else{
+                $name[$k] = "-";
+                $nation[$k] = "-";
+                $data[$k] = "-";
+                $color[$k] = $_basecolor4;
+                $pic[$k] = "";
+            }
         } else {
             $name[$k]   = "???";
             $nation[$k] = "???";
@@ -197,10 +209,17 @@ for($i=0; $i < 4; $i++) {
         $query = "select nation,no,name,picture,imgsvr from general where {$call[$i]}={$k}";
         $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $gen = MYDB_fetch_array($result);
-        $name[$k]   = $gen['name'];
-        $nation[$k] = $nationName[$gen['nation']];
-        $color[$k]  = $nationColor[$gen['nation']];
-        $pic[$k]    = $gen['picture'];
+        if(isset($gen)) {
+            $name[$k] = $gen['name'];
+            $nation[$k] = $gen['nation'] == 0 ? "재야" : $nationName[$gen['nation']];
+            $color[$k] = $gen['nation'] == 0 ? "FFFFFF" : $nationColor[$gen['nation']];
+            $pic[$k] = $gen['picture'];
+        }else{
+            $name[$k] = "미발견";
+            $nation[$k] = "-";
+            $color[$k] = "";
+            $pic[$k] = "";
+        }
         if($color[$k] == "") $color[$k] = $_basecolor4;
         if($nation[$k] == "") $nation[$k] = "&nbsp;";
         if($pic[$k] == "") {
@@ -238,10 +257,17 @@ for($i=0; $i < 4; $i++) {
         $query = "select nation,no,name,picture,imgsvr from general where {$call[$i]}={$k}";
         $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
         $gen = MYDB_fetch_array($result);
-        $name[$k]   = $gen['name'];
-        $nation[$k] = $nationName[$gen['nation']];
-        $color[$k]  = $nationColor[$gen['nation']];
-        $pic[$k]    = $gen['picture'];
+        if(isset($gen)) {
+            $name[$k] = $gen['name'];
+            $nation[$k] = $gen['nation'] == 0 ? "재야" : $nationName[$gen['nation']];
+            $color[$k] = $gen['nation'] == 0 ? "FFFFFF" : $nationColor[$gen['nation']];
+            $pic[$k] = $gen['picture'];
+        }else{
+            $name[$k] = "미발견";
+            $nation[$k] = "-";
+            $color[$k] = "";
+            $pic[$k] = "";
+        }
         if($color[$k] == "") $color[$k] = $_basecolor4;
         if($nation[$k] == "") $nation[$k] = "&nbsp;";
         if($pic[$k] == "") {
diff --git a/twe/func.php b/twe/func.php
index c85bb7ed..b9842e1f 100644
--- a/twe/func.php
+++ b/twe/func.php
@@ -4427,7 +4427,7 @@ function checkSupply($connect) {
             if($label[$i] == 0) {
                 $label[$i] = $labelling;
                 $labelMapping[$labelling] = $cityNation[$i];
-                $comCount[$cityNation[$i]]++;
+                isset($comCount[$cityNation[$i]]) ? $comCount[$cityNation[$i]]++ : $comCount[$cityNation[$i]] = 1;
                 $q->push($i);
                 $marked++;
                 break;
@@ -5527,6 +5527,7 @@ function processCommand($connect, $no) {
     $query = "select month,killturn from game where no='1'";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $admin = MYDB_fetch_array($result);
+    $log = array();
 
     // 블럭자는 미실행. 삭턴 감소
     if($general['block'] == 2) {