CheckLogin을 다시 구현.

- ajax 함수에서는 사용해선 안됨.
- 이외에선 index에서만 제대로 장수삭제처리를 하므로 문제 없을 것.

hwe/_admin1.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 if(Session::getUserGrade() < 5) {

hwe/_admin1_submit.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $admin = getAdmin($connect);

hwe/_admin2.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 if(Session::getUserGrade() < 5) {

hwe/_admin4.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 if(Session::getUserGrade() < 5) {

hwe/_admin4_submit.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 if(Session::getUserGrade() < 5) {

hwe/_admin5.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 if(Session::getUserGrade() < 5) {

hwe/_admin5_submit.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 if(Session::getUserGrade() < 5) {

hwe/_admin6.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 if(Session::getUserGrade() < 5) {

hwe/_admin7.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 if(Session::getUserGrade() < 5) {

hwe/_admin8.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 if(Session::getUserGrade() < 5) {

hwe/_simul.php

@@ -46,7 +46,7 @@ $tch2 = array_fill(0,11, '');
 $dec = 0;
 $rice = 0;
 
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("시뮬", 2);
 

hwe/a_bestGeneral.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("명장일람", 2);
 

hwe/a_genList.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("장수일람", 2);
 

hwe/a_history.php

@@ -5,7 +5,7 @@ include "lib.php";
 include "func.php";
 $yearmonth = $_POST['yearmonth'];
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("연감", 5);
 

hwe/a_kingdomList.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("세력일람", 2);
 

hwe/a_status.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("세력도", 2);
 checkTurn($connect);

hwe/b_auction.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("거래장", 2);
 

hwe/b_battleCenter.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("감찰부", 2);
 //전투 추진을 위해 갱신

hwe/b_betting.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("베팅장", 1);
 checkTurn($connect);

hwe/b_chiefboard.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("기밀실", 1);
 

hwe/b_chiefcenter.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("사령부", 1);
 

hwe/b_currentCity.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("현재도시", 1);
 

hwe/b_dipcenter.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("내무부", 1);
 

hwe/b_diplomacy.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("중원정보", 1);
 

hwe/b_genList.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("암행부", 2);
 

hwe/b_myBossInfo.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("인사부", 1);
 //훼섭 추방을 위해 갱신

hwe/b_myCityInfo.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("세력도시", 1);
 

hwe/b_myGenInfo.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("세력장수", 1);
 

hwe/b_myKingdomInfo.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("세력정보", 1);
 

hwe/b_myPage.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("내정보", 1);
 

hwe/b_nationboard.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("회의실", 1);
 

hwe/b_nationrule.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("국법", 1);
 ?>

hwe/b_tournament.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("토너먼트", 1);
 checkTurn($connect);

hwe/b_troop.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("부대편성", 1);
 

hwe/c_auction.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("입찰", 1);
 

hwe/c_betting.php

@@ -8,7 +8,7 @@ include "func.php";
 
 
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("베팅", 1);
 

hwe/c_chiefboard.php

@@ -6,7 +6,7 @@ include "func.php";
 // $title, $msg, $num
 
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 if(getBlockLevel() != 1 && getBlockLevel() != 3) {

hwe/c_dipcenter.php

@@ -6,7 +6,7 @@ include "func.php";
 // $btn, $msg, $scoutmsg, $rate, $bill, $secretlimit
 
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $query = "select no,nation,level from general where owner='{$_SESSION['userID']}'";

hwe/c_double.php

@@ -6,7 +6,7 @@ include "func.php";
 // $turn, $command, $cost, $name, $nationname, $note, $double, $third, $fourth
 
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 if($command < 0) { $command = 0; }

hwe/c_myBossInfo.php

@@ -6,7 +6,7 @@ include "func.php";
 // $btn, $level, $genlist, $outlist
 
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $query = "select startyear,year,month from game limit 1";

hwe/c_nationboard.php

@@ -6,7 +6,7 @@ include "func.php";
 // $title, $msg, $num
 
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 if(getBlockLevel() != 1 && getBlockLevel() != 3) {

hwe/c_nationrule.php

@@ -6,7 +6,7 @@ include "func.php";
 // $msg
 
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $query = "select no,nation from general where owner='{$_SESSION['userID']}'";

hwe/c_tournament.php

@@ -6,7 +6,7 @@ include "func.php";
 // $btn, $msg
 
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $query = "select tournament,phase,tnmt_type,develcost from game limit 1";

hwe/c_vacation.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $query = "select killturn from game limit 1";

hwe/c_vote.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $query = "select develcost,vote,votecomment from game limit 1";

hwe/d_ally.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin(1);
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 //$when = ($when + 1) * 2;

hwe/d_cancel.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin(1);
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $query = "select year,month from game limit 1";

hwe/d_cease.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin(1);
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $query = "select year,month from game limit 1";

hwe/d_merge.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin(1);
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $query = "select year,month from game limit 1";

hwe/d_scout.php

@@ -10,7 +10,7 @@ include "lib.php";
 include "func.php";
 //로그인 검사
 
-CheckLogin(1);
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $query = "select startyear,year,month,killturn from game limit 1";

hwe/d_surrender.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin(1);
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $query = "select year,month from game limit 1";

hwe/func_legacy.php

@@ -2,18 +2,14 @@
 namespace sammo;
 
 
-function CheckLogin($type=0) {
-    //TODO: 직접해라. setReadOnly() 호출이 필요하다.
-    if(Session::Instance()->loginGame()->generalID){
-       return; 
+function CheckLoginWithGeneralID() {
+    $session = Session::requireLogin()->loginGame()->setReadOnly();
+    $generalID = $session->generalID;
+    if($generalID){
+       return $generalID; 
     }
-    if($type == 0) {
-        header('Location: ../');
-    }
-    else           { 
-        header('Location: index.php');
-    }
-    exit();
+    header('Locatoin:..');
+    die();
 }
 
 

hwe/map_history.php

@@ -17,7 +17,7 @@ if(!$year || !$month) {
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $query = "select map from history where year='$year' and month='$month'";

hwe/preprocessing.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin(1);
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("턴입력", 1);
 

hwe/processing.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $count = sizeof($turn);

hwe/turn.php

@@ -6,7 +6,7 @@ include "func.php";
 //로그인 검사
 
 
-CheckLogin(1);
+CheckLoginWithGeneralID();
 $connect = dbConn();
 increaseRefresh("턴반복", 1);
 

hwe/turn_pop_core.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $query = "select no from general where owner='{$_SESSION['userID']}'";

hwe/turn_push_core.php

@@ -4,7 +4,7 @@ namespace sammo;
 include "lib.php";
 include "func.php";
 //로그인 검사
-CheckLogin();
+CheckLoginWithGeneralID();
 $connect = dbConn();
 
 $query = "select no from general where owner='{$_SESSION['userID']}'";