$session->userID 보다는 버그 확률이 낮은 Session::getUserID로 전환.

- 함수에서 $session->userID는 $session = Session::getInstance() 가 필요

i_entrance/j_change_password.php

@@ -4,6 +4,7 @@ namespace sammo;
 require(__dir__.'/../vendor/autoload.php');
 
 $session = Session::requireLogin([])->setReadOnly();
+$userID = Session::getUserID();
 
 // 외부 파라미터
 // $_POST['old_pw'] : PW
@@ -17,11 +18,11 @@ $db = RootDB::db();
 
 $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->userID, $pw);
+], 'no=%i and pw=sha2(concat(salt, %s, salt), 512)', $userID, $pw);
 
 if(!$db->affectedRows()){
     $db->insert('member_log', [
-        'member_no'=>$session->userID,
+        'member_no'=>$userID,
         'action_type'=>'change_pw',
         'action'=>Json::encode([
             'type'=>'plain',
@@ -36,7 +37,7 @@ if(!$db->affectedRows()){
 }
 
 $db->insert('member_log', [
-    'member_no'=>$session->userID,
+    'member_no'=>$userID,
     'action_type'=>'change_pw',
     'action'=>Json::encode([
         'type'=>'plain',

i_entrance/j_delete_me.php

@@ -4,6 +4,7 @@ namespace sammo;
 require(__dir__.'/../vendor/autoload.php');
 
 $session = Session::requireLogin([]);
+$userID = Session::getUserID();
 
 // 외부 파라미터
 // $_POST['pw'] : PW
@@ -21,7 +22,7 @@ $db = RootDB::db();
 
 $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->userID, $pw);
+    $userID, $pw);
 
 if(!$userInfo){
     Json::die([
@@ -39,7 +40,7 @@ if($userInfo['delete_after']){
 
 $db->update('member',[
     'delete_after'=>TimeUtil::DatetimeFromNowMinute(60*24*30)
-], 'no=%i', $session->userID);
+], 'no=%i', $userID);
 
 if(!$db->affectedRows()){
     Json::die([
@@ -51,7 +52,7 @@ if(!$db->affectedRows()){
 
 
 $db->insert('member_log', [
-    'member_no'=>$session->userID,
+    'member_no'=>$userID,
     'action_type'=>'delete'
 ]);
 

i_entrance/j_get_user_info.php

@@ -4,11 +4,12 @@ namespace sammo;
 require(__dir__.'/../vendor/autoload.php');
 
 $session = Session::requireLogin([])->setReadOnly();
+$userID = Session::getUserID();
 
 // 외부 파라미터
 
 $db = RootDB::db();
-$member = $db->queryFirstRow('SELECT `id`, `name`, `grade`, `picture` FROM `MEMBER` WHERE `NO` = %i', $session->userID);
+$member = $db->queryFirstRow('SELECT `id`, `name`, `grade`, `picture` FROM `MEMBER` WHERE `NO` = %i', $userID);
 
 if(!$member['picture']){
     $picture = IMAGE.'/default.jpg';

i_entrance/j_icon_change.php

@@ -4,6 +4,7 @@ namespace sammo;
 require(__dir__.'/../vendor/autoload.php');
 
 $session = Session::requireLogin([])->setReadOnly();
+$userID = Session::getUserID();
 
 // 외부 파라미터
 // $_FILES['image_upload'] : 사진파일
@@ -21,7 +22,7 @@ $imageType = $size[2];
 $availableImageType = array('.jpg'=>IMAGETYPE_JPEG, '.png'=>IMAGETYPE_PNG, '.gif'=>IMAGETYPE_GIF);
 
 $db = RootDB::db();
-$member = $db->queryFirstRow('SELECT `ID`, `PICTURE` FROM `MEMBER` WHERE `NO` = %i', $session->userID);
+$member = $db->queryFirstRow('SELECT `ID`, `PICTURE` FROM `MEMBER` WHERE `NO` = %i', $userID);
 
 
 $picName = $member['PICTURE'];
@@ -79,7 +80,7 @@ if(!is_uploaded_file($image['tmp_name'])) {
         RootDB::db()->update('MEMBER',[
             'PICTURE' => $pic,
             'IMGSVR' => 1
-        ], 'NO=%i', $session->userID);
+        ], 'NO=%i', $userID);
 
         $servers = [];
 

i_entrance/j_icon_delete.php

@@ -4,12 +4,13 @@ namespace sammo;
 require(__dir__.'/../vendor/autoload.php');
 
 $session = Session::requireLogin([])->setReadOnly();
+$userID = Session::getUserID();
 
 // 외부 파라미터
 
 $respone = [];
 $db = RootDB::db();
-$picName = $db->queryFirstField('SELECT picture FROM `MEMBER` WHERE `NO` = %i', $session->userID);
+$picName = $db->queryFirstField('SELECT picture FROM `MEMBER` WHERE `NO` = %i', $userID);
 
 if($picName && strlen($picName) > 11){
     $dt = substr($picName, -8);
@@ -34,7 +35,7 @@ if($dt == $rf) {
     $db->update('MEMBER', [
         'PICTURE'=>'default.jpg',
         'IMGSVR'=>0,
-    ], 'NO=%i', $session->userID);
+    ], 'NO=%i', $userID);
     
     $servers = [];
 

i_entrance/j_logout.php

@@ -3,20 +3,17 @@ namespace sammo;
 
 require(__dir__.'/../vendor/autoload.php');
 
-$session = Session::getInstance();
-if(!$session->isLoggedIn()){
-    //로그인 안했다니까...
-    Json::die([
-        'result'=>true
-    ]);
-}
-
+$session = Session::requireLogin([
+    'result'=>true,
+    'reason'=>'로그인 되지 않았습니다'
+]);
+$userID = Session::getUserID();
 
 
 // 외부 파라미터
 
 RootDB::db()->insert('member_log',[
-    'member_no'=>$session->userID,
+    'member_no'=>$userID,
     'action_type'=>'logout',
     'action'=>Json::encode([
         'ip'=>Util::get_client_ip(true)