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

getDB(), getRootDB()를 autoload 클래스로 변경

Browse Source 
- 각각 DB::db(), RootDB::db()임.
This commit is contained in:
Hide_D
2018-03-25 00:07:37 +09:00
parent bb1a496835
commit 9e1aadf486
62 changed files with 258 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oauth_kakao/index.php
-1
View File
@@ -1,7 +1,6 @@
<?php
namespace sammo;
require(__DIR__.'/../d_setting/conf_kakao.php');
use \kakao\KakaoKey as KakaoKey;
?>
oauth_kakao/j_change_pw.php
+8 -9
View File
@@ -1,7 +1,6 @@
<?php
namespace sammo;
require(__DIR__.'/../d_setting/conf_kakao.php');
require('_common.php');
require(ROOT.'/f_config/DB.php');
@@ -60,9 +59,9 @@ if($expires < $nowDate){
}
}
getRootDB()->query("lock tables member write, member_log write");
RootDB::db()->query("lock tables member write, member_log write");
$isUser = getRootDB()->queryFirstRow(
$isUser = RootDB::db()->queryFirstRow(
'SELECT count(`no`) from member where no=%i',$userID);
if(!$isUser){
Json::die([
@@ -72,7 +71,7 @@ if(!$isUser){
}
$newPassword = Util::randomStr(6);
$tmpPassword = Util::hashPassword(getGlobalSalt(), $newPassword);
$tmpPassword = Util::hashPassword(RootDB::getGlobalSalt(), $newPassword);
$newSalt = bin2hex(random_bytes(8));
$newFinalPassword = Util::hashPassword($newSalt, $tmpPassword);
@@ -80,8 +79,8 @@ $sendResult = $restAPI->talk_to_me_default([
"object_type"=> "text",
"text"=> "임시 비밀번호는 $newPassword 입니다. 로그인 후 바로 다른 비밀번호로 변경해주세요.",
"link"=> [
"web_url"=> getServerBasepath(),
"mobile_web_url" => getServerBasepath()
"web_url"=> RootDB::getServerBasepath(),
"mobile_web_url" => RootDB::getServerBasepath()
],
"button_title"=> "로그인 페이지 열기"
]);
@@ -93,12 +92,12 @@ if($sendResult['code'] < 0){
]);
}
getRootDB()->update('member', [
RootDB::db()->update('member', [
'pw'=>$newFinalPassword,
'salt'=>$newSalt
],'no=%i', $userID);
getRootDB()->insert('member_log', [
RootDB::db()->insert('member_log', [
'member_no'=>$userID,
'date'=>$nowDate,
'action_type'=>'change_pw',
@@ -109,7 +108,7 @@ getRootDB()->insert('member_log', [
], JSON_UNESCAPED_UNICODE)
]);
getRootDB()->query("unlock tables");
RootDB::db()->query("unlock tables");
Json::die([
oauth_kakao/j_join_process.php
+4 -5
View File
@@ -1,7 +1,6 @@
<?php
namespace sammo;
require(__DIR__.'/../d_setting/conf_kakao.php');
require_once('_common.php');
require('lib.join.php');
require('kakao.php');
@@ -10,7 +9,7 @@ use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper;
session_start();
$canJoin = getRootDB()->queryFirstField('SELECT REG FROM `SYSTEM` WHERE `NO` = 1');
$canJoin = RootDB::db()->queryFirstField('SELECT REG FROM `SYSTEM` WHERE `NO` = 1');
if($canJoin != 'Y'){
Json::die([
'result'=>false,
@@ -144,7 +143,7 @@ if($emailChk !== true){
}
//모든 절차 종료. 등록.
getRootDB()->insert('member',[
RootDB::db()->insert('member',[
'oauth_id' => $kakaoID,
'oauth_type' => 'KAKAO',
'id' => $username,
@@ -154,9 +153,9 @@ getRootDB()->insert('member',[
'name'=>$nickname,
'reg_date'=>$nowDate
]);
$userID = getRootDB()->insertId();
$userID = RootDB::db()->insertId();
getRootDB()->insert('member_log', [
RootDB::db()->insert('member_log', [
'member_no'=>$userID,
'date'=>$nowDate,
'action_type'=>'reg',
oauth_kakao/j_login_oauth.php
+3 -4
View File
@@ -1,7 +1,6 @@
<?php
namespace sammo;
require(__DIR__.'/../d_setting/conf_kakao.php');
require('_common.php');
require(ROOT.'/f_config/DB.php');
require('kakao.php');
@@ -13,7 +12,7 @@ if($session->isLoggedIn()){
$session->logout();
}
$canLogin = getRootDB()->queryFirstField('SELECT `LOGIN` FROM `SYSTEM` WHERE `NO` = 1');
$canLogin = RootDB::db()->queryFirstField('SELECT `LOGIN` FROM `SYSTEM` WHERE `NO` = 1');
if($canLogin != 'Y'){
Json::die([
'result'=>false,
@@ -92,7 +91,7 @@ if(!$email){
}
$userInfo = getRootDB()->queryFirstRow(
$userInfo = RootDB::db()->queryFirstRow(
'SELECT `no`, `id`, `name`, `grade`, `delete_after` from member where email=%s',$email);
if(!$userInfo){
@@ -108,7 +107,7 @@ if($userInfo['delete_after']){
if($userInfo['delete_after'] < $nowDate){
$restAPI->unlink();
unset($_SESSION['access_token']);
getRootDB()->delete('member', 'no=%i', $userInfo['no']);
RootDB::db()->delete('member', 'no=%i', $userInfo['no']);
Json::die([
'result'=>false,
'reason'=>"기간 만기로 삭제되었습니다. 재 가입을 시도해주세요."
oauth_kakao/join.php
+2 -3
View File
@@ -2,7 +2,6 @@
namespace sammo;
require('_common.php');
require_once(__dir__.'/../d_setting/conf.php');
@@ -13,7 +12,7 @@ if(!$access_token){
header('Location:oauth_fail.html');
}
$canJoin = getRootDB()->queryFirstField('SELECT REG FROM `SYSTEM` WHERE `NO` = 1');
$canJoin = RootDB::db()->queryFirstField('SELECT REG FROM `SYSTEM` WHERE `NO` = 1');
if($canJoin != 'Y'){
die('현재는 가입이 금지되어있습니다!');
}
@@ -98,7 +97,7 @@ if($canJoin != 'Y'){
</div>
</div>
<input type="hidden" id="global_salt" name="global_salt" value="<?=getGlobalSalt()?>">
<input type="hidden" id="global_salt" name="global_salt" value="<?=RootDB::getGlobalSalt()?>">
<div class="form-group row">
<div class="col-sm-3"></div>
<div class="col-sm-9">
oauth_kakao/lib.join.php
+4 -5
View File
@@ -2,7 +2,6 @@
namespace sammo;
require_once('_common.php');
require_once(__dir__.'/../d_setting/conf.php');
function checkUsernameDup($username){
if(!$username){
@@ -15,7 +14,7 @@ function checkUsernameDup($username){
return '적절하지 않은 길이입니다.';
}
$cnt = getRootDB()->queryFirstField('SELECT count(no) FROM member WHERE `id` = %s LIMIT 1', $username);
$cnt = RootDB::db()->queryFirstField('SELECT count(no) FROM member WHERE `id` = %s LIMIT 1', $username);
if($cnt != 0){
return '이미 사용중인 계정명입니다';
}
@@ -32,7 +31,7 @@ function checkNicknameDup($nickname){
return '적절하지 않은 길이입니다.';
}
$cnt = getRootDB()->queryFirstField('SELECT count(no) FROM member WHERE `name` = %s LIMIT 1', $nickname);
$cnt = RootDB::db()->queryFirstField('SELECT count(no) FROM member WHERE `name` = %s LIMIT 1', $nickname);
if($cnt != 0){
return '이미 사용중인 닉네임입니다';
}
@@ -50,7 +49,7 @@ function checkEmailDup($email){
return '적절하지 않은 길이입니다.';
}
$userInfo = getRootDB()->queryFirstField('SELECT `no`, `delete_after` FROM member WHERE `email` = %s LIMIT 1', $email);
$userInfo = RootDB::db()->queryFirstField('SELECT `no`, `delete_after` FROM member WHERE `email` = %s LIMIT 1', $email);
if($userInfo){
$nowDate = TimeUtil::DatetimeNow();
if (!$userInfo['delete_after']) {
@@ -62,7 +61,7 @@ function checkEmailDup($email){
}
//$userInfo['delete_after'] < $userInfo
getRootDB()->delete('member', 'no=%i', $userInfo['no']);
RootDB::db()->delete('member', 'no=%i', $userInfo['no']);
}
return true;
}
oauth_kakao/oauth.php
-1
View File
@@ -1,7 +1,6 @@
<?php
namespace sammo;
require(__DIR__.'/../d_setting/conf_kakao.php');
require('_common.php');
use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper;