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

_Setting, _String, _Time 클래스 재 명명

Browse Source 
- autoload로 변환
This commit is contained in:
Hide_D
2018-03-24 21:28:12 +09:00
parent a3f83d1e95
commit 002f9ba6cf
32 changed files with 109 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oauth_kakao/j_change_pw.php
+3 -4
View File
@@ -4,11 +4,10 @@ namespace sammo;
require(__DIR__.'/../d_setting/conf_kakao.php');
require('_common.php');
require(ROOT.'/f_config/DB.php');
require(ROOT.'/f_func/class._Time.php');
use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper;
$nowDate = _Time::DatetimeNow();
$nowDate = TimeUtil::DatetimeNow();
$session = Session::Instance();
if(!$session->isLoggedIn()){
@@ -54,10 +53,10 @@ if($expires < $nowDate){
}
$access_token = $result['access_token'];
$expires = _Time::DatetimeFromNowSecond($nowDate, $result['expires_in']);
$expires = TimeUtil::DatetimeFromNowSecond($nowDate, $result['expires_in']);
if(isset($result['refresh_token'])){
$refresh_token = util::array_get($result['refresh_token']);
$refresh_token_expires = _Time::DatetimeFromNowSecond($nowDate, $result['refresh_token_expires_in']);
$refresh_token_expires = TimeUtil::DatetimeFromNowSecond($nowDate, $result['refresh_token_expires_in']);
}
}
oauth_kakao/j_join_process.php
+3 -4
View File
@@ -4,7 +4,6 @@ namespace sammo;
require(__DIR__.'/../d_setting/conf_kakao.php');
require_once('_common.php');
require('lib.join.php');
require_once(ROOT.'/f_func/class._Time.php');
require('kakao.php');
use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper;
@@ -19,7 +18,7 @@ if($canJoin != 'Y'){
]);
}
$nowDate = _Time::DatetimeNow();
$nowDate = TimeUtil::DatetimeNow();
$access_token = util::array_get($_SESSION['access_token']);
$expires = util::array_get($_SESSION['expires']);
@@ -97,10 +96,10 @@ if($expires < $nowDate){
}
$access_token = $result['access_token'];
$expires = _Time::DatetimeFromNowSecond($nowDate, $result['expires_in']);
$expires = TimeUtil::DatetimeFromNowSecond($nowDate, $result['expires_in']);
if(isset($result['refresh_token'])){
$refresh_token = util::array_get($result['refresh_token']);
$refresh_token_expires = _Time::DatetimeFromNowSecond($nowDate, $result['refresh_token_expires_in']);
$refresh_token_expires = TimeUtil::DatetimeFromNowSecond($nowDate, $result['refresh_token_expires_in']);
}
}
oauth_kakao/j_login_oauth.php
+3 -4
View File
@@ -4,7 +4,6 @@ namespace sammo;
require(__DIR__.'/../d_setting/conf_kakao.php');
require('_common.php');
require(ROOT.'/f_config/DB.php');
require(ROOT.'/f_func/class._Time.php');
require('kakao.php');
use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper;
@@ -23,7 +22,7 @@ if($canLogin != 'Y'){
]);
}
$nowDate = _Time::DatetimeNow();
$nowDate = TimeUtil::DatetimeNow();
$access_token = util::array_get($_SESSION['access_token']);
$expires = util::array_get($_SESSION['expires']);
@@ -62,10 +61,10 @@ if($expires < $nowDate){
}
$access_token = $result['access_token'];
$expires = _Time::DatetimeFromNowSecond($nowDate, $result['expires_in']);
$expires = TimeUtil::DatetimeFromNowSecond($nowDate, $result['expires_in']);
if(isset($result['refresh_token'])){
$refresh_token = util::array_get($result['refresh_token']);
$refresh_token_expires = _Time::DatetimeFromNowSecond($nowDate, $result['refresh_token_expires_in']);
$refresh_token_expires = TimeUtil::DatetimeFromNowSecond($nowDate, $result['refresh_token_expires_in']);
}
}
oauth_kakao/join.php
-1
View File
@@ -2,7 +2,6 @@
namespace sammo;
require('_common.php');
require(ROOT.'/f_func/class._Time.php');
require_once(__dir__.'/../d_setting/conf.php');
oauth_kakao/lib.join.php
+1 -2
View File
@@ -4,7 +4,6 @@ namespace sammo;
require_once('_common.php');
require_once(__dir__.'/../d_setting/conf.php');
require_once(__dir__.'/../f_func/func.php');
require_once(ROOT.'/f_func/class._Time.php');
function checkUsernameDup($username){
if(!$username){
@@ -54,7 +53,7 @@ function checkEmailDup($email){
$userInfo = getRootDB()->queryFirstField('SELECT `no`, `delete_after` FROM member WHERE `email` = %s LIMIT 1', $email);
if($userInfo){
$nowDate = _Time::DatetimeNow();
$nowDate = TimeUtil::DatetimeNow();
if (!$userInfo['delete_after']) {
return '이미 사용중인 이메일입니다. 관리자에게 문의해주세요.';
}
oauth_kakao/oauth.php
+3 -4
View File
@@ -3,7 +3,6 @@ namespace sammo;
require(__DIR__.'/../d_setting/conf_kakao.php');
require('_common.php');
require(ROOT.'/f_func/class._Time.php');
use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper;
@@ -29,11 +28,11 @@ $result = $restAPI->create_access_token($auth_code);
if(util::array_get($result['expires_in'], -1) > 0){
session_start();
$restAPI->set_access_token($result['access_token']);
$now = _Time::DatetimeNow();
$now = TimeUtil::DatetimeNow();
$_SESSION['access_token'] = $result['access_token'];
$_SESSION['expires'] = _Time::DatetimeFromSecond($now, $result['expires_in']);
$_SESSION['expires'] = TimeUtil::DatetimeFromSecond($now, $result['expires_in']);
$_SESSION['refresh_token'] = util::array_get($result['refresh_token']);
$_SESSION['refresh_token_expires'] = _Time::DatetimeFromSecond($now, $result['refresh_token_expires_in']);
$_SESSION['refresh_token_expires'] = TimeUtil::DatetimeFromSecond($now, $result['refresh_token_expires_in']);
}
else{
die('알 수 없는 에러:'.$me['msg']);