diff --git a/hwe/_119_b.php b/hwe/_119_b.php index 0552cbec..591c9008 100644 --- a/hwe/_119_b.php +++ b/hwe/_119_b.php @@ -6,7 +6,7 @@ include "func.php"; $session = Session::requireGameLogin()->setReadOnly(); -if(Session::getUserGrade() < 5){ +if($session->userGrade < 5){ //echo ""; echo '_119.php';//TODO:debug all and replace } diff --git a/hwe/_admin1.php b/hwe/_admin1.php index 23d533b7..154e4b68 100644 --- a/hwe/_admin1.php +++ b/hwe/_admin1.php @@ -6,7 +6,7 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -if(Session::getUserGrade() < 5) { +if($session->userGrade < 5) { echo " diff --git a/hwe/_admin1_submit.php b/hwe/_admin1_submit.php index a1b994e0..ba50038d 100644 --- a/hwe/_admin1_submit.php +++ b/hwe/_admin1_submit.php @@ -8,7 +8,7 @@ $session = Session::requireGameLogin()->setReadOnly(); $admin = getAdmin(); -if(Session::getUserGrade() < 5) { +if($session->userGrade < 5) { //echo ""; echo '_admin1.php';//TODO:debug all and replace } diff --git a/hwe/_admin2.php b/hwe/_admin2.php index 15754bd5..c5f23da2 100644 --- a/hwe/_admin2.php +++ b/hwe/_admin2.php @@ -6,7 +6,7 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -if(Session::getUserGrade() < 5) { +if($session->userGrade < 5) { echo " diff --git a/hwe/_admin4.php b/hwe/_admin4.php index 1447990b..7f6cadb0 100644 --- a/hwe/_admin4.php +++ b/hwe/_admin4.php @@ -6,7 +6,7 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -if(Session::getUserGrade() < 5) { +if($session->userGrade < 5) { echo " diff --git a/hwe/_admin4_submit.php b/hwe/_admin4_submit.php index fc15d67f..d2387fee 100644 --- a/hwe/_admin4_submit.php +++ b/hwe/_admin4_submit.php @@ -6,7 +6,7 @@ include "func.php"; //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); -if(Session::getUserGrade() < 5) { +if($session->userGrade < 5) { //echo ""; echo '_admin4.php';//TODO:debug all and replace } diff --git a/hwe/_simul.php b/hwe/_simul.php index ca4f1b15..f7a55d70 100644 --- a/hwe/_simul.php +++ b/hwe/_simul.php @@ -62,7 +62,7 @@ $game = MYDB_fetch_array($result); $con = checkLimit($me['con'], $game['conlimit']); if($con >= 2) { printLimitMsg($me['turntime']); exit(); } -if(Session::getUserGrade() < 3) { +if($session->userGrade < 3) { echo "특별회원이 아닙니다."; exit(); } diff --git a/hwe/a_vote.php b/hwe/a_vote.php index d21fc49c..70b6b17a 100644 --- a/hwe/a_vote.php +++ b/hwe/a_vote.php @@ -49,7 +49,7 @@ function captureKey(e) { 설 문 조 사 (금과 추첨으로 유니크템 증정!) = 5) { +if($session->userGrade >= 5) { echo " @@ -88,7 +88,7 @@ for($i=1; $i < $voteTypeCount; $i++) { echo " "; - } elseif($admin['voteopen'] >= 1 || Session::getUserGrade() >= 5) { + } elseif($admin['voteopen'] >= 1 || $session->userGrade >= 5) { $query = "select no from general where vote='{$i}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $vCount = MYDB_num_rows($result); @@ -124,7 +124,7 @@ echo " "; -if(Session::getUserGrade() >= 5) { +if($session->userGrade >= 5) { echo " @@ -176,7 +176,7 @@ if($me['no'] > 0) { 전 체 통 계 = 5) { +if($session->userGrade >= 5) { echo " @@ -185,7 +185,7 @@ if(Session::getUserGrade() >= 5) { echo " "; -if($admin['voteopen'] >= 1 || Session::getUserGrade() >= 5) { +if($admin['voteopen'] >= 1 || $session->userGrade >= 5) { echo " 전 체 @@ -226,7 +226,7 @@ if($admin['voteopen'] >= 1 || Session::getUserGrade() >= 5) { "; } -if($admin['voteopen'] >= 2 || Session::getUserGrade() >= 5) { +if($admin['voteopen'] >= 2 || $session->userGrade >= 5) { $query = "select no from general where nation=0 and npc<2"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $memCount = MYDB_num_rows($result); diff --git a/hwe/b_auction.php b/hwe/b_auction.php index d12c0cf2..7c6b90db 100644 --- a/hwe/b_auction.php +++ b/hwe/b_auction.php @@ -32,7 +32,7 @@ $bidCount = MYDB_num_rows($result); $btCount = $tradeCount + $bidCount; -if(Session::getUserGrade() >= 5 || ($me['special'] != 30 && $btCount < 1) || ($me['special'] == 30 && $btCount < 3)) { +if($session->userGrade >= 5 || ($me['special'] != 30 && $btCount < 1) || ($me['special'] == 30 && $btCount < 3)) { $btn = "submit"; } else { $btn = "hidden"; diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php index 37b837f6..8994f549 100644 --- a/hwe/b_currentCity.php +++ b/hwe/b_currentCity.php @@ -131,7 +131,7 @@ echo "
"; // 첩보된 도시까지만 허용 -if($valid == 0 && Session::getUserGrade() < 5) { +if($valid == 0 && $session->userGrade < 5) { $_REQUEST['citylist'] = $me['city']; } @@ -282,7 +282,7 @@ for($j=0; $j < $gencount; $j++) { $intel ".getLevel($general['level']).""; //아국장수이거나 보는 사람이 운영자일때 보여줌 - if(($general['nation'] != 0 && $general['nation'] == $myNation['nation']) || Session::getUserGrade() >= 5) { + if(($general['nation'] != 0 && $general['nation'] == $myNation['nation']) || $session->userGrade >= 5) { switch($general['mode']) { case 0: $mode = "×"; break; case 1: $mode = "○"; break; diff --git a/hwe/b_diplomacy.php b/hwe/b_diplomacy.php index 7107955d..3d7967d4 100644 --- a/hwe/b_diplomacy.php +++ b/hwe/b_diplomacy.php @@ -116,7 +116,7 @@ for($i=0; $i < $nationcount; $i++) { case 0: $str = "★"; break; case 1: $str = "▲"; break; case 2: - if($nationnum[$i] == $me['nation'] || $nationnum[$k] == $me['nation'] || Session::getUserGrade() >= 5) { $str = "ㆍ"; } + if($nationnum[$i] == $me['nation'] || $nationnum[$k] == $me['nation'] || $session->userGrade >= 5) { $str = "ㆍ"; } else { $str = "?"; } // $str = "ㆍ"; break; @@ -125,7 +125,7 @@ for($i=0; $i < $nationcount; $i++) { case 5: $str = "◎"; break; case 6: $str = "◎"; break; case 7: - if($nationnum[$i] == $me['nation'] || $nationnum[$k] == $me['nation'] || Session::getUserGrade() >= 5) { $str = "@"; } + if($nationnum[$i] == $me['nation'] || $nationnum[$k] == $me['nation'] || $session->userGrade >= 5) { $str = "@"; } else { $str = "?"; } // $str = "@"; break; diff --git a/hwe/b_tournament.php b/hwe/b_tournament.php index de8f6e73..15f7e226 100644 --- a/hwe/b_tournament.php +++ b/hwe/b_tournament.php @@ -56,7 +56,7 @@ select { font-family:'굴림'; line-height:100%; } = 5) { +if($session->userGrade >= 5) { echo " diff --git a/hwe/c_auction.php b/hwe/c_auction.php index 99491856..8a849f80 100644 --- a/hwe/c_auction.php +++ b/hwe/c_auction.php @@ -38,7 +38,7 @@ $value = round($value / 10) * 10; if($term > 24) $term = 24; $valid = 1; -if(Session::getUserGrade() >= 5 || ($me['special'] != 30 && $btCount < 1) || ($me['special'] == 30 && $btCount < 3)) { +if($session->userGrade >= 5 || ($me['special'] != 30 && $btCount < 1) || ($me['special'] == 30 && $btCount < 3)) { } else { $msg = "ㆍ더이상 등록할 수 없습니다."; $msg2 = "ㆍ더이상 등록할 수 없습니다."; diff --git a/hwe/c_tournament.php b/hwe/c_tournament.php index cadbd8ac..0c545e67 100644 --- a/hwe/c_tournament.php +++ b/hwe/c_tournament.php @@ -26,17 +26,17 @@ case 2: $tp = "power"; $tp2 = "일기토"; $tp3 = "power"; break; case 3: $tp = "intel"; $tp2 = "설전"; $tp3 = "intel"; break; } -if($me['tournament'] == 1 && Session::getUserGrade() < 5) { echo ""; exit(); } +if($me['tournament'] == 1 && $session->userGrade < 5) { echo ""; exit(); } -if($btn == "자동개최설정" && Session::getUserGrade() >= 5) { +if($btn == "자동개최설정" && $session->userGrade >= 5) { $query = "update game set tnmt_trig={$trig}"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); -} elseif($btn == "개최" && Session::getUserGrade() >= 5) { +} elseif($btn == "개최" && $session->userGrade >= 5) { startTournament($auto, $type); -} elseif($btn == "중단" && Session::getUserGrade() >= 5) { +} elseif($btn == "중단" && $session->userGrade >= 5) { $query = "update game set tnmt_auto=0, tournament=0, phase=0"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); -} elseif((($btn == "투입" || $btn == "무명투입" || $btn == "쪼렙투입" || $btn == "일반투입" || $btn == "굇수투입" || $btn == "랜덤투입") && Session::getUserGrade() >= 5) || $btn == "참가") { +} elseif((($btn == "투입" || $btn == "무명투입" || $btn == "쪼렙투입" || $btn == "일반투입" || $btn == "굇수투입" || $btn == "랜덤투입") && $session->userGrade >= 5) || $btn == "참가") { if($btn == "투입") { $query = "select no,name,npc,leader,power,intel,explevel,gold,horse,weap,book from general where no='$gen'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -127,7 +127,7 @@ if($btn == "자동개최설정" && Session::getUserGrade() >= 5) { $query = "update game set tournament=2, phase=0"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } -} elseif(($btn == "쪼렙전부투입" || $btn == "일반전부투입" || $btn == "굇수전부투입" || $btn == "랜덤전부투입") && Session::getUserGrade() >= 5) { +} elseif(($btn == "쪼렙전부투입" || $btn == "일반전부투입" || $btn == "굇수전부투입" || $btn == "랜덤전부투입") && $session->userGrade >= 5) { $z = 0; for($i=0; $i < 8; $i++) { $query = "select grp from tournament where grp='$i'"; @@ -181,25 +181,25 @@ if($btn == "자동개최설정" && Session::getUserGrade() >= 5) { $query = "update game set tournament=2, phase=0"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); -} elseif($btn == "무명전부투입" && Session::getUserGrade() >= 5) { fillLowGenAll(); -} elseif($btn == "예선" && Session::getUserGrade() >= 5) { qualify($admin['tnmt_type'], $admin['tournament'], $admin['phase']); -} elseif($btn == "예선전부" && Session::getUserGrade() >= 5) { qualifyAll($admin['tnmt_type'], $admin['tournament'], $admin['phase']); -} elseif($btn == "추첨" && Session::getUserGrade() >= 5) { selection($admin['tnmt_type'], $admin['tournament'], $admin['phase']); -} elseif($btn == "추첨전부" && Session::getUserGrade() >= 5) { selectionAll($admin['tnmt_type'], $admin['tournament'], $admin['phase']); -} elseif($btn == "본선" && Session::getUserGrade() >= 5) { finallySingle($admin['tnmt_type'], $admin['tournament'], $admin['phase']); -} elseif($btn == "본선전부" && Session::getUserGrade() >= 5) { finallyAll($admin['tnmt_type'], $admin['tournament'], $admin['phase']); -} elseif($btn == "배정" && Session::getUserGrade() >= 5) { final16set(); -} elseif($btn == "베팅마감" && Session::getUserGrade() >= 5) { +} elseif($btn == "무명전부투입" && $session->userGrade >= 5) { fillLowGenAll(); +} elseif($btn == "예선" && $session->userGrade >= 5) { qualify($admin['tnmt_type'], $admin['tournament'], $admin['phase']); +} elseif($btn == "예선전부" && $session->userGrade >= 5) { qualifyAll($admin['tnmt_type'], $admin['tournament'], $admin['phase']); +} elseif($btn == "추첨" && $session->userGrade >= 5) { selection($admin['tnmt_type'], $admin['tournament'], $admin['phase']); +} elseif($btn == "추첨전부" && $session->userGrade >= 5) { selectionAll($admin['tnmt_type'], $admin['tournament'], $admin['phase']); +} elseif($btn == "본선" && $session->userGrade >= 5) { finallySingle($admin['tnmt_type'], $admin['tournament'], $admin['phase']); +} elseif($btn == "본선전부" && $session->userGrade >= 5) { finallyAll($admin['tnmt_type'], $admin['tournament'], $admin['phase']); +} elseif($btn == "배정" && $session->userGrade >= 5) { final16set(); +} elseif($btn == "베팅마감" && $session->userGrade >= 5) { $dt = date("Y-m-d H:i:s", time() + 60); $query = "update game set tournament='7',phase='0',tnmt_time='$dt'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); -} elseif($btn == "16강" && Session::getUserGrade() >= 5) { finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 16); -} elseif($btn == "8강" && Session::getUserGrade() >= 5) { finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 8); -} elseif($btn == "4강" && Session::getUserGrade() >= 5) { finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 4); -} elseif($btn == "결승" && Session::getUserGrade() >= 5) { finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 2); -} elseif($btn == "포상" && Session::getUserGrade() >= 5) { setGift($admin['tnmt_type'], $admin['tournament'], $admin['phase']); -} elseif($btn == "회수" && Session::getUserGrade() >= 5) { setRefund(); -} elseif($btn == "메시지" && Session::getUserGrade() >= 5) { +} elseif($btn == "16강" && $session->userGrade >= 5) { finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 16); +} elseif($btn == "8강" && $session->userGrade >= 5) { finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 8); +} elseif($btn == "4강" && $session->userGrade >= 5) { finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 4); +} elseif($btn == "결승" && $session->userGrade >= 5) { finalFight($admin['tnmt_type'], $admin['tournament'], $admin['phase'], 2); +} elseif($btn == "포상" && $session->userGrade >= 5) { setGift($admin['tnmt_type'], $admin['tournament'], $admin['phase']); +} elseif($btn == "회수" && $session->userGrade >= 5) { setRefund(); +} elseif($btn == "메시지" && $session->userGrade >= 5) { $msg = addslashes(SQ2DQ($msg)); $query = "update game set tnmt_msg='$msg'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); diff --git a/hwe/c_vote.php b/hwe/c_vote.php index 509430d9..f5e88037 100644 --- a/hwe/c_vote.php +++ b/hwe/c_vote.php @@ -47,7 +47,7 @@ else if($btn == "댓글" && $comment != "") { } -if(Session::getUserGrade() < 5){ +if($session->userGrade < 5){ echo " echo 'a_vote.php '; die(); diff --git a/hwe/func.php b/hwe/func.php index c9611d56..0f392244 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -77,7 +77,7 @@ function GetImageURL($imgsvr) { } function checkLimit($con, $conlimit) { - if(Session::getUserGrade()>=4){ + if($session->userGrade>=4){ return 0; } if($con > $conlimit) { diff --git a/hwe/func_command.php b/hwe/func_command.php index 661eec56..73652a64 100644 --- a/hwe/func_command.php +++ b/hwe/func_command.php @@ -532,7 +532,7 @@ function processCommand($no) { if($general['npc'] >= 2 || $general['killturn'] > $admin['killturn']) { $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); - } elseif(floor($command[0]) == 0 && Session::getUserGrade() < 5) { + } elseif(floor($command[0]) == 0 && $session->userGrade < 5) { $query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'"; MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); } else { diff --git a/hwe/index.php b/hwe/index.php index 027ed4c0..4fed7443 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -170,7 +170,7 @@ echo " = 5) { +if($session->userGrade >= 5) { echo "
【 국가방침 】
【 접속자 】
diff --git a/i_entrance/j_change_password.php b/i_entrance/j_change_password.php index 192d5d25..e4aed8f0 100644 --- a/i_entrance/j_change_password.php +++ b/i_entrance/j_change_password.php @@ -3,16 +3,7 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); -$session = Session::Instance(); - -if(!$session->isLoggedIn()) { - Json::die([ - 'result'=>false, - 'reason'=>'로그인되지 않았습니다.' - ]); -} - -session_write_close(); +$session = Session::requireLogin([])->setReadOnly(); // 외부 파라미터 // $_POST['old_pw'] : PW diff --git a/i_entrance/j_delete_me.php b/i_entrance/j_delete_me.php index 1fd014b0..cbb81b31 100644 --- a/i_entrance/j_delete_me.php +++ b/i_entrance/j_delete_me.php @@ -3,14 +3,7 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); -$session = Session::Instance(); - -if(!$session->isLoggedIn()) { - Json::die([ - 'result'=>false, - 'reason'=>'로그인되지 않았습니다.' - ]); -} +$session = Session::requireLogin([]); // 외부 파라미터 // $_POST['pw'] : PW diff --git a/i_entrance/j_get_user_info.php b/i_entrance/j_get_user_info.php index b13cf267..3070d44b 100644 --- a/i_entrance/j_get_user_info.php +++ b/i_entrance/j_get_user_info.php @@ -3,14 +3,7 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); -$session = Session::Instance(); - -if(!$session->isLoggedIn()) { - Json::die([ - 'result'=>false, - 'reason'=>'로그인되지 않았습니다.' - ]); -} +$session = Session::requireLogin([])->setReadOnly(); // 외부 파라미터 diff --git a/i_entrance/j_get_userlist.php b/i_entrance/j_get_userlist.php index b8543c77..e271a6ce 100644 --- a/i_entrance/j_get_userlist.php +++ b/i_entrance/j_get_userlist.php @@ -3,11 +3,9 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); -$session = Session::requireLogin(null); +$session = Session::requireLogin([])->setReadOnly(); $db = RootDB::db(); -$session->setReadOnly(); - if($session->userGrade < 6){ Json::die([ 'result'=>false, diff --git a/i_entrance/j_icon_change.php b/i_entrance/j_icon_change.php index b2b448b5..3beb4f65 100644 --- a/i_entrance/j_icon_change.php +++ b/i_entrance/j_icon_change.php @@ -3,14 +3,7 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); -$session = Session::Instance(); - -if(!$session->isLoggedIn()) { - Json::die([ - 'result'=>false, - 'reason'=>'로그인되지 않았습니다.' - ]); -} +$session = Session::requireLogin([])->setReadOnly(); // 외부 파라미터 // $_FILES['image_upload'] : 사진파일 diff --git a/i_entrance/j_icon_delete.php b/i_entrance/j_icon_delete.php index 0cf1dd5e..49f522b3 100644 --- a/i_entrance/j_icon_delete.php +++ b/i_entrance/j_icon_delete.php @@ -3,14 +3,7 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); -$session = Session::Instance(); - -if(!$session->isLoggedIn()) { - Json::die([ - 'result'=>false, - 'reason'=>'로그인되지 않았습니다.' - ]); -} +$session = Session::requireLogin([])->setReadOnly(); // 외부 파라미터 diff --git a/i_entrance/j_server_get_admin_status.php b/i_entrance/j_server_get_admin_status.php index 0f451118..255adf6e 100644 --- a/i_entrance/j_server_get_admin_status.php +++ b/i_entrance/j_server_get_admin_status.php @@ -3,7 +3,7 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); -$session = Session::Instance()->setReadOnly(); +$session = Session::requireLogin([])->setReadOnly(); if($session->userGrade < 5){ Json::die([ diff --git a/i_entrance/j_set_userlist.php b/i_entrance/j_set_userlist.php index 55a71f22..13e22ebb 100644 --- a/i_entrance/j_set_userlist.php +++ b/i_entrance/j_set_userlist.php @@ -2,7 +2,8 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); -$session = Session::Instance()->setReadOnly(); + +$session = Session::requireLogin([])->setReadOnly(); if($session->userGrade < 6){ Json::die([