From 26420719f3e8d8312062ca46242099a930ad75f1 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 21 Apr 2019 01:54:22 +0900 Subject: [PATCH] =?UTF-8?q?$connect=20=EC=93=B0=EB=8A=94=20=EB=B6=80?= =?UTF-8?q?=EB=B6=84=20=EC=9D=BC=EB=B6=80=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/_admin1.php | 1 - hwe/_admin1_submit.php | 1 - hwe/_admin2_submit.php | 1 - hwe/_admin5_submit.php | 1 - hwe/a_genList.php | 5 +---- hwe/a_traffic.php | 1 - hwe/b_myGenInfo.php | 5 +---- hwe/b_myPage.php | 5 +---- hwe/b_troop.php | 1 - hwe/c_vote.php | 11 +++++------ hwe/func_legacy.php | 10 ++-------- hwe/j_map_history.php | 1 - hwe/join.php | 5 +---- hwe/preprocessing.php | 1 - hwe/turn.php | 1 - 15 files changed, 11 insertions(+), 39 deletions(-) diff --git a/hwe/_admin1.php b/hwe/_admin1.php index 1aadaed6..86a7aa6d 100644 --- a/hwe/_admin1.php +++ b/hwe/_admin1.php @@ -28,7 +28,6 @@ if($session->userGrade < 5) { } $db = DB::db(); -$connect=$db->get(); $admin = getAdmin(); ?> diff --git a/hwe/_admin1_submit.php b/hwe/_admin1_submit.php index cf4143a7..7c91ce3b 100644 --- a/hwe/_admin1_submit.php +++ b/hwe/_admin1_submit.php @@ -34,7 +34,6 @@ extractMissingPostToGlobals(); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); $admin = getAdmin(); diff --git a/hwe/_admin2_submit.php b/hwe/_admin2_submit.php index 64ef0290..ec389ac0 100644 --- a/hwe/_admin2_submit.php +++ b/hwe/_admin2_submit.php @@ -26,7 +26,6 @@ if(!$generalID){ $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); $src = MessageTarget::buildQuick($session->generalID); diff --git a/hwe/_admin5_submit.php b/hwe/_admin5_submit.php index 8a4a56ba..68789746 100644 --- a/hwe/_admin5_submit.php +++ b/hwe/_admin5_submit.php @@ -19,7 +19,6 @@ if($session->userGrade < 5) { } $db = DB::db(); -$connect=$db->get(); switch($btn) { case "국가변경": diff --git a/hwe/a_genList.php b/hwe/a_genList.php index 64712c02..36fa50dd 100644 --- a/hwe/a_genList.php +++ b/hwe/a_genList.php @@ -12,13 +12,10 @@ $userID = Session::getUserID(); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); increaseRefresh("장수일람", 2); -$query = "select con,turntime from general where owner='{$userID}'"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); -$me = MYDB_fetch_array($result); +$me = $db->queryFirstRow('SELECT con,turntime FROM general WHERE owner = %i', $userID); $con = checkLimit($me['con']); if ($con >= 2) { diff --git a/hwe/a_traffic.php b/hwe/a_traffic.php index 4386954a..2f429b59 100644 --- a/hwe/a_traffic.php +++ b/hwe/a_traffic.php @@ -6,7 +6,6 @@ include "func.php"; $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); increaseRefresh("갱신정보", 2); diff --git a/hwe/b_myGenInfo.php b/hwe/b_myGenInfo.php index acdf650f..cc976b84 100644 --- a/hwe/b_myGenInfo.php +++ b/hwe/b_myGenInfo.php @@ -15,13 +15,10 @@ $userID = Session::getUserID(); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); increaseRefresh("세력장수", 1); -$query = "select no,nation,level from general where owner='{$userID}'"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); -$me = MYDB_fetch_array($result); +$me = $db->queryFirstRow('SELECT no,nation,level from general where owner=%i', $userID); if($me['level'] == 0) { echo "재야입니다."; diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php index e72171e4..374168a4 100644 --- a/hwe/b_myPage.php +++ b/hwe/b_myPage.php @@ -24,13 +24,10 @@ $userID = Session::getUserID(); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); increaseRefresh("내정보", 1); -$query = "select no,npc,mode,tnmt,myset,train,atmos from general where owner='{$userID}'"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); -$me = MYDB_fetch_array($result); +$me = $db->queryFirstRow('SELECT no,npc,mode,tnmt,myset,train,atmos from general WHERE owner = %i', $userID); if ($me['myset'] > 0) { diff --git a/hwe/b_troop.php b/hwe/b_troop.php index b3040501..b314a6ef 100644 --- a/hwe/b_troop.php +++ b/hwe/b_troop.php @@ -8,7 +8,6 @@ $session = Session::requireGameLogin()->setReadOnly(); $userID = Session::getUserID(); $db = DB::db(); -$connect=$db->get(); increaseRefresh("부대편성", 1); diff --git a/hwe/c_vote.php b/hwe/c_vote.php index 58bdac66..e5737202 100644 --- a/hwe/c_vote.php +++ b/hwe/c_vote.php @@ -19,18 +19,17 @@ $isVoteAdmin |= $session->userGrade >= 5; $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); $admin = $gameStor->getValues(['develcost', 'cost', 'vote_title', 'vote', 'votecomment']); -$query = "select no,vote,name,nation,horse,weap,book,item,npc from general where owner='{$userID}'"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); -$me = MYDB_fetch_array($result); +$me = $db->queryFirstRow('SELECT no,vote,name,nation,horse,weap,book,item,npc from general where owner=%i', $userID); if($btn == "투표" && $me['vote'] == 0 && $sel > 0) { $develcost = $admin['develcost'] * 5; - $query = "update general set gold=gold+{$develcost},vote='{$sel}' where owner='{$userID}'"; - MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); + $db->update('general', [ + 'gold'=>$db->sqleval('gold + %i', $develcost), + 'vote'=>$sel + ], 'owner=%i', $userID); $log = []; $log = uniqueItem($me, $log, 1); diff --git a/hwe/func_legacy.php b/hwe/func_legacy.php index 625185ee..11ad5e23 100644 --- a/hwe/func_legacy.php +++ b/hwe/func_legacy.php @@ -109,19 +109,13 @@ function printCitiesBasedOnDistance(int $cityNo, int $maxDistance=1) { function info($type=0) { $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); - $connect=$db->get(); $admin = $gameStor->getValues(['year', 'month', 'turnterm', 'maxgeneral']); $termtype = "{$admin['turnterm']}분 턴"; - $query = "select no from general where npc<2"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $gencount = MYDB_num_rows($result); - - $query = "select no from general where npc>=2"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $npccount = MYDB_num_rows($result); + $gencount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc < 2'); + $npccount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc >= 2'); switch($type) { case 0: diff --git a/hwe/j_map_history.php b/hwe/j_map_history.php index c2c24141..9ca65a71 100644 --- a/hwe/j_map_history.php +++ b/hwe/j_map_history.php @@ -33,7 +33,6 @@ if(!$serverID){ $session = Session::requireGameLogin([])->setReadOnly(); $db = DB::db(); -$connect=$db->get(); $map = $db->queryFirstField('SELECT map FROM history WHERE server_id=%s AND year=%i AND month=%i', $serverID, $year, $month); diff --git a/hwe/join.php b/hwe/join.php index be3f1bf8..4d092f24 100644 --- a/hwe/join.php +++ b/hwe/join.php @@ -24,7 +24,6 @@ if (!$member) { $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); ?> @@ -69,9 +68,7 @@ echo Json::encode((object)$charInfoText); getValues(['show_img_level','maxgeneral']); -$query = "select no from general where npc<2"; -$result = MYDB_query($query, $connect) or Error("join ".MYDB_error($connect), ""); -$gencount = MYDB_num_rows($result); +$gencount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc<2'); if ($gencount >= $admin['maxgeneral']) { echo ""; diff --git a/hwe/preprocessing.php b/hwe/preprocessing.php index f5505d8c..5bf2a194 100644 --- a/hwe/preprocessing.php +++ b/hwe/preprocessing.php @@ -8,7 +8,6 @@ $session = Session::requireGameLogin()->setReadOnly(); $userID = Session::getUserID(); $db = DB::db(); -$connect=$db->get(); $turn = Util::getReq('turn', 'array_int'); $sel = Util::getReq('sel', 'int'); diff --git a/hwe/turn.php b/hwe/turn.php index 450783cd..4891f4a8 100644 --- a/hwe/turn.php +++ b/hwe/turn.php @@ -18,7 +18,6 @@ $userID = Session::getUserID(); $db = DB::db(); $generalID = $session->generalID; $gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); increaseRefresh("턴반복", 1);