From a42387948ac434d6347d2f44630de2967a94fbdf Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 29 Jun 2018 01:50:28 +0900
Subject: [PATCH] =?UTF-8?q?=EC=98=88=EC=95=BD=20=ED=85=8C=EC=9D=B4?=
 =?UTF-8?q?=EB=B8=94=20=EC=A0=90=EA=B2=80.=20=EC=8A=A4=ED=82=A4=EB=A7=88?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/_admin4.php     | 7 +------
 hwe/j_autoreset.php | 9 +++++++++
 hwe/sql/reset.sql   | 9 +++++++++
 hwe/sql/schema.sql  | 2 +-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/hwe/_admin4.php b/hwe/_admin4.php
index ae7b6243..f5edcf36 100644
--- a/hwe/_admin4.php
+++ b/hwe/_admin4.php
@@ -53,12 +53,7 @@ $conlimit = $gameStor->conlimit;
 echo "
             <select name=genlist[] size=20 multiple style=color:white;background-color:black;font-size:13>";
 
-$query = "select no,name,npc,block from general where ip!='' order by npc,ip";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$gencount = MYDB_num_rows($result);
-
-for($i=0; $i < $gencount; $i++) {
-    $general = MYDB_fetch_array($result);
+foreach($db->query('SELECT no,name,npc,block,con from general where ip!=\'\' order by npc,ip') as $general){
     $style = "style=;";
     if($general['block']         > 0) { $style .= "background-color:red;"; }
     if($general['npc']          >= 2) { $style .= "color:cyan;"; }
diff --git a/hwe/j_autoreset.php b/hwe/j_autoreset.php
index 2b404fd8..fb61cd17 100644
--- a/hwe/j_autoreset.php
+++ b/hwe/j_autoreset.php
@@ -6,6 +6,15 @@ include "func.php";
 
 $db = DB::db();
 $gameStor = KVStorage::getStorage($db, 'game_env');
+
+if (!$db->queryFirstField("SHOW TABLES LIKE 'reserved_open'")) {
+    Json::die([
+        'result'=>true,
+        'affected'=>0,
+        'status'=>'no_reserved_table'
+    ]);
+}
+
 $reserved = $db->queryFirstRow('SELECT `date`, options FROM reserved_open ORDER BY `date` ASC LIMIT 1');
 
 if(!$reserved){
diff --git a/hwe/sql/reset.sql b/hwe/sql/reset.sql
index 3b3174f0..c310970b 100644
--- a/hwe/sql/reset.sql
+++ b/hwe/sql/reset.sql
@@ -41,5 +41,14 @@ DROP TABLE IF EXISTS world_history;
 DROP TABLE IF EXISTS general_public_record;
 
 DROP TABLE IF EXISTS reserved_open;
+CREATE TABLE `reserved_open` (
+	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`options` TEXT NULL DEFAULT NULL,
+	`date` DATETIME NULL DEFAULT NULL,
+	PRIMARY KEY (`id`),
+	INDEX `date` (`date`)
+)
+DEFAULT CHARSET=utf8mb4
+ENGINE=MyISAM;
 
 DROP TABLE IF EXISTS select_npc_token;
\ No newline at end of file
diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index dee67627..f9c8576c 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -618,7 +618,7 @@ ENGINE=InnoDB
 
 ######
 # 예약 오픈 테이블
-CREATE TABLE `reserved_open` (
+CREATE TABLE IF NOT EXISTS `reserved_open` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`options` TEXT NULL DEFAULT NULL,
 	`date` DATETIME NULL DEFAULT NULL,