jyp9/core
1
0
Fork 0
forked from devsam/core
Code Pull Requests 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
f_config/SESSION.php
-13
View File
@@ -1,13 +0,0 @@
<?php
namespace sammo;
require_once('_common.php');
$SESSION = new Session();
if(!$SESSION->isLoggedIn()) {
header ("Location: ".ROOT);
die();
}
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';
index.php
+2 -2
View File
@@ -13,12 +13,12 @@ if(!$SETTING->isExists()){
require(ROOT.'/f_config/DB.php');
$SESSION = new _SESSION();
$session = Session::Instance();
use \kakao\KakaoKey as KakaoKey;
if($SESSION->isLoggedIn()){
if($session->isLoggedIn()){
header ('Location:i_entrance/entrance.php');
die();
}
j_login.php
+4 -4
View File
@@ -8,9 +8,9 @@ require_once(ROOT.'/f_config/DB.php');
$SESSION = new Session();
if($SESSION->isLoggedIn()){
$SESSION->logout();
$session = Session::Instance();
if($session->isLoggedIn()){
$session->logout();
}
$username = mb_strtolower(util::array_get($_POST['username']), 'utf-8');
@@ -64,7 +64,7 @@ if($userInfo['delete_after']){
}
$SESSION->login($userInfo['no'], $userInfo['id'], $userInfo['grade']);
$session->login($userInfo['no'], $userInfo['id'], $userInfo['grade']);
Json::die([
'result'=>true,
'reason'=>'로그인 되었습니다.'
oauth_kakao/j_change_pw.php
+3 -3
View File
@@ -10,14 +10,14 @@ use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper;
$nowDate = _Time::DatetimeNow();
$SESSION = new Session();
if(!$SESSION->isLoggedIn()){
$session = Session::Instance();
if(!$session->isLoggedIn()){
Json::die([
'result'=>false,
'reason'=>'로그인이 되어있지 않습니다'
]);
}
$userID = $SESSION->noMember();
$userID = $session->userID;
$access_token = util::array_get($_SESSION['access_token']);
$expires = util::array_get($_SESSION['expires']);
$refresh_token = util::array_get($_SESSION['refresh_token']);
oauth_kakao/j_login_oauth.php
+4 -4
View File
@@ -9,9 +9,9 @@ require('kakao.php');
use \kakao\Kakao_REST_API_Helper as Kakao_REST_API_Helper;
$SESSION = new Session();
if($SESSION->isLoggedIn()){
$SESSION->logout();
$session = Session::Instance();
if($session->isLoggedIn()){
$session->logout();
}
$canLogin = getRootDB()->queryFirstField('SELECT `LOGIN` FROM `SYSTEM` WHERE `NO` = 1');
@@ -126,7 +126,7 @@ if($userInfo['delete_after']){
}
$SESSION->login($userInfo['no'], $userInfo['id'], $userInfo['grade']);
$session->login($userInfo['no'], $userInfo['id'], $userInfo['grade']);
Json::die([
'result'=>true,
'reason'=>'로그인 되었습니다.'
src/sammo/Lock.php
+3
View File
@@ -1,6 +1,9 @@
<?php
namespace sammo;
if(!defined('ROOT')){
define('ROOT', '..');
}
class Lock {
private static $l = ROOT.'/d_log/lock.txt';
src/sammo/Session.php
+100 -30
View File
@@ -1,10 +1,45 @@
<?php
namespace sammo;
require(__dir__.'/../vendor/autoload.php');
if(!defined('ROOT')){
define('ROOT', '..');
}
class Session {
const PROTECTED_NAMES = [
'ip'=>true,
'time'=>true,
'userID'=>true,
'userName'=>true,
'userGrade'=>true,
'writeClosed'=>true
];
private $writeClosed = false;
/**
* @return \sammo\Session
*/
public static function Instance(){
static $inst = null;
if($inst === null){
$inst = new Session();
}
return $inst;
}
/**
* @return \sammo\Session
*/
public static function requireLogin(string $path = ROOT){
$session = Session::Instance();
if(!$session->isLoggedIn()){
header('Location:'.$path);
die();
}
return $session;
}
public function __construct() {
//session_cache_limiter('nocache, must_revalidate');
@@ -21,52 +56,91 @@ class Session {
}
}
public function writeClose(){
session_write_close();
/**
* @return \sammo\Session
*/
public function setReadOnly(){
if(!$this->writeClosed){
session_write_close();
$this->writeClosed = true;
}
return $this;
}
public function __set(string $name, mixed $value){
if(key_exists($key, self::PROTECED_NAMES)){
trigger_error("{$name}은 외부에서 쓰기 금지된 Session 변수입니다.", E_USER_NOTICE);
return;
}
$this->set($name, $value);
}
private function set(string $name, mixed $value){
if($value === null){
unset($_SESSION[$name]);
}
else{
$_SESSION[$name] = $value;
}
}
public function __get(string $name){
return $this->get($name);
}
private function get(string $name){
return util::array_get($_SESSION[$name]);
}
public function set($key, $val) {
$_SESSION[$key] = $val;
}
public function get($key) {
return util::array_get($_SESSION[$key]);
}
public function login($noMember, $idMember, $grade) {
$_SESSION['noMember'] = $noMember;
$_SESSION['p_id'] = $idMember;
$_SESSION['ip'] = util::get_client_ip(true);
$_SESSION['time'] = time();
$_SESSION['userGrade'] = $grade;
public function login(int $userID, string $userName, int $grade) {
$this->set('userID', $userID);
$this->set('userName', $userName);
$this->set('ip', util::get_client_ip(true));
$this->set('time', time());
$this->set('userGrade', $grade);
}
public function logout() {
unset($_SESSION['noMember']);
unset($_SESSION['p_id']);
unset($_SESSION['userGrade']);
$this->set('userID', null);
$this->set('userName', null);
$this->set('userGrade', null);
$this->set('time', time());
}
public function getGrade() {
return $_SESSION['userGrade'];
/**
* 로그인 유저의 전역 grade를 받아옴
* @return int|null
*/
public static function getUserGrade(bool $requireLogin = false, string $exitPath = ROOT){
if($requireLogin){
$obj = self::requireLogin($exitPath);
}
else{
$obj = self::Instance();
}
return $obj->userGrade;
}
/**
* 로그인한 유저의 전역 id(숫자)를 받아옴
*
* @return int|null
*/
public static function getUserID(bool $requireLogin = false, string $exitPath = ROOT){
if($requireLogin){
$obj = self::requireLogin($exitPath);
}
else{
$obj = self::Instance();
}
return $obj->userID;
}
public function isLoggedIn() {
if($this->noMember()){
if($this->userID){
return true;
}
else{
@@ -74,10 +148,6 @@ class Session {
}
}
public function noMember() {
return $this->get('noMember');
}
public function __destruct() {
}
}
twe/_119.php
+1 -1
View File
@@ -6,7 +6,7 @@ include "func.php";
$connect=dbConn();
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
echo "<!DOCTYPE html>
<!DOCTYPE html>
<html>
twe/_119_b.php
+1 -1
View File
@@ -6,7 +6,7 @@ include "func.php";
$connect=dbConn();
if(getUserGrade() < 5){
if(Session::getUserGrade() < 5){
//echo "<script>location.replace('_119.php');</script>";
echo '_119.php';//TODO:debug all and replace
}
twe/_admin1.php
+1 -1
View File
@@ -7,7 +7,7 @@ include "func.php";
CheckLogin();
$connect = dbConn();
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
echo "<!DOCTYPE html>
<html>
<head>
twe/_admin1_submit.php
+1 -1
View File
@@ -9,7 +9,7 @@ $connect = dbConn();
$admin = getAdmin($connect);
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
//echo "<script>location.replace('_admin1.php');</script>";
echo '_admin1.php';//TODO:debug all and replace
}
twe/_admin2.php
+1 -1
View File
@@ -7,7 +7,7 @@ include "func.php";
CheckLogin();
$connect = dbConn();
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
echo "<!DOCTYPE html>
<html>
<head>
twe/_admin2_submit.php
+1 -1
View File
@@ -7,7 +7,7 @@ include "func.php";
CheckLogin();
$connect = dbConn();
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
//echo "<script>location.replace('_admin2.php');</script>";
echo '_admin2.php';//TODO:debug all and replace
}
twe/_admin4.php
+1 -1
View File
@@ -7,7 +7,7 @@ include "func.php";
CheckLogin();
$connect = dbConn();
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
echo "<!DOCTYPE html>
<html>
<head>
twe/_admin4_submit.php
+1 -1
View File
@@ -7,7 +7,7 @@ include "func.php";
CheckLogin();
$connect = dbConn();
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
//echo "<script>location.replace('_admin4.php');</script>";
echo '_admin4.php';//TODO:debug all and replace
}
twe/_admin5.php
+2 -2
View File
@@ -7,11 +7,11 @@ include "func.php";
CheckLogin();
$connect = dbConn();
$query = "select skin from general where owner='{$_SESSION['noMember']}'";
$query = "select skin from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
echo "<!DOCTYPE html>
<html>
<head>
twe/_admin5_submit.php
+3 -3
View File
@@ -7,7 +7,7 @@ include "func.php";
CheckLogin();
$connect = dbConn();
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
//echo "<script>location.replace('_admin5.php');</script>";
echo '_admin5.php';//TODO:debug all and replace
}
@@ -15,10 +15,10 @@ if(getUserGrade() < 5) {
switch($btn) {
case "국가변경":
if($nation == 0) {
$query = "update general set nation=0,level=0 where owner='{$_SESSION['noMember']}'";
$query = "update general set nation=0,level=0 where owner='{$_SESSION['userID']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} else {
$query = "update general set nation='{$nation}',level=1 where owner='{$_SESSION['noMember']}'";
$query = "update general set nation='{$nation}',level=1 where owner='{$_SESSION['userID']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
break;
twe/_admin6.php
+1 -1
View File
@@ -7,7 +7,7 @@ include "func.php";
CheckLogin();
$connect = dbConn();
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
echo "<!DOCTYPE html>
<html>
<head>
twe/_admin7.php
+2 -2
View File
@@ -7,11 +7,11 @@ include "func.php";
CheckLogin();
$connect = dbConn();
$query = "select skin from general where owner='{$_SESSION['noMember']}'";
$query = "select skin from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
echo "<!DOCTYPE html>
<html>
<head>
twe/_admin8.php
+2 -2
View File
@@ -7,11 +7,11 @@ include "func.php";
CheckLogin();
$connect = dbConn();
$query = "select skin from general where owner='{$_SESSION['noMember']}'";
$query = "select skin from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
echo "<!DOCTYPE html>
<html>
<head>
twe/_simul.php
+2 -2
View File
@@ -50,7 +50,7 @@ CheckLogin();
$connect = dbConn();
increaseRefresh("시뮬", 2);
$query = "select no,tournament,con,turntime from general where owner='{$_SESSION['noMember']}'";
$query = "select no,tournament,con,turntime from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -61,7 +61,7 @@ $game = MYDB_fetch_array($result);
$con = checkLimit($me['con'], $game['conlimit']);
if($con >= 2) { printLimitMsg($me['turntime']); exit(); }
if(getUserGrade() < 3) {
if(Session::getUserGrade() < 3) {
echo "특별회원이 아닙니다.";
exit();
}
twe/a_bestGeneral.php
+1 -1
View File
@@ -12,7 +12,7 @@ $query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select con,turntime from general where owner='{$_SESSION['noMember']}'";
$query = "select con,turntime from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/a_genList.php
+1 -1
View File
@@ -12,7 +12,7 @@ $query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select con,turntime from general where owner='{$_SESSION['noMember']}'";
$query = "select con,turntime from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/a_history.php
+1 -1
View File
@@ -13,7 +13,7 @@ $query = "select startyear,year,month,conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select skin,map,con,turntime from general where owner='{$_SESSION['noMember']}'";
$query = "select skin,map,con,turntime from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/a_kingdomList.php
+1 -1
View File
@@ -12,7 +12,7 @@ $query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select con,turntime from general where owner='{$_SESSION['noMember']}'";
$query = "select con,turntime from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/a_status.php
+1 -1
View File
@@ -13,7 +13,7 @@ $query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select skin,map,con,turntime from general where owner='{$_SESSION['noMember']}'";
$query = "select skin,map,con,turntime from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/a_vote.php
+7 -7
View File
@@ -6,7 +6,7 @@ include "func.php";
$connect = dbConn();
increaseRefresh("설문조사", 1);
$query = "select no,vote from general where owner='{$_SESSION['noMember']}'";
$query = "select no,vote from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -46,7 +46,7 @@ function captureKey(e) {
<tr><td colspan=3 align=center id=bg2><font size=5>설 문 조 사 (<?=$admin['develcost']*5;?>금과 추첨으로 유니크템 증정!)</font></td></tr>
<?php
if(getUserGrade() >= 5) {
if(Session::getUserGrade() >= 5) {
echo "
<tr>
<td width=48 align=center><input type=submit name=btn value='알림'></td>
@@ -85,7 +85,7 @@ for($i=1; $i < $voteTypeCount; $i++) {
echo "
<input type=radio name=sel value={$i}>
";
} elseif($admin['voteopen'] >= 1 || getUserGrade() >= 5) {
} elseif($admin['voteopen'] >= 1 || Session::getUserGrade() >= 5) {
$query = "select no from general where vote='{$i}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$vCount = MYDB_num_rows($result);
@@ -121,7 +121,7 @@ echo "
</tr>
";
if(getUserGrade() >= 5) {
if(Session::getUserGrade() >= 5) {
echo "
<tr>
<td align=center><input type=submit name=btn value='리셋'></td>
@@ -173,7 +173,7 @@ if($me['no'] > 0) {
<tr><td colspan=3 align=center id=bg2><font size=5>
전 체 통 계
<?php
if(getUserGrade() >= 5) {
if(Session::getUserGrade() >= 5) {
echo "
<input type=submit name=btn value='숨김'>
<input type=submit name=btn value='전체통계만'>
@@ -182,7 +182,7 @@ if(getUserGrade() >= 5) {
echo "
</font></td></tr>";
if($admin['voteopen'] >= 1 || getUserGrade() >= 5) {
if($admin['voteopen'] >= 1 || Session::getUserGrade() >= 5) {
echo "
<tr>
<td width=98 align=center>전 체</td>
@@ -223,7 +223,7 @@ if($admin['voteopen'] >= 1 || getUserGrade() >= 5) {
";
}
if($admin['voteopen'] >= 2 || getUserGrade() >= 5) {
if($admin['voteopen'] >= 2 || Session::getUserGrade() >= 5) {
$query = "select no from general where nation=0 and npc<2";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$memCount = MYDB_num_rows($result);
twe/b_auction.php
+2 -2
View File
@@ -8,7 +8,7 @@ CheckLogin();
$connect = dbConn();
increaseRefresh("거래장", 2);
$query = "select no,special,skin,con,turntime from general where owner='{$_SESSION['noMember']}'";
$query = "select no,special,skin,con,turntime from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -29,7 +29,7 @@ $bidCount = MYDB_num_rows($result);
$btCount = $tradeCount + $bidCount;
if(getUserGrade() >= 5 || ($me['special'] != 30 && $btCount < 1) || ($me['special'] == 30 && $btCount < 3)) {
if(Session::getUserGrade() >= 5 || ($me['special'] != 30 && $btCount < 1) || ($me['special'] == 30 && $btCount < 3)) {
$btn = "submit";
} else {
$btn = "hidden";
twe/b_battleCenter.php
+1 -1
View File
@@ -18,7 +18,7 @@ $query = "select nation from general where no='$gen'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result);
$query = "select skin,no,nation,level,con,turntime,belong from general where owner='{$_SESSION['noMember']}'";
$query = "select skin,no,nation,level,con,turntime,belong from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/b_betting.php
+2 -2
View File
@@ -9,7 +9,7 @@ $connect = dbConn();
increaseRefresh("베팅장", 1);
checkTurn($connect);
$query = "select no,tournament,con,turntime,bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 as bet from general where owner='{$_SESSION['noMember']}'";
$query = "select no,tournament,con,turntime,bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 as bet from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -194,7 +194,7 @@ for($i=0; $i < 16; $i++) {
echo "<td width=70>{$gen[$i]}</td>";
}
$query = "select bet0,bet1,bet2,bet3,bet4,bet5,bet6,bet7,bet8,bet9,bet10,bet11,bet12,bet13,bet14,bet15 from general where owner='{$_SESSION['noMember']}'";
$query = "select bet0,bet1,bet2,bet3,bet4,bet5,bet6,bet7,bet8,bet9,bet10,bet11,bet12,bet13,bet14,bet15 from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
for($i=0; $i < 16; $i++) {
twe/b_chiefboard.php
+1 -1
View File
@@ -8,7 +8,7 @@ CheckLogin();
$connect = dbConn();
increaseRefresh("기밀실", 1);
$query = "select skin,no,nation,level from general where owner='{$_SESSION['noMember']}'";
$query = "select skin,no,nation,level from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/b_chiefcenter.php
+1 -1
View File
@@ -12,7 +12,7 @@ $query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select skin,no,nation,level,con,turntime,belong from general where owner='{$_SESSION['noMember']}'";
$query = "select skin,no,nation,level,con,turntime,belong from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/b_currentCity.php
+3 -3
View File
@@ -8,7 +8,7 @@ CheckLogin();
$connect = dbConn();
increaseRefresh("현재도시", 1);
$query = "select skin,no,nation,level,city from general where owner='{$_SESSION['noMember']}'";
$query = "select skin,no,nation,level,city from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -132,7 +132,7 @@ echo "
<br>";
// 첩보된 도시까지만 허용
if($valid == 0 && getUserGrade() < 5) {
if($valid == 0 && Session::getUserGrade() < 5) {
$_REQUEST['citylist'] = $me['city'];
}
@@ -283,7 +283,7 @@ for($j=0; $j < $gencount; $j++) {
<td align=center>$intel</td>
<td align=center>".getLevel($general['level'])."</td>";
//아국장수이거나 보는 사람이 운영자일때 보여줌
if(($general['nation'] != 0 && $general['nation'] == $myNation['nation']) || getUserGrade() >= 5) {
if(($general['nation'] != 0 && $general['nation'] == $myNation['nation']) || Session::getUserGrade() >= 5) {
switch($general['mode']) {
case 0: $mode = "×"; break;
case 1: $mode = "○"; break;
twe/b_dipcenter.php
+1 -1
View File
@@ -12,7 +12,7 @@ $query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select skin,no,nation,level,con,turntime,belong from general where owner='{$_SESSION['noMember']}'";
$query = "select skin,no,nation,level,con,turntime,belong from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/b_diplomacy.php
+3 -3
View File
@@ -12,7 +12,7 @@ $query = "select turnterm from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,nation,skin,map from general where owner='{$_SESSION['noMember']}'";
$query = "select no,nation,skin,map from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -117,7 +117,7 @@ for($i=0; $i < $nationcount; $i++) {
case 0: $str = "<font color=red>★</font>"; break;
case 1: $str = "<font color=magenta>▲</font>"; break;
case 2:
if($nationnum[$i] == $me['nation'] || $nationnum[$k] == $me['nation'] || getUserGrade() >= 5) { $str = "ㆍ"; }
if($nationnum[$i] == $me['nation'] || $nationnum[$k] == $me['nation'] || Session::getUserGrade() >= 5) { $str = "ㆍ"; }
else { $str = "?"; }
// $str = "ㆍ";
break;
@@ -126,7 +126,7 @@ for($i=0; $i < $nationcount; $i++) {
case 5: $str = "<font color=cyan>◎</font>"; break;
case 6: $str = "<font color=cyan>◎</font>"; break;
case 7:
if($nationnum[$i] == $me['nation'] || $nationnum[$k] == $me['nation'] || getUserGrade() >= 5) { $str = "<font color=green>@</font>"; }
if($nationnum[$i] == $me['nation'] || $nationnum[$k] == $me['nation'] || Session::getUserGrade() >= 5) { $str = "<font color=green>@</font>"; }
else { $str = "?"; }
// $str = "<font color=limegreen>@</font>";
break;
twe/b_genList.php
+1 -1
View File
@@ -12,7 +12,7 @@ $query = "select conlimit from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select skin,no,nation,level,con,turntime,belong from general where owner='{$_SESSION['noMember']}'";
$query = "select skin,no,nation,level,con,turntime,belong from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/b_myBossInfo.php
+1 -1
View File
@@ -10,7 +10,7 @@ increaseRefresh("인사부", 1);
//훼섭 추방을 위해 갱신
checkTurn($connect);
$query = "select skin,no,nation,level from general where owner='{$_SESSION['noMember']}'";
$query = "select skin,no,nation,level from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/b_myCityInfo.php
+2 -2
View File
@@ -8,7 +8,7 @@ CheckLogin();
$connect = dbConn();
increaseRefresh("세력도시", 1);
$query = "select no,nation,level,skin from general where owner='{$_SESSION['noMember']}'";
$query = "select no,nation,level,skin from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -59,7 +59,7 @@ if($me['skin'] < 1) {
</td></tr>
</table>
<?php
$query = "select nation from general where owner='{$_SESSION['noMember']}'";
$query = "select nation from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/b_myGenInfo.php
+1 -1
View File
@@ -8,7 +8,7 @@ CheckLogin();
$connect = dbConn();
increaseRefresh("세력장수", 1);
$query = "select skin,no,nation,level from general where owner='{$_SESSION['noMember']}'";
$query = "select skin,no,nation,level from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/b_myKingdomInfo.php
+2 -2
View File
@@ -8,7 +8,7 @@ CheckLogin();
$connect = dbConn();
increaseRefresh("세력정보", 1);
$query = "select no,nation,level from general where owner='{$_SESSION['noMember']}'";
$query = "select no,nation,level from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -33,7 +33,7 @@ if($me['level'] == 0) {
</table>
<br>
<?php
$query = "select nation,skin from general where owner='{$_SESSION['noMember']}'";
$query = "select nation,skin from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/b_myPage.php
+3 -3
View File
@@ -8,7 +8,7 @@ CheckLogin();
$connect = dbConn();
increaseRefresh("내정보", 1);
$query = "select myset from general where owner='{$_SESSION['noMember']}'";
$query = "select myset from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -25,11 +25,11 @@ if($btn == "설정저장" && $me['myset'] > 0) {
$submit = 'hidden';
}
$query = "update general set myset=myset-1,map='$map',mode='$mode',skin='$skin',tnmt='$tnmt' where owner='{$_SESSION['noMember']}'";
$query = "update general set myset=myset-1,map='$map',mode='$mode',skin='$skin',tnmt='$tnmt' where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
$query = "select no,skin,map,mode,tnmt,myset from general where owner='{$_SESSION['noMember']}'";
$query = "select no,skin,map,mode,tnmt,myset from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/b_nationboard.php
+1 -1
View File
@@ -8,7 +8,7 @@ CheckLogin();
$connect = dbConn();
increaseRefresh("회의실", 1);
$query = "select skin,no,nation from general where owner='{$_SESSION['noMember']}'";
$query = "select skin,no,nation from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/b_nationrule.php
+1 -1
View File
@@ -23,7 +23,7 @@ increaseRefresh("국법", 1);
<tr><td>
<?php
$query = "select no,nation,level from general where owner='{$_SESSION['noMember']}'";
$query = "select no,nation,level from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/b_tournament.php
+2 -2
View File
@@ -9,7 +9,7 @@ $connect = dbConn();
increaseRefresh("토너먼트", 1);
checkTurn($connect);
$query = "select no,tournament,con,turntime from general where owner='{$_SESSION['noMember']}'";
$query = "select no,tournament,con,turntime from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -53,7 +53,7 @@ select { font-family:'굴림'; line-height:100%; }
</table>
<table align=center border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13px;word-break:break-all; id=bg0>
<?php
if(getUserGrade() >= 5) {
if(Session::getUserGrade() >= 5) {
echo "
<form method=post action=c_tournament.php>
<tr><td colspan=8><input type=textarea size=150 style=color:white;background-color:black; name=msg><input type=submit name=btn value='메시지'></td></tr>
twe/b_troop.php
+1 -1
View File
@@ -8,7 +8,7 @@ CheckLogin();
$connect = dbConn();
increaseRefresh("부대편성", 1);
$query = "select skin,no,nation,troop from general where owner='{$_SESSION['noMember']}'";
$query = "select skin,no,nation,troop from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/c_auction.php
+2 -2
View File
@@ -12,7 +12,7 @@ $query = "select turnterm from game where no=1";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,gold,rice,special from general where owner='{$_SESSION['noMember']}'";
$query = "select no,name,gold,rice,special from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -44,7 +44,7 @@ $value = round($value / 10) * 10;
if($term > 24) $term = 24;
$valid = 1;
if(getUserGrade() >= 5 || ($me['special'] != 30 && $btCount < 1) || ($me['special'] == 30 && $btCount < 3)) {
if(Session::getUserGrade() >= 5 || ($me['special'] != 30 && $btCount < 1) || ($me['special'] == 30 && $btCount < 3)) {
} else {
$msg = "ㆍ<span class='ev_warning'>더이상 등록할 수 없습니다.</span>";
$msg2 = "ㆍ<span class='ev_warning'>더이상 등록할 수 없습니다.</span>";
twe/c_betting.php
+2 -2
View File
@@ -22,7 +22,7 @@ if($admin['tournament'] != 6) {
exit();
}
$query = "select gold,bet0,bet1,bet2,bet3,bet4,bet5,bet6,bet7,bet8,bet9,bet10,bet11,bet12,bet13,bet14,bet15,bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 as bet from general where owner='{$_SESSION['noMember']}'";
$query = "select gold,bet0,bet1,bet2,bet3,bet4,bet5,bet6,bet7,bet8,bet9,bet10,bet11,bet12,bet13,bet14,bet15,bet0+bet1+bet2+bet3+bet4+bet5+bet6+bet7+bet8+bet9+bet10+bet11+bet12+bet13+bet14+bet15 as bet from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -32,7 +32,7 @@ for($i=0; $i < 16; $i++) {
$mebet = $me["bet{$i}"];
if($gold >= 10 && $gold <= 1000) {
if($gold + 500 <= $me['gold'] && $gold + $mebet <= 1000 && $gold + $me['bet'] <= 1000) {
$query = "update general set gold=gold-'$gold',bet{$i}=bet{$i}+'$gold',betgold=betgold+'$gold' where owner='{$_SESSION['noMember']}'";
$query = "update general set gold=gold-'$gold',bet{$i}=bet{$i}+'$gold',betgold=betgold+'$gold' where owner='{$_SESSION['userID']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "update game set bet{$i}=bet{$i}+'$gold' where no='1'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
twe/c_chiefboard.php
+1 -1
View File
@@ -10,7 +10,7 @@ CheckLogin();
$connect = dbConn();
if(getBlockLevel() != 1 && getBlockLevel() != 3) {
$query = "select no,nation from general where owner='{$_SESSION['noMember']}'";
$query = "select no,nation from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/c_dipcenter.php
+1 -1
View File
@@ -9,7 +9,7 @@ include "func.php";
CheckLogin();
$connect = dbConn();
$query = "select no,nation,level from general where owner='{$_SESSION['noMember']}'";
$query = "select no,nation,level from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/c_double.php
+6 -6
View File
@@ -32,7 +32,7 @@ if($command == 46) {
if($name == "") { $name = "무명"; }
$name = _String::SubStrForWidth($name, 0, 12);
$query = "update general set makenation='{$name}' where owner='{$_SESSION['noMember']}'";
$query = "update general set makenation='{$name}' where owner='{$_SESSION['userID']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = sizeof($turn);
@@ -40,13 +40,13 @@ if($command == 46) {
for($i=0; $i < $count; $i++) {
$str .= ",turn{$turn[$i]}='{$comStr}'";
}
$query = "update general set {$str} where owner='{$_SESSION['noMember']}'";
$query = "update general set {$str} where owner='{$_SESSION['userID']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//echo "<script>location.replace('index.php');</script>";
echo 'index.php';//TODO:debug all and replace
//통합제의
} elseif($command == 53) {
$query = "select nation,level from general where owner='{$_SESSION['noMember']}'";
$query = "select nation,level from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -73,7 +73,7 @@ if($command == 46) {
echo 'b_chiefcenter.php';//TODO:debug all and replace
//불가침
} elseif($command == 61) {
$query = "select nation,level from general where owner='{$_SESSION['noMember']}'";
$query = "select nation,level from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -102,7 +102,7 @@ if($command == 46) {
//백성동원, 수몰, 허보, 피장파장, 의병모집, 이호경식, 급습
//국기변경
} elseif($command == 23 || $command == 24 || $command == 27 || $command == 51 || $command == 52 || $command > 60) {
$query = "select no,nation,level from general where owner='{$_SESSION['noMember']}'";
$query = "select no,nation,level from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -125,7 +125,7 @@ if($command == 46) {
for($i=0; $i < $count; $i++) {
$str .= ",turn{$turn[$i]}='{$comStr}'";
}
$query = "update general set {$str} where owner='{$_SESSION['noMember']}'";
$query = "update general set {$str} where owner='{$_SESSION['userID']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//echo "<script>location.replace('index.php');</script>";
echo 'index.php';//TODO:debug all and replace
twe/c_myBossInfo.php
+1 -1
View File
@@ -13,7 +13,7 @@ $query = "select startyear,year,month from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,nation,level from general where owner='{$_SESSION['noMember']}'";
$query = "select no,nation,level from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
$meLevel = $me['level'];
twe/c_nationboard.php
+1 -1
View File
@@ -10,7 +10,7 @@ CheckLogin();
$connect = dbConn();
if(getBlockLevel() != 1 && getBlockLevel() != 3) {
$query = "select no,nation from general where owner='{$_SESSION['noMember']}'";
$query = "select no,nation from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/c_nationrule.php
+1 -1
View File
@@ -9,7 +9,7 @@ include "func.php";
CheckLogin();
$connect = dbConn();
$query = "select no,nation from general where owner='{$_SESSION['noMember']}'";
$query = "select no,nation from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/c_tournament.php
+23 -23
View File
@@ -13,7 +13,7 @@ $query = "select tournament,phase,tnmt_type,develcost from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,tournament from general where owner='{$_SESSION['noMember']}'";
$query = "select no,name,tournament from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -24,17 +24,17 @@ case 2: $tp = "power"; $tp2 = "일기토"; $tp3 = "power"; break;
case 3: $tp = "intel"; $tp2 = "설전"; $tp3 = "intel"; break;
}
if($me['tournament'] == 1 && getUserGrade() < 5) { echo "<script>location.replace('b_tournament.php');</script>"; exit(); }
if($me['tournament'] == 1 && Session::getUserGrade() < 5) { echo "<script>location.replace('b_tournament.php');</script>"; exit(); }
if($btn == "자동개최설정" && getUserGrade() >= 5) {
if($btn == "자동개최설정" && Session::getUserGrade() >= 5) {
$query = "update game set tnmt_trig={$trig}";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} elseif($btn == "개최" && getUserGrade() >= 5) {
} elseif($btn == "개최" && Session::getUserGrade() >= 5) {
startTournament($connect, $auto, $type);
} elseif($btn == "중단" && getUserGrade() >= 5) {
} elseif($btn == "중단" && Session::getUserGrade() >= 5) {
$query = "update game set tnmt_auto=0, tournament=0, phase=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} elseif((($btn == "투입" || $btn == "무명투입" || $btn == "쪼렙투입" || $btn == "일반투입" || $btn == "굇수투입" || $btn == "랜덤투입") && getUserGrade() >= 5) || $btn == "참가") {
} elseif((($btn == "투입" || $btn == "무명투입" || $btn == "쪼렙투입" || $btn == "일반투입" || $btn == "굇수투입" || $btn == "랜덤투입") && Session::getUserGrade() >= 5) || $btn == "참가") {
if($btn == "투입") {
$query = "select no,name,npc,leader,power,intel,explevel,gold,horse,weap,book from general where no='$gen'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -125,7 +125,7 @@ if($btn == "자동개최설정" && getUserGrade() >= 5) {
$query = "update game set tournament=2, phase=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
} elseif(($btn == "쪼렙전부투입" || $btn == "일반전부투입" || $btn == "굇수전부투입" || $btn == "랜덤전부투입") && getUserGrade() >= 5) {
} elseif(($btn == "쪼렙전부투입" || $btn == "일반전부투입" || $btn == "굇수전부투입" || $btn == "랜덤전부투입") && Session::getUserGrade() >= 5) {
$z = 0;
for($i=0; $i < 8; $i++) {
$query = "select grp from tournament where grp='$i'";
@@ -179,25 +179,25 @@ if($btn == "자동개최설정" && getUserGrade() >= 5) {
$query = "update game set tournament=2, phase=0";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} elseif($btn == "무명전부투입" && getUserGrade() >= 5) { fillLowGenAll($connect);
} elseif($btn == "예선" && getUserGrade() >= 5) { qualify($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase']);
} elseif($btn == "예선전부" && getUserGrade() >= 5) { qualifyAll($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase']);
} elseif($btn == "추첨" && getUserGrade() >= 5) { selection($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase']);
} elseif($btn == "추첨전부" && getUserGrade() >= 5) { selectionAll($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase']);
} elseif($btn == "본선" && getUserGrade() >= 5) { finallySingle($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase']);
} elseif($btn == "본선전부" && getUserGrade() >= 5) { finallyAll($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase']);
} elseif($btn == "배정" && getUserGrade() >= 5) { final16set($connect);
} elseif($btn == "베팅마감" && getUserGrade() >= 5) {
} elseif($btn == "무명전부투입" && Session::getUserGrade() >= 5) { fillLowGenAll($connect);
} elseif($btn == "예선" && Session::getUserGrade() >= 5) { qualify($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase']);
} elseif($btn == "예선전부" && Session::getUserGrade() >= 5) { qualifyAll($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase']);
} elseif($btn == "추첨" && Session::getUserGrade() >= 5) { selection($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase']);
} elseif($btn == "추첨전부" && Session::getUserGrade() >= 5) { selectionAll($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase']);
} elseif($btn == "본선" && Session::getUserGrade() >= 5) { finallySingle($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase']);
} elseif($btn == "본선전부" && Session::getUserGrade() >= 5) { finallyAll($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase']);
} elseif($btn == "배정" && Session::getUserGrade() >= 5) { final16set($connect);
} elseif($btn == "베팅마감" && Session::getUserGrade() >= 5) {
$dt = date("Y-m-d H:i:s", time() + 60);
$query = "update game set tournament='7',phase='0',tnmt_time='$dt' where no=1";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} elseif($btn == "16강" && getUserGrade() >= 5) { finalFight($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase'], 16);
} elseif($btn == "8강" && getUserGrade() >= 5) { finalFight($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase'], 8);
} elseif($btn == "4강" && getUserGrade() >= 5) { finalFight($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase'], 4);
} elseif($btn == "결승" && getUserGrade() >= 5) { finalFight($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase'], 2);
} elseif($btn == "포상" && getUserGrade() >= 5) { setGift($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase']);
} elseif($btn == "회수" && getUserGrade() >= 5) { setRefund($connect);
} elseif($btn == "메시지" && getUserGrade() >= 5) {
} elseif($btn == "16강" && Session::getUserGrade() >= 5) { finalFight($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase'], 16);
} elseif($btn == "8강" && Session::getUserGrade() >= 5) { finalFight($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase'], 8);
} elseif($btn == "4강" && Session::getUserGrade() >= 5) { finalFight($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase'], 4);
} elseif($btn == "결승" && Session::getUserGrade() >= 5) { finalFight($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase'], 2);
} elseif($btn == "포상" && Session::getUserGrade() >= 5) { setGift($connect, $admin['tnmt_type'], $admin['tournament'], $admin['phase']);
} elseif($btn == "회수" && Session::getUserGrade() >= 5) { setRefund($connect);
} elseif($btn == "메시지" && Session::getUserGrade() >= 5) {
$msg = addslashes(SQ2DQ($msg));
$query = "update game set tnmt_msg='$msg'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
twe/c_troop.php
+1 -1
View File
@@ -9,7 +9,7 @@ include "func.php";
CheckLogin();
$connect = dbConn();
$query = "select no,nation,troop from general where owner='{$_SESSION['noMember']}'";
$query = "select no,nation,troop from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/c_vacation.php
+1 -1
View File
@@ -13,7 +13,7 @@ $admin = MYDB_fetch_array($result);
$admin['killturn'] *= 3;
$query = "update general set killturn='{$admin['killturn']}' where owner='{$_SESSION['noMember']}'";
$query = "update general set killturn='{$admin['killturn']}' where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//echo "<script>location.replace('b_myPage.php');</script>";
twe/c_vote.php
+3 -3
View File
@@ -11,13 +11,13 @@ $query = "select develcost,vote,votecomment from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,vote,name,nation,horse,weap,book,item,npc from general where owner='{$_SESSION['noMember']}'";
$query = "select no,vote,name,nation,horse,weap,book,item,npc from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
if($btn == "투표" && $me['vote'] == 0 && $sel > 0) {
$develcost = $admin['develcost'] * 5;
$query = "update general set gold=gold+{$develcost},vote='{$sel}' where owner='{$_SESSION['noMember']}'";
$query = "update general set gold=gold+{$develcost},vote='{$sel}' where owner='{$_SESSION['userID']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$log = array();
@@ -45,7 +45,7 @@ else if($btn == "댓글" && $comment != "") {
}
if(getUserGrade() < 5){
if(Session::getUserGrade() < 5){
echo "<!--<script>location.replace('a_vote.php');</script>"; //TODO:debug all and replace -->
echo 'a_vote.php ';
die();
twe/commandlist.php
+1 -1
View File
@@ -67,7 +67,7 @@ function myCommandList($connect) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,turntime,term,turn0,turn1,turn2,turn3,turn4,turn5,turn6,turn7,turn8,turn9,turn10,turn11,turn12,turn13,turn14,turn15,turn16,turn17,turn18,turn19,turn20,turn21,turn22,turn23 from general where owner='{$_SESSION['noMember']}'";
$query = "select no,turntime,term,turn0,turn1,turn2,turn3,turn4,turn5,turn6,turn7,turn8,turn9,turn10,turn11,turn12,turn13,turn14,turn15,turn16,turn17,turn18,turn19,turn20,turn21,turn22,turn23 from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
$turn = getTurn($connect, $me, 2);
twe/d_ally.php
+1 -1
View File
@@ -13,7 +13,7 @@ $query = "select year,month from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/d_cancel.php
+1 -1
View File
@@ -11,7 +11,7 @@ $query = "select year,month from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/d_cease.php
+1 -1
View File
@@ -11,7 +11,7 @@ $query = "select year,month from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/d_merge.php
+1 -1
View File
@@ -11,7 +11,7 @@ $query = "select year,month from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/d_scout.php
+1 -1
View File
@@ -17,7 +17,7 @@ $query = "select startyear,year,month,killturn from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,nation,nations,level,troop,npc,gold,rice from general where owner='{$_SESSION['noMember']}'";
$query = "select no,name,nation,nations,level,troop,npc,gold,rice from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/d_surrender.php
+1 -1
View File
@@ -11,7 +11,7 @@ $query = "select year,month from game where no='1'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['noMember']}'";
$query = "select no,name,nation,level,picture,imgsvr from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/event_1.php
+1 -1
View File
@@ -11,7 +11,7 @@ include "func.php";
CheckLogin();
$connect = dbConn();
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
echo "
<!DOCTYPE html>
<html>
twe/event_2.php
+1 -1
View File
@@ -11,7 +11,7 @@ include "func.php";
CheckLogin();
$connect = dbConn();
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
echo "
<!DOCTYPE html>
<html>
twe/event_3.php
+1 -1
View File
@@ -11,7 +11,7 @@ include "func.php";
CheckLogin();
$connect = dbConn();
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
echo "
<!DOCTYPE html>
<html>
twe/event_4.php
+1 -1
View File
@@ -14,7 +14,7 @@ include "func.php";
CheckLogin();
$connect = dbConn();
if(getUserGrade() < 5) {
if(Session::getUserGrade() < 5) {
echo "
<html>
<head>
twe/func.php
+19 -54
View File
@@ -42,48 +42,13 @@ function randBool($prob = 0.5){
return randF() < $prob;
}
/**
* 로그인한 유저의 전역 id(숫자)를 받아옴
*
* @return int|null
*/
function getUserID($forceExit=false){
$userID = util::array_get($_SESSION['noMember'], null);
if(!$userID && $forceExit){
header('Location:..');
die();
}
if($userID == -1){
unset($_SESSION['noMember']);
header('Location:..');
die();
}
return $userID;
}
/**
* 로그인 유저의 전역 grade를 받아옴
* @return int|null
*/
function getUserGrade($forceExit=false){
$userGrade = util::array_get($_SESSION['userGrade'], null);
if(!$userGrade && $forceExit){
header('Location:..');
die();
}
return $userGrade;
}
/**
* 로그인한 유저의 장수 id를 받아옴
*
* @return int|null
*/
function getGeneralID($forceExit=false, $countLogin=true){
$userID = getUserID();
$userID = Session::getUserID();
if(!$userID){ //유저id 없으면 어차피 의미 없음.
return null;
}
@@ -237,7 +202,7 @@ function isSigned(){
function checkLimit($con, $conlimit) {
if(getUserGrade()>=4){
if(Session::getUserGrade()>=4){
return 0;
}
if($con > $conlimit) {
@@ -278,7 +243,7 @@ function getRandGenName() {
function cityInfo($connect) {
global $_basecolor, $_basecolor2, $images;
$query = "select no,city,skin from general where owner='{$_SESSION['noMember']}'";
$query = "select no,city,skin from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -393,7 +358,7 @@ function myNationInfo($connect) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select skin,no,nation from general where owner='{$_SESSION['noMember']}'";
$query = "select skin,no,nation from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -579,7 +544,7 @@ function commandTable($connect) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,npc,troop,city,nation,level,crew,makelimit,special from general where owner='{$_SESSION['noMember']}'";
$query = "select no,npc,troop,city,nation,level,crew,makelimit,special from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -813,7 +778,7 @@ function CoreCommandTable($connect) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select no,nation,city,level from general where owner='{$_SESSION['noMember']}'";
$query = "select no,nation,city,level from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -903,7 +868,7 @@ function CoreCommandTable($connect) {
}
function myInfo($connect) {
$query = "select no,skin from general where owner='{$_SESSION['noMember']}'";
$query = "select no,skin from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -917,7 +882,7 @@ function generalInfo($connect, $no, $skin) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result);
$query = "select skin from general where owner='{$_SESSION['noMember']}'";
$query = "select skin from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -1100,7 +1065,7 @@ function generalInfo($connect, $no, $skin) {
}
function myInfo2($connect) {
$query = "select no,skin from general where owner='{$_SESSION['noMember']}'";
$query = "select no,skin from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -1522,7 +1487,7 @@ function onlineNation($connect) {
}
function nationMsg($connect) {
$query = "select no,nation,skin from general where owner='{$_SESSION['noMember']}'";
$query = "select no,nation,skin from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -1832,7 +1797,7 @@ function increaseRefresh($type="", $cnt=1) {
getDB()->query('UPDATE game set refresh=refresh+%i where `no`=1', $cnt);
if(!util::array_get($_SESSION['noMember'], null)) {
if(!util::array_get($_SESSION['userID'], null)) {
getDB()->query('UPDATE general set `lastrefresh`=%s_date, `con`=`con`+%i_cnt, `connect`=`connect`+%i_cnt, refcnt=refcnt+%i_cnt, refresh=refresh+%i_cnt where `no`=%i_no',[
'date'=>$date,
'cnt'=>$cnt,
@@ -1844,7 +1809,7 @@ function increaseRefresh($type="", $cnt=1) {
$date2 = substr($date, 0, 10);
$online = getOnlineNum();
$fp = fopen("logs/_{$date2}_refresh.txt", "a");
$msg = _String::Fill2($date,20," ")._String::Fill2($_SESSION['p_id'],13," ")._String::Fill2($_SESSION['p_name'],13," ")._String::Fill2($_SESSION['p_ip'],16," ")._String::Fill2($type, 10, " ")." 동접자: {$online}";
$msg = _String::Fill2($date,20," ")._String::Fill2($_SESSION['userName'],13," ")._String::Fill2($_SESSION['p_name'],13," ")._String::Fill2($_SESSION['p_ip'],16," ")._String::Fill2($type, 10, " ")." 동접자: {$online}";
fwrite($fp, $msg."\n");
fclose($fp);
@@ -1873,7 +1838,7 @@ function increaseRefresh($type="", $cnt=1) {
if($str != "") {
file_put_contents("logs/_{$date2}_ipcheck.txt",
sprintf("ID:%s//name:%s//REMOTE_ADDR:%s%s\n",
$_SESSION['p_id'],$_SESSION['p_name'],$_SERVER['REMOTE_ADDR'],$str), FILE_APPEND);
$_SESSION['userName'],$_SESSION['p_name'],$_SERVER['REMOTE_ADDR'],$str), FILE_APPEND);
}
}
@@ -2088,7 +2053,7 @@ function checkTurn($connect) {
return;
}
$locklog[0] = "- checkTurn() : ".date('Y-m-d H:i:s')." : ".$_SESSION['p_id'];
$locklog[0] = "- checkTurn() : ".date('Y-m-d H:i:s')." : ".$_SESSION['userName'];
pushLockLog($locklog);
// 파일락 해제
@@ -2096,7 +2061,7 @@ function checkTurn($connect) {
// 세마포어 해제
//if(!@sem_release($sema)) { echo "치명적 에러! 유기체에게 문의하세요!"; exit(1); }
$locklog[0] = "- checkTurn() 입 : ".date('Y-m-d H:i:s')." : ".$_SESSION['p_id'];
$locklog[0] = "- checkTurn() 입 : ".date('Y-m-d H:i:s')." : ".$_SESSION['userName'];
pushLockLog($locklog);
//if(STEP_LOG) delStepLog();
@@ -2162,7 +2127,7 @@ function checkTurn($connect) {
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', preUpdateMonthly');
$result = preUpdateMonthly($connect);
if($result == false) {
$locklog[0] = "-- checkTurn() 오류출 : ".date('Y-m-d H:i:s')." : ".$_SESSION['p_id'];
$locklog[0] = "-- checkTurn() 오류출 : ".date('Y-m-d H:i:s')." : ".$_SESSION['userName'];
pushLockLog($locklog);
// 잡금 해제
@@ -2175,7 +2140,7 @@ function checkTurn($connect) {
$dt = turnDate($connect, $nextTurn);
$admin['year'] = $dt[0]; $admin['month'] = $dt[1];
$locklog[0] = "-- checkTurn() ".$admin['month']."월 : ".date('Y-m-d H:i:s')." : ".$_SESSION['p_id'];
$locklog[0] = "-- checkTurn() ".$admin['month']."월 : ".date('Y-m-d H:i:s')." : ".$_SESSION['userName'];
pushLockLog($locklog);
// 분기계산. 장수들 턴보다 먼저 있다면 먼저처리
if($admin['month'] == 1) {
@@ -2291,7 +2256,7 @@ function checkTurn($connect) {
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', unlock');
unlock();
$locklog[0] = "- checkTurn() 출 : ".date('Y-m-d H:i:s')." : ".$_SESSION['p_id'];
$locklog[0] = "- checkTurn() 출 : ".date('Y-m-d H:i:s')." : ".$_SESSION['userName'];
pushLockLog($locklog);
//if(STEP_LOG) pushStepLog(date('Y-m-d H:i:s').', finish');
@@ -2920,7 +2885,7 @@ function getAdmin($connect) {
}
function getMe($connect) {
$query = "select * from general where owner='{$_SESSION['noMember']}'";
$query = "select * from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error("접속자가 많아 접속을 중단합니다. 잠시후 갱신해주세요.<br>getMe : ".MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/func_command.php
+3 -3
View File
@@ -523,7 +523,7 @@ function processCommand($connect, $no) {
if($general['npc'] >= 2 || $general['killturn'] > $admin['killturn']) {
$query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} elseif(floor($command[0]) == 0 && getUserGrade() < 5) {
} elseif(floor($command[0]) == 0 && Session::getUserGrade() < 5) {
$query = "update general set recturn=turn0,resturn='FAIL',myset=3,con=0,killturn=killturn-1 where no='{$general['no']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} else {
@@ -674,7 +674,7 @@ function command_Single($connect, $turn, $command) {
for($i=0; $i < $count; $i++) {
$str .= ",turn{$turn[$i]}='{$command}'";
}
$query = "update general set {$str} where owner='{$_SESSION['noMember']}'";
$query = "update general set {$str} where owner='{$_SESSION['userID']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//echo "<script>location.replace('commandlist.php');</script>";
echo 'commandlist.php';//TODO:debug all and replace
@@ -684,7 +684,7 @@ function command_Single($connect, $turn, $command) {
function command_Chief($connect, $turn, $command) {
$command = EncodeCommand(0, 0, 0, $command);
$query = "select nation,level from general where owner='{$_SESSION['noMember']}'";
$query = "select nation,level from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/func_legacy.php
+1 -1
View File
@@ -3,7 +3,7 @@ namespace sammo;
function CheckLogin($type=0) {
if(!isset($_SESSION['noMember'])) {
if(!isset($_SESSION['userID'])) {
if($type == 0) {
header('Location: ../');
}
twe/func_message.php
+2 -2
View File
@@ -282,7 +282,7 @@ function getMailboxList(){
// who : xxxx,xxxx(발신인, 수신인)
function DecodeMsg($connect, $msg, $type, $who, $date, $bg, $num=0) {
//FIXME: 폐기
$query = "select skin,no,nation,name,picture,level from general where owner='{$_SESSION['noMember']}'";
$query = "select skin,no,nation,name,picture,level from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
@@ -343,7 +343,7 @@ function moveMsg($connect, $table, $msgtype, $msgnum, $msg, $type, $who, $when,
}
function MsgDip($connect, $bg) {
$query = "select no,nation from general where owner='{$_SESSION['noMember']}'";
$query = "select no,nation from general where owner='{$_SESSION['userID']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result);
twe/index.php
+5 -5
View File
@@ -17,7 +17,7 @@ if(!isSigned()){
die();
}
$userID = getUserID();
$userID = Session::getUserID();
if(!$userID){
header('Location:../');
die();
@@ -33,13 +33,13 @@ if($me === null) {
}
if($me['newmsg'] == 1 && $me['newvote'] == 1) {
$query = "update general set newmsg=0,newvote=0 where owner='{$_SESSION['noMember']}'";
$query = "update general set newmsg=0,newvote=0 where owner='{$_SESSION['userID']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} elseif($me['newmsg'] == 1) {
$query = "update general set newmsg=0 where owner='{$_SESSION['noMember']}'";
$query = "update general set newmsg=0 where owner='{$_SESSION['userID']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} elseif($me['newvote'] == 1) {
$query = "update general set newvote=0 where owner='{$_SESSION['noMember']}'";
$query = "update general set newvote=0 where owner='{$_SESSION['userID']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
}
@@ -174,7 +174,7 @@ echo "
<tr><td colspan=5>【 국가방침 】<?php nationMsg($connect, $me['skin']); ?></td></tr>
<tr><td colspan=5>【 접속자 】<?=onlinegen($connect);?></td></tr>
<?php
if(getUserGrade() >= 5) {
if(Session::getUserGrade() >= 5) {
echo "
<tr><td colspan=5>
<input type=button value=게임관리 onclick=location.replace('_admin1.php')>
twe/install.php
+1 -1
View File
@@ -2,7 +2,7 @@
include "lib.php";
include "func.php";
if(getUserGrade(true) < 5){
if(Session::getUserGrade(true) < 5){
die('관리자 아님');
}
twe/j_adjust_icon.php
+1 -1
View File
@@ -2,7 +2,7 @@
include('lib.php');
include('func.php');
$userID = getUserID();
$userID = Session::getUserID();
$generalID = getGeneralID();
session_write_close();
twe/j_drop_settings.php
+1 -1
View File
@@ -2,7 +2,7 @@
include "lib.php";
include "func.php";
if(getUserGrade(true) < 5){
if(Session::getUserGrade(true) < 5){
die('관리자 아님');
}
twe/j_get_scenario_map.php
+2 -3
View File
@@ -1,12 +1,11 @@
<?php
require(__DIR__.'/../f_func/func.php');
require(__DIR__.'/../f_config/SESSION.php');
require('func_install.php');
$session = Session::requireLogin();
if($SESSION->getGrade() < 5){
if($session->userGrade < 5){
Json::die([
'result'=>false,
'reason'=>'충분한 권한을 가지고 있지 않습니다.'
twe/j_init_settings.php
+1 -1
View File
@@ -3,7 +3,7 @@ include "lib.php";
include "func.php";
include "schema.php";
if(getUserGrade(true) < 5){
if(Session::getUserGrade(true) < 5){
die('관리자 아님');
}
twe/j_msgsubmit.php
+1 -1
View File
@@ -56,7 +56,7 @@ if(getBlockLevel() == 1 || getBlockLevel() == 3) {
$conlimit = $db->queryFirstField('select conlimit from game where no=1');
$me = $db->queryFirstRow('select `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr` from `general` where `owner` = %i', getUserID());
$me = $db->queryFirstRow('select `no`,`name`,`nation`,`level`,`con`,`picture`,`imgsvr` from `general` where `owner` = %i', Session::getUserID());
if(!$me){
resetSessionGeneralValues();
twe/j_server_basic_info.php
+2 -2
View File
@@ -2,7 +2,7 @@
include "lib.php";
include "func.php";
if(!getUserID()){
if(!Session::getUserID()){
Json::die([
'game'=>'x',
'me'=>'no'
@@ -70,7 +70,7 @@ $game['npcCnt'] = $npcCnt;
$game['nationCnt'] = $nationCnt;
$generalID = getGeneralID(false, false);
$userGrade = getUserGrade();
$userGrade = Session::getUserGrade();
$me = [
];
twe/join.php
+1 -1
View File
@@ -5,7 +5,7 @@ include "lib.php";
include "func.php";
require("new_lib.php");
$userID = getUserID();
$userID = Session::getUserID();
if(!$userID) {
MessageBox("잘못된 접근입니다!!!");
twe/join_post.php
+1 -1
View File
@@ -17,7 +17,7 @@ $intel = util::array_get($_POST['intel'], 50);
$mylog = [];
$userID = getUserID();
$userID = Session::getUserID();
if(!$userID) {
MessageBox("잘못된 접근입니다!!!");
twe/login_process.php
+2 -2
View File
@@ -10,7 +10,7 @@ include "func.php";
$db = getDB();
$userID = getUserID();
$userID = Session::getUserID();
//회원 테이블에서 정보확인
$me= $db->queryFirstRow('select no,name,nation,block,killturn from general where owner= %s', $userID);
@@ -44,7 +44,7 @@ $_SESSION['p_time'] = time();
$date = date('Y-m-d H:i:s');
//
$query="update general set logcnt=logcnt+1,ip='{$_SESSION['p_ip']}',lastconnect='$date',conmsg='$conmsg' where owner='{$_SESSION['noMember']}'";
$query="update general set logcnt=logcnt+1,ip='{$_SESSION['p_ip']}',lastconnect='$date',conmsg='$conmsg' where owner='{$_SESSION['userID']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$date = date('Y_m_d H:i:s');
twe/old/install.php
+1 -1
View File
@@ -3,7 +3,7 @@ namespace sammo;
include "lib.php";
if(getUserGrade(true) < 5){
if(Session::getUserGrade(true) < 5){
die('관리자 아님');
}
twe/old/install1.php
+1 -1
View File
@@ -3,7 +3,7 @@ namespace sammo;
include "lib.php";
if(getUserGrade(true) < 5){
if(Session::getUserGrade(true) < 5){
die('관리자 아님');
}
twe/old/install2.php
+1 -1
View File
@@ -3,7 +3,7 @@ namespace sammo;
require "lib.php";
if(getUserGrade(true) < 5){
if(Session::getUserGrade(true) < 5){
die('관리자 아님');
}
?>
twe/old/j_old_install.php
+1 -1
View File
@@ -5,7 +5,7 @@ include "func.php";
if(getUserGrade(true) < 5){
if(Session::getUserGrade(true) < 5){
die('관리자 아님');
}
twe/old/j_old_install2.php
+1 -1
View File
@@ -12,7 +12,7 @@ $extend = util::array_get($_POST['extend'],'0');
$npcmode = util::array_get($_POST['npcmode'],'0');
$img = util::array_get($_POST['img'],'0');
if(getUserGrade(true) < 5){
if(Session::getUserGrade(true) < 5){
die('관리자 아님');
}

Some files were not shown because too many files have changed in this diff Show More