From 19a84d0cc801377ff9af7ddce12ede00c74633d4 Mon Sep 17 00:00:00 2001 From: hide_d Date: Tue, 5 May 2020 00:19:01 +0900 Subject: [PATCH] =?UTF-8?q?getReq=EB=B3=80=EA=B2=BD,=20ajax=EC=9D=B8=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20ajax=EC=9A=94=EC=B2=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- f_install/j_create_admin.php | 6 +++--- f_install/j_setup_db.php | 22 +++++++++++----------- f_install/j_update_js_css_path.php | 6 +++--- hwe/_119_b.php | 6 +++--- hwe/_admin1_submit.php | 14 +++++++------- hwe/_admin2_submit.php | 8 ++++---- hwe/_admin4_submit.php | 6 +++--- hwe/_admin5.php | 4 ++-- hwe/_admin5_submit.php | 4 ++-- hwe/_admin6.php | 2 +- hwe/_admin7.php | 6 +++--- hwe/_admin8.php | 4 ++-- hwe/b_myPage.php | 8 ++++---- hwe/c_auction.php | 14 +++++++------- hwe/c_dipcenter.php | 12 ++++++------ hwe/c_tournament.php | 14 +++++++------- hwe/c_vote.php | 10 +++++----- hwe/j_adjust_icon.php | 1 + hwe/j_betting.php | 6 ++++-- hwe/j_board_article_add.php | 8 +++++--- hwe/j_board_comment_add.php | 6 ++++-- hwe/j_board_get_articles.php | 4 +++- hwe/j_chief_turn.php | 4 +++- hwe/j_diplomacy_destroy_letter.php | 4 +++- hwe/j_diplomacy_get_letter.php | 4 +++- hwe/j_diplomacy_respond_letter.php | 8 +++++--- hwe/j_diplomacy_rollback_letter.php | 4 +++- hwe/j_diplomacy_send_letter.php | 10 ++++++---- hwe/j_general_set_permission.php | 6 ++++-- hwe/j_general_turn.php | 6 ++++-- hwe/j_get_general_list.php | 2 +- hwe/j_get_nation_general_list.php | 4 ++-- hwe/j_get_select_npc_token.php | 4 ++-- hwe/j_image_upload.php | 2 ++ hwe/j_install.php | 8 +++++--- hwe/j_install_db.php | 14 ++++++++------ hwe/j_load_scenarios.php | 2 +- hwe/j_map.php | 2 +- hwe/j_map_history.php | 6 +++--- hwe/j_msg_decide_opt.php | 4 +++- hwe/j_msg_delete.php | 4 +++- hwe/j_msg_get_old.php | 4 ++-- hwe/j_msg_get_recent.php | 2 +- hwe/j_msg_submit.php | 4 +++- hwe/j_myBossInfo.php | 10 ++++++---- hwe/j_raise_event.php | 4 ++-- hwe/j_select_npc.php | 4 +++- hwe/j_set_chief_command.php | 8 +++++--- hwe/j_set_general_command.php | 8 +++++--- hwe/j_simulate_battle.php | 6 ++++-- hwe/j_troop.php | 10 ++++++---- hwe/join_post.php | 14 +++++++------- hwe/sammo/GameConstBase.php | 2 +- i_entrance/j_change_password.php | 6 ++++-- i_entrance/j_delete_me.php | 4 +++- i_entrance/j_disallow_third_use.php | 2 ++ i_entrance/j_icon_change.php | 2 ++ i_entrance/j_icon_delete.php | 2 ++ i_entrance/j_logout.php | 2 ++ i_entrance/j_server_change_status.php | 8 +++++--- i_entrance/j_server_get_admin_status.php | 2 ++ i_entrance/j_set_userlist.php | 8 +++++--- oauth_kakao/j_change_pw.php | 2 ++ oauth_kakao/j_check_OTP.php | 4 +++- oauth_kakao/j_check_dup.php | 6 ++++-- oauth_kakao/j_join_process.php | 14 ++++++++------ oauth_kakao/j_login_oauth.php | 2 ++ oauth_kakao/j_reset_token.php | 2 ++ src/sammo/WebUtil.php | 13 +++++++++++++ 69 files changed, 258 insertions(+), 166 deletions(-) diff --git a/f_install/j_create_admin.php b/f_install/j_create_admin.php index bfabd179..95810503 100644 --- a/f_install/j_create_admin.php +++ b/f_install/j_create_admin.php @@ -7,9 +7,9 @@ require(__DIR__ . '/../vendor/autoload.php'); session_start(); session_destroy(); -$username = mb_strtolower(Util::getReq('username'), 'utf-8'); -$password = Util::getReq('password', 'string'); -$nickname = Util::getReq('nickname'); +$username = mb_strtolower(Util::getPost('username'), 'utf-8'); +$password = Util::getPost('password', 'string'); +$nickname = Util::getPost('nickname'); if (!$username || !$password || !$nickname) { Json::die([ diff --git a/f_install/j_setup_db.php b/f_install/j_setup_db.php index 465da5f2..2b830e91 100644 --- a/f_install/j_setup_db.php +++ b/f_install/j_setup_db.php @@ -4,18 +4,18 @@ namespace sammo; require(__DIR__ . '/../vendor/autoload.php'); -$host = Util::getReq('db_host'); -$port = Util::getReq('db_port', 'int'); -$username = Util::getReq('db_id'); -$password = Util::getReq('db_pw'); -$dbName = Util::getReq('db_name'); -$servHost = Util::getReq('serv_host'); -$sharedIconPath = Util::getReq('shared_icon_path'); -$gameImagePath = Util::getReq('game_image_path'); -$imageRequestKey = Util::getReq('image_request_key'); +$host = Util::getPost('db_host'); +$port = Util::getPost('db_port', 'int'); +$username = Util::getPost('db_id'); +$password = Util::getPost('db_pw'); +$dbName = Util::getPost('db_name'); +$servHost = Util::getPost('serv_host'); +$sharedIconPath = Util::getPost('shared_icon_path'); +$gameImagePath = Util::getPost('game_image_path'); +$imageRequestKey = Util::getPost('image_request_key'); -$kakaoRESTKey = Util::getReq('kakao_rest_key', 'string', ''); -$kakaoAdminKey = Util::getReq('kakao_admin_key', 'string', ''); +$kakaoRESTKey = Util::getPost('kakao_rest_key', 'string', ''); +$kakaoAdminKey = Util::ggetPostetReq('kakao_admin_key', 'string', ''); if (!$host || !$port || !$username || !$password || !$dbName || !$servHost || !$sharedIconPath || !$gameImagePath) { diff --git a/f_install/j_update_js_css_path.php b/f_install/j_update_js_css_path.php index 56802714..e561e3b9 100644 --- a/f_install/j_update_js_css_path.php +++ b/f_install/j_update_js_css_path.php @@ -12,9 +12,9 @@ if ($session->userGrade < 6) { ]); } -$servHost = Util::getReq('serv_host'); -$sharedIconPath = Util::getReq('shared_icon_path'); -$gameImagePath = Util::getReq('game_image_path'); +$servHost = Util::getPost('serv_host'); +$sharedIconPath = Util::getPost('shared_icon_path'); +$gameImagePath = Util::getPost('game_image_path'); if ($servHost) { if (!$sharedIconPath || $gameImagePath) { diff --git a/hwe/_119_b.php b/hwe/_119_b.php index accc6d2e..9e18f21f 100644 --- a/hwe/_119_b.php +++ b/hwe/_119_b.php @@ -21,9 +21,9 @@ if (!$v->validate()) { Error($v->errorStr()); } -$btn = Util::getReq('btn'); -$minute = Util::getReq('minute', 'int'); -$minute2 = Util::getReq('minute2', 'int'); +$btn = Util::getPost('btn'); +$minute = Util::getPost('minute', 'int'); +$minute2 = Util::getPost('minute2', 'int'); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); diff --git a/hwe/_admin1_submit.php b/hwe/_admin1_submit.php index 91333afe..a7a2177e 100644 --- a/hwe/_admin1_submit.php +++ b/hwe/_admin1_submit.php @@ -22,13 +22,13 @@ if (!$v->validate()) { Error($v->errorStr()); } -$msg = Util::getReq('msg'); -$btn = Util::getReq('btn'); -$log = Util::getReq('log'); -$starttime = Util::getReq('starttime', 'string', (new \DateTime())->format('Y-m-d H:i:s')); -$maxgeneral = Util::getReq('maxgeneral', 'int', GameConst::$defaultMaxGeneral); -$maxnation = Util::getReq('maxnation', 'int', GameConst::$defaultMaxNation); -$startyear = Util::getReq('startyear', 'int', GameConst::$defaultStartYear); +$msg = Util::getPost('msg'); +$btn = Util::getPost('btn'); +$log = Util::getPost('log'); +$starttime = Util::getPost('starttime', 'string', (new \DateTime())->format('Y-m-d H:i:s')); +$maxgeneral = Util::getPost('maxgeneral', 'int', GameConst::$defaultMaxGeneral); +$maxnation = Util::getPost('maxnation', 'int', GameConst::$defaultMaxNation); +$startyear = Util::getPost('startyear', 'int', GameConst::$defaultStartYear); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); diff --git a/hwe/_admin2_submit.php b/hwe/_admin2_submit.php index 86c8df65..f6542850 100644 --- a/hwe/_admin2_submit.php +++ b/hwe/_admin2_submit.php @@ -5,10 +5,10 @@ namespace sammo; include "lib.php"; include "func.php"; -$btn = Util::getReq('btn'); -$item = Util::getReq('item', 'string'); -$genlist = Util::getReq('genlist', 'array_int'); -$msg = Util::getReq('msg', 'string'); +$btn = Util::getPost('btn'); +$item = Util::getPost('item', 'string'); +$genlist = Util::getPost('genlist', 'array_int'); +$msg = Util::getPost('msg', 'string'); //로그인 검사 $session = Session::requireLogin()->loginGame()->setReadOnly(); diff --git a/hwe/_admin4_submit.php b/hwe/_admin4_submit.php index beaceed1..1d9fba81 100644 --- a/hwe/_admin4_submit.php +++ b/hwe/_admin4_submit.php @@ -12,9 +12,9 @@ if ($session->userGrade < 5) { die(); } -$btn = Util::getReq('btn'); -$genlist = Util::getReq('genlist', 'array_int'); -$msg = Util::getReq('msg', 'string', '메시지'); +$btn = Util::getPost('btn'); +$genlist = Util::getPost('genlist', 'array_int'); +$msg = Util::getPost('msg', 'string', '메시지'); $db = DB::db(); diff --git a/hwe/_admin5.php b/hwe/_admin5.php index c1a9a812..84c861fa 100644 --- a/hwe/_admin5.php +++ b/hwe/_admin5.php @@ -5,8 +5,8 @@ namespace sammo; include "lib.php"; include "func.php"; -$type = Util::getReq('type', 'int', 0); -$type2 = Util::getReq('type2', 'int', 0); +$type = Util::getPost('type', 'int', 0); +$type2 = Util::getPost('type2', 'int', 0); if ($type < 0 || $type > 17) { $type = 0; diff --git a/hwe/_admin5_submit.php b/hwe/_admin5_submit.php index 7371c7e8..976e8359 100644 --- a/hwe/_admin5_submit.php +++ b/hwe/_admin5_submit.php @@ -5,8 +5,8 @@ namespace sammo; include "lib.php"; include "func.php"; -$btn = Util::getReq('btn'); -$nation = Util::getReq('nation', 'int'); +$btn = Util::getPost('btn'); +$nation = Util::getPost('nation', 'int'); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); diff --git a/hwe/_admin6.php b/hwe/_admin6.php index 52c9889d..1805e283 100644 --- a/hwe/_admin6.php +++ b/hwe/_admin6.php @@ -5,7 +5,7 @@ namespace sammo; include "lib.php"; include "func.php"; -$type = Util::getReq('type', 'int', 0); +$type = Util::getPost('type', 'int', 0); if ($type < 0 || $type > 4) { $type = 0; } diff --git a/hwe/_admin7.php b/hwe/_admin7.php index b4aaa2c8..df7b6deb 100644 --- a/hwe/_admin7.php +++ b/hwe/_admin7.php @@ -5,9 +5,9 @@ namespace sammo; include "lib.php"; include "func.php"; -$btn = Util::getReq('btn'); -$gen = Util::getReq('gen', 'int', 0); -$reqQueryType = Util::getReq('query_type', 'string', null); +$btn = Util::getPost('btn'); +$gen = Util::getPost('gen', 'int', 0); +$reqQueryType = Util::getPost('query_type', 'string', null); // $queryTypeText, $reqArgType(0=>None, 1=>AdditionalColumn, 2=>rankVal, 3=>aux), $comp $queryMap = [ diff --git a/hwe/_admin8.php b/hwe/_admin8.php index c1bb570d..4f143310 100644 --- a/hwe/_admin8.php +++ b/hwe/_admin8.php @@ -4,8 +4,8 @@ namespace sammo; include "lib.php"; include "func.php"; -$btn = Util::getReq('btn'); -$gen = Util::getReq('gen', 'int', 0); +$btn = Util::getPost('btn'); +$gen = Util::getPost('gen', 'int', 0); $type = 0; //로그인 검사 diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php index 6790093c..e351d782 100644 --- a/hwe/b_myPage.php +++ b/hwe/b_myPage.php @@ -4,10 +4,10 @@ namespace sammo; include "lib.php"; include "func.php"; -$btn = Util::getReq('btn'); -$defence_train = Util::getReq('defence_train', 'int', 2); -$tnmt = Util::getReq('tnmt', 'int', 1); -//$detachNPC = Util::getReq('detachNPC', 'bool'); +$btn = Util::getPost('btn'); +$defence_train = Util::getPost('defence_train', 'int', 2); +$tnmt = Util::getPost('tnmt', 'int', 1); +//$detachNPC = Util::getPost('detachNPC', 'bool'); $detachNPC = false; $showDieImmediatelyBtn = false; diff --git a/hwe/c_auction.php b/hwe/c_auction.php index 6ca1ed40..760c74e0 100644 --- a/hwe/c_auction.php +++ b/hwe/c_auction.php @@ -14,13 +14,13 @@ $v->rule('integer', [ 'sel' ]); -$btn = Util::getReq('btn'); -$amount = Util::getReq('amount', 'int'); -$cost = Util::getReq('cost', 'int'); -$topv = Util::getReq('topv', 'int'); -$value = Util::getReq('value', 'int'); -$term = Util::getReq('term', 'int'); -$sel = Util::getReq('sel', 'int'); +$btn = Util::getPost('btn'); +$amount = Util::getPost('amount', 'int'); +$cost = Util::getPost('cost', 'int'); +$topv = Util::getPost('topv', 'int'); +$value = Util::getPost('value', 'int'); +$term = Util::getPost('term', 'int'); +$sel = Util::getPost('sel', 'int'); $msg = ''; $msg2 = ''; diff --git a/hwe/c_dipcenter.php b/hwe/c_dipcenter.php index 271263f2..23ac5152 100644 --- a/hwe/c_dipcenter.php +++ b/hwe/c_dipcenter.php @@ -5,12 +5,12 @@ include "lib.php"; include "func.php"; // $btn, $msg, $scoutmsg, $rate, $bill, $secretlimit -$btn = Util::getReq('btn'); -$msg = Util::getReq('msg'); -$scoutmsg = Util::getReq('scoutmsg'); -$rate = Util::getReq('rate', 'int'); -$bill = Util::getReq('bill', 'int'); -$secretlimit = Util::getReq('secretlimit', 'int'); +$btn = Util::getPost('btn'); +$msg = Util::getPost('msg'); +$scoutmsg = Util::getPost('scoutmsg'); +$rate = Util::getPost('rate', 'int'); +$bill = Util::getPost('bill', 'int'); +$secretlimit = Util::getPost('secretlimit', 'int'); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); diff --git a/hwe/c_tournament.php b/hwe/c_tournament.php index 05fb6c85..b55eb4b9 100644 --- a/hwe/c_tournament.php +++ b/hwe/c_tournament.php @@ -4,15 +4,15 @@ namespace sammo; include "lib.php"; include "func.php"; // $btn, $msg -$btn = Util::getReq('btn'); -$msg = Util::getReq('msg'); +$btn = Util::getPost('btn'); +$msg = Util::getPost('msg'); //관리자용 -$auto = Util::getReq('auto', 'int'); -$type = Util::getReq('type', 'int'); -$gen = Util::getReq('gen', 'int'); -$sel = Util::getReq('sel', 'int'); -$trig = Util::getReq('trig', 'int'); +$auto = Util::getPost('auto', 'int'); +$type = Util::getPost('type', 'int'); +$gen = Util::getPost('gen', 'int'); +$sel = Util::getPost('sel', 'int'); +$trig = Util::getPost('trig', 'int'); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); diff --git a/hwe/c_vote.php b/hwe/c_vote.php index 5c148f58..b8bed2bf 100644 --- a/hwe/c_vote.php +++ b/hwe/c_vote.php @@ -4,11 +4,11 @@ namespace sammo; include "lib.php"; include "func.php"; -$btn = Util::getReq('btn'); -$sel = Util::getReq('sel', 'int'); -$comment = Util::getReq('comment'); -$title = Util::getReq('title'); -$str = Util::getReq('str'); +$btn = Util::getPost('btn'); +$sel = Util::getPost('sel', 'int'); +$comment = Util::getPost('comment'); +$title = Util::getPost('title'); +$str = Util::getPost('str'); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); diff --git a/hwe/j_adjust_icon.php b/hwe/j_adjust_icon.php index c546360a..6d065b2b 100644 --- a/hwe/j_adjust_icon.php +++ b/hwe/j_adjust_icon.php @@ -3,6 +3,7 @@ namespace sammo; include('lib.php'); +WebUtil::requireAJAX(); $session = Session::requireGameLogin([])->setReadOnly(); $userID = Session::getUserID(); diff --git a/hwe/j_betting.php b/hwe/j_betting.php index da4439b8..af4d0d52 100644 --- a/hwe/j_betting.php +++ b/hwe/j_betting.php @@ -4,8 +4,10 @@ namespace sammo; include "lib.php"; include "func.php"; -$betTarget = Util::getReq('target', 'int', -1); -$betGold = Util::getReq('amount', 'int', 0); +WebUtil::requireAJAX(); + +$betTarget = Util::getPost('target', 'int', -1); +$betGold = Util::getPost('amount', 'int', 0); if($betTarget < 0 || $betTarget >= 16 || $betGold < 10 || $betGold > 1000){ diff --git a/hwe/j_board_article_add.php b/hwe/j_board_article_add.php index 52a58ac6..4b4b3a89 100644 --- a/hwe/j_board_article_add.php +++ b/hwe/j_board_article_add.php @@ -3,15 +3,17 @@ namespace sammo; include "lib.php"; include "func.php"; + +WebUtil::requireAJAX(); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); $userID = Session::getUserID(); $db = DB::db(); -$isSecretBoard = Util::getReq('isSecret', 'bool', false); -$title = Util::getReq('title'); -$text = Util::getReq('text'); +$isSecretBoard = Util::getPost('isSecret', 'bool', false); +$title = Util::getPost('title'); +$text = Util::getPost('text'); increaseRefresh("회의실", 1); diff --git a/hwe/j_board_comment_add.php b/hwe/j_board_comment_add.php index dcae175a..12ada898 100644 --- a/hwe/j_board_comment_add.php +++ b/hwe/j_board_comment_add.php @@ -3,14 +3,16 @@ namespace sammo; include "lib.php"; include "func.php"; + +WebUtil::requireAJAX(); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); $userID = Session::getUserID(); $db = DB::db(); -$articleNo = Util::getReq('articleNo', 'int'); -$text = Util::getReq('text'); +$articleNo = Util::getPost('articleNo', 'int'); +$text = Util::getPost('text'); increaseRefresh("회의실", 1); diff --git a/hwe/j_board_get_articles.php b/hwe/j_board_get_articles.php index b827cf35..9b902cf4 100644 --- a/hwe/j_board_get_articles.php +++ b/hwe/j_board_get_articles.php @@ -3,6 +3,8 @@ namespace sammo; include "lib.php"; include "func.php"; + +WebUtil::requireAJAX(); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); $userID = Session::getUserID(); @@ -10,7 +12,7 @@ $userID = Session::getUserID(); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$isSecretBoard = Util::getReq('isSecret', 'bool', false); +$isSecretBoard = Util::getPost('isSecret', 'bool', false); increaseRefresh("회의실", 1); diff --git a/hwe/j_chief_turn.php b/hwe/j_chief_turn.php index 1ac30d8b..b6e1dcd6 100644 --- a/hwe/j_chief_turn.php +++ b/hwe/j_chief_turn.php @@ -3,11 +3,13 @@ namespace sammo; include "lib.php"; include "func.php"; + +WebUtil::requireAJAX(); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); $userID = Session::getUserID(); -$turnAmount = Util::getReq('amount', 'int'); +$turnAmount = Util::getPost('amount', 'int'); $db = DB::db(); $me = $db->queryFirstRow('SELECT no,nation,officer_level FROM general WHERE owner=%i', $userID); diff --git a/hwe/j_diplomacy_destroy_letter.php b/hwe/j_diplomacy_destroy_letter.php index bc0eb71e..e4afb2eb 100644 --- a/hwe/j_diplomacy_destroy_letter.php +++ b/hwe/j_diplomacy_destroy_letter.php @@ -3,13 +3,15 @@ namespace sammo; include "lib.php"; include "func.php"; + +WebUtil::requireAJAX(); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); $userID = Session::getUserID(); $db = DB::db(); -$letterNo = Util::getReq('letterNo', 'int'); +$letterNo = Util::getPost('letterNo', 'int'); increaseRefresh("외교부", 1); diff --git a/hwe/j_diplomacy_get_letter.php b/hwe/j_diplomacy_get_letter.php index 6ff0410a..39aed480 100644 --- a/hwe/j_diplomacy_get_letter.php +++ b/hwe/j_diplomacy_get_letter.php @@ -3,6 +3,8 @@ namespace sammo; include "lib.php"; include "func.php"; + +WebUtil::requireAJAX(); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); $userID = Session::getUserID(); @@ -10,7 +12,7 @@ $userID = Session::getUserID(); $db = DB::db(); $gameStor = KVStorage::getStorage($db, 'game_env'); -$isSecretBoard = Util::getReq('isSecret', 'bool', false); +$isSecretBoard = Util::getPost('isSecret', 'bool', false); increaseRefresh("외교부", 1); diff --git a/hwe/j_diplomacy_respond_letter.php b/hwe/j_diplomacy_respond_letter.php index 12e599bd..27a11fc4 100644 --- a/hwe/j_diplomacy_respond_letter.php +++ b/hwe/j_diplomacy_respond_letter.php @@ -3,15 +3,17 @@ namespace sammo; include "lib.php"; include "func.php"; + +WebUtil::requireAJAX(); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); $userID = Session::getUserID(); $db = DB::db(); -$letterNo = Util::getReq('letterNo', 'int'); -$isAgree = Util::getReq('isAgree', 'bool', false); -$reason = Util::getReq('reason', 'string', ''); +$letterNo = Util::getPost('letterNo', 'int'); +$isAgree = Util::getPost('isAgree', 'bool', false); +$reason = Util::getPost('reason', 'string', ''); diff --git a/hwe/j_diplomacy_rollback_letter.php b/hwe/j_diplomacy_rollback_letter.php index 1f24f753..55446595 100644 --- a/hwe/j_diplomacy_rollback_letter.php +++ b/hwe/j_diplomacy_rollback_letter.php @@ -3,13 +3,15 @@ namespace sammo; include "lib.php"; include "func.php"; + +WebUtil::requireAJAX(); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); $userID = Session::getUserID(); $db = DB::db(); -$letterNo = Util::getReq('letterNo', 'int'); +$letterNo = Util::getPost('letterNo', 'int'); increaseRefresh("외교부", 1); diff --git a/hwe/j_diplomacy_send_letter.php b/hwe/j_diplomacy_send_letter.php index c04bff5e..ad987993 100644 --- a/hwe/j_diplomacy_send_letter.php +++ b/hwe/j_diplomacy_send_letter.php @@ -3,16 +3,18 @@ namespace sammo; include "lib.php"; include "func.php"; + +WebUtil::requireAJAX(); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); $userID = Session::getUserID(); $db = DB::db(); -$destNationNo = Util::getReq('destNation', 'int', 0); -$prevNo = Util::getReq('prevNo', 'int', null); -$textBrief = Util::getReq('brief'); -$textDetail = Util::getReq('detail'); +$destNationNo = Util::getPost('destNation', 'int', 0); +$prevNo = Util::getPost('prevNo', 'int', null); +$textBrief = Util::getPost('brief'); +$textDetail = Util::getPost('detail'); increaseRefresh("외교부", 1); diff --git a/hwe/j_general_set_permission.php b/hwe/j_general_set_permission.php index aeec3291..765e1c0e 100644 --- a/hwe/j_general_set_permission.php +++ b/hwe/j_general_set_permission.php @@ -4,10 +4,12 @@ namespace sammo; include "lib.php"; include "func.php"; +WebUtil::requireAJAX(); + //TODO: 변경이 완료되면 항상 공지되어야함 -$isAmbassador = Util::getReq('isAmbassador', 'bool'); -$genlist = Util::getReq('genlist', 'array_int'); +$isAmbassador = Util::getPost('isAmbassador', 'bool'); +$genlist = Util::getPost('genlist', 'array_int'); //로그인 검사 $session = Session::requireGameLogin([])->setReadOnly(); diff --git a/hwe/j_general_turn.php b/hwe/j_general_turn.php index e17443a6..358e00b9 100644 --- a/hwe/j_general_turn.php +++ b/hwe/j_general_turn.php @@ -4,14 +4,16 @@ namespace sammo; include "lib.php"; include "func.php"; +WebUtil::requireAJAX(); + $session = Session::requireGameLogin([])->setReadOnly(); $generalID = $session->generalID; -$turnAmount = Util::getReq('amount', 'int'); -$isRepeat = Util::getReq('is_repeat', 'bool', false); +$turnAmount = Util::getPost('amount', 'int'); +$isRepeat = Util::getPost('is_repeat', 'bool', false); if($turnAmount == null){ Json::die([ diff --git a/hwe/j_get_general_list.php b/hwe/j_get_general_list.php index 61a8e44d..b4c26056 100644 --- a/hwe/j_get_general_list.php +++ b/hwe/j_get_general_list.php @@ -10,7 +10,7 @@ $session = Session::requireLogin(); $userID = Session::getUserID(); $db = DB::db(); -$withToken = Util::getReq('with_token', 'bool', false); +$withToken = Util::getPost('with_token', 'bool', false); $gameStor = KVStorage::getStorage($db, 'game_env'); if($session->isGameLoggedIn()){ diff --git a/hwe/j_get_nation_general_list.php b/hwe/j_get_nation_general_list.php index 4a083061..02d332c5 100644 --- a/hwe/j_get_nation_general_list.php +++ b/hwe/j_get_nation_general_list.php @@ -11,8 +11,8 @@ $session = Session::requireGameLogin([])->setReadOnly(); $userID = Session::getUserID(); $db = DB::db(); -$reqType = Util::getReq('req', 'int', 1); -$reqForce = Util::getReq('force', 'bool', false); +$reqType = Util::getPost('req', 'int', 1); +$reqForce = Util::getPost('force', 'bool', false); $gameStor = KVStorage::getStorage($db, 'game_env'); increaseRefresh("세력장수", 1); diff --git a/hwe/j_get_select_npc_token.php b/hwe/j_get_select_npc_token.php index f2d181af..4a8ceced 100644 --- a/hwe/j_get_select_npc_token.php +++ b/hwe/j_get_select_npc_token.php @@ -9,8 +9,8 @@ const PICK_MORE_SECOND = 10; const KEEP_CNT = 3; -$refresh = Util::getReq('refresh', 'bool', false); -$keepResult = Util::getReq('keep', 'array_int', []); +$refresh = Util::getPost('refresh', 'bool', false); +$keepResult = Util::getPost('keep', 'array_int', []); $session = Session::requireLogin([])->setReadOnly(); $userID = Session::getUserID(); diff --git a/hwe/j_image_upload.php b/hwe/j_image_upload.php index 7c2e1c3d..582b6864 100644 --- a/hwe/j_image_upload.php +++ b/hwe/j_image_upload.php @@ -4,6 +4,8 @@ namespace sammo; include 'lib.php'; include 'func.php'; +WebUtil::requireAJAX(); + $session = Session::requireGameLogin([])->setReadOnly(); $userID = $session::getUserID(); $serverID = UniqueConst::$serverID; diff --git a/hwe/j_install.php b/hwe/j_install.php index 7b924e18..63dc1455 100644 --- a/hwe/j_install.php +++ b/hwe/j_install.php @@ -4,6 +4,8 @@ namespace sammo; include "lib.php"; include "func.php"; +WebUtil::requireAJAX(); + $session = Session::requireLogin([])->setReadOnly(); if(!class_exists('\\sammo\\DB')){ @@ -19,7 +21,7 @@ $allowReset = in_array('reset', $serverAcl); $allowFullReset = in_array('fullReset',$serverAcl); $allowReset |= $allowFullReset; -$reserve_open = Util::getReq('reserve_open'); +$reserve_open = Util::getPost('reserve_open'); if($reserve_open && $reserve_open < date('Y-m-d H:i')){ Json::die([ 'result'=>false, @@ -27,7 +29,7 @@ if($reserve_open && $reserve_open < date('Y-m-d H:i')){ ]); } -$pre_reserve_open = Util::getReq('pre_reserve_open'); +$pre_reserve_open = Util::getPost('pre_reserve_open'); if($pre_reserve_open && !$reserve_open){ Json::die([ 'result'=>false, @@ -112,7 +114,7 @@ $tournament_trig = (int)$_POST['tournament_trig']; $join_mode = $_POST['join_mode']; $autorun_user_minutes = (int)$_POST['autorun_user_minutes']; $autorun_user_options = []; -foreach(Util::getReq('autorun_user', 'array_string', []) as $autorun_option){ +foreach(Util::getPost('autorun_user', 'array_string', []) as $autorun_option){ $autorun_user_options[$autorun_option] = 1; } diff --git a/hwe/j_install_db.php b/hwe/j_install_db.php index 69700b9b..11908fea 100644 --- a/hwe/j_install_db.php +++ b/hwe/j_install_db.php @@ -4,6 +4,8 @@ namespace sammo; include "lib.php"; include "func.php"; +WebUtil::requireAJAX(); + $session = Session::requireLogin([])->setReadOnly(); if($session->userGrade < 6){ Json::die([ @@ -12,12 +14,12 @@ if($session->userGrade < 6){ ]); } -$fullReset = Util::getReq('full_reset', 'bool', false); -$host = Util::getReq('db_host'); -$port = Util::getReq('db_port', 'int'); -$username = Util::getReq('db_id'); -$password = Util::getReq('db_pw'); -$dbName = Util::getReq('db_name'); +$fullReset = Util::getPost('full_reset', 'bool', false); +$host = Util::getPost('db_host'); +$port = Util::getPost('db_port', 'int'); +$username = Util::getPost('db_id'); +$password = Util::getPost('db_pw'); +$dbName = Util::getPost('db_name'); if(!$host || !$port || !$username || !$password || !$dbName){ Json::die([ diff --git a/hwe/j_load_scenarios.php b/hwe/j_load_scenarios.php index 4fb09e74..d5eaa7af 100644 --- a/hwe/j_load_scenarios.php +++ b/hwe/j_load_scenarios.php @@ -19,7 +19,7 @@ if($session->userGrade < 5 && !$allowReset){ } -$scenarioIdx = Util::getReq('scenarioIdx', 'int'); +$scenarioIdx = Util::getPost('scenarioIdx', 'int'); if ($scenarioIdx !== null) { //TODO: preview 지도 출력 diff --git a/hwe/j_map.php b/hwe/j_map.php index 576e78d5..1be7fbf0 100644 --- a/hwe/j_map.php +++ b/hwe/j_map.php @@ -13,7 +13,7 @@ $defaultPost = [ 'neutralView' => false, 'showMe' => true ]; -$post = Json::decode(Util::getReq('data', 'string', '{}')); +$post = Json::decode(Util::getPost('data', 'string', '{}')); $post += $defaultPost; if(!$session->isGameLoggedIn()){ diff --git a/hwe/j_map_history.php b/hwe/j_map_history.php index 9ca65a71..d45c5c23 100644 --- a/hwe/j_map_history.php +++ b/hwe/j_map_history.php @@ -4,9 +4,9 @@ namespace sammo; include "lib.php"; include "func.php"; -$year = Util::getReq('year', 'int'); -$month = Util::getReq('month', 'int'); -$serverID = Util::getReq('serverID', 'string', null); +$year = Util::getPost('year', 'int'); +$month = Util::getPost('month', 'int'); +$serverID = Util::getPost('serverID', 'string', null); $url = '/a_history.php'; diff --git a/hwe/j_msg_decide_opt.php b/hwe/j_msg_decide_opt.php index decd11a5..483c5622 100644 --- a/hwe/j_msg_decide_opt.php +++ b/hwe/j_msg_decide_opt.php @@ -4,6 +4,8 @@ namespace sammo; include 'lib.php'; include 'func.php'; +WebUtil::requireAJAX(); + //{msgID: 1206, response: true} $session = Session::requireGameLogin([])->setReadOnly(); @@ -17,7 +19,7 @@ if (!$generalID) { ]); } -$jsonPost = Json::decode(Util::getReq('data', 'string', '{}')); +$jsonPost = Json::decode(Util::getPost('data', 'string', '{}')); $msgID = Util::toInt($jsonPost['msgID']??null); $msgResponse = $jsonPost['response']??null; diff --git a/hwe/j_msg_delete.php b/hwe/j_msg_delete.php index 15a680b8..e65fac43 100644 --- a/hwe/j_msg_delete.php +++ b/hwe/j_msg_delete.php @@ -4,10 +4,12 @@ namespace sammo; include('lib.php'); include('func.php'); +WebUtil::requireAJAX(); + $session = Session::requireGameLogin([]); $userID = Session::getUserID(); -$msgID = Util::getReq('msgID', 'int'); +$msgID = Util::getPost('msgID', 'int'); if($msgID === null){ Json::die([ 'result'=>false, diff --git a/hwe/j_msg_get_old.php b/hwe/j_msg_get_old.php index 86208571..858a4c8f 100644 --- a/hwe/j_msg_get_old.php +++ b/hwe/j_msg_get_old.php @@ -7,8 +7,8 @@ include('func.php'); $session = Session::requireGameLogin([]); $userID = Session::getUserID(); -$reqTo = Util::getReq('to', 'int'); -$reqType = Util::getReq('type', 'string'); +$reqTo = Util::getPost('to', 'int'); +$reqType = Util::getPost('type', 'string'); if($reqTo === null){ Json::die([ diff --git a/hwe/j_msg_get_recent.php b/hwe/j_msg_get_recent.php index 36c1f712..d7e5e17e 100644 --- a/hwe/j_msg_get_recent.php +++ b/hwe/j_msg_get_recent.php @@ -7,7 +7,7 @@ include('func.php'); $session = Session::requireGameLogin([]); $userID = Session::getUserID(); -$reqSequence = Util::getReq('sequence', 'int', -1); +$reqSequence = Util::getPost('sequence', 'int', -1); $lastMsgGet = Json::decode($session->lastMsgGet)??[]; $now = new \DateTime(); diff --git a/hwe/j_msg_submit.php b/hwe/j_msg_submit.php index a13e8152..33582367 100644 --- a/hwe/j_msg_submit.php +++ b/hwe/j_msg_submit.php @@ -4,7 +4,9 @@ namespace sammo; include 'lib.php'; include 'func.php'; -$post = Json::decode(Util::getReq('data', 'string', '{}')); +WebUtil::requireAJAX(); + +$post = Json::decode(Util::getPost('data', 'string', '{}')); '@phan-var mixed[] $post'; $v = new Validator($post); diff --git a/hwe/j_myBossInfo.php b/hwe/j_myBossInfo.php index 6b009155..1b567bea 100644 --- a/hwe/j_myBossInfo.php +++ b/hwe/j_myBossInfo.php @@ -4,10 +4,12 @@ namespace sammo; include "lib.php"; include "func.php"; -$action = Util::getReq('action'); -$officerLevel = Util::getReq('officerLevel', 'int'); -$destGeneralID = Util::getReq('destGeneralID', 'int'); -$destCityID = Util::getReq('destCityID', 'int'); +WebUtil::requireAJAX(); + +$action = Util::getPost('action'); +$officerLevel = Util::getPost('officerLevel', 'int'); +$destGeneralID = Util::getPost('destGeneralID', 'int'); +$destCityID = Util::getPost('destCityID', 'int'); //로그인 검사 $session = Session::requireGameLogin()->setReadOnly(); diff --git a/hwe/j_raise_event.php b/hwe/j_raise_event.php index f28b8eb2..cfa22499 100644 --- a/hwe/j_raise_event.php +++ b/hwe/j_raise_event.php @@ -14,8 +14,8 @@ if(Session::getInstance()->userGrade < 5){ ]); } -$eventName = Util::getReq('event', 'string'); -$eventArgsJson = Util::getReq('arg', 'string'); +$eventName = Util::getPost('event', 'string'); +$eventArgsJson = Util::getPost('arg', 'string'); if($eventName === null){ Json::die([ diff --git a/hwe/j_select_npc.php b/hwe/j_select_npc.php index 313b335d..a1c44b63 100644 --- a/hwe/j_select_npc.php +++ b/hwe/j_select_npc.php @@ -4,7 +4,9 @@ namespace sammo; include "lib.php"; include "func.php"; -$pick = Util::getReq('pick', 'int'); +WebUtil::requireAJAX(); + +$pick = Util::getPost('pick', 'int'); if(!$pick){ Json::die([ diff --git a/hwe/j_set_chief_command.php b/hwe/j_set_chief_command.php index f35efa56..10dc8981 100644 --- a/hwe/j_set_chief_command.php +++ b/hwe/j_set_chief_command.php @@ -4,14 +4,16 @@ namespace sammo; include "lib.php"; include "func.php"; +WebUtil::requireAJAX(); + $session = Session::requireGameLogin([])->setReadOnly(); $generalID = $session->generalID; -$action = Util::getReq('action', 'string'); -$arg = Json::decode(Util::getReq('arg', 'string')); -$turnList = Util::getReq('turnList', 'array_int'); +$action = Util::getPost('action', 'string'); +$arg = Json::decode(Util::getPost('arg', 'string')); +$turnList = Util::getPost('turnList', 'array_int'); if(!is_array($turnList) || !$turnList){ Json::die([ diff --git a/hwe/j_set_general_command.php b/hwe/j_set_general_command.php index 4776028b..a587184c 100644 --- a/hwe/j_set_general_command.php +++ b/hwe/j_set_general_command.php @@ -4,13 +4,15 @@ namespace sammo; include "lib.php"; include "func.php"; +WebUtil::requireAJAX(); + $session = Session::requireGameLogin([])->setReadOnly(); $generalID = $session->generalID; -$action = Util::getReq('action', 'string'); -$arg = Json::decode(Util::getReq('arg', 'string')); -$turnList = Util::getReq('turnList', 'array_int'); +$action = Util::getPost('action', 'string'); +$arg = Json::decode(Util::getPost('arg', 'string')); +$turnList = Util::getPost('turnList', 'array_int'); if(!is_array($turnList) || !$turnList){ Json::die([ diff --git a/hwe/j_simulate_battle.php b/hwe/j_simulate_battle.php index 18900cb3..d8860be5 100644 --- a/hwe/j_simulate_battle.php +++ b/hwe/j_simulate_battle.php @@ -4,10 +4,12 @@ namespace sammo; include "lib.php"; include "func.php"; +WebUtil::requireAJAX(); + $session = Session::requireLogin([])->setReadOnly(); $userID = Session::getUserID(); -$query = Util::getReq('query'); +$query = Util::getPost('query'); if($query === null){ Json::die([ 'result'=>false, @@ -15,7 +17,7 @@ if($query === null){ ]); } -$action = Util::getReq('action'); +$action = Util::getPost('action'); if($action === null || !in_array($action, ['reorder', 'battle'])){ Json::die([ 'result'=>false, diff --git a/hwe/j_troop.php b/hwe/j_troop.php index 465f87a0..868301ab 100644 --- a/hwe/j_troop.php +++ b/hwe/j_troop.php @@ -3,11 +3,13 @@ namespace sammo; include "lib.php"; include "func.php"; + +WebUtil::requireAJAX(); // $btn, $name, $troop -$action = Util::getReq('action'); -$name = Util::getReq('name'); -$gen = Util::getReq('gen', 'int'); -$troop = Util::getReq('troop', 'int'); +$action = Util::getPost('action'); +$name = Util::getPost('name'); +$gen = Util::getPost('gen', 'int'); +$troop = Util::getPost('troop', 'int'); //로그인 검사 $session = Session::requireGameLogin([])->setReadOnly(); diff --git a/hwe/join_post.php b/hwe/join_post.php index e8aff162..e0456fd8 100644 --- a/hwe/join_post.php +++ b/hwe/join_post.php @@ -40,19 +40,19 @@ $session = Session::requireLogin()->setReadOnly(); $userID = Session::getUserID(); //NOTE: 이 페이지에서는 세션에 데이터를 등록하지 않음. 로그인은 이후에. -$name = Util::getReq('name'); +$name = Util::getPost('name'); $name = htmlspecialchars($name); $name = StringUtil::removeSpecialCharacter($name); $name = WebUtil::htmlPurify($name); $name = StringUtil::textStrip($name); -$pic = (int)Util::getReq('pic', 'bool', 0); -$character = Util::getReq('character'); +$pic = (int)Util::getPost('pic', 'bool', 0); +$character = Util::getPost('character'); -$leadership = Util::getReq('leadership', 'int', 50); -$strength = Util::getReq('strength', 'int', 50); -$intel = Util::getReq('intel', 'int', 50); +$leadership = Util::getPost('leadership', 'int', 50); +$strength = Util::getPost('strength', 'int', 50); +$intel = Util::getPost('intel', 'int', 50); -$join = Util::getReq('join'); //쓸모 없음 +$join = Util::getPost('join'); //쓸모 없음 $rootDB = RootDB::db(); //회원 테이블에서 정보확인 diff --git a/hwe/sammo/GameConstBase.php b/hwe/sammo/GameConstBase.php index 0ac81204..bad78527 100644 --- a/hwe/sammo/GameConstBase.php +++ b/hwe/sammo/GameConstBase.php @@ -328,7 +328,7 @@ class GameConstBase 'che_급습', ], '기타'=>[ - //'che_국기변경', + 'che_국기변경', //'che_국호변경', ] ]; diff --git a/i_entrance/j_change_password.php b/i_entrance/j_change_password.php index 7a490013..f4223ca7 100644 --- a/i_entrance/j_change_password.php +++ b/i_entrance/j_change_password.php @@ -3,12 +3,14 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); +WebUtil::requireAJAX(); + $session = Session::requireLogin([])->setReadOnly(); $userID = Session::getUserID(); // 외부 파라미터 -$pw = Util::getReq('old_pw'); -$newPw = Util::getReq('new_pw'); +$pw = Util::getPost('old_pw'); +$newPw = Util::getPost('new_pw'); $response = ['result' => false]; diff --git a/i_entrance/j_delete_me.php b/i_entrance/j_delete_me.php index 00a2a245..e3c86419 100644 --- a/i_entrance/j_delete_me.php +++ b/i_entrance/j_delete_me.php @@ -3,12 +3,14 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); +WebUtil::requireAJAX(); + $session = Session::requireLogin([]); $userID = Session::getUserID(); // 외부 파라미터 // $_POST['pw'] : PW -$pw = Util::getReq('pw'); +$pw = Util::getPost('pw'); if(!$pw){ Json::die([ diff --git a/i_entrance/j_disallow_third_use.php b/i_entrance/j_disallow_third_use.php index bc801f94..4e6da362 100644 --- a/i_entrance/j_disallow_third_use.php +++ b/i_entrance/j_disallow_third_use.php @@ -3,6 +3,8 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); +WebUtil::requireAJAX(); + $session = Session::requireLogin([])->setReadOnly(); $userID = Session::getUserID(); diff --git a/i_entrance/j_icon_change.php b/i_entrance/j_icon_change.php index edcc7b8d..487c36a4 100644 --- a/i_entrance/j_icon_change.php +++ b/i_entrance/j_icon_change.php @@ -3,6 +3,8 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); +WebUtil::requireAJAX(); + $session = Session::requireLogin([])->setReadOnly(); $userID = Session::getUserID(); diff --git a/i_entrance/j_icon_delete.php b/i_entrance/j_icon_delete.php index b11cad34..4b1ae842 100644 --- a/i_entrance/j_icon_delete.php +++ b/i_entrance/j_icon_delete.php @@ -3,6 +3,8 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); +WebUtil::requireAJAX(); + $session = Session::requireLogin([])->setReadOnly(); $userID = Session::getUserID(); diff --git a/i_entrance/j_logout.php b/i_entrance/j_logout.php index 1c9ed255..9d49be6d 100644 --- a/i_entrance/j_logout.php +++ b/i_entrance/j_logout.php @@ -3,6 +3,8 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); +WebUtil::requireAJAX(); + $session = Session::requireLogin([ 'result'=>true, 'reason'=>'로그인 되지 않았습니다' diff --git a/i_entrance/j_server_change_status.php b/i_entrance/j_server_change_status.php index 146718a0..22b2bc14 100644 --- a/i_entrance/j_server_change_status.php +++ b/i_entrance/j_server_change_status.php @@ -3,6 +3,8 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); +WebUtil::requireAJAX(); + $session = Session::requireLogin(null); @@ -12,9 +14,9 @@ $session = Session::requireLogin(null); // $_POST['notice'] : 공지 // $_POST['server'] : 서버 인덱스 -$action = Util::getReq('action', 'string', ''); -$notice = Util::getReq('notice', 'string', ''); -$server = Util::getReq('server', 'string', ''); +$action = Util::getPost('action', 'string', ''); +$notice = Util::getPost('notice', 'string', ''); +$server = Util::getPost('server', 'string', ''); $db = RootDB::db(); $userGrade = $session->userGrade; diff --git a/i_entrance/j_server_get_admin_status.php b/i_entrance/j_server_get_admin_status.php index 44de390e..575430d7 100644 --- a/i_entrance/j_server_get_admin_status.php +++ b/i_entrance/j_server_get_admin_status.php @@ -3,6 +3,8 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); +WebUtil::requireAJAX(); + $session = Session::requireLogin([])->setReadOnly(); if($session->userGrade < 5 && !$session->acl){ Json::die([ diff --git a/i_entrance/j_set_userlist.php b/i_entrance/j_set_userlist.php index bfa96d30..931d1ae9 100644 --- a/i_entrance/j_set_userlist.php +++ b/i_entrance/j_set_userlist.php @@ -3,6 +3,8 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); +WebUtil::requireAJAX(); + $session = Session::requireLogin([])->setReadOnly(); if($session->userGrade < 5){ @@ -17,9 +19,9 @@ if($session->userGrade < 5){ // user_id : 유저 이름 // param : 추가 파라미터 -$action = Util::getReq('action'); -$userID = Util::getReq('user_id'); -$param = Util::getReq('param'); +$action = Util::getPost('action'); +$userID = Util::getPost('user_id'); +$param = Util::getPost('param'); if(!$action){ Json::die([ diff --git a/oauth_kakao/j_change_pw.php b/oauth_kakao/j_change_pw.php index ed81c856..3212c483 100644 --- a/oauth_kakao/j_change_pw.php +++ b/oauth_kakao/j_change_pw.php @@ -3,6 +3,8 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); +WebUtil::requireAJAX(); + use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper; $now = TimeUtil::now(); diff --git a/oauth_kakao/j_check_OTP.php b/oauth_kakao/j_check_OTP.php index 6117d751..e4c321cd 100644 --- a/oauth_kakao/j_check_OTP.php +++ b/oauth_kakao/j_check_OTP.php @@ -3,6 +3,8 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); +WebUtil::requireAJAX(); + $RootDB = RootDB::db(); $session = Session::getInstance(); if($session->isLoggedIn()){ @@ -21,7 +23,7 @@ if(!$session->isLoggedIn(true)){ ]); } -$otp = Util::getReq('otp', 'int'); +$otp = Util::getPost('otp', 'int'); if(!$otp){ Json::die([ 'result'=>false, diff --git a/oauth_kakao/j_check_dup.php b/oauth_kakao/j_check_dup.php index 3f162989..1c85e028 100644 --- a/oauth_kakao/j_check_dup.php +++ b/oauth_kakao/j_check_dup.php @@ -4,6 +4,8 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); require('lib.join.php'); +WebUtil::requireAJAX(); + $session = Session::getInstance()->setReadOnly(); @@ -13,8 +15,8 @@ if(!$access_token){ } -$value = Util::getReq('value'); -switch(Util::getReq('type')){ +$value = Util::getPost('value'); +switch(Util::getPost('type')){ case 'nickname': Json::die(checkNicknameDup($value)); case 'username': diff --git a/oauth_kakao/j_join_process.php b/oauth_kakao/j_join_process.php index f682f734..d902c3cf 100644 --- a/oauth_kakao/j_join_process.php +++ b/oauth_kakao/j_join_process.php @@ -4,6 +4,8 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); require('lib.join.php'); +WebUtil::requireAJAX(); + use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper; $session = Session::getInstance(); @@ -35,12 +37,12 @@ if($expires < $nowDate && (!$refresh_token || ($refresh_token_expires < $nowDate 'reason'=>'로그인 토큰 만료.'.$refresh_token_expires.' 다시 카카오로그인을 수행해주세요.' ]); } -$secret_agree = Util::getReq('secret_agree', 'bool'); -$secret_agree2 = Util::getReq('secret_agree2', 'bool'); -$third_use = Util::getReq('third_use', 'bool'); -$username = mb_strtolower(Util::getReq('username'), 'utf-8'); -$password = Util::getReq('password'); -$nickname = Util::getReq('nickname'); +$secret_agree = Util::getPost('secret_agree', 'bool'); +$secret_agree2 = Util::getPost('secret_agree2', 'bool'); +$third_use = Util::getPost('third_use', 'bool'); +$username = mb_strtolower(Util::getPost('username'), 'utf-8'); +$password = Util::getPost('password'); +$nickname = Util::getPost('nickname'); if(!$username || !$password || !$nickname){ Json::die([ diff --git a/oauth_kakao/j_login_oauth.php b/oauth_kakao/j_login_oauth.php index 512ae666..a430f3b5 100644 --- a/oauth_kakao/j_login_oauth.php +++ b/oauth_kakao/j_login_oauth.php @@ -3,6 +3,8 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); require('lib.join.php'); + +WebUtil::requireAJAX(); use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper; $RootDB = RootDB::db(); diff --git a/oauth_kakao/j_reset_token.php b/oauth_kakao/j_reset_token.php index 235a3fdb..93432dd3 100644 --- a/oauth_kakao/j_reset_token.php +++ b/oauth_kakao/j_reset_token.php @@ -3,6 +3,8 @@ namespace sammo; require(__DIR__.'/../vendor/autoload.php'); +WebUtil::requireAJAX(); + use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper; $session = Session::requireLogin([ diff --git a/src/sammo/WebUtil.php b/src/sammo/WebUtil.php index c9f67b83..3922e8ec 100644 --- a/src/sammo/WebUtil.php +++ b/src/sammo/WebUtil.php @@ -28,6 +28,19 @@ class WebUtil } } + public static function isAJAX(){ + return strtolower($_SERVER['HTTP_X_REQUESTED_WITH']??null) === 'xmlhttprequest'; + } + + public static function requireAJAX():void{ + if(!static::isAJAX()){ + Json::die([ + 'result'=>false, + 'reason'=>'no ajax' + ]); + } + } + /** * @return mixed|mixed[] */