From 723a7bbfba4ae4cb05b0dba08269711d3d3f7010 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 15 Apr 2018 23:42:30 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9E=A5=EC=88=98=20=EC=83=9D=EC=84=B1=20?=
 =?UTF-8?q?=EC=8B=9C=20=EC=98=A4=EB=A5=98=20=EB=82=98=EB=8D=98=20=EB=AC=B8?=
 =?UTF-8?q?=EC=A0=9C=20=ED=95=B4=EA=B2=B0=20-=20Validation=20=EB=AC=B8?=
 =?UTF-8?q?=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/join_post.php                     | 6 +++---
 hwe/select_npc_post.php               | 2 +-
 i_entrance/j_server_change_status.php | 2 +-
 src/sammo/Validator.php               | 5 +----
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/hwe/join_post.php b/hwe/join_post.php
index c8c0f12e..776a328b 100644
--- a/hwe/join_post.php
+++ b/hwe/join_post.php
@@ -20,7 +20,7 @@ $v
     'character',
     'pic'
 ])
-->rule('lengthBetween', 'name', [1, 6])
+->rule('lengthBetween', 'name', 1, 6)
 ->rule('min', [
     'leader',
     'power',
@@ -69,9 +69,9 @@ $db = DB::db();
 ########## 동일 정보 존재여부 확인. ##########
 
 $admin = $db->queryFirstRow('SELECT year,month,maxgeneral,turnterm,genius,npcmode from game limit 1');
-$gencount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE noc<2');
+$gencount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');
 $oldGeneral = $db->queryFirstField('SELECT `no` FROM general WHERE `owner`=%i', $userID);
-$oldName = $db->queryFirstField('SELECT `no` FROM general WHERE `name`=%i', $name);
+$oldName = $db->queryFirstField('SELECT `no` FROM general WHERE `name`=%s', $name);
 
 if ($oldGeneral) {
     echo("<script>
diff --git a/hwe/select_npc_post.php b/hwe/select_npc_post.php
index a826251f..8f4c3c15 100644
--- a/hwe/select_npc_post.php
+++ b/hwe/select_npc_post.php
@@ -50,7 +50,7 @@ list(
     $npcmode
 ) = $db->queryFirstList('SELECT year,month,maxgeneral,turnterm,genius,npcmode from game limit 1');
 
-$gencount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE noc<2');
+$gencount = $db->queryFirstField('SELECT count(`no`) FROM general WHERE npc<2');
 $oldGeneral = $db->queryFirstField('SELECT `no` FROM general WHERE `owner`=%i', $userID);
 
 if($npcmode != 1) {
diff --git a/i_entrance/j_server_change_status.php b/i_entrance/j_server_change_status.php
index 715296bc..442fb720 100644
--- a/i_entrance/j_server_change_status.php
+++ b/i_entrance/j_server_change_status.php
@@ -18,7 +18,7 @@ $server = Util::getReq('server', 'string', '');
 
 $db = RootDB::db();
 $userGrade = $session->userGrade;
-session_write_close();
+$session->setReadOnly();
 
 if($userGrade < 6) {
     Json::die([
diff --git a/src/sammo/Validator.php b/src/sammo/Validator.php
index 6a17f8c8..4d8377ac 100644
--- a/src/sammo/Validator.php
+++ b/src/sammo/Validator.php
@@ -29,10 +29,7 @@ class Validator extends \Valitron\Validator
      */
     public function rule($rule, $fields){
         $params = func_get_args();
-        if(count($params) > 2){
-            return parent::rule($rule, $fields, $params[2]);
-        }
-        return parent::rule($rule, $fields);
+        return parent::rule(...$params);
 
         
     }