diff --git a/hwe/commandlist.php b/hwe/commandlist.php index c53dd9b2..c6a2e616 100644 --- a/hwe/commandlist.php +++ b/hwe/commandlist.php @@ -65,7 +65,7 @@ function myclock() { myCommandList(); function myCommandList() { - $session = Session::Instance(); + $session = Session::getInstance(); global $_basecolor, $_basecolor2, $_basecolor3; global $images; diff --git a/hwe/func.php b/hwe/func.php index 08af199e..38747f40 100644 --- a/hwe/func.php +++ b/hwe/func.php @@ -77,7 +77,7 @@ function GetImageURL($imgsvr) { } function checkLimit($con, $conlimit) { - $session = Session::Instance(); + $session = Session::getInstance(); if($session->userGrade>=4){ return 0; } @@ -92,7 +92,7 @@ function checkLimit($con, $conlimit) { } function getBlockLevel() { - return DB::db()->queryFirstField('select block from general where no = %i', Session::Instance()->generalID); + return DB::db()->queryFirstField('select block from general where no = %i', Session::getInstance()->generalID); } function getRandGenName() { @@ -117,7 +117,7 @@ function getRandGenName() { function cityInfo() { - $session = Session::Instance(); + $session = Session::getInstance(); global $_basecolor, $_basecolor2, $images; $db = DB::db(); @@ -232,7 +232,7 @@ function cityInfo() { } function myNationInfo() { - $session = Session::Instance(); + $session = Session::getInstance(); global $_basecolor, $_basecolor2, $images; $db = DB::db(); @@ -411,7 +411,7 @@ function commandGroup($typename, $type=0) { } function commandTable() { - $session = Session::Instance(); + $session = Session::getInstance(); $db = DB::db(); $connect=$db->get(); @@ -649,7 +649,7 @@ function commandTable() { } function CoreCommandTable() { - $session = Session::Instance(); + $session = Session::getInstance(); $db = DB::db(); $connect=$db->get(); @@ -749,7 +749,7 @@ function CoreCommandTable() { function myInfo() { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); $query = "select no from general where owner='{$session->userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -938,7 +938,7 @@ function generalInfo($no) { } function myInfo2() { - $session = Session::Instance(); + $session = Session::getInstance(); $db = DB::db(); $connect=$db->get(); @@ -1079,7 +1079,7 @@ function onlinegen() { $connect=$db->get(); $onlinegen = ""; - $generalID = Session::Instance()->generalID; + $generalID = Session::getInstance()->generalID; $nationID = DB::db()->queryFirstField('select `nation` from `general` where `no` = %i', $generalID); if($nationID === null || Util::toInt($nationID) === 0) { $query = "select onlinegen from game limit 1"; @@ -1104,7 +1104,7 @@ function onlineNation() { } function nationMsg() { - $session = Session::Instance(); + $session = Session::getInstance(); $db = DB::db(); $connect=$db->get(); @@ -1256,7 +1256,7 @@ function cutDay($date, int $turnterm) { function increaseRefresh($type="", $cnt=1) { //FIXME: 로그인, 비로그인 시 처리가 명확하지 않음 - $session = Session::Instance(); + $session = Session::getInstance(); $generalID = $session->generalID; $date = date('Y-m-d H:i:s'); @@ -1519,7 +1519,7 @@ function checkTurn() { return; } - $session = Session::Instance(); + $session = Session::getInstance(); $locklog[0] = "- checkTurn() : ".date('Y-m-d H:i:s')." : ".$session->userName; pushLockLog($locklog); @@ -2388,7 +2388,7 @@ function getAdmin() { function getMe() { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); $query = "select * from general where owner='{$session->userID}'"; $result = MYDB_query($query, $connect) or Error("접속자가 많아 접속을 중단합니다. 잠시후 갱신해주세요.
getMe : ".MYDB_error($connect),""); diff --git a/hwe/func_command.php b/hwe/func_command.php index b55bb486..a54f3813 100644 --- a/hwe/func_command.php +++ b/hwe/func_command.php @@ -455,7 +455,7 @@ function getCoreTurn($nation, $level) { function processCommand($no) { - $session = Session::Instance(); + $session = Session::getInstance(); $db = DB::db(); $connect=$db->get(); @@ -685,7 +685,7 @@ where nation='{$general['nation']}' function command_Single($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); $command = EncodeCommand(0, 0, 0, $command); @@ -704,7 +704,7 @@ function command_Single($turn, $command) { function command_Chief($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); $command = EncodeCommand(0, 0, 0, $command); diff --git a/hwe/func_map.php b/hwe/func_map.php index 8d583d91..51a1afc0 100644 --- a/hwe/func_map.php +++ b/hwe/func_map.php @@ -50,7 +50,7 @@ function getWorldMap($req){ return getHistoryMap($req->year, $req->month); } - $session = Session::Instance(); + $session = Session::getInstance(); $generalID = $session->generalID; $db = DB::db(); diff --git a/hwe/func_message.php b/hwe/func_message.php index 6fa7d5d9..0b86cedf 100644 --- a/hwe/func_message.php +++ b/hwe/func_message.php @@ -78,7 +78,7 @@ function getRawMessage($mailbox, $msgType, $limit=30, $fromSeq=null){ } function getMessage($msgType, $nationID=null, $limit=30, $fromSeq=null){ - $generalID = Session::Instance()->generalID; + $generalID = Session::getInstance()->generalID; if($generalID === null){ return []; } @@ -280,7 +280,7 @@ function getMailboxList(){ function DecodeMsg($msg, $type, $who, $date, $bg, $num=0) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); //FIXME: 폐기 $query = "select no,nation,name,picture,level from general where owner='{$session->userID}'"; @@ -349,7 +349,7 @@ function moveMsg($table, $msgtype, $msgnum, $msg, $type, $who, $when, $column, $ function MsgDip($bg) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); $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/func_template.php b/hwe/func_template.php index f75858f6..bb9112f0 100644 --- a/hwe/func_template.php +++ b/hwe/func_template.php @@ -89,7 +89,7 @@ function allButton() { function commandButton() { global $_basecolor, $_basecolor2; - $session = Session::Instance(); + $session = Session::getInstance(); $generalID = $session->generalID; if($generalID === null){ diff --git a/hwe/j_map.php b/hwe/j_map.php index c2e9630b..6d636d7d 100644 --- a/hwe/j_map.php +++ b/hwe/j_map.php @@ -4,7 +4,7 @@ namespace sammo; include 'lib.php'; include 'func.php'; -$session = Session::Instance()->setReadOnly(); +$session = Session::getInstance()->setReadOnly(); $defaultPost = [ 'year' => null, diff --git a/hwe/j_msg_contact_list.php b/hwe/j_msg_contact_list.php index cacbfffd..46c2d0ad 100644 --- a/hwe/j_msg_contact_list.php +++ b/hwe/j_msg_contact_list.php @@ -6,7 +6,7 @@ include('func.php'); $session = Session::requireGameLogin([])->setReadOnly(); -if(!Session::Instance()->generalID){ +if(!Session::getInstance()->generalID){ Json::die([ "nation"=>[] ]); diff --git a/hwe/j_msg_decide_opt.php b/hwe/j_msg_decide_opt.php index cf2f5a37..ad49dd93 100644 --- a/hwe/j_msg_decide_opt.php +++ b/hwe/j_msg_decide_opt.php @@ -8,7 +8,7 @@ include 'func.php'; $session = Session::requireGameLogin([])->setReadOnly(); -$generalID = Session::Instance()->generalID; +$generalID = Session::getInstance()->generalID; if (!$generalID) { Json::die([ diff --git a/hwe/processing.php b/hwe/processing.php index 2aa86a50..b62c83d6 100644 --- a/hwe/processing.php +++ b/hwe/processing.php @@ -176,7 +176,7 @@ function ender($type=0) { function command_99($turn) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); $query = "select nation,level from general where owner='{$session->userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); @@ -238,7 +238,7 @@ function GetExplain() { function command_11($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); global $_basecolor, $_basecolor2, $images, $image; starter("징병"); @@ -447,7 +447,7 @@ function calc(cost, formnum) { function command_12($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); global $_basecolor, $_basecolor2, $images, $image; starter("모병"); @@ -658,7 +658,7 @@ function calc(cost, formnum) { function command_15($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("재편성"); $query = "select no,nation from general where owner='{$session->userID}'"; @@ -703,7 +703,7 @@ function command_15($turn, $command) { function command_16($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("출병"); $query = "select city from general where owner='{$session->userID}'"; @@ -746,7 +746,7 @@ function command_16($turn, $command) { function command_21($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("이동"); $query = "select city from general where owner='{$session->userID}'"; @@ -789,7 +789,7 @@ function command_21($turn, $command) { function command_22($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); die('비활성화됨');//TODO:등용장 대 디자인 starter("등용"); @@ -854,7 +854,7 @@ function command_22($turn, $command) { function command_23($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("포상", 1); $query = "select no,nation from general where owner='{$session->userID}'"; @@ -928,7 +928,7 @@ function command_23($turn, $command) { function command_24($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("몰수", 1); $query = "select no,nation from general where owner='{$session->userID}'"; @@ -1005,7 +1005,7 @@ function command_25($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("임관"); @@ -1083,7 +1083,7 @@ function command_25($turn, $command) { function command_27($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("발령", 1); @@ -1143,7 +1143,7 @@ function command_27($turn, $command) { function command_30($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("강행"); $query = "select city from general where owner='{$session->userID}'"; @@ -1186,7 +1186,7 @@ ender(); function command_31($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("첩보"); $query = "select city from general where owner='{$session->userID}'"; @@ -1233,7 +1233,7 @@ function command_31($turn, $command) { function command_32($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("화계"); $query = "select city from general where owner='{$session->userID}'"; @@ -1275,7 +1275,7 @@ function command_32($turn, $command) { function command_33($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("탈취"); $query = "select city from general where owner='{$session->userID}'"; @@ -1317,7 +1317,7 @@ function command_33($turn, $command) { function command_34($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("파괴"); $query = "select city from general where owner='{$session->userID}'"; @@ -1359,7 +1359,7 @@ function command_34($turn, $command) { function command_35($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("선동"); $query = "select city from general where owner='{$session->userID}'"; @@ -1401,7 +1401,7 @@ function command_35($turn, $command) { function command_36($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("기습"); $query = "select city from general where owner='{$session->userID}'"; @@ -1443,7 +1443,7 @@ function command_36($turn, $command) { function command_43($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("증여"); $query = "select no,nation from general where owner='{$session->userID}'"; @@ -1663,7 +1663,7 @@ function command_46($turn, $command) { function command_48($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("장비 매매"); @@ -1780,7 +1780,7 @@ function command_49($turn, $command) { function command_51($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("항복 권고", 1); @@ -1835,7 +1835,7 @@ function command_51($turn, $command) { function command_52($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("원조", 1); @@ -1913,7 +1913,7 @@ function command_52($turn, $command) { function command_53($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("통합제의", 1); @@ -1982,7 +1982,7 @@ function command_53($turn, $command) { function command_54($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("선양"); $query = "select no,nation from general where owner='{$session->userID}'"; @@ -2029,7 +2029,7 @@ function command_54($turn, $command) { function command_61($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("불가침", 1); @@ -2113,7 +2113,7 @@ function command_61($turn, $command) { function command_62($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("선전포고", 1); @@ -2180,7 +2180,7 @@ function command_62($turn, $command) { function command_63($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("종전", 1); @@ -2239,7 +2239,7 @@ function command_63($turn, $command) { function command_64($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("파기", 1); @@ -2298,7 +2298,7 @@ function command_64($turn, $command) { function command_65($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("초토화", 1); $query = "select city from general where owner='{$session->userID}'"; @@ -2338,7 +2338,7 @@ echo "
function command_66($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("천도", 1); $query = "select city from general where owner='{$session->userID}'"; @@ -2379,7 +2379,7 @@ echo "
function command_67($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("증축", 1); $query = "select city from general where owner='{$session->userID}'"; @@ -2420,7 +2420,7 @@ echo "
function command_68($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("감축", 1); $query = "select city from general where owner='{$session->userID}'"; @@ -2461,7 +2461,7 @@ echo "
function command_72($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("백성동원", 1); $query = "select city from general where owner='{$session->userID}'"; @@ -2502,7 +2502,7 @@ echo "
function command_73($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("수몰", 1); $query = "select city from general where owner='{$session->userID}'"; @@ -2543,7 +2543,7 @@ echo "
function command_74($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("허보", 1); $query = "select city from general where owner='{$session->userID}'"; @@ -2584,7 +2584,7 @@ echo "
function command_75($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("피장파장", 1); @@ -2644,7 +2644,7 @@ function command_75($turn, $command) { function command_77($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("이호경식", 1); @@ -2704,7 +2704,7 @@ function command_77($turn, $command) { function command_78($turn, $command) { $db = DB::db(); $connect=$db->get(); - $session = Session::Instance(); + $session = Session::getInstance(); starter("급습", 1); diff --git a/i_entrance/j_logout.php b/i_entrance/j_logout.php index 6433be37..63d0c3ea 100644 --- a/i_entrance/j_logout.php +++ b/i_entrance/j_logout.php @@ -3,7 +3,7 @@ namespace sammo; require(__dir__.'/../vendor/autoload.php'); -$session = Session::Instance(); +$session = Session::getInstance(); if(!$session->isLoggedIn()){ //로그인 안했다니까... Json::die([ diff --git a/index.php b/index.php index f80b87fb..1be59d9e 100644 --- a/index.php +++ b/index.php @@ -9,7 +9,7 @@ if(!class_exists('\\sammo\\RootDB')){ } -$session = Session::Instance(); +$session = Session::getInstance(); use \kakao\KakaoKey as KakaoKey; diff --git a/j_login.php b/j_login.php index 069e92c9..4565cdf5 100644 --- a/j_login.php +++ b/j_login.php @@ -5,7 +5,7 @@ require(__dir__.'/vendor/autoload.php'); $RootDB = RootDB::db(); -$session = Session::Instance(); +$session = Session::getInstance(); if($session->isLoggedIn()){ $session->logout(); } diff --git a/oauth_kakao/j_check_dup.php b/oauth_kakao/j_check_dup.php index a0670fc3..e76e0b90 100644 --- a/oauth_kakao/j_check_dup.php +++ b/oauth_kakao/j_check_dup.php @@ -5,7 +5,7 @@ require(__dir__.'/../vendor/autoload.php'); require('lib.join.php'); -$session = Session::Instance()->setReadOnly(); +$session = Session::getInstance()->setReadOnly(); $access_token = $session->access_token; if(!$access_token){ diff --git a/oauth_kakao/j_join_process.php b/oauth_kakao/j_join_process.php index b044c1e7..6c43f866 100644 --- a/oauth_kakao/j_join_process.php +++ b/oauth_kakao/j_join_process.php @@ -6,7 +6,7 @@ require('lib.join.php'); use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper; -$session = Session::Instance(); +$session = Session::getInstance(); $canJoin = RootDB::db()->queryFirstField('SELECT REG FROM `SYSTEM` WHERE `NO` = 1'); if($canJoin != 'Y'){ diff --git a/oauth_kakao/j_login_oauth.php b/oauth_kakao/j_login_oauth.php index ffb8edba..f1e05874 100644 --- a/oauth_kakao/j_login_oauth.php +++ b/oauth_kakao/j_login_oauth.php @@ -6,7 +6,7 @@ require(__dir__.'/../vendor/autoload.php'); use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper; $RootDB = RootDB::db(); -$session = Session::Instance(); +$session = Session::getInstance(); if($session->isLoggedIn()){ $session->logout(); } diff --git a/oauth_kakao/join.php b/oauth_kakao/join.php index d5243623..f07be930 100644 --- a/oauth_kakao/join.php +++ b/oauth_kakao/join.php @@ -5,7 +5,7 @@ require(__dir__.'/../vendor/autoload.php'); WebUtil::setHeaderNoCache(); -$session = Session::Instance()->setReadOnly(); +$session = Session::getInstance()->setReadOnly(); $access_token = $session->access_token; if(!$access_token){ diff --git a/oauth_kakao/oauth.php b/oauth_kakao/oauth.php index f297e451..2c121200 100644 --- a/oauth_kakao/oauth.php +++ b/oauth_kakao/oauth.php @@ -30,7 +30,7 @@ if (Util::array_get($result['expires_in'], -1) <= 0) { die('알 수 없는 에러:'.$me['msg']); } -$session = Session::Instance(); +$session = Session::getInstance(); $restAPI->set_access_token($result['access_token']); $now = TimeUtil::DatetimeNow(); diff --git a/src/sammo/Session.php b/src/sammo/Session.php index 3474a4af..a9c73f5c 100644 --- a/src/sammo/Session.php +++ b/src/sammo/Session.php @@ -31,7 +31,7 @@ class Session { private $writeClosed = false; private $sessionID = null; - public static function Instance(): Session{ + public static function getInstance(): Session{ static $inst = null; if($inst === null){ $inst = new Session(); @@ -69,7 +69,7 @@ class Session { } public static function requireLogin($result = '..'): Session{ - $session = Session::Instance(); + $session = Session::getInstance(); if($session->isLoggedIn()){ return $session; } @@ -278,7 +278,7 @@ class Session { $obj = self::requireLogin($exitPath); } else{ - $obj = self::Instance(); + $obj = self::getInstance(); } return $obj->userGrade; @@ -294,7 +294,7 @@ class Session { $obj = self::requireLogin($exitPath); } else{ - $obj = self::Instance(); + $obj = self::getInstance(); } return $obj->userID;