devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

count를 써야할 자리에 MYDB_num_rows를 쓰는 코드 수정, 일부 정리

Browse Source
This commit is contained in:
Hide_D
2019-04-21 02:34:22 +09:00
parent 71ce5c4dcb
commit df1221ba74
9 changed files with 30 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/a_vote.php
+7 -26
View File
@@ -8,16 +8,13 @@ $session = Session::requireGameLogin()->setReadOnly();
$userID = Session::getUserID(); $userID = Session::getUserID();
$db = DB::db(); $db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env'); $gameStor = KVStorage::getStorage($db, 'game_env');
$connect=$db->get();
increaseRefresh("설문조사", 1); increaseRefresh("설문조사", 1);
$isVoteAdmin = in_array('vote', $session->acl[DB::prefix()]??[]); $isVoteAdmin = in_array('vote', $session->acl[DB::prefix()]??[]);
$isVoteAdmin |= $session->userGrade >= 5; $isVoteAdmin |= $session->userGrade >= 5;
$query = "select no,vote from general where owner='{$userID}'"; $me = $db->queryFirstRow('SELECT no,vote from general where owner=%i', $userID);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$me = MYDB_fetch_array($result);
$admin = $gameStor->getValues(['develcost','voteopen','vote_title','vote','votecomment']); $admin = $gameStor->getValues(['develcost','voteopen','vote_title','vote','votecomment']);
$vote_title = $admin['vote_title']??'-'; $vote_title = $admin['vote_title']??'-';
@@ -84,13 +81,8 @@ echo "
</tr> </tr>
"; ";
$query = "select no from general where vote>0 and npc<2"; $voteCount = $db->queryFirstField('SELECT count(no) FROM general WHERE vote>0 AND npc<2');
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); $allCount = $db->queryFirstField('SELECT count(no) FROM general WHERE npc<2');
$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);
$percentage = round($voteCount / $allCount * 100, 1); $percentage = round($voteCount / $allCount * 100, 1);
@@ -106,9 +98,7 @@ for ($i=1; $i < $voteTypeCount; $i++) {
<input type=radio name=sel value={$i}> <input type=radio name=sel value={$i}>
"; ";
} elseif ($admin['voteopen'] >= 1 || $isVoteAdmin) { } elseif ($admin['voteopen'] >= 1 || $isVoteAdmin) {
$query = "select no from general where vote='{$i}'"; $vCount = $db->queryFirstField('SELECT count(no) FROM general WHERE vote=%i', $i);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$vCount = MYDB_num_rows($result);
$per = @round($vCount / $voteCount * 100, 1); $per = @round($vCount / $voteCount * 100, 1);
echo "{$vCount} 표 ({$per}%)"; echo "{$vCount} 표 ({$per}%)";
@@ -268,9 +258,7 @@ if ($admin['voteopen'] >= 1 || $isVoteAdmin) {
} }
if ($admin['voteopen'] >= 2 || $isVoteAdmin) { if ($admin['voteopen'] >= 2 || $isVoteAdmin) {
$query = "select no from general where nation=0 and npc<2"; $memCount = $db->queryFirstField('SELECT count(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);
if ($memCount == 0) { if ($memCount == 0) {
$memCount = 1; $memCount = 1;
} }
@@ -312,15 +300,8 @@ if ($admin['voteopen'] >= 2 || $isVoteAdmin) {
</tr> </tr>
"; ";
$query = "select nation,color,name,gennum from nation order by gennum desc"; foreach($db->query('SELECT nation,color,name,gennum from nation order by gennum desc') as $i=>$nation){
$nationResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); $memCount = $db->queryFirstField('SELECT count(no) FROM general WHERE nation=%i AND npc<2', $nation['nation']);
$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);
hwe/b_auction.php
+2 -7
View File
@@ -27,13 +27,8 @@ if ($con >= 2) {
exit(); exit();
} }
$query = "select no from auction where no1='{$me['no']}'"; $tradeCount = $db->queryFirstField('SELECT count(no) FROM auction WHERE no1=%i', $me['no']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); $bidCount = $db->queryFirstField('SELECT count(no) FROM auction where no2=%i', $me['no']);
$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);
$btCount = $tradeCount + $bidCount; $btCount = $tradeCount + $bidCount;
hwe/b_dipcenter.php
+5 -11
View File
@@ -95,12 +95,11 @@ $nationcount = MYDB_num_rows($result);
for ($i=0; $i < $nationcount; $i++) { for ($i=0; $i < $nationcount; $i++) {
$nation = MYDB_fetch_array($result); $nation = MYDB_fetch_array($result);
//속령수
$citycount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i', $nation['nation']);
// 아국표시 // 아국표시
if ($nation['nation'] == $me['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 " echo "
<tr> <tr>
<td align=center style=color:".newColor($nation['color']).";background-color:{$nation['color']};>{$nation['name']}</td> <td align=center style=color:".newColor($nation['color']).";background-color:{$nation['color']};>{$nation['name']}</td>
@@ -115,14 +114,9 @@ for ($i=0; $i < $nationcount; $i++) {
continue; continue;
} }
$query = "select state,term from diplomacy where me='{$me['nation']}' and you='{$nation['nation']}'"; $dip = $db->queryFirstRow('SELECT state,term FROM diplomacy WHERE me = %i AND you = %i', $me['nation'], $nation['nation']);
$result2 = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$dip = MYDB_fetch_array($result2);
//속령수
$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']) { switch ($dip['state']) {
case 0: $state = "<font color=red>교 전</font>"; break; case 0: $state = "<font color=red>교 전</font>"; break;
case 1: $state = "<font color=magenta>선포중</font>"; break; case 1: $state = "<font color=magenta>선포중</font>"; break;
hwe/b_diplomacy.php
+1 -3
View File
@@ -32,9 +32,7 @@ $cityStr = "";
for($i=0; $i < $nationcount; $i++) { for($i=0; $i < $nationcount; $i++) {
$nation = MYDB_fetch_array($result); $nation = MYDB_fetch_array($result);
$query = "select city from city where nation='{$nation['nation']}'"; $citycount = $db->queryFirstField('SELECT count(city) FROM city WHERE nation=%i', $nation['nation']);
$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$citycount = MYDB_num_rows($cityresult);
$nationnum[] = $nation['nation']; $nationnum[] = $nation['nation'];
hwe/c_auction.php
+5 -17
View File
@@ -34,23 +34,15 @@ $userID = Session::getUserID();
$db = DB::db(); $db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env'); $gameStor = KVStorage::getStorage($db, 'game_env');
$connect=$db->get();
increaseRefresh("입찰", 1); increaseRefresh("입찰", 1);
$turnterm = $gameStor->turnterm; $turnterm = $gameStor->turnterm;
$query = "select no,name,gold,rice,special from general where owner='{$userID}'"; $me = $db->queryFirstRow('SELECT no,name,gold,rice,special from general where owner=%i', $userID);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$me = MYDB_fetch_array($result);
$query = "select no from auction where no1='{$me['no']}'"; $tradeCount = $db->queryFirstField('SELECT count(no) FROM auction WHERE no1=%i', $me['no']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); $bidCount = $db->queryFirstField('SELECT count(no) FROM auction WHERE no2=%i', $me['no']);
$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);
$btCount = $tradeCount + $bidCount; $btCount = $tradeCount + $bidCount;
@@ -118,9 +110,7 @@ if ($btn == "판매") {
]); ]);
} }
} elseif ($btn == "구매시도") { } elseif ($btn == "구매시도") {
$query = "select no2,value,topv,expire,amount from auction where no='$sel'"; $auction = $db->queryFirstRow('SELECT no2,value,topv,expire,amount FROM auction WHERE no=%i LIMIT 1', $sel);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$auction = MYDB_fetch_array($result);
if ($value == $auction['topv']) { if ($value == $auction['topv']) {
$valid = 2; $valid = 2;
@@ -221,9 +211,7 @@ if ($btn == "판매") {
]); ]);
} }
} elseif ($btn == "판매시도") { } elseif ($btn == "판매시도") {
$query = "select no2,value,topv,expire,amount from auction where no='$sel'"; $auction = $db->queryFirstRow('SELECT no2,value,topv,expire,amount FROM auction WHERE no=%i LIMIT 1', $sel);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$auction = MYDB_fetch_array($result);
if ($value == $auction['topv']) { if ($value == $auction['topv']) {
$valid = 2; $valid = 2;
hwe/c_myBossInfo.php
+2 -7
View File
@@ -103,13 +103,8 @@ if($btn == "추방") {
//이미 지정했다면 무시 //이미 지정했다면 무시
if($nation["l{$meLevel}set"] == 0 && $general['level'] > 0 && $general['level'] < 12) { 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'"; $dipcount1 = $db->queryFirstField('SELECT count(no) FROM diplomacy WHERE me=%i AND state>=3 AND state<=4', $general['nation']);
$dipresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $dipcount2 = $db->queryFirstField('SELECT count(no) FROM diplomacy WHERE me=%i AND state>=5 AND state<=6', $general['nation']);
$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);
$gold = 0; $gold = 0;
$rice = 0; $rice = 0;
hwe/func.php
+5 -16
View File
@@ -545,30 +545,19 @@ function printCommandTable(General $generalObj) {
function chiefCommandTable() { function chiefCommandTable() {
$db = DB::db(); $db = DB::db();
$gameStor = KVStorage::getStorage($db, 'game_env'); $gameStor = KVStorage::getStorage($db, 'game_env');
$connect=$db->get();
$userID = Session::getUserID(); $userID = Session::getUserID();
$develcost = $gameStor->develcost; $develcost = $gameStor->develcost;
$query = "select no,nation,city,level from general where owner='{$userID}'"; $me = $db->queryFirstRow('select no,nation,city,level from general where owner=%i', $userID);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $nation = $db->queryFirstRow('SELECT level,can_change_flag,gennum FROM nation WHERE nation=%i', $me['nation']);
$me = MYDB_fetch_array($result);
$query = "select level,can_change_flag from nation where nation='{$me['nation']}'"; $genCount = $nation['gennum'];
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $citySupply = $db->queryFirstField('SELECT supply FROM city WHERE city=%i', $me['city']);
$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);
if($nation['level'] > 0) { $valid = 1; } if($nation['level'] > 0) { $valid = 1; }
else { $valid = 0; } else { $valid = 0; }
if($city['supply'] == 0) { $valid = 0; } if($citySupply == 0) { $valid = 0; }
echo " echo "
<select name=commandtype size=1 style='height:20px;color:white;background-color:black;font-size:13px;'>"; <select name=commandtype size=1 style='height:20px;color:white;background-color:black;font-size:13px;'>";
hwe/func_auction.php
+2 -63
View File
@@ -35,66 +35,7 @@ function registerAuction() {
if($general['rice'] < 1000) { $general['rice'] = 1000; } if($general['rice'] < 1000) { $general['rice'] = 1000; }
if($general['rice'] > 20000) { $general['rice'] = 20000; } if($general['rice'] > 20000) { $general['rice'] = 20000; }
/* $count = $db->queryFirstField('SELECT count(*) FROM auction WHERE type=0 AND stuff=0 AND no1=0');
// 유닉템 등록
$query = "select * from auction where stuff!='0'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = MYDB_num_rows($result);
// 유닉템 거래가 없을 경우 1% 확률로 등장
if($count == 0 && rand()%100 < 1) {
// 유닉템 선택
$sel = rand() % 4 + 1;
switch($sel) {
case 1: $type = "weap"; break;
case 2: $type = "book"; break;
case 3: $type = "horse"; break;
case 4: $type = "item"; break;
}
$query = "select no,{$type} from general where {$type}>6";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = MYDB_num_rows($result);
if($count < 20) {
for($i=0; $i < $count; $i++) {
$gen = MYDB_fetch_array($result);
$occupied[$gen[$type]] = 1;
}
for($i=7; $i <= 26; $i++) {
if($occupied[$i] == 0) {
$item[] = $i;
}
}
$it = $item[rand() % count($item)];
$stuff = $it * 10 + $sel;
//평균 금의 100%
$amount = 1;
$cost = $general['gold'];
$topv = $general['maxgold'] * 10;
if($cost < 5000) { $cost = 5000; }
if($topv < 10000) { $topv = 10000; }
$cost = Util::round($cost / 10) * 10;
$topv = Util::round($topv / 10) * 10;
$term = 12;
$date = date("Y-m-d H:i:s", strtotime(date("Y-m-d H:i:s")) + $unit * $term);
$query = "insert into auction (type, no1, name1, stuff, amount, cost, value, topv, expire) values (0, '0', 'ⓝ암시장상인', '$stuff', '$amount', '$cost', '$cost', '$topv', '$date')";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$josaYi = JosaUtil::pick(GetStuffName($stuff), '이');
$alllog[0] = "<C>●</>{$admin['month']}월:<C>".GetStuffName($stuff)."</>{$josaYi} 거래장에 등장했습니다!";
$josaUl = JosaUtil::pick(GetStuffName($stuff), '을');
$history[0] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<C><b>【암시장】</b></><Y>ⓝ암시장상인</>이 <C>".GetStuffName($stuff)."</>{$josaUl} 판다는 소문이 돌고 있습니다!";
pushGeneralPublicRecord($alllog, $admin['year'], $admin['month']);
pushWorldHistory($history, $admin['year'], $admin['month']);
}
}
*/
$query = "select * from auction where type='0' and stuff='0' and no1='0'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = MYDB_num_rows($result);
$count += 5; $count += 5;
// 판매건 등록 // 판매건 등록
if(rand()%$count == 0) { if(rand()%$count == 0) {
@@ -116,9 +57,7 @@ function registerAuction() {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} }
$query = "select * from auction where type='1' and stuff='0' and no1='0'"; $count = $db->queryFirstField('SELECT count(*) FROM auction WHERE type=1 AND stuff=0 AND no1=0');
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = MYDB_num_rows($result);
$count += 5; $count += 5;
// 구매건 등록 // 구매건 등록
if(rand()%$count == 0) { if(rand()%$count == 0) {
hwe/func_tournament.php
+1 -3
View File
@@ -327,9 +327,7 @@ function fillLowGenAll() {
]; ];
for($i=0; $i < 8; $i++) { for($i=0; $i < 8; $i++) {
$query = "select grp from tournament where grp='$i'"; $grpCount[$i] = $db->queryFirstField('SELECT count(grp) FROM tournament WHERE grp=%i', $i);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$grpCount[$i] = MYDB_num_rows($result);
} }
//자동신청하고, 돈 있고, 아직 참가 안한 장수 //자동신청하고, 돈 있고, 아직 참가 안한 장수