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

Session 클래스 수정.

Browse Source 
- Session클래스 내에서 global setter, getter 재정의
- Session클래스에서 static 함수로 getUserID, getUserGrade 재정의
- 내부 서버에서 getUserID, getUserGrade를 쓰던 것 Session 클래스로 통일
- SESSION.php가 requireLogin 기능을 수행하던것을 Session의 static 함수로 통합
This commit is contained in:
Hide_D
2018-03-24 20:04:55 +09:00
parent 4bcdf8b208
commit a3f83d1e95
110 changed files with 367 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
i_entrance/admin_userlist.php
+4 -4
View File
@@ -3,15 +3,15 @@ namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
require_once(ROOT.'/f_config/SESSION.php');
$session = Session::requireLogin();
$db = getRootDB();
$userGrade = $SESSION->getGrade();
$userGrade = $session->userGrade;
session_write_close();
$session->setReadOnly();
if($userGrade < 6){
header('Location:../');
header('Location:'.ROOT);
die();
}
?>
i_entrance/entrance.php
+2 -2
View File
@@ -3,13 +3,13 @@ namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
require_once(ROOT.'/f_config/SESSION.php');
$session = Session::requireLogin();
$templates = new \League\Plates\Engine('templates');
$db = getRootDB();
$notice = $db->queryFirstField('SELECT `NOTICE` FROM `SYSTEM` WHERE `NO`=1');
$userGrade = $SESSION->getGrade();
$userGrade = $session->userGrade;
?>
<!DOCTYPE html>
<html>
i_entrance/j_change_password.php
+5 -5
View File
@@ -4,9 +4,9 @@ namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$SESSION = new Session();
$session = Session::Instance();
if(!$SESSION->isLoggedIn()) {
if(!$session->isLoggedIn()) {
Json::die([
'result'=>false,
'reason'=>'로그인되지 않았습니다.'
@@ -27,11 +27,11 @@ $db = getRootDB();
$userInfo = $db->update('member',[
'pw'=>$db->sqleval('sha2(concat(salt, %s, salt), 512)', $newPw)
], 'no=%i and pw=sha2(concat(salt, %s, salt), 512)', $SESSION->noMember(), $pw);
], 'no=%i and pw=sha2(concat(salt, %s, salt), 512)', $session->userID, $pw);
if(!$db->affectedRows()){
$db->insert('member_log', [
'member_no'=>$SESSION->noMember(),
'member_no'=>$session->userID,
'action_type'=>'change_pw',
'action'=>json_encode([
'type'=>'plain',
@@ -46,7 +46,7 @@ if(!$db->affectedRows()){
}
$db->insert('member_log', [
'member_no'=>$SESSION->noMember(),
'member_no'=>$session->userID,
'action_type'=>'change_pw',
'action'=>json_encode([
'type'=>'plain',
i_entrance/j_delete_me.php
+6 -6
View File
@@ -5,9 +5,9 @@ require_once('_common.php');
require_once(ROOT.'/f_func/class._Time.php');
require_once(ROOT.'/f_config/DB.php');
$SESSION = new Session();
$session = Session::Instance();
if(!$SESSION->isLoggedIn()) {
if(!$session->isLoggedIn()) {
Json::die([
'result'=>false,
'reason'=>'로그인되지 않았습니다.'
@@ -30,7 +30,7 @@ $db = getRootDB();
$userInfo = $db->queryFirstRow('SELECT oauth_id, oauth_type, email, delete_after FROM MEMBER '.
'WHERE `no`=%i and pw=sha2(concat(salt, %s, salt), 512)',
$SESSION->noMember(), $pw);
$session->userID, $pw);
if(!$userInfo){
Json::die([
@@ -48,7 +48,7 @@ if($userInfo['delete_after']){
$db->update('member',[
'delete_after'=>_Time::DatetimeFromNowMinute(60*24*30)
], 'no=%i', $SESSION->noMember());
], 'no=%i', $session->userID);
if(!$db->affectedRows()){
Json::die([
@@ -60,11 +60,11 @@ if(!$db->affectedRows()){
$db->insert('member_log', [
'member_no'=>$SESSION->noMember(),
'member_no'=>$session->userID,
'action_type'=>'delete'
]);
$SESSION->logout();
$session->logout();
unset($_SESSION['access_token']);
setcookie("hello", "", time()-3600);
i_entrance/j_get_user_info.php
+3 -3
View File
@@ -4,9 +4,9 @@ namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$SESSION = new Session();
$session = Session::Instance();
if(!$SESSION->isLoggedIn()) {
if(!$session->isLoggedIn()) {
Json::die([
'result'=>false,
'reason'=>'로그인되지 않았습니다.'
@@ -16,7 +16,7 @@ if(!$SESSION->isLoggedIn()) {
// 외부 파라미터
$db = getRootDB();
$member = $db->queryFirstRow('SELECT `id`, `name`, `grade`, `picture` FROM `MEMBER` WHERE `NO` = %i', $SESSION->noMember());
$member = $db->queryFirstRow('SELECT `id`, `name`, `grade`, `picture` FROM `MEMBER` WHERE `NO` = %i', $session->userID);
if(!$member['picture']){
$picture = IMAGE.'/default.jpg';
i_entrance/j_icon_change.php
+4 -4
View File
@@ -4,9 +4,9 @@ namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$SESSION = new Session();
$session = Session::Instance();
if(!$SESSION->isLoggedIn()) {
if(!$session->isLoggedIn()) {
Json::die([
'result'=>false,
'reason'=>'로그인되지 않았습니다.'
@@ -29,7 +29,7 @@ $imageType = $size[2];
$availableImageType = array('.jpg'=>IMAGETYPE_JPEG, '.png'=>IMAGETYPE_PNG, '.gif'=>IMAGETYPE_GIF);
$db = getRootDB();
$member = $db->queryFirstRow('SELECT `ID`, `PICTURE` FROM `MEMBER` WHERE `NO` = %i', $SESSION->noMember());
$member = $db->queryFirstRow('SELECT `ID`, `PICTURE` FROM `MEMBER` WHERE `NO` = %i', $session->userID);
$picName = $member['PICTURE'];
@@ -87,7 +87,7 @@ if(!is_uploaded_file($image['tmp_name'])) {
getRootDB()->update('MEMBER',[
'PICTURE' => $pic,
'IMGSVR' => 1
], 'NO=%i', $SESSION->noMember());
], 'NO=%i', $session->userID);
$servers = [];
i_entrance/j_icon_delete.php
+4 -4
View File
@@ -4,9 +4,9 @@ namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
$SESSION = new Session();
$session = Session::Instance();
if(!$SESSION->isLoggedIn()) {
if(!$session->isLoggedIn()) {
Json::die([
'result'=>false,
'reason'=>'로그인되지 않았습니다.'
@@ -17,7 +17,7 @@ if(!$SESSION->isLoggedIn()) {
$respone = [];
$db = getRootDB();
$picName = $db->queryFirstField('SELECT picture FROM `MEMBER` WHERE `NO` = %i', $SESSION->noMember());
$picName = $db->queryFirstField('SELECT picture FROM `MEMBER` WHERE `NO` = %i', $session->userID);
if($picName && strlen($picName) > 11){
$dt = substr($picName, -8);
@@ -42,7 +42,7 @@ if($dt == $rf) {
$db->update('MEMBER', [
'PICTURE'=>'default.jpg',
'IMGSVR'=>0,
], 'NO=%i', $SESSION->noMember());
], 'NO=%i', $session->userID);
$servers = [];
i_entrance/j_logout.php
+2 -2
View File
@@ -3,12 +3,12 @@ namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
require_once(ROOT.'/f_config/SESSION.php');
$session = Session::requireLogin();
// 외부 파라미터
$SESSION->logout();
$session->logout();
unset($_SESSION['access_token']);
session_write_close();
setcookie("hello", "", time()-3600);
i_entrance/j_server_change_status.php
+2 -2
View File
@@ -3,7 +3,7 @@ namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
require_once(ROOT.'/f_config/SESSION.php');
$session = Session::requireLogin();
@@ -21,7 +21,7 @@ $notice = util::array_get($_POST['notice'], '');
$server = util::array_get($_POST['server'], '');
$db = getRootDB();
$userGrade = $SESSION->getGrade();
$userGrade = $session->userGrade;
session_write_close();
if($userGrade < 6) {
i_entrance/j_server_get_admin_status.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
require_once(ROOT.'/f_config/SESSION.php');
$session = Session::requireLogin();
$result = [];
i_entrance/member/Get.php
+2 -2
View File
@@ -3,7 +3,7 @@ namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
require_once(ROOT.'/f_config/SESSION.php');
$session = Session::requireLogin();
@@ -12,7 +12,7 @@ require_once(ROOT.'/f_config/SESSION.php');
$select = $_GET['select'];
$db = getRootDB();
$userGrade = $SESSION->getGrade();
$userGrade = $session->userGrade;
if($userGrade < 6) {
Json::die([
'result'=>'FAIL',
i_entrance/member/Post.php
+2 -2
View File
@@ -3,7 +3,7 @@ namespace sammo;
require_once('_common.php');
require_once(ROOT.'/f_config/DB.php');
require_once(ROOT.'/f_config/SESSION.php');
$session = Session::requireLogin();
// 외부 파라미터
// $_POST['select'] : 처리종류
@@ -12,7 +12,7 @@ $select = $_POST['select'];
$no = $_POST['no'];
$db = getRootDB();
$member = $db->queryFirstRow('SELECT `GRADE` FROM `MEMBER` WHERE `NO` = %i', $SESSION->noMember());
$member = $db->queryFirstRow('SELECT `GRADE` FROM `MEMBER` WHERE `NO` = %i', $session->userID);
if($member['GRADE'] < 6) {
$response['result'] = 'FAIL';