diff --git a/hwe/_admin5_submit.php b/hwe/_admin5_submit.php index 3c7c4995..d3bd5a26 100644 --- a/hwe/_admin5_submit.php +++ b/hwe/_admin5_submit.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); if($session->userGrade < 5) { //echo ""; @@ -17,10 +18,10 @@ $connect=$db->get(); switch($btn) { case "국가변경": if($nation == 0) { - $query = "update general set nation=0,level=0 where owner='{$session->userID}'"; + $query = "update general set nation=0,level=0 where owner='{$userID}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } else { - $query = "update general set nation='{$nation}',level=1 where owner='{$session->userID}'"; + $query = "update general set nation='{$nation}',level=1 where owner='{$userID}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } break; diff --git a/hwe/_simul.php b/hwe/_simul.php index f7a55d70..befadaa9 100644 --- a/hwe/_simul.php +++ b/hwe/_simul.php @@ -5,7 +5,7 @@ include "lib.php"; include "func.php"; $session = Session::requireGameLogin()->setReadOnly(); - +$userID = Session::getUserID(); //로그인 검사 @@ -51,7 +51,7 @@ $db = DB::db(); $connect=$db->get(); increaseRefresh("시뮬", 2); -$query = "select no,tournament,con,turntime from general where owner='{$session->userID}'"; +$query = "select no,tournament,con,turntime from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/a_bestGeneral.php b/hwe/a_bestGeneral.php index e34c8d49..e8cd2935 100644 --- a/hwe/a_bestGeneral.php +++ b/hwe/a_bestGeneral.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -15,7 +16,7 @@ $query = "select conlimit from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select con,turntime from general where owner='{$session->userID}'"; +$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); diff --git a/hwe/a_genList.php b/hwe/a_genList.php index 3a921631..19360623 100644 --- a/hwe/a_genList.php +++ b/hwe/a_genList.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -15,7 +16,7 @@ $query = "select conlimit from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select con,turntime from general where owner='{$session->userID}'"; +$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); diff --git a/hwe/a_history.php b/hwe/a_history.php index 27886455..701602dd 100644 --- a/hwe/a_history.php +++ b/hwe/a_history.php @@ -6,6 +6,7 @@ include "func.php"; $yearmonth = $_POST['yearmonth']; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -16,7 +17,7 @@ $query = "select startyear,year,month,conlimit from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select map,con,turntime from general where owner='{$session->userID}'"; +$query = "select map,con,turntime from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/a_kingdomList.php b/hwe/a_kingdomList.php index 2259be32..0bcc1b1a 100644 --- a/hwe/a_kingdomList.php +++ b/hwe/a_kingdomList.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -15,7 +16,7 @@ $query = "select conlimit from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select con,turntime from general where owner='{$session->userID}'"; +$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); diff --git a/hwe/a_status.php b/hwe/a_status.php index 757aa3e7..e7f8b8f8 100644 --- a/hwe/a_status.php +++ b/hwe/a_status.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -16,7 +17,7 @@ $query = "select conlimit from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select map,con,turntime from general where owner='{$session->userID}'"; +$query = "select map,con,turntime from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/a_vote.php b/hwe/a_vote.php index 67a5f0db..c1e5cadd 100644 --- a/hwe/a_vote.php +++ b/hwe/a_vote.php @@ -4,13 +4,14 @@ namespace sammo; include "lib.php"; include "func.php"; +$session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); -$session = Session::requireGameLogin()->setReadOnly(); increaseRefresh("설문조사", 1); -$query = "select no,vote from general where owner='{$session->userID}'"; +$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); diff --git a/hwe/b_auction.php b/hwe/b_auction.php index 7c6b90db..2cd0b8a7 100644 --- a/hwe/b_auction.php +++ b/hwe/b_auction.php @@ -5,13 +5,14 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); increaseRefresh("거래장", 2); -$query = "select no,special,con,turntime from general where owner='{$session->userID}'"; +$query = "select no,special,con,turntime from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/b_battleCenter.php b/hwe/b_battleCenter.php index 19538bda..4c99e851 100644 --- a/hwe/b_battleCenter.php +++ b/hwe/b_battleCenter.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -21,7 +22,7 @@ $query = "select nation from general where no='$gen'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $general = MYDB_fetch_array($result); -$query = "select no,nation,level,con,turntime,belong from general where owner='{$session->userID}'"; +$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/b_betting.php b/hwe/b_betting.php index 11436f1e..ff3487c0 100644 --- a/hwe/b_betting.php +++ b/hwe/b_betting.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -12,7 +13,7 @@ $connect=$db->get(); increaseRefresh("베팅장", 1); checkTurn(); -$query = "select no,tournament,con,turntime,bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 as bet from general where owner='{$session->userID}'"; +$query = "select no,tournament,con,turntime,bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 as bet from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -197,7 +198,7 @@ for($i=0; $i < 16; $i++) { echo "{$gen[$i]}"; } -$query = "select bet0,bet1,bet2,bet3,bet4,bet5,bet6,bet7,bet8,bet9,bet10,bet11,bet12,bet13,bet14,bet15 from general where owner='{$session->userID}'"; +$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); for($i=0; $i < 16; $i++) { diff --git a/hwe/b_chiefboard.php b/hwe/b_chiefboard.php index 3d129182..8d0c70cb 100644 --- a/hwe/b_chiefboard.php +++ b/hwe/b_chiefboard.php @@ -5,13 +5,14 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); increaseRefresh("기밀실", 1); -$query = "select no,nation,level from general where owner='{$session->userID}'"; +$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); diff --git a/hwe/b_chiefcenter.php b/hwe/b_chiefcenter.php index 550bc4ab..2f640a57 100644 --- a/hwe/b_chiefcenter.php +++ b/hwe/b_chiefcenter.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -15,7 +16,7 @@ $query = "select conlimit from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,nation,level,con,turntime,belong from general where owner='{$session->userID}'"; +$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php index 8994f549..2659008e 100644 --- a/hwe/b_currentCity.php +++ b/hwe/b_currentCity.php @@ -5,13 +5,14 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); increaseRefresh("현재도시", 1); -$query = "select no,nation,level,city from general where owner='{$session->userID}'"; +$query = "select no,nation,level,city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/b_dipcenter.php b/hwe/b_dipcenter.php index e0342346..9ec11191 100644 --- a/hwe/b_dipcenter.php +++ b/hwe/b_dipcenter.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -15,7 +16,7 @@ $query = "select conlimit from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,nation,level,con,turntime,belong from general where owner='{$session->userID}'"; +$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/b_diplomacy.php b/hwe/b_diplomacy.php index 3d7967d4..4753c3a3 100644 --- a/hwe/b_diplomacy.php +++ b/hwe/b_diplomacy.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -15,7 +16,7 @@ $query = "select turnterm from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,nation,map from general where owner='{$session->userID}'"; +$query = "select no,nation,map from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/b_genList.php b/hwe/b_genList.php index bd8ad050..1d39d0b0 100644 --- a/hwe/b_genList.php +++ b/hwe/b_genList.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -15,7 +16,7 @@ $query = "select conlimit from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,nation,level,con,turntime,belong from general where owner='{$session->userID}'"; +$query = "select no,nation,level,con,turntime,belong from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/b_myBossInfo.php b/hwe/b_myBossInfo.php index 29fbb795..82eef811 100644 --- a/hwe/b_myBossInfo.php +++ b/hwe/b_myBossInfo.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -13,7 +14,7 @@ increaseRefresh("인사부", 1); //훼섭 추방을 위해 갱신 checkTurn(); -$query = "select no,nation,level from general where owner='{$session->userID}'"; +$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); diff --git a/hwe/b_myCityInfo.php b/hwe/b_myCityInfo.php index d0c22e60..c65609c3 100644 --- a/hwe/b_myCityInfo.php +++ b/hwe/b_myCityInfo.php @@ -5,13 +5,14 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); increaseRefresh("세력도시", 1); -$query = "select no,nation,level from general where owner='{$session->userID}'"; +$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); @@ -58,7 +59,7 @@ $sel[$type] = "selected"; userID}'"; +$query = "select nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/b_myGenInfo.php b/hwe/b_myGenInfo.php index f960402c..9112cece 100644 --- a/hwe/b_myGenInfo.php +++ b/hwe/b_myGenInfo.php @@ -5,13 +5,14 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); increaseRefresh("세력장수", 1); -$query = "select no,nation,level from general where owner='{$session->userID}'"; +$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); diff --git a/hwe/b_myKingdomInfo.php b/hwe/b_myKingdomInfo.php index 16804c86..6975493d 100644 --- a/hwe/b_myKingdomInfo.php +++ b/hwe/b_myKingdomInfo.php @@ -5,13 +5,14 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); increaseRefresh("세력정보", 1); -$query = "select no,nation,level from general where owner='{$session->userID}'"; +$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); @@ -36,7 +37,7 @@ if($me['level'] == 0) {
userID}'"; +$query = "select nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php index cc9f2bd6..779699a2 100644 --- a/hwe/b_myPage.php +++ b/hwe/b_myPage.php @@ -5,13 +5,14 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); increaseRefresh("내정보", 1); -$query = "select myset from general where owner='{$session->userID}'"; +$query = "select myset from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); $me = MYDB_fetch_array($result); @@ -33,10 +34,10 @@ if ($btn == "설정저장" && $me['myset'] > 0) { 'map'=>$map, 'mode'=>$mode, 'tnmt'=>$tnmt - ], 'owner=%i', $session->userID); + ], 'owner=%i', $userID); } -$query = "select no,map,mode,tnmt,myset from general where owner='{$session->userID}'"; +$query = "select no,map,mode,tnmt,myset from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); $me = MYDB_fetch_array($result); diff --git a/hwe/b_nationboard.php b/hwe/b_nationboard.php index 36fb99c0..f2027cb9 100644 --- a/hwe/b_nationboard.php +++ b/hwe/b_nationboard.php @@ -5,13 +5,14 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); increaseRefresh("회의실", 1); -$query = "select no,nation from general where owner='{$session->userID}'"; +$query = "select no,nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/b_nationrule.php b/hwe/b_nationrule.php index 3d6ebd1e..7abe963b 100644 --- a/hwe/b_nationrule.php +++ b/hwe/b_nationrule.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -26,7 +27,7 @@ increaseRefresh("국법", 1); userID}'"; +$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); diff --git a/hwe/b_tournament.php b/hwe/b_tournament.php index 15f7e226..80cc76d9 100644 --- a/hwe/b_tournament.php +++ b/hwe/b_tournament.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -12,7 +13,7 @@ $connect=$db->get(); increaseRefresh("토너먼트", 1); checkTurn(); -$query = "select no,tournament,con,turntime from general where owner='{$session->userID}'"; +$query = "select no,tournament,con,turntime from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/b_troop.php b/hwe/b_troop.php index d09726f7..11395feb 100644 --- a/hwe/b_troop.php +++ b/hwe/b_troop.php @@ -5,13 +5,14 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); increaseRefresh("부대편성", 1); -$query = "select no,nation,troop from general where owner='{$session->userID}'"; +$query = "select no,nation,troop from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/c_auction.php b/hwe/c_auction.php index b843c323..fee2d8b7 100644 --- a/hwe/c_auction.php +++ b/hwe/c_auction.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -15,7 +16,7 @@ $query = "select turnterm from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); $admin = MYDB_fetch_array($result); -$query = "select no,name,gold,rice,special from general where owner='{$session->userID}'"; +$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); diff --git a/hwe/c_betting.php b/hwe/c_betting.php index 8af40dc0..39537469 100644 --- a/hwe/c_betting.php +++ b/hwe/c_betting.php @@ -9,6 +9,7 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -25,7 +26,7 @@ if($admin['tournament'] != 6) { exit(); } -$query = "select gold,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 general where owner='{$session->userID}'"; +$query = "select gold,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 general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -35,7 +36,7 @@ for($i=0; $i < 16; $i++) { $mebet = $me["bet{$i}"]; if($gold >= 10 && $gold <= 1000) { if($gold + 500 <= $me['gold'] && $gold + $mebet <= 1000 && $gold + $me['bet'] <= 1000) { - $query = "update general set gold=gold-'$gold',bet{$i}=bet{$i}+'$gold',betgold=betgold+'$gold' where owner='{$session->userID}'"; + $query = "update general set gold=gold-'$gold',bet{$i}=bet{$i}+'$gold',betgold=betgold+'$gold' where owner='{$userID}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $query = "update game set bet{$i}=bet{$i}+'$gold'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/c_chiefboard.php b/hwe/c_chiefboard.php index 7cc1598b..96344515 100644 --- a/hwe/c_chiefboard.php +++ b/hwe/c_chiefboard.php @@ -11,12 +11,13 @@ $num = Util::toInt(Util::array_get($_POST['num'])); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); if(getBlockLevel() != 1 && getBlockLevel() != 3) { - $query = "select no,nation from general where owner='{$session->userID}'"; + $query = "select no,nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/c_dipcenter.php b/hwe/c_dipcenter.php index b0eac691..47754969 100644 --- a/hwe/c_dipcenter.php +++ b/hwe/c_dipcenter.php @@ -7,11 +7,12 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); -$query = "select no,nation,level from general where owner='{$session->userID}'"; +$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); diff --git a/hwe/c_double.php b/hwe/c_double.php index 4b026e67..d6bff845 100644 --- a/hwe/c_double.php +++ b/hwe/c_double.php @@ -7,6 +7,7 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -36,18 +37,18 @@ if($command == 46) { $db->update('general', [ 'makenation'=>$name - ], 'owner=%i', $session->userID); + ], 'owner=%i', $userID); $count = sizeof($turn); $query = ['con'=>$db->eval('con')]; foreach($turn as $turnIdx){ $query['turn'.$turnIdx] = $comStr; } - $db->upate('general', $query, 'owner=%i', $session->userID); + $db->upate('general', $query, 'owner=%i', $userID); header('Location:index.php'); //통합제의 } elseif($command == 53) { - $query = "select nation,level from general where owner='{$session->userID}'"; + $query = "select nation,level from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -74,7 +75,7 @@ if($command == 46) { echo 'b_chiefcenter.php';//TODO:debug all and replace //불가침 } elseif($command == 61) { - $query = "select nation,level from general where owner='{$session->userID}'"; + $query = "select nation,level from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -103,7 +104,7 @@ if($command == 46) { //백성동원, 수몰, 허보, 피장파장, 의병모집, 이호경식, 급습 //국기변경 } elseif($command == 23 || $command == 24 || $command == 27 || $command == 51 || $command == 52 || $command > 60) { - $query = "select no,nation,level from general where owner='{$session->userID}'"; + $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); @@ -126,7 +127,7 @@ if($command == 46) { for($i=0; $i < $count; $i++) { $str .= ",turn{$turn[$i]}='{$comStr}'"; } - $query = "update general set {$str} where owner='{$session->userID}'"; + $query = "update general set {$str} where owner='{$userID}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //echo ""; echo 'index.php';//TODO:debug all and replace diff --git a/hwe/c_myBossInfo.php b/hwe/c_myBossInfo.php index eabdbab6..8305b970 100644 --- a/hwe/c_myBossInfo.php +++ b/hwe/c_myBossInfo.php @@ -12,6 +12,7 @@ $outlist = Util::toInt(Util::array_get($_POST['outlist'])); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -20,7 +21,7 @@ $query = "select startyear,year,month from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,nation,level from general where owner='{$session->userID}'"; +$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); $meLevel = $me['level']; diff --git a/hwe/c_nationboard.php b/hwe/c_nationboard.php index 70ca196a..7bafd78f 100644 --- a/hwe/c_nationboard.php +++ b/hwe/c_nationboard.php @@ -10,12 +10,13 @@ $num = Util::toInt(Util::array_get($_POST['num'])); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); if(getBlockLevel() != 1 && getBlockLevel() != 3) { - $query = "select no,nation from general where owner='{$session->userID}'"; + $query = "select no,nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/c_nationrule.php b/hwe/c_nationrule.php index 14e3ffa7..89366ac7 100644 --- a/hwe/c_nationrule.php +++ b/hwe/c_nationrule.php @@ -7,11 +7,12 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); -$query = "select no,nation from general where owner='{$session->userID}'"; +$query = "select no,nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/c_tournament.php b/hwe/c_tournament.php index 11fa0eb0..e0b0df5e 100644 --- a/hwe/c_tournament.php +++ b/hwe/c_tournament.php @@ -10,6 +10,7 @@ $sel = Util::toInt(Util::array_get($_POST['sel'])); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -18,7 +19,7 @@ $query = "select tournament,phase,tnmt_type,develcost from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,name,tournament from general where owner='{$session->userID}'"; +$query = "select no,name,tournament from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/c_vacation.php b/hwe/c_vacation.php index 99859b20..eda7ba4b 100644 --- a/hwe/c_vacation.php +++ b/hwe/c_vacation.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -15,7 +16,7 @@ $admin = MYDB_fetch_array($result); $admin['killturn'] *= 3; -$query = "update general set killturn='{$admin['killturn']}' where owner='{$session->userID}'"; +$query = "update general set killturn='{$admin['killturn']}' where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //echo ""; diff --git a/hwe/c_vote.php b/hwe/c_vote.php index 48031658..a89cbecf 100644 --- a/hwe/c_vote.php +++ b/hwe/c_vote.php @@ -8,6 +8,7 @@ $sel = Util::toInt(Util::array_get($_POST['sel'])); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -16,13 +17,13 @@ $query = "select develcost,vote,votecomment from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,vote,name,nation,horse,weap,book,item,npc from general where owner='{$session->userID}'"; +$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); if($btn == "투표" && $me['vote'] == 0 && $sel > 0) { $develcost = $admin['develcost'] * 5; - $query = "update general set gold=gold+{$develcost},vote='{$sel}' where owner='{$session->userID}'"; + $query = "update general set gold=gold+{$develcost},vote='{$sel}' where owner='{$userID}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $log = []; diff --git a/hwe/commandlist.php b/hwe/commandlist.php index c6a2e616..c71863d2 100644 --- a/hwe/commandlist.php +++ b/hwe/commandlist.php @@ -65,12 +65,12 @@ function myclock() { myCommandList(); function myCommandList() { - $session = Session::getInstance(); global $_basecolor, $_basecolor2, $_basecolor3; global $images; $db = DB::db(); $connect=$db->get(); + $userID = Session::getUserID(); $date = date('Y-m-d H:i:s'); @@ -79,7 +79,7 @@ function myCommandList() { $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); - $query = "select no,turntime,term,turn0,turn1,turn2,turn3,turn4,turn5,turn6,turn7,turn8,turn9,turn10,turn11,turn12,turn13,turn14,turn15,turn16,turn17,turn18,turn19,turn20,turn21,turn22,turn23 from general where owner='{$session->userID}'"; + $query = "select no,turntime,term,turn0,turn1,turn2,turn3,turn4,turn5,turn6,turn7,turn8,turn9,turn10,turn11,turn12,turn13,turn14,turn15,turn16,turn17,turn18,turn19,turn20,turn21,turn22,turn23 from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); $turn = getTurn($me, 2); diff --git a/hwe/d_ally.php b/hwe/d_ally.php index bcc92f80..692e1c69 100644 --- a/hwe/d_ally.php +++ b/hwe/d_ally.php @@ -5,7 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); - +$userID = Session::getUserID(); //FIXME: 망했음. CriticalFailure. 재 구현. $db = DB::db(); @@ -17,7 +17,7 @@ $query = "select year,month from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$session->userID}'"; +$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/d_cancel.php b/hwe/d_cancel.php index 49c9cc40..344b3a6e 100644 --- a/hwe/d_cancel.php +++ b/hwe/d_cancel.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); //FIXME: 망했음. CriticalFailure. 재 구현. @@ -15,7 +16,7 @@ $query = "select year,month from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$session->userID}'"; +$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/d_cease.php b/hwe/d_cease.php index 22a7c540..098a5b35 100644 --- a/hwe/d_cease.php +++ b/hwe/d_cease.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); //FIXME: 망했음. CriticalFailure. 재 구현. @@ -15,7 +16,7 @@ $query = "select year,month from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$session->userID}'"; +$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/d_merge.php b/hwe/d_merge.php index d7e4fbea..f1b1db84 100644 --- a/hwe/d_merge.php +++ b/hwe/d_merge.php @@ -5,6 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -15,7 +16,7 @@ $query = "select year,month from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$session->userID}'"; +$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/d_scout.php b/hwe/d_scout.php index 52c3a6a5..f0bbf68a 100644 --- a/hwe/d_scout.php +++ b/hwe/d_scout.php @@ -11,7 +11,7 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); - +$userID = Session::getUserID(); //FIXME: 망했음. CriticalFailure. 재 구현. $db = DB::db(); @@ -21,7 +21,7 @@ $query = "select startyear,year,month,killturn from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,name,nation,nations,level,troop,npc,gold,rice from general where owner='{$session->userID}'"; +$query = "select no,name,nation,nations,level,troop,npc,gold,rice from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/d_surrender.php b/hwe/d_surrender.php index d660b932..bf63dea5 100644 --- a/hwe/d_surrender.php +++ b/hwe/d_surrender.php @@ -5,7 +5,7 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); - +$userID = Session::getUserID(); //FIXME: 망했음. CriticalFailure. 재 구현. $db = DB::db(); @@ -15,7 +15,7 @@ $query = "select year,month from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$session->userID}'"; +$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/func.php b/hwe/func.php index 38747f40..fa0b599d 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -117,13 +117,13 @@ function getRandGenName() { function cityInfo() { - $session = Session::getInstance(); global $_basecolor, $_basecolor2, $images; $db = DB::db(); $connect=$db->get(); + $userID = Session::getUserID(); - $query = "select no,city from general where owner='{$session->userID}'"; + $query = "select no,city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -232,17 +232,17 @@ function cityInfo() { } function myNationInfo() { - $session = Session::getInstance(); global $_basecolor, $_basecolor2, $images; $db = DB::db(); $connect=$db->get(); + $userID = Session::getUserID(); $query = "select startyear,year from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); - $query = "select no,nation from general where owner='{$session->userID}'"; + $query = "select no,nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -411,15 +411,15 @@ function commandGroup($typename, $type=0) { } function commandTable() { - $session = Session::getInstance(); $db = DB::db(); $connect=$db->get(); + $userID = Session::getUserID(); $query = "select startyear,year,develcost,scenario from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); - $query = "select no,npc,troop,city,nation,level,crew,makelimit,special from general where owner='{$session->userID}'"; + $query = "select no,npc,troop,city,nation,level,crew,makelimit,special from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -649,15 +649,15 @@ function commandTable() { } function CoreCommandTable() { - $session = Session::getInstance(); $db = DB::db(); $connect=$db->get(); + $userID = Session::getUserID(); $query = "select develcost from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); - $query = "select no,nation,city,level from general where owner='{$session->userID}'"; + $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); @@ -749,9 +749,9 @@ function CoreCommandTable() { function myInfo() { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); - $query = "select no from general where owner='{$session->userID}'"; + $query = "select no from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -938,11 +938,11 @@ function generalInfo($no) { } function myInfo2() { - $session = Session::getInstance(); $db = DB::db(); $connect=$db->get(); + $userID = Session::getUserID(); - $query = "select no from general where owner='{$session->userID}'"; + $query = "select no from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -1104,11 +1104,11 @@ function onlineNation() { } function nationMsg() { - $session = Session::getInstance(); $db = DB::db(); $connect=$db->get(); + $userID = Session::getUserID(); - $query = "select no,nation from general where owner='{$session->userID}'"; + $query = "select no,nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -2388,9 +2388,9 @@ function getAdmin() { function getMe() { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); - $query = "select * from general where owner='{$session->userID}'"; + $query = "select * from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("접속자가 많아 접속을 중단합니다. 잠시후 갱신해주세요.
getMe : ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/func_command.php b/hwe/func_command.php index a54f3813..4db7e281 100644 --- a/hwe/func_command.php +++ b/hwe/func_command.php @@ -685,7 +685,7 @@ where nation='{$general['nation']}' function command_Single($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); $command = EncodeCommand(0, 0, 0, $command); @@ -694,7 +694,7 @@ function command_Single($turn, $command) { for($i=0; $i < $count; $i++) { $str .= ",turn{$turn[$i]}='{$command}'"; } - $query = "update general set {$str} where owner='{$session->userID}'"; + $query = "update general set {$str} where owner='{$userID}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); //echo ""; echo 'commandlist.php';//TODO:debug all and replace @@ -704,11 +704,11 @@ function command_Single($turn, $command) { function command_Chief($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); $command = EncodeCommand(0, 0, 0, $command); - $query = "select nation,level from general where owner='{$session->userID}'"; + $query = "select nation,level from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/func_message.php b/hwe/func_message.php index 0b86cedf..9c7bd8e7 100644 --- a/hwe/func_message.php +++ b/hwe/func_message.php @@ -280,10 +280,10 @@ function getMailboxList(){ function DecodeMsg($msg, $type, $who, $date, $bg, $num=0) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); //FIXME: 폐기 - $query = "select no,nation,name,picture,level from general where owner='{$session->userID}'"; + $query = "select no,nation,name,picture,level from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -349,9 +349,9 @@ function moveMsg($table, $msgtype, $msgnum, $msg, $type, $who, $when, $column, $ function MsgDip($bg) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); - $query = "select no,nation from general where owner='{$session->userID}'"; + $query = "select no,nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/func_template.php b/hwe/func_template.php index bb9112f0..4b3f4204 100644 --- a/hwe/func_template.php +++ b/hwe/func_template.php @@ -90,13 +90,14 @@ function commandButton() { global $_basecolor, $_basecolor2; $session = Session::getInstance(); + $userID = Session::getUserID(); $generalID = $session->generalID; if($generalID === null){ return ''; } $db = DB::db(); - $me = $db->queryFirstRow("select no,nation,level,belong from general where owner=%i", $session->userID); + $me = $db->queryFirstRow("select no,nation,level,belong from general where owner=%i", $userID); $nation = $db->queryFirstRow("select nation,color,secretlimit from nation where nation=%i",$me['nation']); diff --git a/hwe/index.php b/hwe/index.php index a6138389..8c5f9378 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -5,20 +5,21 @@ include "lib.php"; include "func.php"; $session = Session::requireLogin()->loginGame(); +$userID = Session::getUserID(); increaseRefresh("메인", 1); $db = DB::db(); $connect=$db->get(); -if(!$session->userID){ +if(!$userID){ header('Location:..'); die(); } $me = $db->queryFirstRow( 'SELECT no,con,turntime,newmsg,newvote,map from general where owner = %i', - $session->userID + $userID ); //턴 실행. @@ -34,14 +35,14 @@ if(!$session->generalID){ $session = Session::requireGameLogin(); } $session->setReadOnly(); - +$userID = Session::getUserID(); if($me['newmsg'] == 1 || $me['newvote'] == 1) { $db->update('general', [ 'newmsg'=>0, 'newvote'=>0 - ], 'owner=%i', $session->userID); + ], 'owner=%i', $userID); } $query = "select develcost,online,conlimit,tournament,tnmt_type,turnterm,scenario,scenario_text,extended_general,fiction,npcmode,vote from game limit 1"; diff --git a/hwe/j_adjust_icon.php b/hwe/j_adjust_icon.php index 65c7e90a..4121e998 100644 --- a/hwe/j_adjust_icon.php +++ b/hwe/j_adjust_icon.php @@ -4,8 +4,7 @@ namespace sammo; include('lib.php'); $session = Session::requireGameLogin([])->setReadOnly(); -$userID = $session->userID; -$generalID = $session->generalID; +$userID = Session::getUserID(); $rootDB = RootDB::db(); $db = DB::db(); diff --git a/hwe/j_basic_info.php b/hwe/j_basic_info.php index b5b64a9b..ee4b8a8b 100644 --- a/hwe/j_basic_info.php +++ b/hwe/j_basic_info.php @@ -9,14 +9,9 @@ $result = [ "isChief"=>false ]; $session = Session::requireGameLogin([])->setReadOnly(); +$userID = Session::getUserID(); -$generalID = $session->generalID; - -if(!$generalID){ - Json::die($result); -} - -$generalInfo = DB::db()->queryFirstRow('SELECT `nation`, `level` from `general` where `no`=%i', $generalID); +$generalInfo = DB::db()->queryFirstRow('SELECT `no`, `nation`, `level` from `general` where `owner`=%i', $userID); if(!$generalInfo){ Json::die($result); } diff --git a/hwe/j_msgsubmit.php b/hwe/j_msgsubmit.php index 43f11213..8f6bdd99 100644 --- a/hwe/j_msgsubmit.php +++ b/hwe/j_msgsubmit.php @@ -8,6 +8,7 @@ include 'func.php'; $session = Session::requireGameLogin([ 'newSeq' => false ]); +$userID = Session::getUserID(); //NOTE: 전송 메시지 시간 계산을 위해 Session을 쓰기 가능 상태로 열어둠. /** @@ -47,7 +48,7 @@ if(getBlockLevel() == 1 || getBlockLevel() == 3) { $conlimit = $db->queryFirstField('select conlimit from game limit 1'); -$me = $db->queryFirstRow('select `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr` from `general` where `owner` = %i', $session->userID); +$me = $db->queryFirstRow('select `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr` from `general` where `owner` = %i', $userID); if(!$me){ $session->logoutGame(); diff --git a/hwe/j_server_basic_info.php b/hwe/j_server_basic_info.php index ff946d79..c388c1e0 100644 --- a/hwe/j_server_basic_info.php +++ b/hwe/j_server_basic_info.php @@ -7,6 +7,7 @@ $session = Session::requireLogin([ 'game'=>'x', 'me'=>null ])->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); @@ -23,7 +24,7 @@ $game['nationCnt'] = $nationCnt; $me = []; -$general = $db->queryFirstRow('SELECT name, picture, imgsvr from general where owner=%i', $session->userID); +$general = $db->queryFirstRow('SELECT name, picture, imgsvr from general where owner=%i', $userID); if($general){ $me['name'] = $general['name']; diff --git a/hwe/join.php b/hwe/join.php index dff55fbb..e4626a63 100644 --- a/hwe/join.php +++ b/hwe/join.php @@ -5,8 +5,7 @@ include "lib.php"; include "func.php"; $session = Session::requireLogin()->setReadOnly(); - -$userID = $session->userID; +$userID = Session::getUserID(); if(!$userID) { MessageBox("잘못된 접근입니다!!!"); diff --git a/hwe/join_post.php b/hwe/join_post.php index 59957e4d..6bf37201 100644 --- a/hwe/join_post.php +++ b/hwe/join_post.php @@ -41,6 +41,7 @@ if(!$v->validate()){ } $session = Session::requireLogin()->setReadOnly(); +$userID = Session::getUserID(); //NOTE: 이 페이지에서는 세션에 데이터를 등록하지 않음. 로그인은 이후에. $name = $_POST['name']; @@ -54,7 +55,6 @@ $intel = (int)$_POST['intel']; $mylog = []; -$userID = $session->userID; $rootDB = RootDB::db(); //회원 테이블에서 정보확인 $member = $rootDB->queryFirstRow('SELECT `no`, id, picture, grade, `name` FROM MEMBER WHERE no=%i', $userID); diff --git a/hwe/preprocessing.php b/hwe/preprocessing.php index 54656ad9..20c72eec 100644 --- a/hwe/preprocessing.php +++ b/hwe/preprocessing.php @@ -5,17 +5,19 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $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); -$query = "select no,name,nation,con from general where owner='{$session->userID}'"; +$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); diff --git a/hwe/processing.php b/hwe/processing.php index b62c83d6..4bdecd62 100644 --- a/hwe/processing.php +++ b/hwe/processing.php @@ -176,9 +176,9 @@ function ender($type=0) { function command_99($turn) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); - $query = "select nation,level from general where owner='{$session->userID}'"; + $query = "select nation,level from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -238,7 +238,7 @@ function GetExplain() { function command_11($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); global $_basecolor, $_basecolor2, $images, $image; starter("징병"); @@ -246,7 +246,7 @@ function command_11($turn, $command) { $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $admin = MYDB_fetch_array($result); - $query = "select no,nation,level,personal,special2,level,city,crew,horse,injury,leader,crewtype,gold from general where owner='{$session->userID}'"; + $query = "select no,nation,level,personal,special2,level,city,crew,horse,injury,leader,crewtype,gold from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -447,7 +447,7 @@ function calc(cost, formnum) { function command_12($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); global $_basecolor, $_basecolor2, $images, $image; starter("모병"); @@ -455,7 +455,7 @@ function command_12($turn, $command) { $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $admin = MYDB_fetch_array($result); - $query = "select no,nation,level,personal,special2,level,city,crew,horse,injury,leader,crewtype,gold from general where owner='{$session->userID}'"; + $query = "select no,nation,level,personal,special2,level,city,crew,horse,injury,leader,crewtype,gold from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -658,10 +658,10 @@ function calc(cost, formnum) { function command_15($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("재편성"); - $query = "select no,nation from general where owner='{$session->userID}'"; + $query = "select no,nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); $me = $general['no']; @@ -703,10 +703,10 @@ function command_15($turn, $command) { function command_16($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("출병"); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -746,10 +746,10 @@ function command_16($turn, $command) { function command_21($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("이동"); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -789,12 +789,12 @@ function command_21($turn, $command) { function command_22($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); die('비활성화됨');//TODO:등용장 대 디자인 starter("등용"); - $query = "select nation from general where owner='{$session->userID}'"; + $query = "select nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -854,10 +854,10 @@ function command_22($turn, $command) { function command_23($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("포상", 1); - $query = "select no,nation from general where owner='{$session->userID}'"; + $query = "select no,nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -928,10 +928,10 @@ function command_23($turn, $command) { function command_24($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("몰수", 1); - $query = "select no,nation from general where owner='{$session->userID}'"; + $query = "select no,nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -1005,7 +1005,7 @@ function command_25($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("임관"); @@ -1013,7 +1013,7 @@ function command_25($turn, $command) { $result = MYDB_query($query, $connect) or Error("command_46 ".MYDB_error($connect),""); $admin = MYDB_fetch_array($result); - $query = "select no,nations from general where owner='{$session->userID}'"; + $query = "select no,nations from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("command_27 ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -1083,11 +1083,11 @@ function command_25($turn, $command) { function command_27($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("발령", 1); - $query = "select no,nation,level from general where owner='{$session->userID}'"; + $query = "select no,nation,level from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("command_27 ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -1143,10 +1143,10 @@ function command_27($turn, $command) { function command_30($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("강행"); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -1186,10 +1186,10 @@ ender(); function command_31($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("첩보"); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -1233,10 +1233,10 @@ function command_31($turn, $command) { function command_32($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("화계"); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -1275,10 +1275,10 @@ function command_32($turn, $command) { function command_33($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("탈취"); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -1317,10 +1317,10 @@ function command_33($turn, $command) { function command_34($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("파괴"); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -1359,10 +1359,10 @@ function command_34($turn, $command) { function command_35($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("선동"); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -1401,10 +1401,10 @@ function command_35($turn, $command) { function command_36($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("기습"); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -1443,10 +1443,10 @@ function command_36($turn, $command) { function command_43($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("증여"); - $query = "select no,nation from general where owner='{$session->userID}'"; + $query = "select no,nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -1663,11 +1663,11 @@ function command_46($turn, $command) { function command_48($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("장비 매매"); - $query = "select no,city,gold from general where owner='{$session->userID}'"; + $query = "select no,city,gold from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("command_48 ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); $city = getCity($me['city'], "secu"); @@ -1780,11 +1780,11 @@ function command_49($turn, $command) { function command_51($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("항복 권고", 1); - $query = "select nation from general where owner='{$session->userID}'"; + $query = "select nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -1835,11 +1835,11 @@ function command_51($turn, $command) { function command_52($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("원조", 1); - $query = "select nation from general where owner='{$session->userID}'"; + $query = "select nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -1913,11 +1913,11 @@ function command_52($turn, $command) { function command_53($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("통합제의", 1); - $query = "select no,nation from general where owner='{$session->userID}'"; + $query = "select no,nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("command_53 ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -1982,10 +1982,10 @@ function command_53($turn, $command) { function command_54($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("선양"); - $query = "select no,nation from general where owner='{$session->userID}'"; + $query = "select no,nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -2029,11 +2029,11 @@ function command_54($turn, $command) { function command_61($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("불가침", 1); - $query = "select nation from general where owner='{$session->userID}'"; + $query = "select nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -2113,11 +2113,11 @@ function command_61($turn, $command) { function command_62($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("선전포고", 1); - $query = "select nation from general where owner='{$session->userID}'"; + $query = "select nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -2180,11 +2180,11 @@ function command_62($turn, $command) { function command_63($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("종전", 1); - $query = "select nation from general where owner='{$session->userID}'"; + $query = "select nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -2239,11 +2239,11 @@ function command_63($turn, $command) { function command_64($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("파기", 1); - $query = "select nation from general where owner='{$session->userID}'"; + $query = "select nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -2298,10 +2298,10 @@ function command_64($turn, $command) { function command_65($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("초토화", 1); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -2338,10 +2338,10 @@ echo "
function command_66($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("천도", 1); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -2379,10 +2379,10 @@ echo "
function command_67($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("증축", 1); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -2420,10 +2420,10 @@ echo "
function command_68($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("감축", 1); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -2461,10 +2461,10 @@ echo "
function command_72($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("백성동원", 1); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -2502,10 +2502,10 @@ echo "
function command_73($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("수몰", 1); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -2543,10 +2543,10 @@ echo "
function command_74($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("허보", 1); - $query = "select city from general where owner='{$session->userID}'"; + $query = "select city from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $general = MYDB_fetch_array($result); @@ -2584,11 +2584,11 @@ echo "
function command_75($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("피장파장", 1); - $query = "select nation from general where owner='{$session->userID}'"; + $query = "select nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -2644,11 +2644,11 @@ function command_75($turn, $command) { function command_77($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("이호경식", 1); - $query = "select nation from general where owner='{$session->userID}'"; + $query = "select nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); @@ -2704,11 +2704,11 @@ function command_77($turn, $command) { function command_78($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::getInstance(); + $userID = Session::getUserID(); starter("급습", 1); - $query = "select nation from general where owner='{$session->userID}'"; + $query = "select nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/select_npc.php b/hwe/select_npc.php index 87c42a97..b36c03b8 100644 --- a/hwe/select_npc.php +++ b/hwe/select_npc.php @@ -5,9 +5,9 @@ include "lib.php"; include "func.php"; $session = Session::requireLogin()->setReadOnly(); +$userID = Session::getUserID(); $rootDB = RootDB::db(); -$userID = $session->userID; //회원 테이블에서 정보확인 $member = $rootDB->queryFirstRow('select no,name,picture,grade from MEMBER where no=%i', $userID); MYDB_fetch_array($result); diff --git a/hwe/select_npc_post.php b/hwe/select_npc_post.php index fec0c792..57f8098f 100644 --- a/hwe/select_npc_post.php +++ b/hwe/select_npc_post.php @@ -15,10 +15,9 @@ if(!$v->validate()){ } $session = Session::requireLogin()->setReadOnly(); +$userID = Session::getUserID(); $face = (int)$_POST['face']; - -$userID = $session->userID; $rootDB = RootDB::db(); //회원 테이블에서 정보확인 diff --git a/hwe/turn.php b/hwe/turn.php index aad233ea..e80ae572 100644 --- a/hwe/turn.php +++ b/hwe/turn.php @@ -7,6 +7,7 @@ include "func.php"; $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); @@ -17,7 +18,7 @@ $query = "select conlimit from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,name,nation,con from general where owner='{$session->userID}'"; +$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); @@ -40,7 +41,7 @@ case 0: if($k >= 24) break; $query .= ","; } - $query .= " where owner='{$session->userID}'"; + $query .= " where owner='{$userID}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } */ @@ -54,7 +55,7 @@ case 0: if($k >= 24) break; } } - $query .= " where owner='{$session->userID}'"; + $query .= " where owner='{$userID}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 1: @@ -72,7 +73,7 @@ case 1: if($k < 0) break; $query .= ","; } - $query .= " where owner='{$session->userID}'"; + $query .= " where owner='{$userID}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; case 2: @@ -90,7 +91,7 @@ case 2: if($i >= 24) break; $query .= ","; } - $query .= " where owner='{$session->userID}'"; + $query .= " where owner='{$userID}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); break; } diff --git a/hwe/turn_pop_core.php b/hwe/turn_pop_core.php index a33c5102..06f3614c 100644 --- a/hwe/turn_pop_core.php +++ b/hwe/turn_pop_core.php @@ -5,11 +5,12 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); -$query = "select no from general where owner='{$session->userID}'"; +$query = "select no from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/turn_push_core.php b/hwe/turn_push_core.php index 709aa51b..1d5cb31d 100644 --- a/hwe/turn_push_core.php +++ b/hwe/turn_push_core.php @@ -5,11 +5,12 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); +$userID = Session::getUserID(); $db = DB::db(); $connect=$db->get(); -$query = "select no from general where owner='{$session->userID}'"; +$query = "select no from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/i_entrance/j_change_password.php b/i_entrance/j_change_password.php index e4aed8f0..91aebd16 100644 --- a/i_entrance/j_change_password.php +++ b/i_entrance/j_change_password.php @@ -4,6 +4,7 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); $session = Session::requireLogin([])->setReadOnly(); +$userID = Session::getUserID(); // 외부 파라미터 // $_POST['old_pw'] : PW @@ -17,11 +18,11 @@ $db = RootDB::db(); $userInfo = $db->update('member',[ 'pw'=>$db->sqleval('sha2(concat(salt, %s, salt), 512)', $newPw) -], 'no=%i and pw=sha2(concat(salt, %s, salt), 512)', $session->userID, $pw); +], 'no=%i and pw=sha2(concat(salt, %s, salt), 512)', $userID, $pw); if(!$db->affectedRows()){ $db->insert('member_log', [ - 'member_no'=>$session->userID, + 'member_no'=>$userID, 'action_type'=>'change_pw', 'action'=>Json::encode([ 'type'=>'plain', @@ -36,7 +37,7 @@ if(!$db->affectedRows()){ } $db->insert('member_log', [ - 'member_no'=>$session->userID, + 'member_no'=>$userID, 'action_type'=>'change_pw', 'action'=>Json::encode([ 'type'=>'plain', diff --git a/i_entrance/j_delete_me.php b/i_entrance/j_delete_me.php index cbb81b31..c999e113 100644 --- a/i_entrance/j_delete_me.php +++ b/i_entrance/j_delete_me.php @@ -4,6 +4,7 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); $session = Session::requireLogin([]); +$userID = Session::getUserID(); // 외부 파라미터 // $_POST['pw'] : PW @@ -21,7 +22,7 @@ $db = RootDB::db(); $userInfo = $db->queryFirstRow('SELECT oauth_id, oauth_type, email, delete_after FROM MEMBER '. 'WHERE `no`=%i and pw=sha2(concat(salt, %s, salt), 512)', - $session->userID, $pw); + $userID, $pw); if(!$userInfo){ Json::die([ @@ -39,7 +40,7 @@ if($userInfo['delete_after']){ $db->update('member',[ 'delete_after'=>TimeUtil::DatetimeFromNowMinute(60*24*30) -], 'no=%i', $session->userID); +], 'no=%i', $userID); if(!$db->affectedRows()){ Json::die([ @@ -51,7 +52,7 @@ if(!$db->affectedRows()){ $db->insert('member_log', [ - 'member_no'=>$session->userID, + 'member_no'=>$userID, 'action_type'=>'delete' ]); diff --git a/i_entrance/j_get_user_info.php b/i_entrance/j_get_user_info.php index 3070d44b..c1383d53 100644 --- a/i_entrance/j_get_user_info.php +++ b/i_entrance/j_get_user_info.php @@ -4,11 +4,12 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); $session = Session::requireLogin([])->setReadOnly(); +$userID = Session::getUserID(); // 외부 파라미터 $db = RootDB::db(); -$member = $db->queryFirstRow('SELECT `id`, `name`, `grade`, `picture` FROM `MEMBER` WHERE `NO` = %i', $session->userID); +$member = $db->queryFirstRow('SELECT `id`, `name`, `grade`, `picture` FROM `MEMBER` WHERE `NO` = %i', $userID); if(!$member['picture']){ $picture = IMAGE.'/default.jpg'; diff --git a/i_entrance/j_icon_change.php b/i_entrance/j_icon_change.php index 3beb4f65..1089f075 100644 --- a/i_entrance/j_icon_change.php +++ b/i_entrance/j_icon_change.php @@ -4,6 +4,7 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); $session = Session::requireLogin([])->setReadOnly(); +$userID = Session::getUserID(); // 외부 파라미터 // $_FILES['image_upload'] : 사진파일 @@ -21,7 +22,7 @@ $imageType = $size[2]; $availableImageType = array('.jpg'=>IMAGETYPE_JPEG, '.png'=>IMAGETYPE_PNG, '.gif'=>IMAGETYPE_GIF); $db = RootDB::db(); -$member = $db->queryFirstRow('SELECT `ID`, `PICTURE` FROM `MEMBER` WHERE `NO` = %i', $session->userID); +$member = $db->queryFirstRow('SELECT `ID`, `PICTURE` FROM `MEMBER` WHERE `NO` = %i', $userID); $picName = $member['PICTURE']; @@ -79,7 +80,7 @@ if(!is_uploaded_file($image['tmp_name'])) { RootDB::db()->update('MEMBER',[ 'PICTURE' => $pic, 'IMGSVR' => 1 - ], 'NO=%i', $session->userID); + ], 'NO=%i', $userID); $servers = []; diff --git a/i_entrance/j_icon_delete.php b/i_entrance/j_icon_delete.php index 49f522b3..a0e59432 100644 --- a/i_entrance/j_icon_delete.php +++ b/i_entrance/j_icon_delete.php @@ -4,12 +4,13 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); $session = Session::requireLogin([])->setReadOnly(); +$userID = Session::getUserID(); // 외부 파라미터 $respone = []; $db = RootDB::db(); -$picName = $db->queryFirstField('SELECT picture FROM `MEMBER` WHERE `NO` = %i', $session->userID); +$picName = $db->queryFirstField('SELECT picture FROM `MEMBER` WHERE `NO` = %i', $userID); if($picName && strlen($picName) > 11){ $dt = substr($picName, -8); @@ -34,7 +35,7 @@ if($dt == $rf) { $db->update('MEMBER', [ 'PICTURE'=>'default.jpg', 'IMGSVR'=>0, - ], 'NO=%i', $session->userID); + ], 'NO=%i', $userID); $servers = []; diff --git a/i_entrance/j_logout.php b/i_entrance/j_logout.php index 63d0c3ea..bf56974f 100644 --- a/i_entrance/j_logout.php +++ b/i_entrance/j_logout.php @@ -3,20 +3,17 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); -$session = Session::getInstance(); -if(!$session->isLoggedIn()){ - //로그인 안했다니까... - Json::die([ - 'result'=>true - ]); -} - +$session = Session::requireLogin([ + 'result'=>true, + 'reason'=>'로그인 되지 않았습니다' +]); +$userID = Session::getUserID(); // 외부 파라미터 RootDB::db()->insert('member_log',[ - 'member_no'=>$session->userID, + 'member_no'=>$userID, 'action_type'=>'logout', 'action'=>Json::encode([ 'ip'=>Util::get_client_ip(true) diff --git a/oauth_kakao/j_change_pw.php b/oauth_kakao/j_change_pw.php index 44db7042..eb0db4b6 100644 --- a/oauth_kakao/j_change_pw.php +++ b/oauth_kakao/j_change_pw.php @@ -10,8 +10,7 @@ $nowDate = TimeUtil::DatetimeNow(); $session = Session::requireLogin([ 'reason'=>'로그인이 되어있지 않습니다' ]); - -$userID = $session->userID; +$userID = Session::getUserID(); $access_token = $session->access_token; $expires = $session->expires; $refresh_token = $session->refresh_token;