정적 분석 결과 반영

This commit is contained in:
2018-04-09 01:29:29 +09:00
parent 27d313c594
commit da89d81ef9
28 changed files with 116 additions and 37 deletions
+12
View File
@@ -106,6 +106,18 @@ if($isgen == "장수평균" || $isgen == "성벽평균") {
$simulCount = 1;
}
$general = [
'no'=>1
];
$oppose = [
'no'=>2
];
$city = [
'gen1'=>0,
'gen2'=>0,
'gen3'=>0,
];
if($isgen == "장수공격" || $isgen == "성벽공격" || $isgen == "장수평균" || $isgen == "성벽평균") {
$msg2 = "";
for($i=0; $i < $simulCount; $i++) {
+2
View File
@@ -65,6 +65,8 @@ if(!isset($type) || $type == 0) {
</td></tr>
</table>
<?php
$nationname = [];
$nationlevel = [];
$nationname[0] = "-";
foreach(getAllNationStaticInfo() as $nation){
$nationname[$nation['nation']] = $nation['name'];
+6
View File
@@ -50,6 +50,12 @@ $type = array(
"베 팅 수 익 률"
);
for ($i=0; $i < 21; $i++) {
$name = [];
$nation = [];
$data = [];
$color = [];
$pic = [];
$query = "select * from hall where type={$i} order by rank";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
+4
View File
@@ -4,6 +4,8 @@ namespace sammo;
include "lib.php";
include "func.php";
$type = Util::getReq('type', 'int', 1);
$db = DB::db();
$connect=$db->get();
@@ -12,6 +14,7 @@ increaseRefresh("빙의일람", 2);
if($type == 0) {
$type = 1;
}
$sel = [];
$sel[$type] = "selected";
?>
@@ -44,6 +47,7 @@ $sel[$type] = "selected";
</td></tr>
</table>
<?php
$nationname = [];
$nationname[0] = "-";
foreach(getAllNationStaticInfo() as $nation){
$nationname[$nation['nation']] = $nation['name'];
+6
View File
@@ -15,6 +15,12 @@ $game = MYDB_fetch_array($result);
$log = [];
$date = [];
$year = [];
$month = [];
$refresh = [];
$online = [];
$curonline = getOnlineNum();
for ($i=0; $i < 11; $i++) {
$parse = explode("|", $log[count($log)-12+$i]);
+1
View File
@@ -61,6 +61,7 @@ if ($btn == '정렬하기') {
if ($type == 0) {
$type = 0;
}
$sel = [];
$sel[$type] = "selected";
?>
+6
View File
@@ -94,6 +94,8 @@ echo "
$query = "select npc,name,win from tournament where grp>=50 order by grp, grp_no";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$cent = [];
$line = [];
for ($i=0; $i < 1; $i++) {
$cent[$i] = "<font color=white>";
}
@@ -255,6 +257,10 @@ for ($i=0; $i < 16; $i++) {
$query = "select bet0,bet1,bet2,bet3,bet4,bet5,bet6,bet7,bet8,bet9,bet10,bet11,bet12,bet13,bet14,bet15 from general where owner='{$userID}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$me = MYDB_fetch_array($result);
$myBet = [];
$bet = [];
$gold = [];
for ($i=0; $i < 16; $i++) {
$myBet[$i] = $me["bet{$i}"];
}
+7
View File
@@ -57,6 +57,8 @@ $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""
$nation = MYDB_fetch_array($result);
$lv = getNationChiefLevel($nation['level']);
$turn = [];
$gen = [];
for($i=12; $i >= $lv; $i--) {
$turn[$i] = getCoreTurn($nation, $i);
@@ -93,6 +95,11 @@ function turn(type) {
$year = $admin['year'];
$month = $admin['month'];
$date = substr(date('Y-m-d H:i:s'), 14);
$totaldate = [];
$turntime = [];
$turndate = [];
for($i=12; $i >= $lv; $i--) {
$totaldate[$i] = $gen[$i]['turntime'];
$turntime[$i] = substr($gen[$i]['turntime'], 14);
+2
View File
@@ -217,6 +217,8 @@ $query = "select npc,mode,no,picture,imgsvr,name,injury,leader,power,intel,level
$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($genresult);
$nationname = [];
$nationlevel = [];
foreach(getAllNationStaticInfo() as $nation){
$nationname[$nation['nation']] = $nation['name'];
$nationlevel[$nation['nation']] = $nation['level'];
+6 -1
View File
@@ -23,7 +23,9 @@ $me = MYDB_fetch_array($result);
$query = "select nation,color,name,power,gennum from nation where level>0 order by power desc";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nationcount = MYDB_num_rows($result);
$nationnum = array();
$nationnum = [];
$nationname = [];
$nationcolor = [];
$nationStr = "";
$powerStr = "";
@@ -99,6 +101,8 @@ for($i=0; $i < $nationcount; $i++) {
echo "
</tr>";
$state = [];
for($i=0; $i < $nationcount; $i++) {
$query = "select you,state from diplomacy where me='$nationnum[$i]'";
$dipresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -199,6 +203,7 @@ for($i=0; $i < $citycount; $i++) {
}
function mySort($killnum) {
$seq = [];
for($i=0; $i < count($killnum); $i++) {
$seq[$i] = $i;
}
+2 -1
View File
@@ -38,6 +38,7 @@ if ($me['level'] == 0 || ($me['level'] == 1 && $me['belong'] < $nation['secretli
if ($type == 0) {
$type = 7;
}
$sel = [];
$sel[$type] = "selected";
?>
@@ -75,7 +76,7 @@ $sel[$type] = "selected";
$query = "select troop,name from troop where nation='{$me['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$troopCount = MYDB_num_rows($result);
$troopName = [];
for ($i=0; $i < $troopCount; $i++) {
$troop = MYDB_fetch_array($result);
$troopName[$troop['troop']] = $troop['name'];
+10 -7
View File
@@ -59,6 +59,7 @@ else { $btn = "hidden"; }
$query = "select name,level,picture,imgsvr,belong from general where nation='{$nation['nation']}' and level>={$lv} order by level desc";
$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$level = [];
for($i=12; $i >= $lv; $i--) {
$levels = MYDB_fetch_array($genresult);
$level[$levels['level']] = $levels;
@@ -212,12 +213,13 @@ echo "
</tr>
";
$querys[10] = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and power>='".GameConst::$goodgenpower."' order by npc,binary(name)";
$querys[9] = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and intel>='".GameConst::$goodgenintel."' order by npc,binary(name)";
$querys[8] = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and power>='".GameConst::$goodgenpower."' order by npc,binary(name)";
$querys[7] = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and intel>='".GameConst::$goodgenintel."' order by npc,binary(name)";
$querys[6] = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and power>='".GameConst::$goodgenpower."' order by npc,binary(name)";
$querys[5] = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and intel>='".GameConst::$goodgenintel."' order by npc,binary(name)";
$queries = [];
$queries[10] = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and power>='".GameConst::$goodgenpower."' order by npc,binary(name)";
$queries[9] = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and intel>='".GameConst::$goodgenintel."' order by npc,binary(name)";
$queries[8] = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and power>='".GameConst::$goodgenpower."' order by npc,binary(name)";
$queries[7] = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and intel>='".GameConst::$goodgenintel."' order by npc,binary(name)";
$queries[6] = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and power>='".GameConst::$goodgenpower."' order by npc,binary(name)";
$queries[5] = "select no,name,level,city from general where nation='{$me['nation']}' and level!='12' and intel>='".GameConst::$goodgenintel."' order by npc,binary(name)";
for($i=10; $i >= $lv; $i--) {
if($i % 2 == 0) { echo "<tr>"; }
@@ -232,7 +234,7 @@ for($i=10; $i >= $lv; $i--) {
<select name=genlist size=1 style=color:white;background-color:black;>
<option value=0>____공석____</option>";
$query = $querys[$i];
$query = $queries[$i];
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($result);
@@ -443,6 +445,7 @@ echo "
</tr>
";
$citylevel = [];
$citylevel[1] = "수";
$citylevel[2] = "진";
$citylevel[3] = "관";
+1 -1
View File
@@ -24,7 +24,7 @@ if ($me['level'] == 0) {
if ($type == 0) {
$type = 10;
}
$sel[$type] = "selected";
$sel = [$type => "selected"];
?>
<!DOCTYPE html>
+1 -1
View File
@@ -25,7 +25,7 @@ if($me['level'] == 0) {
if($type == 0) {
$type = 1;
}
$sel[$type] = "selected";
$sel = [$type => "selected"];
?>
<!DOCTYPE html>
+1
View File
@@ -52,6 +52,7 @@ $citycount = MYDB_num_rows($cityresult);
$totalpop = 0;
$maxpop = 0;
$cityname = [];
for($j=0; $j < $citycount; $j++) {
$city = MYDB_fetch_array($cityresult);
if($city['city'] == $nation['capital']) { $cityname[$j] = "<font color=cyan>[{$city['name']}]</font>"; }
+4
View File
@@ -63,6 +63,7 @@ select { font-family:'굴림'; line-height:100%; }
<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
<?php
if ($session->userGrade >= 5) {
$sel = [];
echo "
<form method=post action=c_tournament.php>
<tr><td colspan=8><input type=textarea size=150 style=color:white;background-color:black; name=msg><input type=submit name=btn value='메시지'></td></tr>
@@ -208,9 +209,11 @@ echo "
$query = "select npc,name,win from tournament where grp>=50 order by grp, grp_no";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$cent = [];
for ($i=0; $i < 1; $i++) {
$cent[$i] = "<font color=white>";
}
$line = [];
for ($i=0; $i < 2; $i++) {
$general = MYDB_fetch_array($result);
if ($general['name'] == "") {
@@ -372,6 +375,7 @@ echo"
$query = "select tournament,bet0,bet1,bet2,bet3,bet4,bet5,bet6,bet7,bet8,bet9,bet10,bet11,bet12,bet13,bet14,bet15,bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 as bet from game limit 1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), "");
$betting = MYDB_fetch_array($result);
$bet = [];
for ($i=0; $i < 16; $i++) {
$bet[$i] = @round($betting['bet'] / $betting["bet{$i}"], 2);
if ($bet[$i] == 0) {
+2
View File
@@ -73,6 +73,8 @@ if($btn == "추방") {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$alllog = [];
//이미 지정했다면 무시
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'";
+3
View File
@@ -108,10 +108,12 @@ if($btn == "자동개최설정" && $session->userGrade >= 5) {
$query = "select grp from tournament where grp<10 group by grp having count(*)=8";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$grpCount = MYDB_num_rows($result);
$occupied = [];
for($i=0; $i < $grpCount; $i++) {
$grp = MYDB_fetch_array($result);
$occupied[$grp['grp']] = 1;
}
$map = [];
for($i=0; $i < 8; $i++) {
if($occupied[$i] == 0) {
$map[] = $i;
@@ -138,6 +140,7 @@ if($btn == "자동개최설정" && $session->userGrade >= 5) {
}
} elseif(($btn == "쪼렙전부투입" || $btn == "일반전부투입" || $btn == "굇수전부투입" || $btn == "랜덤전부투입") && $session->userGrade >= 5) {
$z = 0;
$code = [];
for($i=0; $i < 8; $i++) {
$query = "select grp from tournament where grp='$i'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+1 -1
View File
@@ -55,7 +55,7 @@ $dip = MYDB_fetch_array($result);
$mylog = [];
$youlog = [];
$allog = [];
$alllog = [];
$history = [];
if($ok == "수락") {
+1 -1
View File
@@ -55,7 +55,7 @@ $dip = MYDB_fetch_array($result);
$mylog = [];
$youlog = [];
$allog = [];
$alllog = [];
$history = [];
if($ok == "수락") {
+1 -1
View File
@@ -80,7 +80,7 @@ for($i=0; $i < $warcount; $i++) {
$mylog = [];
$youlog = [];
$allog = [];
$alllog = [];
$history = [];
if($ok == "수락") {
+1 -1
View File
@@ -71,7 +71,7 @@ for($i=0; $i < $warcount; $i++) {
$mylog = [];
$youlog = [];
$allog = [];
$alllog = [];
$history = [];
if($ok == "수락") {
+13 -13
View File
@@ -181,44 +181,44 @@ function declineScout($messageInfo, $reason=null){
return [true, 'success'];
}
function acceptAlly($messageInfo, $general){
function acceptAlly($messageInfo, $general, $msgResponse){
return [false, 'NYI'];
}
function declineAlly($messageInfo, $general, $msgResponse){
}
function declineAlly($messageInfo, $general){
function acceptBreakAlly($messageInfo, $general, $msgResponse){
}
function acceptBreakAlly($messageInfo, $general){
function declineBreakAlly($messageInfo, $general, $msgResponse){
}
function declineBreakAlly($messageInfo, $general){
function acceptStopWar($messageInfo, $general, $msgResponse){
}
function acceptStopWar($messageInfo, $general){
}
function declineStopWar($messageInfo, $general){
function declineStopWar($messageInfo, $general, $msgResponse){
}
function acceptMergeNations($messageInfo, $general){
function acceptMergeNations($messageInfo, $general, $msgResponse){
}
function declineMergeNations($messageInfo, $general){
function declineMergeNations($messageInfo, $general, $msgResponse){
}
function acceptSurrender($messageInfo, $general){
function acceptSurrender($messageInfo, $general, $msgResponse){
}
function declineSurrender($messageInfo, $general){
function declineSurrender($messageInfo, $general, $msgResponse){
}
+4 -5
View File
@@ -663,8 +663,7 @@ function checkWander() {
$kingResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$king = MYDB_fetch_array($kingResult);
$log[0] = "<C>●</>초반 제한후 방랑군은 자동 해산됩니다.";
pushGenLog($king, $log);
pushGenLog($king, ["<C>●</>초반 제한후 방랑군은 자동 해산됩니다."]);
process_56($king);
}
@@ -722,7 +721,7 @@ function checkMerge() {
$query = "select no,name,nation from general where nation='{$you['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($result);
$genlog[0] = "<C>●</><D><b>{$mynation['name']}</b></>(와)과 통합에 성공했습니다.";
$genlog = ["<C>●</><D><b>{$mynation['name']}</b></>(와)과 통합에 성공했습니다."];
for($i=0; $i < $gencount; $i++) {
$gen = MYDB_fetch_array($result);
pushGenLog($gen, $genlog);
@@ -843,7 +842,7 @@ function checkSurrender() {
$query = "select no,name,nation from general where nation='{$you['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($result);
$genlog[0] = "<C>●</><D><b>{$mynation['name']}</b></> 합병에 성공했습니다.";
$genlog = ["<C>●</><D><b>{$mynation['name']}</b></> 합병에 성공했습니다."];
for($i=0; $i < $gencount; $i++) {
$gen = MYDB_fetch_array($result);
pushGenLog($gen, $genlog);
@@ -1243,7 +1242,7 @@ function checkEmperior() {
}
}
$log[0] = "<C>●</>{$admin['year']}{$admin['month']}월: <D><b>{$nation['name']}</b></>(이)가 전토를 통일하였습니다.";
$log = ["<C>●</>{$admin['year']}{$admin['month']}월: <D><b>{$nation['name']}</b></>(이)가 전토를 통일하였습니다."];
$query = "select no,name from general where nation='{$nation['nation']}' order by dedication desc";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+1 -1
View File
@@ -40,7 +40,7 @@ if(!$general){
]);
}
list($result, $messageInfo) = getSingleMessage($msgID, $general);
list($result, $messageInfo) = getSingleMessage($msgID);
if (!$result) {
Json::die([
+1 -2
View File
@@ -258,8 +258,7 @@ if ($genius) {
pushGenLog($me, $mylog);
pushGeneralPublicRecord($log, $admin['year'], $admin['month']);
$adminLog[0] = "가입 : {$userID} // {$name} // {$generalID}".getenv("REMOTE_ADDR");
pushAdminLog($adminLog);
pushAdminLog(["가입 : {$userID} // {$name} // {$generalID}".getenv("REMOTE_ADDR")]);
$rootDB->insert('member_log', [
'member_no' => $userID,
+16
View File
@@ -1632,6 +1632,8 @@ function command_48($turn, $command) {
$me = MYDB_fetch_array($result);
$city = getCity($me['city'], "secu");
$color = [];
for($i=1; $i <= 6; $i++) {
if($city['secu'] >= $i*1000) {
$color[$i] = "white";
@@ -2009,6 +2011,8 @@ function command_61($turn, $command) {
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
$diplomacy = [];
for($i=1; $i <= $count; $i++) {
$dip = MYDB_fetch_array($result);
$diplomacy[$dip['you']] = $dip['state'];
@@ -2094,6 +2098,8 @@ function command_62($turn, $command) {
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
$diplomacy = [];
for($i=1; $i <= $count; $i++) {
$dip = MYDB_fetch_array($result);
$diplomacy[$dip['you']] = $dip['state'];
@@ -2159,6 +2165,8 @@ function command_63($turn, $command) {
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
$diplomacy = [];
for($i=1; $i <= $count; $i++) {
$dip = MYDB_fetch_array($result);
$diplomacy[$dip['you']] = $dip['state'];
@@ -2218,6 +2226,8 @@ function command_64($turn, $command) {
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
$diplomacy = [];
for($i=1; $i <= $count; $i++) {
$dip = MYDB_fetch_array($result);
$diplomacy[$dip['you']] = $dip['state'];
@@ -2564,6 +2574,8 @@ function command_75($turn, $command) {
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
$diplomacy = [];
for($i=1; $i <= $count; $i++) {
$dip = MYDB_fetch_array($result);
$diplomacy[$dip['you']] = $dip['state'];
@@ -2624,6 +2636,8 @@ function command_77($turn, $command) {
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
$diplomacy = [];
for($i=1; $i <= $count; $i++) {
$dip = MYDB_fetch_array($result);
$diplomacy[$dip['you']] = $dip['state'];
@@ -2684,6 +2698,8 @@ function command_78($turn, $command) {
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
$diplomacy = [];
for($i=1; $i <= $count; $i++) {
$dip = MYDB_fetch_array($result);
$diplomacy[$dip['you']] = $dip['state'];
+1 -1
View File
@@ -12,7 +12,7 @@ $userID = Session::getUserID();
$pw = $_POST['old_pw'];
$newPw = $_POST['new_pw'];
$response['result'] = false;
$response = ['result' => false];
$db = RootDB::db();