From 1412834b60a81f94ee10217948bc1a7b22482d97 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 10 Apr 2018 21:11:12 +0900
Subject: [PATCH] =?UTF-8?q?=ED=84=B4=20=EA=B0=B1=EC=8B=A0,=20=EB=8B=B9?=
 =?UTF-8?q?=EA=B8=B0=EA=B8=B0,=20=EB=B0=80=EA=B8=B0=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=20=EC=9E=AC=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/GameConst.php |  3 ++
 hwe/turn.php            | 98 ++++++++++++++---------------------------
 2 files changed, 35 insertions(+), 66 deletions(-)

diff --git a/hwe/sammo/GameConst.php b/hwe/sammo/GameConst.php
index 00f1d2ad..22d5ddca 100644
--- a/hwe/sammo/GameConst.php
+++ b/hwe/sammo/GameConst.php
@@ -80,4 +80,7 @@ class GameConst
     public static $defaultMaxGenius = 5;
     /** @var int 초기 시작 년도. 실제 값은 시나리오에서 정해지므로 딱히 의미는 없음. */
     public static $defaultStartYear = 180;
+
+    /** @var int 최대 턴(현재는 DB상 24턴으로 고정) */
+    public static $maxTurn = 24;
 }
diff --git a/hwe/turn.php b/hwe/turn.php
index e80ae572..41534ddd 100644
--- a/hwe/turn.php
+++ b/hwe/turn.php
@@ -5,6 +5,12 @@ include "lib.php";
 include "func.php";
 //로그인 검사
 
+$type = Util::getReq('type', 'int', 0);
+$sel = Util::getReq('sel', 'int', 1);
+
+if($sel <= 0 || $sel > 12){
+    $sel = 1;
+}
 
 $session = Session::requireGameLogin()->setReadOnly();
 $userID = Session::getUserID();
@@ -14,87 +20,47 @@ $connect=$db->get();
 
 increaseRefresh("턴반복", 1);
 
-$query = "select conlimit from game limit 1";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$admin = MYDB_fetch_array($result);
+$myActionCnt = $db->queryFirstField('SELECT con FROM general WHERE `owner`=%i', $userID);
+$conLimit = $db->queryFirstField('SELECT conlimit FROM game LIMIT 1');
 
-$query = "select no,name,nation,con from general where owner='{$userID}'";
-$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-$me = MYDB_fetch_array($result);
-
-$con = checkLimit($me['con'], $admin['conlimit']);
+$con = checkLimit($myActionCnt, $conLimit);
 if($con >= 2) { 
-    //echo "<script>window.top.main.location.replace('index.php');</script>"; 
-    echo 'index.php';//TODO:debug all and replace
+    echo "<script>window.top.main.location.replace('index.php');</script>"; 
+    //echo 'index.php';//TODO:debug all and replace
     exit();
  }
 
 switch($type) {
-case 0:
-/*
-    for($i=0; $i < $sel; $i++) {
-        $k = $i + $sel;
-        $query = "update general set ";
-        while(1) {
-            $query .= "turn{$k}=turn{$i}";
-            $k += $sel;
-            if($k >= 24) break;
-            $query .= ",";
-        }
-        $query .= " where owner='{$userID}'";
-        MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+case 0://반복
+    $valueMap = [];
+    foreach(range($sel, GameConst::$maxTurn - 1) as $idx){
+        $src = $idx % $sel;
+        $valueMap['turn'.$idx] = $db->sqleval('%b', 'turn'.$src);
     }
-*/
-    $query = "update general set ";
-    for($i=0; $i < $sel; $i++) {
-        $k = $i + $sel;
-        while(1) {
-            $query .= "turn{$k}=turn{$i}";
-            $k += $sel;
-            if($i < $sel-1 || $k < 24) { $query .= ","; }
-            if($k >= 24) break;
-        }
-    }
-    $query .= " where owner='{$userID}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $db->update('general', $valueMap, 'owner=%i', $userID);
     break;
 case 1:
-    $i = 23 - $sel;
-    $k = 23;
-    $query = "update general set ";
-    while(1) {
-        $query .= "turn{$k}=turn{$i},";
-        $i--; $k--;
-        if($i < 0) break;
+    $valueMap = [];
+    foreach(range(GameConst::$maxTurn -1, $sel, -1) as $idx){
+        $src = $idx - $sel;
+        $valueMap['turn'.$idx] = $db->sqleval('%b', 'turn'.$src);
     }
-    while(1) {
-        $query .= "turn{$k}=0";
-        $k--;
-        if($k < 0) break;
-        $query .= ",";
+    foreach(range($sel -1, 0, -1) as $idx){
+        $valueMap['turn'.$idx] = EncodeCommand(0, 0, 0, 0);
     }
-    $query .= " where owner='{$userID}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $db->update('general', $valueMap, 'owner=%i', $userID);
     break;
 case 2:
-    $i = 0;
-    $k = $sel;
-    $query = "update general set ";
-    while(1) {
-        $query .= "turn{$i}=turn{$k},";
-        $i++; $k++;
-        if($k >= 24) break;
+    $valueMap = [];
+    foreach(range(0, GameConst::$maxTurn - $sel - 1) as $idx){
+        $src = $idx + $sel;
+        $valueMap['turn'.$idx] = $db->sqleval('%b', 'turn'.$src);
     }
-    while(1) {
-        $query .= "turn{$i}=0";
-        $i++;
-        if($i >= 24) break;
-        $query .= ",";
+    foreach(range(GameConst::$maxTurn - $sel, GameConst::$maxTurn - 1) as $idx){
+        $valueMap['turn'.$idx] = EncodeCommand(0, 0, 0, 0);
     }
-    $query .= " where owner='{$userID}'";
-    MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+    $db->update('general', $valueMap, 'owner=%i', $userID);
     break;
 }
 
-//echo "<script>location.replace('commandlist.php');</script>";
-echo 'commandlist.php';//TODO:debug all and replace
+header('location:commandlist.php');