diff --git a/hwe/a_vote.php b/hwe/a_vote.php index c7d3f606..3b232d31 100644 --- a/hwe/a_vote.php +++ b/hwe/a_vote.php @@ -8,16 +8,13 @@ $session = Session::requireGameLogin()->setReadOnly(); $userID = Session::getUserID(); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); increaseRefresh("설문조사", 1); $isVoteAdmin = in_array('vote', $session->acl[DB::prefix()]??[]); $isVoteAdmin |= $session->userGrade >= 5; -$query = "select no,vote 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 from general where owner=%i', $userID); $admin = $gameStor->getValues(['develcost','voteopen','vote_title','vote','votecomment']); $vote_title = $admin['vote_title']??'-'; @@ -84,13 +81,8 @@ echo " "; -$query = "select no from general where vote>0 and npc<2"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); -$voteCount = MYDB_num_rows($result); - -$query = "select no from general where npc<2"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); -$allCount = MYDB_num_rows($result); +$voteCount = $db->queryFirstField('SELECT count(no) FROM general WHERE vote>0 AND npc<2'); +$allCount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc<2'); $percentage = round($voteCount / $allCount * 100, 1); @@ -106,9 +98,7 @@ for ($i=1; $i < $voteTypeCount; $i++) { "; } elseif ($admin['voteopen'] >= 1 || $isVoteAdmin) { - $query = "select no from general where vote='{$i}'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); - $vCount = MYDB_num_rows($result); + $vCount = $db->queryFirstField('SELECT count(no) FROM general WHERE vote=%i', $i); $per = @round($vCount / $voteCount * 100, 1); echo "{$vCount} 표 ({$per}%)"; @@ -268,9 +258,7 @@ if ($admin['voteopen'] >= 1 || $isVoteAdmin) { } if ($admin['voteopen'] >= 2 || $isVoteAdmin) { - $query = "select no from general where nation=0 and npc<2"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); - $memCount = MYDB_num_rows($result); + $memCount = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=0 AND npc <2'); if ($memCount == 0) { $memCount = 1; } @@ -312,15 +300,8 @@ if ($admin['voteopen'] >= 2 || $isVoteAdmin) { "; - $query = "select nation,color,name,gennum from nation order by gennum desc"; - $nationResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); - $nationcount = MYDB_num_rows($nationResult); - for ($i=0; $i < $nationcount; $i++) { - $nation = MYDB_fetch_array($nationResult); - - $query = "select no from general where nation='{$nation['nation']}' and npc<2"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); - $memCount = MYDB_num_rows($result); + foreach($db->query('SELECT nation,color,name,gennum from nation order by gennum desc') as $i=>$nation){ + $memCount = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i AND npc<2', $nation['nation']); diff --git a/hwe/b_auction.php b/hwe/b_auction.php index 8ea94b30..f040eeb8 100644 --- a/hwe/b_auction.php +++ b/hwe/b_auction.php @@ -27,13 +27,8 @@ if ($con >= 2) { exit(); } -$query = "select no from auction where no1='{$me['no']}'"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); -$tradeCount = MYDB_num_rows($result); - -$query = "select no from auction where no2='{$me['no']}'"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); -$bidCount = MYDB_num_rows($result); +$tradeCount = $db->queryFirstField('SELECT count(no) FROM auction WHERE no1=%i', $me['no']); +$bidCount = $db->queryFirstField('SELECT count(no) FROM auction where no2=%i', $me['no']); $btCount = $tradeCount + $bidCount; diff --git a/hwe/b_dipcenter.php b/hwe/b_dipcenter.php index f16a900b..fe3bc4e5 100644 --- a/hwe/b_dipcenter.php +++ b/hwe/b_dipcenter.php @@ -95,12 +95,11 @@ $nationcount = MYDB_num_rows($result); for ($i=0; $i < $nationcount; $i++) { $nation = MYDB_fetch_array($result); + //속령수 + $citycount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i', $nation['nation']); + // 아국표시 if ($nation['nation'] == $me['nation']) { - //속령수 - $query = "select city from city where nation='{$nation['nation']}'"; - $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); - $citycount = MYDB_num_rows($result2); echo " {$nation['name']} @@ -115,14 +114,9 @@ for ($i=0; $i < $nationcount; $i++) { continue; } - $query = "select state,term from diplomacy where me='{$me['nation']}' and you='{$nation['nation']}'"; - $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); - $dip = MYDB_fetch_array($result2); + $dip = $db->queryFirstRow('SELECT state,term FROM diplomacy WHERE me = %i AND you = %i', $me['nation'], $nation['nation']); - //속령수 - $query = "select city from city where nation='{$nation['nation']}'"; - $result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); - $citycount = MYDB_num_rows($result2); + switch ($dip['state']) { case 0: $state = "교 전"; break; case 1: $state = "선포중"; break; diff --git a/hwe/b_diplomacy.php b/hwe/b_diplomacy.php index f0c9ef36..caf93202 100644 --- a/hwe/b_diplomacy.php +++ b/hwe/b_diplomacy.php @@ -32,9 +32,7 @@ $cityStr = ""; for($i=0; $i < $nationcount; $i++) { $nation = MYDB_fetch_array($result); - $query = "select city from city where nation='{$nation['nation']}'"; - $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $citycount = MYDB_num_rows($cityresult); + $citycount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i', $nation['nation']); $nationnum[] = $nation['nation']; diff --git a/hwe/c_auction.php b/hwe/c_auction.php index d86e6cfe..0e41cb38 100644 --- a/hwe/c_auction.php +++ b/hwe/c_auction.php @@ -34,23 +34,15 @@ $userID = Session::getUserID(); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$connect=$db->get(); increaseRefresh("입찰", 1); $turnterm = $gameStor->turnterm; -$query = "select no,name,gold,rice,special 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,name,gold,rice,special from general where owner=%i', $userID); -$query = "select no from auction where no1='{$me['no']}'"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); -$tradeCount = MYDB_num_rows($result); - -$query = "select no from auction where no2='{$me['no']}'"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); -$bidCount = MYDB_num_rows($result); +$tradeCount = $db->queryFirstField('SELECT count(no) FROM auction WHERE no1=%i', $me['no']); +$bidCount = $db->queryFirstField('SELECT count(no) FROM auction WHERE no2=%i', $me['no']); $btCount = $tradeCount + $bidCount; @@ -118,9 +110,7 @@ if ($btn == "판매") { ]); } } elseif ($btn == "구매시도") { - $query = "select no2,value,topv,expire,amount from auction where no='$sel'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); - $auction = MYDB_fetch_array($result); + $auction = $db->queryFirstRow('SELECT no2,value,topv,expire,amount FROM auction WHERE no=%i LIMIT 1', $sel); if ($value == $auction['topv']) { $valid = 2; @@ -221,9 +211,7 @@ if ($btn == "판매") { ]); } } elseif ($btn == "판매시도") { - $query = "select no2,value,topv,expire,amount from auction where no='$sel'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); - $auction = MYDB_fetch_array($result); + $auction = $db->queryFirstRow('SELECT no2,value,topv,expire,amount FROM auction WHERE no=%i LIMIT 1', $sel); if ($value == $auction['topv']) { $valid = 2; diff --git a/hwe/c_myBossInfo.php b/hwe/c_myBossInfo.php index f138d2c7..13e94edd 100644 --- a/hwe/c_myBossInfo.php +++ b/hwe/c_myBossInfo.php @@ -103,13 +103,8 @@ if($btn == "추방") { //이미 지정했다면 무시 if($nation["l{$meLevel}set"] == 0 && $general['level'] > 0 && $general['level'] < 12) { - $query = "select no from diplomacy where me='{$general['nation']}' and state>='3' and state<='4'"; - $dipresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $dipcount1 = MYDB_num_rows($dipresult); - - $query = "select no from diplomacy where me='{$general['nation']}' and state>='5' and state<='6'"; - $dipresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $dipcount2 = MYDB_num_rows($dipresult); + $dipcount1 = $db->queryFirstField('SELECT count(no) FROM diplomacy WHERE me=%i AND state>=3 AND state<=4', $general['nation']); + $dipcount2 = $db->queryFirstField('SELECT count(no) FROM diplomacy WHERE me=%i AND state>=5 AND state<=6', $general['nation']); $gold = 0; $rice = 0; diff --git a/hwe/func.php b/hwe/func.php index c24d0fb5..dd8e2b2b 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -545,30 +545,19 @@ function printCommandTable(General $generalObj) { function chiefCommandTable() { $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); - $connect=$db->get(); $userID = Session::getUserID(); $develcost = $gameStor->develcost; - $query = "select no,nation,city,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,city,level from general where owner=%i', $userID); + $nation = $db->queryFirstRow('SELECT level,can_change_flag,gennum FROM nation WHERE nation=%i', $me['nation']); - $query = "select level,can_change_flag from nation where nation='{$me['nation']}'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $nation = MYDB_fetch_array($result); - - $query = "select no from general where nation='{$me['nation']}'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $genCount = MYDB_num_rows($result); - - $query = "select supply from city where city='{$me['city']}'"; - $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - $city = MYDB_fetch_array($result); + $genCount = $nation['gennum']; + $citySupply = $db->queryFirstField('SELECT supply FROM city WHERE city=%i', $me['city']); if($nation['level'] > 0) { $valid = 1; } else { $valid = 0; } - if($city['supply'] == 0) { $valid = 0; } + if($citySupply == 0) { $valid = 0; } echo "