From 102dff43f4fcd8155831f73a93a9cf9f3d817ec0 Mon Sep 17 00:00:00 2001 From: hide_d Date: Sun, 18 Mar 2018 13:28:48 +0900 Subject: [PATCH] =?UTF-8?q?tmp=5Fkakao=EB=A5=BC=20=EA=B2=BD=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i_login/login.php | 2 +- {tmp_kakao => oauth_kakao}/_common.php | 0 {tmp_kakao => oauth_kakao}/index.php | 2 +- {tmp_kakao => oauth_kakao}/j_change_pw.php | 0 {tmp_kakao => oauth_kakao}/j_check_dup.php | 0 {tmp_kakao => oauth_kakao}/j_join_process.php | 0 {tmp_kakao => oauth_kakao}/j_login_oauth.php | 0 {tmp_kakao => oauth_kakao}/join.css | 0 {tmp_kakao => oauth_kakao}/join.php | 0 {tmp_kakao => oauth_kakao}/kakao.php | 2 +- {tmp_kakao => oauth_kakao}/kakao_btn.png | Bin {tmp_kakao => oauth_kakao}/kakao_to_me.png | Bin {tmp_kakao => oauth_kakao}/lib.join.php | 0 {tmp_kakao => oauth_kakao}/oauth.php | 0 {tmp_kakao => oauth_kakao}/oauth_fail.html | 0 {tmp_kakao => oauth_kakao}/oauth_leave.php | 0 {tmp_kakao => oauth_kakao}/terms.html | 0 tmp_kakao/try_login.php | 17 ----------------- 18 files changed, 3 insertions(+), 20 deletions(-) rename {tmp_kakao => oauth_kakao}/_common.php (100%) rename {tmp_kakao => oauth_kakao}/index.php (97%) rename {tmp_kakao => oauth_kakao}/j_change_pw.php (100%) rename {tmp_kakao => oauth_kakao}/j_check_dup.php (100%) rename {tmp_kakao => oauth_kakao}/j_join_process.php (100%) rename {tmp_kakao => oauth_kakao}/j_login_oauth.php (100%) rename {tmp_kakao => oauth_kakao}/join.css (100%) rename {tmp_kakao => oauth_kakao}/join.php (100%) rename {tmp_kakao => oauth_kakao}/kakao.php (99%) rename {tmp_kakao => oauth_kakao}/kakao_btn.png (100%) rename {tmp_kakao => oauth_kakao}/kakao_to_me.png (100%) rename {tmp_kakao => oauth_kakao}/lib.join.php (100%) rename {tmp_kakao => oauth_kakao}/oauth.php (100%) rename {tmp_kakao => oauth_kakao}/oauth_fail.html (100%) rename {tmp_kakao => oauth_kakao}/oauth_leave.php (100%) rename {tmp_kakao => oauth_kakao}/terms.html (100%) delete mode 100644 tmp_kakao/try_login.php diff --git a/i_login/login.php b/i_login/login.php index 3766f28a..a5c29a0c 100644 --- a/i_login/login.php +++ b/i_login/login.php @@ -2,7 +2,7 @@ require_once('_common.php'); require_once(ROOT.'/f_func/class._Session.php'); require_once(ROOT.'/f_config/DB.php'); -require_once(ROOT.'/tmp_kakao/conf.php');//TODO: kakao 가입 정식 적용하면 코드 변경 +require_once(ROOT.'/d_setting/conf_kakao.php'); $SESSION = new _Session(); if($SESSION->isLoggedIn()){ header(ROOT.'/i_entrance/Frame.php'); diff --git a/tmp_kakao/_common.php b/oauth_kakao/_common.php similarity index 100% rename from tmp_kakao/_common.php rename to oauth_kakao/_common.php diff --git a/tmp_kakao/index.php b/oauth_kakao/index.php similarity index 97% rename from tmp_kakao/index.php rename to oauth_kakao/index.php index d8acebc3..1be2b7fc 100644 --- a/tmp_kakao/index.php +++ b/oauth_kakao/index.php @@ -1,5 +1,5 @@ diff --git a/tmp_kakao/j_change_pw.php b/oauth_kakao/j_change_pw.php similarity index 100% rename from tmp_kakao/j_change_pw.php rename to oauth_kakao/j_change_pw.php diff --git a/tmp_kakao/j_check_dup.php b/oauth_kakao/j_check_dup.php similarity index 100% rename from tmp_kakao/j_check_dup.php rename to oauth_kakao/j_check_dup.php diff --git a/tmp_kakao/j_join_process.php b/oauth_kakao/j_join_process.php similarity index 100% rename from tmp_kakao/j_join_process.php rename to oauth_kakao/j_join_process.php diff --git a/tmp_kakao/j_login_oauth.php b/oauth_kakao/j_login_oauth.php similarity index 100% rename from tmp_kakao/j_login_oauth.php rename to oauth_kakao/j_login_oauth.php diff --git a/tmp_kakao/join.css b/oauth_kakao/join.css similarity index 100% rename from tmp_kakao/join.css rename to oauth_kakao/join.css diff --git a/tmp_kakao/join.php b/oauth_kakao/join.php similarity index 100% rename from tmp_kakao/join.php rename to oauth_kakao/join.php diff --git a/tmp_kakao/kakao.php b/oauth_kakao/kakao.php similarity index 99% rename from tmp_kakao/kakao.php rename to oauth_kakao/kakao.php index 1e6f7ad2..61467cab 100644 --- a/tmp_kakao/kakao.php +++ b/oauth_kakao/kakao.php @@ -1,5 +1,5 @@ set_admin_key(''); - -$helper->test_user_management_api(); -//$helper->test_story_api(); -//$helper->test_talk_api(); -//$helper->test_push_notification_api();