diff --git a/f_config/SETTING.php b/f_config/SETTING.php
index 1bd3d7f7..ec98498f 100644
--- a/f_config/SETTING.php
+++ b/f_config/SETTING.php
@@ -2,8 +2,7 @@
namespace sammo;
require_once('_common.php');
-require_once(__DIR__.'/../f_func/class._Setting.php');
-$SETTING = new _Setting(__DIR__.'/..');
+$SETTING = new Setting(__DIR__.'/..');
diff --git a/f_config/app.php b/f_config/app.php
index 82d16e9b..a800917f 100644
--- a/f_config/app.php
+++ b/f_config/app.php
@@ -2,7 +2,7 @@
namespace sammo;
require_once('_common.php');
-require_once(ROOT.'/f_func/class._Setting.php');
+require_once(ROOT.'/f_func/class.Setting.php');
function getServerConfigList(){
@@ -11,11 +11,11 @@ function getServerConfigList(){
return $serverList;
}
$serverList = [
- 'che'=>['체', 'white', new _Setting(__DIR__.'/../che')],
- 'kwe'=>['퀘', 'yellow', new _Setting(__DIR__.'/../kwe')],
- 'pwe'=>['풰', 'orange', new _Setting(__DIR__.'/../pwe')],
- 'twe'=>['퉤', 'magenta', new _Setting(__DIR__.'/../twe')],
- 'hwe'=>['훼', 'red', new _Setting(__DIR__.'/../hwe')]
+ 'che'=>['체', 'white', new Setting(__DIR__.'/../che')],
+ 'kwe'=>['퀘', 'yellow', new Setting(__DIR__.'/../kwe')],
+ 'pwe'=>['풰', 'orange', new Setting(__DIR__.'/../pwe')],
+ 'twe'=>['퉤', 'magenta', new Setting(__DIR__.'/../twe')],
+ 'hwe'=>['훼', 'red', new Setting(__DIR__.'/../hwe')]
];
return $serverList;
}
\ No newline at end of file
diff --git a/f_config/config.php b/f_config/config.php
index b863fd05..2a18d862 100644
--- a/f_config/config.php
+++ b/f_config/config.php
@@ -1,9 +1,10 @@
0){
$userSalt = bin2hex(random_bytes(8));
$finalPassword = hashPassword($userSalt, $password);
-$nowDate = _Time::DatetimeNow();
+$nowDate = TimeUtil::DatetimeNow();
$rootDB->insert('member',[
'oauth_type' => 'NONE',
diff --git a/f_install/j_setup_db.php b/f_install/j_setup_db.php
index b5013483..5189e707 100644
--- a/f_install/j_setup_db.php
+++ b/f_install/j_setup_db.php
@@ -3,7 +3,6 @@ namespace sammo;
require('_common.php');
require(__DIR__.'/../f_config/SETTING.php');
-require(__DIR__.'/../f_func/class._Time.php');
@@ -136,8 +135,8 @@ if($mysqli_obj->multi_query(file_get_contents(__dir__.'/sql/common_schema.sql'))
$rootDB->insert('system', array(
'REG' => 'N',
'LOGIN' => 'N',
- 'CRT_DATE' => _Time::DatetimeNow(),
- 'MDF_DATE' => _Time::DatetimeNow()
+ 'CRT_DATE' => TimeUtil::DatetimeNow(),
+ 'MDF_DATE' => TimeUtil::DatetimeNow()
));
$globalSalt = bin2hex(random_bytes(16));
diff --git a/i_entrance/j_delete_me.php b/i_entrance/j_delete_me.php
index 73e7d58a..14e49996 100644
--- a/i_entrance/j_delete_me.php
+++ b/i_entrance/j_delete_me.php
@@ -2,7 +2,6 @@
namespace sammo;
require_once('_common.php');
-require_once(ROOT.'/f_func/class._Time.php');
require_once(ROOT.'/f_config/DB.php');
$session = Session::Instance();
@@ -47,7 +46,7 @@ if($userInfo['delete_after']){
}
$db->update('member',[
- 'delete_after'=>_Time::DatetimeFromNowMinute(60*24*30)
+ 'delete_after'=>TimeUtil::DatetimeFromNowMinute(60*24*30)
], 'no=%i', $session->userID);
if(!$db->affectedRows()){
diff --git a/j_login.php b/j_login.php
index da4b04cf..0304ffe0 100644
--- a/j_login.php
+++ b/j_login.php
@@ -2,8 +2,6 @@
namespace sammo;
require_once('_common.php');
-require_once(ROOT.'/f_func/class._String.php');
-require(ROOT.'/f_func/class._Time.php');
require_once(ROOT.'/f_config/DB.php');
@@ -46,7 +44,7 @@ if(!$userInfo){
]);
}
-$nowDate = _Time::DatetimeNow();
+$nowDate = TimeUtil::DatetimeNow();
if($userInfo['delete_after']){
if($userInfo['delete_after'] < $nowDate){
getRootDB()->delete('member', 'no=%i', $userInfo['no']);
diff --git a/oauth_kakao/j_change_pw.php b/oauth_kakao/j_change_pw.php
index d6f737fb..9aa8c2ad 100644
--- a/oauth_kakao/j_change_pw.php
+++ b/oauth_kakao/j_change_pw.php
@@ -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']);
}
}
diff --git a/oauth_kakao/j_join_process.php b/oauth_kakao/j_join_process.php
index b48393d3..07a5c72f 100644
--- a/oauth_kakao/j_join_process.php
+++ b/oauth_kakao/j_join_process.php
@@ -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']);
}
}
diff --git a/oauth_kakao/j_login_oauth.php b/oauth_kakao/j_login_oauth.php
index d87db3e9..a9acdf81 100644
--- a/oauth_kakao/j_login_oauth.php
+++ b/oauth_kakao/j_login_oauth.php
@@ -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']);
}
}
diff --git a/oauth_kakao/join.php b/oauth_kakao/join.php
index b5cdd41e..cebfb1e4 100644
--- a/oauth_kakao/join.php
+++ b/oauth_kakao/join.php
@@ -2,7 +2,6 @@
namespace sammo;
require('_common.php');
-require(ROOT.'/f_func/class._Time.php');
require_once(__dir__.'/../d_setting/conf.php');
diff --git a/oauth_kakao/lib.join.php b/oauth_kakao/lib.join.php
index ff6cfa4e..786c95b5 100644
--- a/oauth_kakao/lib.join.php
+++ b/oauth_kakao/lib.join.php
@@ -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 '이미 사용중인 이메일입니다. 관리자에게 문의해주세요.';
}
diff --git a/oauth_kakao/oauth.php b/oauth_kakao/oauth.php
index ac3e580a..0adf542f 100644
--- a/oauth_kakao/oauth.php
+++ b/oauth_kakao/oauth.php
@@ -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']);
diff --git a/f_func/class._Setting.php b/src/sammo/Setting.php
similarity index 93%
rename from f_func/class._Setting.php
rename to src/sammo/Setting.php
index ef67fb93..04234f42 100644
--- a/f_func/class._Setting.php
+++ b/src/sammo/Setting.php
@@ -1,9 +1,7 @@
{$history['year']}년 {$history['month']}월";
diff --git a/twe/b_currentCity.php b/twe/b_currentCity.php
index d2bb4be0..575cf027 100644
--- a/twe/b_currentCity.php
+++ b/twe/b_currentCity.php
@@ -53,7 +53,7 @@ if($me['level'] == 0) {
echo "