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

TimeUtil 리팩토링

Browse Source
This commit is contained in:
Hide_D
2018-09-16 04:14:22 +09:00
parent 0e9de6e1bb
commit eece42480a
32 changed files with 165 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oauth_kakao/j_change_pw.php
+2 -2
View File
@@ -5,7 +5,7 @@ require(__dir__.'/../vendor/autoload.php');
use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper;
$now = TimeUtil::DatetimeNow();
$now = TimeUtil::now();
$session = Session::requireLogin([
'reason'=>'로그인이 되어있지 않습니다'
@@ -52,7 +52,7 @@ if($nextPasswordChange && $now < $nextPasswordChange){
]);
}
$nextPasswordChange = TimeUtil::DatetimeFromNowHour(4);
$nextPasswordChange = TimeUtil::nowAddHours(4);
$oauthInfo['nextPasswordChange'] = $nextPasswordChange;
oauth_kakao/j_check_OTP.php
+2 -2
View File
@@ -46,7 +46,7 @@ if(!$oauthInfo){
$OTPValue = $oauthInfo['OTPValue']??null;
$OTPTrialUntil = $oauthInfo['OTPTrialUntil']??null;
$OTPTrialCount = $oauthInfo['OTPTrialCount']??0;
$now = TimeUtil::DatetimeNow();
$now = TimeUtil::now();
if(!$OTPTrialUntil || $OTPTrialUntil <= $now){
$session->logout();
@@ -78,7 +78,7 @@ if($OTPValue != $otp){
]);
}
$tokenValidUntil = TimeUtil::DatetimeFromNowDay(10);
$tokenValidUntil = TimeUtil::nowAddDays(10);
$session->setReqOTP(false, $tokenValidUntil);
RootDB::db()->update('member', [
'oauth_info'=>Json::encode($oauthInfo),
oauth_kakao/j_join_process.php
+3 -3
View File
@@ -16,7 +16,7 @@ if($canJoin != 'Y'){
]);
}
$nowDate = TimeUtil::DatetimeNow();
$nowDate = TimeUtil::now();
$access_token = $session->access_token;
$expires = $session->expires;
@@ -105,10 +105,10 @@ if($expires < $nowDate){
}
$access_token = $result['access_token'];
$expires = TimeUtil::DatetimeFromNowSecond($result['expires_in']);
$expires = TimeUtil::nowAddSeconds($result['expires_in']);
if(isset($result['refresh_token'])){
$refresh_token = Util::array_get($result['refresh_token']);
$refresh_token_expires = TimeUtil::DatetimeFromNowSecond($result['refresh_token_expires_in']);
$refresh_token_expires = TimeUtil::nowAddSeconds($result['refresh_token_expires_in']);
}
}
oauth_kakao/j_login_oauth.php
+3 -3
View File
@@ -21,7 +21,7 @@ if($canLogin != 'Y'){
]);
}
$now = TimeUtil::DatetimeNow();
$now = TimeUtil::now();
$access_token = $session->access_token;
$expires = $session->expires;
@@ -63,10 +63,10 @@ if($expires < $now){
}
$access_token = $result['access_token'];
$expires = TimeUtil::DatetimeFromNowSecond($result['expires_in']);
$expires = TimeUtil::nowAddSeconds($result['expires_in']);
if(isset($result['refresh_token'])){
$refresh_token = Util::array_get($result['refresh_token']);
$refresh_token_expires = TimeUtil::DatetimeFromNowSecond($result['refresh_token_expires_in']);
$refresh_token_expires = TimeUtil::nowAddSeconds($result['refresh_token_expires_in']);
}
}
oauth_kakao/j_reset_token.php
+2 -2
View File
@@ -21,8 +21,8 @@ if(!$tokenValidUntil){
]);
}
$now = TimeUtil::DatetimeNow();
$expectedDate = TimeUtil::DatetimeFromNowDay(5);
$now = TimeUtil::now();
$expectedDate = TimeUtil::nowAddDays(5);
if($expectedDate <= $tokenValidUntil){
Json::die([
oauth_kakao/lib.join.php
+3 -3
View File
@@ -50,7 +50,7 @@ function checkEmailDup($email){
$userInfo = RootDB::db()->queryFirstField('SELECT `no`, `delete_after` FROM member WHERE `email` = %s LIMIT 1', $email);
if($userInfo){
$nowDate = TimeUtil::DatetimeNow();
$nowDate = TimeUtil::now();
if (!$userInfo['delete_after']) {
return '이미 사용중인 이메일입니다. 관리자에게 문의해주세요.';
}
@@ -80,7 +80,7 @@ function createOTPbyUserNO(int $userNo):bool{
$OTPValue = $oauthInfo['OTPValue']??null;
$OTPTrialUntil = $oauthInfo['OTPTrialUntil']??null;
$now = TimeUtil::DatetimeNow();
$now = TimeUtil::now();
if($OTPTrialUntil && $OTPValue && $OTPTrialUntil > $now){
@@ -108,7 +108,7 @@ function createOTP(string $accessToken):?array{
$restAPI = new Kakao_REST_API_Helper($accessToken);
$OTPValue = Util::randRangeInt(10000, 99999);
$OTPTrialUntil = TimeUtil::DatetimeFromNowSecond(180);
$OTPTrialUntil = TimeUtil::nowAddSeconds(180);
$sendResult = $restAPI->talk_to_me_default([
"object_type"=> "text",
oauth_kakao/oauth.php
+3 -3
View File
@@ -33,11 +33,11 @@ if (Util::array_get($result['expires_in'], -1) <= 0) {
$session = Session::getInstance();
$restAPI->set_access_token($result['access_token']);
$now = TimeUtil::DatetimeNow();
$now = new \DateTimeImmutable();
$session->access_token = $result['access_token'];
$session->expires = TimeUtil::DatetimeFromSecond($now, $result['expires_in']);
$session->expires = $now->add(TimeUtil::secondsToDateInterval($result['expires_in']))->format('Y-m-d H:i:s');
$session->refresh_token = Util::array_get($result['refresh_token']);
$session->refresh_token_expires = TimeUtil::DatetimeFromSecond($now, $result['refresh_token_expires_in']);
$session->refresh_token_expires = $now->add(TimeUtil::secondsToDateInterval($result['refresh_token_expires_in']))->format('Y-m-d H:i:s');
$session->tmpx = Json::encode($result);