From 50d1c4cd34f11070b6c5003617b6a77a21fff37f Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Mon, 9 Apr 2018 03:21:11 +0900
Subject: [PATCH] =?UTF-8?q?dateFormat=EC=97=90=20=ED=8F=AC=EB=A7=B7=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80.=20error=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?=
 =?UTF-8?q?=ED=91=9C=EA=B8=B0=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/_admin1_submit.php  | 5 ++---
 hwe/index.php           | 2 +-
 hwe/sql/schema.sql      | 2 +-
 hwe/templates/error.php | 4 +++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/hwe/_admin1_submit.php b/hwe/_admin1_submit.php
index eef09be8..2ae49504 100644
--- a/hwe/_admin1_submit.php
+++ b/hwe/_admin1_submit.php
@@ -17,7 +17,7 @@ $v->rule('integer', [
     'minutes2'
 ])->rule('dateFormat', [
     'starttime'
-]);
+], 'Y-m-d H:i:s');
 if (!$v->validate()) {
     Error($v->errorStr());
 }
@@ -117,5 +117,4 @@ switch ($btn) {
         break;
 }
 
-//echo "<script>location.replace('_admin1.php');</script>";
-echo '_admin1.php';//TODO:debug all and replace
+header('location:_admin1.php');
\ No newline at end of file
diff --git a/hwe/index.php b/hwe/index.php
index 7192fff4..5a340b70 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -224,7 +224,7 @@ if ($session->userGrade >= 5) {
         <td width=698 height=520 colspan=2>
             <?=getMapHtml()?>
         </td>
-        <td width=298 rowspan=4><iframe seamless="seamless" sandbox="allow-same-origin allow-top-navigation allow-forms allow-scripts" name=commandlist src='commandlist.php' width=298 height=700 frameborder=0 marginwidth=0 marginheight=0 topmargin=0 scrolling=no></iframe></td>
+        <td width=298 rowspan=4><iframe seamless="seamless" name=commandlist src='commandlist.php' width=298 height=700 frameborder=0 marginwidth=0 marginheight=0 topmargin=0 scrolling=no></iframe></td>
     </tr>
 <form name=form2 action=preprocessing.php method=post target=commandlist>
     <tr>
diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql
index dd883803..1c53da16 100644
--- a/hwe/sql/schema.sql
+++ b/hwe/sql/schema.sql
@@ -54,7 +54,7 @@ CREATE TABLE `general` (
 	`turntime` DATETIME NULL DEFAULT NULL,
 	`recwar` DATETIME NULL DEFAULT NULL,
 	`makenation` CHAR(255) NULL DEFAULT NULL,
-	`makelimit` INT(2) NULL DEFAULT '24',
+	`makelimit` INT(2) NULL DEFAULT '0',
 	`killturn` INT(3) NULL DEFAULT NULL,
 	`lastconnect` DATETIME NULL DEFAULT NULL,
 	`lastrefresh` DATETIME NULL DEFAULT NULL,
diff --git a/hwe/templates/error.php b/hwe/templates/error.php
index 6db303bf..7718226e 100644
--- a/hwe/templates/error.php
+++ b/hwe/templates/error.php
@@ -22,10 +22,12 @@
         <button style='width:200px;height:2em;font-size:1.2em;' onclick="location.replace('index.php')">몇 초 뒤 눌러주세요</button>
     </div>
     <div class="with_border">
-        <?=$message?>
+        <?=$this->message?>
     </div>  
     <div class="with_border">
+        <pre>
         <?php debug_print_backtrace(); ?>
+</pre>
     </div>  
 </div>
 </body>