From 0c0ef213f96a00debcebbedf107834ef82ac61ed Mon Sep 17 00:00:00 2001 From: hide_d Date: Thu, 5 Apr 2018 02:24:46 +0900 Subject: [PATCH] =?UTF-8?q?dbConn=20=EC=82=AD=EC=A0=9C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/_119.php | 4 +++- hwe/_119_b.php | 5 ++++- hwe/_admin1.php | 4 +++- hwe/_admin1_submit.php | 4 +++- hwe/_admin2.php | 4 +++- hwe/_admin2_submit.php | 3 ++- hwe/_admin4.php | 4 +++- hwe/_admin4_submit.php | 4 +++- hwe/_admin5.php | 6 ++++-- hwe/_admin5_submit.php | 4 +++- hwe/_admin6.php | 6 ++++-- hwe/_admin7.php | 6 ++++-- hwe/_admin8.php | 6 ++++-- hwe/_simul.php | 3 ++- hwe/a_bestGeneral.php | 4 +++- hwe/a_emperior.php | 5 ++++- hwe/a_emperior2.php | 5 ++++- hwe/a_genList.php | 5 ++++- hwe/a_hallOfFame.php | 5 ++++- hwe/a_history.php | 5 ++++- hwe/a_kingdomList.php | 5 ++++- hwe/a_npcList.php | 5 ++++- hwe/a_status.php | 5 ++++- hwe/a_traffic.php | 5 ++++- hwe/a_vote.php | 5 ++++- hwe/b_auction.php | 5 ++++- hwe/b_battleCenter.php | 5 ++++- hwe/b_betting.php | 5 ++++- hwe/b_chiefboard.php | 5 ++++- hwe/b_chiefcenter.php | 5 ++++- hwe/b_currentCity.php | 5 ++++- hwe/b_dipcenter.php | 5 ++++- hwe/b_diplomacy.php | 5 ++++- hwe/b_genList.php | 5 ++++- hwe/b_myBossInfo.php | 5 ++++- hwe/b_myCityInfo.php | 5 ++++- hwe/b_myGenInfo.php | 5 ++++- hwe/b_myKingdomInfo.php | 5 ++++- hwe/b_myPage.php | 5 ++++- hwe/b_nationboard.php | 5 ++++- hwe/b_nationrule.php | 5 ++++- hwe/b_tournament.php | 5 ++++- hwe/b_troop.php | 5 ++++- hwe/c_auction.php | 5 ++++- hwe/c_betting.php | 5 ++++- hwe/c_chiefboard.php | 4 +++- hwe/c_dipcenter.php | 4 +++- hwe/c_double.php | 4 +++- hwe/c_myBossInfo.php | 4 +++- hwe/c_nationboard.php | 4 +++- hwe/c_nationrule.php | 4 +++- hwe/c_tournament.php | 4 +++- hwe/c_vacation.php | 4 +++- hwe/c_vote.php | 4 +++- hwe/commandlist.php | 3 ++- hwe/d_ally.php | 4 +++- hwe/d_cancel.php | 4 +++- hwe/d_cease.php | 4 +++- hwe/d_merge.php | 4 +++- hwe/d_scout.php | 4 +++- hwe/d_surrender.php | 4 +++- hwe/index.php | 2 +- hwe/j_msgsubmit.php | 2 +- hwe/join.php | 3 ++- hwe/lib.php | 9 --------- hwe/map_history.php | 4 +++- hwe/preprocessing.php | 5 ++++- hwe/proc.php | 4 +++- hwe/processing.php | 4 +++- hwe/select_npc.php | 15 +++++++-------- hwe/selection.php | 30 ------------------------------ hwe/turn.php | 5 ++++- hwe/turn_pop_core.php | 4 +++- hwe/turn_push_core.php | 4 +++- 74 files changed, 249 insertions(+), 122 deletions(-) delete mode 100644 hwe/selection.php diff --git a/hwe/_119.php b/hwe/_119.php index ba0dd858..bb3d26a7 100644 --- a/hwe/_119.php +++ b/hwe/_119.php @@ -4,7 +4,6 @@ namespace sammo; include "lib.php"; include "func.php"; -$connect=dbConn(); $session = Session::requireGameLogin()->setReadOnly(); if($session->userGrade < 5) { ?> @@ -24,6 +23,9 @@ if($session->userGrade < 5) { exit(); } +$db = DB::db(); +$connect=$db->get(); + $query = "select turntime,tnmt_time from game"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); diff --git a/hwe/_119_b.php b/hwe/_119_b.php index 60038df9..e3439d18 100644 --- a/hwe/_119_b.php +++ b/hwe/_119_b.php @@ -4,13 +4,16 @@ namespace sammo; include "lib.php"; include "func.php"; -$connect=dbConn(); + $session = Session::requireGameLogin()->setReadOnly(); if(Session::getUserGrade() < 5){ //echo ""; echo '_119.php';//TODO:debug all and replace } +$db = DB::db(); +$connect=$db->get(); + switch($btn) { case "분당김": $query = "update game set turntime=DATE_SUB(turntime, INTERVAL $minute MINUTE),starttime=DATE_SUB(starttime, INTERVAL $minute MINUTE),tnmt_time=DATE_SUB(tnmt_time, INTERVAL $minute MINUTE)"; diff --git a/hwe/_admin1.php b/hwe/_admin1.php index 102cd2a3..2d3f6aed 100644 --- a/hwe/_admin1.php +++ b/hwe/_admin1.php @@ -5,7 +5,6 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); if(Session::getUserGrade() < 5) { echo " @@ -26,6 +25,9 @@ if(Session::getUserGrade() < 5) { exit(); } +$db = DB::db(); +$connect=$db->get(); + $admin = getAdmin($connect); ?> diff --git a/hwe/_admin1_submit.php b/hwe/_admin1_submit.php index deb573e9..35fc2082 100644 --- a/hwe/_admin1_submit.php +++ b/hwe/_admin1_submit.php @@ -5,7 +5,6 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); $admin = getAdmin($connect); @@ -14,6 +13,9 @@ if(Session::getUserGrade() < 5) { echo '_admin1.php';//TODO:debug all and replace } +$db = DB::db(); +$connect=$db->get(); + switch($btn) { case "변경": $msg = addslashes(SQ2DQ($msg)); diff --git a/hwe/_admin2.php b/hwe/_admin2.php index fb10ca39..15754bd5 100644 --- a/hwe/_admin2.php +++ b/hwe/_admin2.php @@ -5,7 +5,6 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); if(Session::getUserGrade() < 5) { echo " @@ -26,6 +25,9 @@ if(Session::getUserGrade() < 5) { exit(); } +$db = DB::db(); +$connect=$db->get(); + $query = "select conlimit,conweight from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); diff --git a/hwe/_admin2_submit.php b/hwe/_admin2_submit.php index 87ef4fb5..ecdf03c7 100644 --- a/hwe/_admin2_submit.php +++ b/hwe/_admin2_submit.php @@ -15,7 +15,8 @@ if(!$generalID){ header('location:_admin2.php'); } -$connect = dbConn(); +$db = DB::db(); +$connect=$db->get(); switch($btn) { case "전체 접속허용": diff --git a/hwe/_admin4.php b/hwe/_admin4.php index 2237f86f..1447990b 100644 --- a/hwe/_admin4.php +++ b/hwe/_admin4.php @@ -5,7 +5,6 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); if(Session::getUserGrade() < 5) { echo " @@ -26,6 +25,9 @@ if(Session::getUserGrade() < 5) { exit(); } +$db = DB::db(); +$connect=$db->get(); + $query = "select conlimit from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); diff --git a/hwe/_admin4_submit.php b/hwe/_admin4_submit.php index ad859299..fc15d67f 100644 --- a/hwe/_admin4_submit.php +++ b/hwe/_admin4_submit.php @@ -5,13 +5,15 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); if(Session::getUserGrade() < 5) { //echo ""; echo '_admin4.php';//TODO:debug all and replace } +$db = DB::db(); +$connect=$db->get(); + //NOTE: 왜 기능이 admin2와 admin4가 같이 있는가? //NOTE: 왜 블럭 시 admin4에선 금쌀을 없애지 않는가? switch($btn) { diff --git a/hwe/_admin5.php b/hwe/_admin5.php index d3583c36..035e6c0a 100644 --- a/hwe/_admin5.php +++ b/hwe/_admin5.php @@ -5,9 +5,8 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); -if(Session::getUserGrade() < 5) { +if($session->userGrade < 5) { echo " @@ -26,6 +25,9 @@ if(Session::getUserGrade() < 5) { exit(); } +$db = DB::db(); +$connect=$db->get(); + if($type == 0) { $type = 0; } diff --git a/hwe/_admin5_submit.php b/hwe/_admin5_submit.php index 2df54227..3c7c4995 100644 --- a/hwe/_admin5_submit.php +++ b/hwe/_admin5_submit.php @@ -5,13 +5,15 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); if($session->userGrade < 5) { //echo ""; echo '_admin5.php';//TODO:debug all and replace } +$db = DB::db(); +$connect=$db->get(); + switch($btn) { case "국가변경": if($nation == 0) { diff --git a/hwe/_admin6.php b/hwe/_admin6.php index 961d9da8..d7e0bcfc 100644 --- a/hwe/_admin6.php +++ b/hwe/_admin6.php @@ -5,9 +5,8 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); -if(Session::getUserGrade() < 5) { +if($session->userGrade < 5) { echo " @@ -26,6 +25,9 @@ if(Session::getUserGrade() < 5) { exit(); } +$db = DB::db(); +$connect=$db->get(); + if($type == 0) { $type = 0; } diff --git a/hwe/_admin7.php b/hwe/_admin7.php index 5016bc70..0a6fe047 100644 --- a/hwe/_admin7.php +++ b/hwe/_admin7.php @@ -5,9 +5,8 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); -if(Session::getUserGrade() < 5) { +if($session->userGrade() < 5) { echo " @@ -26,6 +25,9 @@ if(Session::getUserGrade() < 5) { exit(); } +$db = DB::db(); +$connect=$db->get(); + if($btn == '정렬하기') { $gen = 0; } diff --git a/hwe/_admin8.php b/hwe/_admin8.php index 67d1dda4..5ab701b7 100644 --- a/hwe/_admin8.php +++ b/hwe/_admin8.php @@ -5,9 +5,8 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); -if(Session::getUserGrade() < 5) { +if($session->userGrade() < 5) { echo " @@ -26,6 +25,9 @@ if(Session::getUserGrade() < 5) { exit(); } +$db = DB::db(); +$connect=$db->get(); + if($btn == '정렬하기') { $gen = 0; } diff --git a/hwe/_simul.php b/hwe/_simul.php index 3cd2379e..ca4f1b15 100644 --- a/hwe/_simul.php +++ b/hwe/_simul.php @@ -47,7 +47,8 @@ $tch2 = array_fill(0,11, ''); $dec = 0; $rice = 0; -$connect = dbConn(); +$db = DB::db(); +$connect=$db->get(); increaseRefresh("시뮬", 2); $query = "select no,tournament,con,turntime from general where owner='{$session->userID}'"; diff --git a/hwe/a_bestGeneral.php b/hwe/a_bestGeneral.php index df0a78b3..e34c8d49 100644 --- a/hwe/a_bestGeneral.php +++ b/hwe/a_bestGeneral.php @@ -6,7 +6,9 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("명장일람", 2); $query = "select conlimit from game limit 1"; diff --git a/hwe/a_emperior.php b/hwe/a_emperior.php index 053a057c..15d0e63e 100644 --- a/hwe/a_emperior.php +++ b/hwe/a_emperior.php @@ -3,7 +3,10 @@ namespace sammo; include "lib.php"; include "func.php"; -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("왕조일람", 2); ?> diff --git a/hwe/a_emperior2.php b/hwe/a_emperior2.php index 63aee90a..27bb2018 100644 --- a/hwe/a_emperior2.php +++ b/hwe/a_emperior2.php @@ -3,7 +3,10 @@ namespace sammo; include "lib.php"; include "func.php"; -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("왕조일람", 2); ?> diff --git a/hwe/a_genList.php b/hwe/a_genList.php index 453c7241..3a921631 100644 --- a/hwe/a_genList.php +++ b/hwe/a_genList.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("장수일람", 2); $query = "select conlimit from game limit 1"; diff --git a/hwe/a_hallOfFame.php b/hwe/a_hallOfFame.php index 4435db1f..06650a8a 100644 --- a/hwe/a_hallOfFame.php +++ b/hwe/a_hallOfFame.php @@ -3,7 +3,10 @@ namespace sammo; include "lib.php"; include "func.php"; -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("명예의전당", 2); ?> diff --git a/hwe/a_history.php b/hwe/a_history.php index 37ca7307..27886455 100644 --- a/hwe/a_history.php +++ b/hwe/a_history.php @@ -6,7 +6,10 @@ include "func.php"; $yearmonth = $_POST['yearmonth']; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("연감", 5); $query = "select startyear,year,month,conlimit from game limit 1"; diff --git a/hwe/a_kingdomList.php b/hwe/a_kingdomList.php index 3ce7848d..2259be32 100644 --- a/hwe/a_kingdomList.php +++ b/hwe/a_kingdomList.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("세력일람", 2); $query = "select conlimit from game limit 1"; diff --git a/hwe/a_npcList.php b/hwe/a_npcList.php index 99280414..8e560b1a 100644 --- a/hwe/a_npcList.php +++ b/hwe/a_npcList.php @@ -3,7 +3,10 @@ namespace sammo; include "lib.php"; include "func.php"; -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("빙의일람", 2); if($type == 0) { diff --git a/hwe/a_status.php b/hwe/a_status.php index 5b617f43..964860ee 100644 --- a/hwe/a_status.php +++ b/hwe/a_status.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("세력도", 2); checkTurn($connect); diff --git a/hwe/a_traffic.php b/hwe/a_traffic.php index 6be1c25f..70922d0c 100644 --- a/hwe/a_traffic.php +++ b/hwe/a_traffic.php @@ -3,7 +3,10 @@ namespace sammo; include "lib.php"; include "func.php"; -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("갱신정보", 2); $query = "select year,month,refresh,maxrefresh,maxonline from game limit 1"; diff --git a/hwe/a_vote.php b/hwe/a_vote.php index 3168a50d..d21fc49c 100644 --- a/hwe/a_vote.php +++ b/hwe/a_vote.php @@ -3,7 +3,10 @@ namespace sammo; include "lib.php"; include "func.php"; -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("설문조사", 1); $query = "select no,vote from general where owner='{$session->userID}'"; diff --git a/hwe/b_auction.php b/hwe/b_auction.php index fc0a996a..d12c0cf2 100644 --- a/hwe/b_auction.php +++ b/hwe/b_auction.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("거래장", 2); $query = "select no,special,con,turntime from general where owner='{$session->userID}'"; diff --git a/hwe/b_battleCenter.php b/hwe/b_battleCenter.php index c5f68c8a..28069c8b 100644 --- a/hwe/b_battleCenter.php +++ b/hwe/b_battleCenter.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("감찰부", 2); //전투 추진을 위해 갱신 checkTurn($connect); diff --git a/hwe/b_betting.php b/hwe/b_betting.php index 11092da2..bc7d6a87 100644 --- a/hwe/b_betting.php +++ b/hwe/b_betting.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("베팅장", 1); checkTurn($connect); diff --git a/hwe/b_chiefboard.php b/hwe/b_chiefboard.php index 4a63d0e3..8c43319a 100644 --- a/hwe/b_chiefboard.php +++ b/hwe/b_chiefboard.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("기밀실", 1); $query = "select no,nation,level from general where owner='{$session->userID}'"; diff --git a/hwe/b_chiefcenter.php b/hwe/b_chiefcenter.php index 8654ce70..704ff6b1 100644 --- a/hwe/b_chiefcenter.php +++ b/hwe/b_chiefcenter.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("사령부", 1); $query = "select conlimit from game limit 1"; diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php index 9873ecd2..b825fd58 100644 --- a/hwe/b_currentCity.php +++ b/hwe/b_currentCity.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("현재도시", 1); $query = "select no,nation,level,city from general where owner='{$session->userID}'"; diff --git a/hwe/b_dipcenter.php b/hwe/b_dipcenter.php index 1e4c905d..f103393f 100644 --- a/hwe/b_dipcenter.php +++ b/hwe/b_dipcenter.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("내무부", 1); $query = "select conlimit from game limit 1"; diff --git a/hwe/b_diplomacy.php b/hwe/b_diplomacy.php index 7e065efa..7107955d 100644 --- a/hwe/b_diplomacy.php +++ b/hwe/b_diplomacy.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("중원정보", 1); $query = "select turnterm from game limit 1"; diff --git a/hwe/b_genList.php b/hwe/b_genList.php index 9827a97f..82b0d2b6 100644 --- a/hwe/b_genList.php +++ b/hwe/b_genList.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("암행부", 2); $query = "select conlimit from game limit 1"; diff --git a/hwe/b_myBossInfo.php b/hwe/b_myBossInfo.php index f7726b2f..20f8f402 100644 --- a/hwe/b_myBossInfo.php +++ b/hwe/b_myBossInfo.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("인사부", 1); //훼섭 추방을 위해 갱신 checkTurn($connect); diff --git a/hwe/b_myCityInfo.php b/hwe/b_myCityInfo.php index b2888fe3..d0c22e60 100644 --- a/hwe/b_myCityInfo.php +++ b/hwe/b_myCityInfo.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("세력도시", 1); $query = "select no,nation,level from general where owner='{$session->userID}'"; diff --git a/hwe/b_myGenInfo.php b/hwe/b_myGenInfo.php index 4e8fe9fa..f960402c 100644 --- a/hwe/b_myGenInfo.php +++ b/hwe/b_myGenInfo.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("세력장수", 1); $query = "select no,nation,level from general where owner='{$session->userID}'"; diff --git a/hwe/b_myKingdomInfo.php b/hwe/b_myKingdomInfo.php index 1d2a2640..d5667b4f 100644 --- a/hwe/b_myKingdomInfo.php +++ b/hwe/b_myKingdomInfo.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("세력정보", 1); $query = "select no,nation,level from general where owner='{$session->userID}'"; diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php index 640663b5..0c06df33 100644 --- a/hwe/b_myPage.php +++ b/hwe/b_myPage.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("내정보", 1); $query = "select myset from general where owner='{$session->userID}'"; diff --git a/hwe/b_nationboard.php b/hwe/b_nationboard.php index 3b4d6c23..2db98e3d 100644 --- a/hwe/b_nationboard.php +++ b/hwe/b_nationboard.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("회의실", 1); $query = "select no,nation from general where owner='{$session->userID}'"; diff --git a/hwe/b_nationrule.php b/hwe/b_nationrule.php index d3bcfa53..3d6ebd1e 100644 --- a/hwe/b_nationrule.php +++ b/hwe/b_nationrule.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("국법", 1); ?> diff --git a/hwe/b_tournament.php b/hwe/b_tournament.php index 2e1b254a..ce865747 100644 --- a/hwe/b_tournament.php +++ b/hwe/b_tournament.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("토너먼트", 1); checkTurn($connect); diff --git a/hwe/b_troop.php b/hwe/b_troop.php index f00410bc..d09726f7 100644 --- a/hwe/b_troop.php +++ b/hwe/b_troop.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("부대편성", 1); $query = "select no,nation,troop from general where owner='{$session->userID}'"; diff --git a/hwe/c_auction.php b/hwe/c_auction.php index b992ad9a..2c310618 100644 --- a/hwe/c_auction.php +++ b/hwe/c_auction.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("입찰", 1); $query = "select turnterm from game limit 1"; diff --git a/hwe/c_betting.php b/hwe/c_betting.php index c79403a6..cd3eae40 100644 --- a/hwe/c_betting.php +++ b/hwe/c_betting.php @@ -9,7 +9,10 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("베팅", 1); $query = "select tournament,phase,tnmt_type,develcost from game limit 1"; diff --git a/hwe/c_chiefboard.php b/hwe/c_chiefboard.php index e673314c..a8ddaece 100644 --- a/hwe/c_chiefboard.php +++ b/hwe/c_chiefboard.php @@ -7,7 +7,9 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); if(getBlockLevel() != 1 && getBlockLevel() != 3) { $query = "select no,nation from general where owner='{$session->userID}'"; diff --git a/hwe/c_dipcenter.php b/hwe/c_dipcenter.php index 98f47be0..c2f25fde 100644 --- a/hwe/c_dipcenter.php +++ b/hwe/c_dipcenter.php @@ -7,7 +7,9 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $query = "select no,nation,level from general where owner='{$session->userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/c_double.php b/hwe/c_double.php index 4a9b7662..183b473a 100644 --- a/hwe/c_double.php +++ b/hwe/c_double.php @@ -7,7 +7,9 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); if($command < 0) { $command = 0; } if($double < 0) { $double = 0; } diff --git a/hwe/c_myBossInfo.php b/hwe/c_myBossInfo.php index b0522ff6..36d23191 100644 --- a/hwe/c_myBossInfo.php +++ b/hwe/c_myBossInfo.php @@ -7,7 +7,9 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $query = "select startyear,year,month from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/c_nationboard.php b/hwe/c_nationboard.php index af75b442..b88f10ec 100644 --- a/hwe/c_nationboard.php +++ b/hwe/c_nationboard.php @@ -7,7 +7,9 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); if(getBlockLevel() != 1 && getBlockLevel() != 3) { $query = "select no,nation from general where owner='{$session->userID}'"; diff --git a/hwe/c_nationrule.php b/hwe/c_nationrule.php index 98a17384..14e3ffa7 100644 --- a/hwe/c_nationrule.php +++ b/hwe/c_nationrule.php @@ -7,7 +7,9 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $query = "select no,nation from general where owner='{$session->userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/c_tournament.php b/hwe/c_tournament.php index 54f587a5..b820fcc8 100644 --- a/hwe/c_tournament.php +++ b/hwe/c_tournament.php @@ -7,7 +7,9 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $query = "select tournament,phase,tnmt_type,develcost from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/c_vacation.php b/hwe/c_vacation.php index d7351e37..99859b20 100644 --- a/hwe/c_vacation.php +++ b/hwe/c_vacation.php @@ -5,7 +5,9 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $query = "select killturn from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/c_vote.php b/hwe/c_vote.php index 519cba0b..907d1f11 100644 --- a/hwe/c_vote.php +++ b/hwe/c_vote.php @@ -5,7 +5,9 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $query = "select develcost,vote,votecomment from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/commandlist.php b/hwe/commandlist.php index 1e237935..1018a45b 100644 --- a/hwe/commandlist.php +++ b/hwe/commandlist.php @@ -6,7 +6,8 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); +$db = DB::db(); +$connect=$db->get(); ?> diff --git a/hwe/d_ally.php b/hwe/d_ally.php index 8caed3f1..94359184 100644 --- a/hwe/d_ally.php +++ b/hwe/d_ally.php @@ -5,7 +5,9 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); //$when = ($when + 1) * 2; diff --git a/hwe/d_cancel.php b/hwe/d_cancel.php index 611ddeef..a6e32471 100644 --- a/hwe/d_cancel.php +++ b/hwe/d_cancel.php @@ -5,7 +5,9 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $query = "select year,month from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/d_cease.php b/hwe/d_cease.php index e036e41f..a5b93183 100644 --- a/hwe/d_cease.php +++ b/hwe/d_cease.php @@ -5,7 +5,9 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $query = "select year,month from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/d_merge.php b/hwe/d_merge.php index 6663624a..5ad31eed 100644 --- a/hwe/d_merge.php +++ b/hwe/d_merge.php @@ -5,7 +5,9 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $query = "select year,month from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/d_scout.php b/hwe/d_scout.php index 463c1f87..f380b0ed 100644 --- a/hwe/d_scout.php +++ b/hwe/d_scout.php @@ -11,7 +11,9 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $query = "select startyear,year,month,killturn from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/d_surrender.php b/hwe/d_surrender.php index 1ccbfcd4..200f1bf7 100644 --- a/hwe/d_surrender.php +++ b/hwe/d_surrender.php @@ -5,7 +5,9 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $query = "select year,month from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/index.php b/hwe/index.php index 6fe5200a..faa42526 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -9,6 +9,7 @@ $session = Session::requireGameLogin(); increaseRefresh("메인", 1); $db = DB::db(); +$connect=$db->get(); if(!$session->userID){ header('Location:..'); @@ -21,7 +22,6 @@ $me = $db->queryFirstRow( ); //턴 실행. -$connect = dbConn(); checkTurn($connect); //그새 사망이면 diff --git a/hwe/j_msgsubmit.php b/hwe/j_msgsubmit.php index ea4dd1de..43f11213 100644 --- a/hwe/j_msgsubmit.php +++ b/hwe/j_msgsubmit.php @@ -33,8 +33,8 @@ $datetime = new \DateTime(); $date = $datetime->format('Y-m-d H:i:s'); $db = DB::db(); +$connect=$db->get(); -$connect = dbConn(); increaseRefresh('서신전달', 1); if(getBlockLevel() == 1 || getBlockLevel() == 3) { diff --git a/hwe/join.php b/hwe/join.php index fef0c79c..86278c28 100644 --- a/hwe/join.php +++ b/hwe/join.php @@ -23,7 +23,8 @@ if(!$member) { exit(1); } -$connect = dbConn(); +$db = DB::db(); +$connect=$db->get(); ?> diff --git a/hwe/lib.php b/hwe/lib.php index 7d9d82d0..11b26140 100644 --- a/hwe/lib.php +++ b/hwe/lib.php @@ -78,15 +78,6 @@ session_cache_limiter('nocache');//NOTE: 캐시가 가능하도록 설정해야 ob_start(); -// MySQL 데이타 베이스에 접근 -function dbConn($isRoot=false) -{ - if ($isRoot) { - return RootDB::db()->get(); - } - return DB::db()->get(); -} - // 에러 메세지 출력 function Error($message, $url="") { diff --git a/hwe/map_history.php b/hwe/map_history.php index edcb555c..21dee783 100644 --- a/hwe/map_history.php +++ b/hwe/map_history.php @@ -18,7 +18,9 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $query = "select map from history where year='$year' and month='$month'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/preprocessing.php b/hwe/preprocessing.php index cd0dba5f..5dada890 100644 --- a/hwe/preprocessing.php +++ b/hwe/preprocessing.php @@ -5,7 +5,10 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("턴입력", 1); $query = "select conlimit from game limit 1"; diff --git a/hwe/proc.php b/hwe/proc.php index 100d53b8..babee7e9 100644 --- a/hwe/proc.php +++ b/hwe/proc.php @@ -4,6 +4,8 @@ namespace sammo; include "lib.php"; include "func.php"; -$connect = dbConn(); +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("자동", 2); checkTurn($connect); diff --git a/hwe/processing.php b/hwe/processing.php index 4430c65b..dd297194 100644 --- a/hwe/processing.php +++ b/hwe/processing.php @@ -5,7 +5,9 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $count = sizeof($turn); for($i=0; $i < $count; $i++) { diff --git a/hwe/select_npc.php b/hwe/select_npc.php index 32ab2286..57852bf6 100644 --- a/hwe/select_npc.php +++ b/hwe/select_npc.php @@ -5,12 +5,11 @@ include "lib.php"; include "func.php"; $session = Session::requireLogin()->setReadOnly(); -$connect = dbConn(true); +$rootDB = RootDB::db(); + $userID = $session->userID; //회원 테이블에서 정보확인 -$query = "select no,name,picture,grade from MEMBER where no='$userID'"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); -$member = MYDB_fetch_array($result); +$member = $rootDB->queryFirstRow('select no,name,picture,grade from MEMBER where no=%i', $userID); MYDB_fetch_array($result); if(!$member) { MessageBox("잘못된 접근입니다!!!"); @@ -18,16 +17,16 @@ if(!$member) { exit(1); } -$query = "select npcmode,maxgeneral,img from game limit 1"; -$result = MYDB_query($query, $connect) or Error("join ".MYDB_error($connect),""); -$admin = MYDB_fetch_array($result); +$admin = $rootDB->queryFirstRow('select npcmode,maxgeneral,show_img_level from game limit 1'); if($admin['npcmode'] != 1) { header('Location:join.php'); die(); } -$connect = dbConn(); +$db = DB::db(); +$connect=$db->get(); + ?> diff --git a/hwe/selection.php b/hwe/selection.php deleted file mode 100644 index 5b478170..00000000 --- a/hwe/selection.php +++ /dev/null @@ -1,30 +0,0 @@ -setReadOnly(); -$connect = dbConn(true); - -//회원 테이블에서 정보확인 -$query = "select no,name,picture,grade from MEMBER where no='$userID'"; -$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); -$member = MYDB_fetch_array($result); - -if(!$member) { - MessageBox("잘못된 접근입니다!!!"); - echo ""; - exit(1); -} - - - -if($btn == "장수생성") { - header('Location:join.php'); -} elseif($btn == "장수선택") { - header('Location:select_npc.php'); -} \ No newline at end of file diff --git a/hwe/turn.php b/hwe/turn.php index 01772f48..aad233ea 100644 --- a/hwe/turn.php +++ b/hwe/turn.php @@ -7,7 +7,10 @@ include "func.php"; $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); + increaseRefresh("턴반복", 1); $query = "select conlimit from game limit 1"; diff --git a/hwe/turn_pop_core.php b/hwe/turn_pop_core.php index 99581e9b..21387dcf 100644 --- a/hwe/turn_pop_core.php +++ b/hwe/turn_pop_core.php @@ -5,7 +5,9 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $query = "select no from general where owner='{$session->userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/turn_push_core.php b/hwe/turn_push_core.php index 36c78706..0dc45ca8 100644 --- a/hwe/turn_push_core.php +++ b/hwe/turn_push_core.php @@ -5,7 +5,9 @@ include "lib.php"; include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -$connect = dbConn(); + +$db = DB::db(); +$connect=$db->get(); $query = "select no from general where owner='{$session->userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");