devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

util 클래스 명을 PSR1에 맞게 Util로 재 명명

Browse Source
This commit is contained in:
Hide_D
2018-03-24 21:31:31 +09:00
parent 002f9ba6cf
commit b5cba27df9
26 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oauth_kakao/j_change_pw.php
+6 -6
View File
@@ -17,10 +17,10 @@ if(!$session->isLoggedIn()){
]);
}
$userID = $session->userID;
$access_token = util::array_get($_SESSION['access_token']);
$expires = util::array_get($_SESSION['expires']);
$refresh_token = util::array_get($_SESSION['refresh_token']);
$refresh_token_expires = util::array_get($_SESSION['refresh_token_expires']);
$access_token = Util::array_get($_SESSION['access_token']);
$expires = Util::array_get($_SESSION['expires']);
$refresh_token = Util::array_get($_SESSION['refresh_token']);
$refresh_token_expires = Util::array_get($_SESSION['refresh_token_expires']);
if(!$access_token || !$expires){
Json::die([
@@ -55,7 +55,7 @@ if($expires < $nowDate){
$access_token = $result['access_token'];
$expires = TimeUtil::DatetimeFromNowSecond($nowDate, $result['expires_in']);
if(isset($result['refresh_token'])){
$refresh_token = util::array_get($result['refresh_token']);
$refresh_token = Util::array_get($result['refresh_token']);
$refresh_token_expires = TimeUtil::DatetimeFromNowSecond($nowDate, $result['refresh_token_expires_in']);
}
}
@@ -85,7 +85,7 @@ $sendResult = $restAPI->talk_to_me_default([
],
"button_title"=> "로그인 페이지 열기"
]);
$sendResult['code'] = util::array_get($sendResult['code'], 0);
$sendResult['code'] = Util::array_get($sendResult['code'], 0);
if($sendResult['code'] < 0){
Json::die([
'result'=>false,
oauth_kakao/j_check_dup.php
+3 -3
View File
@@ -9,14 +9,14 @@ require('lib.join.php');
session_start();
$access_token = util::array_get($_SESSION['access_token']);
$access_token = Util::array_get($_SESSION['access_token']);
if(!$access_token){
Json::die('로그인 토큰 에러. 다시 로그인을 수행해주세요.');
}
$value = util::array_get($_POST['value']);
switch(util::array_get($_POST['type'])){
$value = Util::array_get($_POST['value']);
switch(Util::array_get($_POST['type'])){
case 'nickname':
Json::die(checkNicknameDup($value));
case 'username':
oauth_kakao/j_join_process.php
+13 -13
View File
@@ -20,10 +20,10 @@ if($canJoin != 'Y'){
$nowDate = TimeUtil::DatetimeNow();
$access_token = util::array_get($_SESSION['access_token']);
$expires = util::array_get($_SESSION['expires']);
$refresh_token = util::array_get($_SESSION['refresh_token']);
$refresh_token_expires = util::array_get($_SESSION['refresh_token_expires']);
$access_token = Util::array_get($_SESSION['access_token']);
$expires = Util::array_get($_SESSION['expires']);
$refresh_token = Util::array_get($_SESSION['refresh_token']);
$refresh_token_expires = Util::array_get($_SESSION['refresh_token_expires']);
if(!$access_token){
Json::die([
'result'=>false,
@@ -37,10 +37,10 @@ if($expires < $nowDate && (!$refresh_token || ($refresh_token_expires < $nowDate
'reason'=>'로그인 토큰 만료.'.$refresh_token_expires.' 다시 카카오로그인을 수행해주세요.'
]);
}
$secret_agree =util::array_get($_POST['secret_agree']);
$username = mb_strtolower(util::array_get($_POST['username']), 'utf-8');
$password = util::array_get($_POST['password']);
$nickname = util::array_get($_POST['nickname']);
$secret_agree =Util::array_get($_POST['secret_agree']);
$username = mb_strtolower(Util::array_get($_POST['username']), 'utf-8');
$password = Util::array_get($_POST['password']);
$nickname = Util::array_get($_POST['nickname']);
if(!$username || !$password || !$nickname){
Json::die([
@@ -98,16 +98,16 @@ if($expires < $nowDate){
$access_token = $result['access_token'];
$expires = TimeUtil::DatetimeFromNowSecond($nowDate, $result['expires_in']);
if(isset($result['refresh_token'])){
$refresh_token = util::array_get($result['refresh_token']);
$refresh_token = Util::array_get($result['refresh_token']);
$refresh_token_expires = TimeUtil::DatetimeFromNowSecond($nowDate, $result['refresh_token_expires_in']);
}
}
$signupResult = $restAPI->signup();
$kakaoID = util::array_get($signupResult['id']);
$kakaoID = Util::array_get($signupResult['id']);
if(!$kakaoID && util::array_get($signupResult['msg'])!='already registered'){
if(!$kakaoID && Util::array_get($signupResult['msg'])!='already registered'){
Json::die([
'result'=>false,
'reason'=>'카카오 로그인 과정 중 앱 연결 절차를 실패했습니다'.json_encode($signupResult)
@@ -115,7 +115,7 @@ if(!$kakaoID && util::array_get($signupResult['msg'])!='already registered'){
}
$me = $restAPI->meWithEmail();
$me['code'] = util::array_get($me['code'], 0);
$me['code'] = Util::array_get($me['code'], 0);
if ($me['code']< 0) {
$restAPI->unlink();
Json::die([
@@ -124,7 +124,7 @@ if ($me['code']< 0) {
]);
}
if(!util::array_get($me['kaccount_email_verified'],false)){
if(!Util::array_get($me['kaccount_email_verified'],false)){
$restAPI->unlink();
Json::die([
'result'=>false,
oauth_kakao/j_login_oauth.php
+8 -8
View File
@@ -24,11 +24,11 @@ if($canLogin != 'Y'){
$nowDate = TimeUtil::DatetimeNow();
$access_token = util::array_get($_SESSION['access_token']);
$expires = util::array_get($_SESSION['expires']);
$refresh_token = util::array_get($_SESSION['refresh_token']);
$refresh_token_expires = util::array_get($_SESSION['refresh_token_expires']);
$email = util::array_get($_SESSION['kaccount_email']);
$access_token = Util::array_get($_SESSION['access_token']);
$expires = Util::array_get($_SESSION['expires']);
$refresh_token = Util::array_get($_SESSION['refresh_token']);
$refresh_token_expires = Util::array_get($_SESSION['refresh_token_expires']);
$email = Util::array_get($_SESSION['kaccount_email']);
if(!$access_token || !$expires){
@@ -63,7 +63,7 @@ if($expires < $nowDate){
$access_token = $result['access_token'];
$expires = TimeUtil::DatetimeFromNowSecond($nowDate, $result['expires_in']);
if(isset($result['refresh_token'])){
$refresh_token = util::array_get($result['refresh_token']);
$refresh_token = Util::array_get($result['refresh_token']);
$refresh_token_expires = TimeUtil::DatetimeFromNowSecond($nowDate, $result['refresh_token_expires_in']);
}
}
@@ -71,7 +71,7 @@ if($expires < $nowDate){
if(!$email){
$me = $restAPI->meWithEmail();
$me['code'] = util::array_get($me['code'], 0);
$me['code'] = Util::array_get($me['code'], 0);
if ($me['code']< 0) {
Json::die([
'result'=>false,
@@ -79,7 +79,7 @@ if(!$email){
]);
}
if(!util::array_get($me['kaccount_email_verified'],false)){
if(!Util::array_get($me['kaccount_email_verified'],false)){
$restAPI->unlink();
Json::die([
'result'=>false,
oauth_kakao/join.php
+1 -1
View File
@@ -8,7 +8,7 @@ require_once(__dir__.'/../d_setting/conf.php');
session_start();
$access_token = util::array_get($_SESSION['access_token']);
$access_token = Util::array_get($_SESSION['access_token']);
if(!$access_token){
header('Location:oauth_fail.html');
}
oauth_kakao/oauth.php
+4 -4
View File
@@ -6,7 +6,7 @@ require('_common.php');
use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper;
$auth_code = util::array_get($_GET['code']);
$auth_code = Util::array_get($_GET['code']);
if(!$auth_code){
header('Location:oauth_fail.html');
@@ -25,13 +25,13 @@ $result = $restAPI->create_access_token($auth_code);
if(util::array_get($result['expires_in'], -1) > 0){
if(Util::array_get($result['expires_in'], -1) > 0){
session_start();
$restAPI->set_access_token($result['access_token']);
$now = TimeUtil::DatetimeNow();
$_SESSION['access_token'] = $result['access_token'];
$_SESSION['expires'] = TimeUtil::DatetimeFromSecond($now, $result['expires_in']);
$_SESSION['refresh_token'] = util::array_get($result['refresh_token']);
$_SESSION['refresh_token'] = Util::array_get($result['refresh_token']);
$_SESSION['refresh_token_expires'] = TimeUtil::DatetimeFromSecond($now, $result['refresh_token_expires_in']);
}
else{
@@ -45,7 +45,7 @@ $me = $restAPI->meWithEmail();
$oauth_mode = 'login';
$me['code'] = util::array_get($me['code'], 0);
$me['code'] = Util::array_get($me['code'], 0);
if($me['code']< 0){
switch($me['msg']){
case 'NotRegisteredUserException':