diff --git a/f_config/app.js b/f_config/app.js index 751ba5a2..e69de29b 100644 --- a/f_config/app.js +++ b/f_config/app.js @@ -1,14 +0,0 @@ -var POPUP = "popup"; - -var LOGIN = "login"; -var JOIN = "join"; -var FINDPW = "findpw"; - -var ENTRANCE = "entrance"; -var SERVERLIST = "serverList"; -var LOGOUT = "logout"; -var ADMIN = "admin"; -var MEMBER = "member"; - -var MANAGE = "manage"; -var ICON = "icon"; diff --git a/f_config/app.php b/f_config/app.php index 074af660..7478e4a4 100644 --- a/f_config/app.php +++ b/f_config/app.php @@ -2,20 +2,6 @@ require_once('_common.php'); require_once(ROOT.'/f_func/class._Setting.php'); -define('POPUP', 'popup'); - -define('LOGIN', 'login'); -define('JOIN', 'join'); -define('FINDPW', 'findpw'); - -define('ENTRANCE', 'entrance'); -define('SERVERLIST', 'serverList'); -define('LOGOUT', 'logout'); -define('ADMIN', 'admin'); -define('MEMBER', 'member'); - -define('MANAGE', 'manage'); -define('ICON', 'icon'); function getServerConfigList(){ static $serverList = null; diff --git a/f_config/config.js b/f_config/config.js index 1e31fcb8..e69de29b 100644 --- a/f_config/config.js +++ b/f_config/config.js @@ -1,16 +0,0 @@ -var W = "/"; -var HOME = "/dev_sam/"; //TODO:install시 수정 -//var HOME = "http://62che.com/sam/"; -//var HOME = "http://localhost/sam/"; - -var I = "i_"; - -var PHP = ".php"; -var FRAME = "Frame.php"; -var STYLE = "Style.css"; -var ACTION = "Action.js"; -var POST = "Post.php"; -var GET = "Get.php"; -var INC = "Inc.php"; - -var RETRIVAL = "retrival"; diff --git a/f_config/config.php b/f_config/config.php index fb2385db..02cf1216 100644 --- a/f_config/config.php +++ b/f_config/config.php @@ -29,13 +29,6 @@ define('F_FUNC', 'f_func'); define('JS', '.js'); define('CSS', '.css'); -define('PHP', '.php'); -define('FRAME', 'Frame.php'); -define('STYLE', 'Style.css'); -define('ACTION', 'Action.js'); -//define('POST', 'Post.php'); -//define('GET', 'Get.php'); -define('INC', 'Inc.php'); define('APP', 'app'); define('FUNC', 'func'); @@ -43,7 +36,6 @@ define('DB', 'DB'); define('SESSION', 'SESSION'); define('CONFIG', 'config'); define('SETTING', 'SETTING'); -define('RETRIVAL', 'retrival'); define('INSTALL', 'install'); define('SLEEP', 'sleep'); diff --git a/i_entrance/Action.js b/i_entrance/Action.js index a8491ed2..4066d470 100644 --- a/i_entrance/Action.js +++ b/i_entrance/Action.js @@ -43,7 +43,7 @@ var serverLoginTemplate = "\ "; function Entrance_Import() { - ImportAction(HOME+I+ENTRANCE+W+MANAGE+W+ACTION); + ImportAction("../i_entrance/manage/Action.js"); EntranceManage_Import(); } @@ -62,7 +62,7 @@ function Entrance_Update() { function Entrance_UpdateServer() { Popup_Wait(function() { PostJSON( - HOME+I+ENTRANCE+W+SERVERLIST+POST, { + "../i_entrance/serverListPost.php", { }, function(response, textStatus) { if(response.result == "SUCCESS") { @@ -87,10 +87,10 @@ function Entrance_drawServerList(serverInfos){ return true; } - var serverPath = '../'+serverInfo.name; + var serverPath = "../"+serverInfo.name; - $.getJSON('../'+serverInfo.name+'/j_server_basic_info.php',{}, function(result){ + $.getJSON("../"+serverInfo.name+'/j_server_basic_info.php',{}, function(result){ console.log(result); console.log(result.game); if(!result.game){ @@ -168,12 +168,12 @@ function Entrance_Manage() { function Entrance_Logout() { Popup_Wait(function() { PostJSON( - HOME+I+ENTRANCE+W+LOGOUT+POST, { + "../i_entrance/logoutPost.php", { }, function(response, textStatus) { if(response.result == "SUCCESS") { Popup_WaitHide(); - ReplaceFrame(HOME); + ReplaceFrame("../"); } else { Popup_WaitShow("로그아웃 실패!"); } @@ -184,7 +184,7 @@ function Entrance_Logout() { $(function(){ ImportView("body", "../i_popup/Frame.php"); - //ImportView("body", FRAME); + //ImportView("body", "Frame.php"); Popup_Import(); Popup_Init(); diff --git a/i_entrance/adminAction.js b/i_entrance/adminAction.js index b0d64fd4..fd0834f2 100644 --- a/i_entrance/adminAction.js +++ b/i_entrance/adminAction.js @@ -78,7 +78,7 @@ function Entrance_AdminChangeNotice() { Popup_Confirm('정말 실행하시겠습니까?', function() { Popup_Wait(function() { PostJSON( - HOME+I+ENTRANCE+W+ADMIN+POST, { + "../i_entrance/adminPost.php", { action: 'notice', notice: notice }, @@ -101,7 +101,7 @@ function modifyServerStatus(caller, action) { Popup_Confirm('정말 실행하시겠습니까?', function() { Popup_Wait(function() { PostJSON( - HOME+I+ENTRANCE+W+ADMIN+POST, { + "../i_entrance/adminPost.php", { server: server, action: action }, @@ -111,7 +111,7 @@ function modifyServerStatus(caller, action) { if(action == 'reset') { ReplaceFrame(response.installURL); } else { - Replace(ENTRANCE+PHP); + Replace("entrance.php"); } } else { Popup_WaitShow(response.msg); @@ -125,23 +125,23 @@ function modifyServerStatus(caller, action) { function Entrance_AdminNPCLogin(caller) { var $caller = $(caller); var serverDir = $caller.parents('tr').data('server_name'); - location.href = serverDir+W+'npc_login'+PHP; + location.href = serverDir+"/npc_login.php"; } function Entrance_AdminNPCCreate(caller) { var $caller = $(caller); var serverDir = $caller.parents('tr').data('server_name'); - location.href = serverDir+W+'npc_join'+PHP; + location.href = serverDir+"/npc_join.php"; } function Entrance_AdminClosedLogin(caller) { var $caller = $(caller); var serverDir = $caller.parents('tr').data('server_name'); - location.href = serverDir+W+'npc_login'+PHP; + location.href = serverDir+"/npc_login.php"; } function Entrance_AdminOpen119(caller) { var $caller = $(caller); var serverDir = $caller.parents('tr').data('server_name'); - location.href = serverDir+W+'_119'+PHP; + location.href = serverDir+"/_119.php"; } diff --git a/i_entrance/entrance.php b/i_entrance/entrance.php index 9bae4ab6..521eeb88 100644 --- a/i_entrance/entrance.php +++ b/i_entrance/entrance.php @@ -44,7 +44,7 @@ $userGrade = $member['GRADE']; - + = 6) { include('member/Frame.php'); @@ -100,8 +100,8 @@ if($userGrade >= 6){
계 정 관 리
- - + +
diff --git a/i_entrance/manage/Action.js b/i_entrance/manage/Action.js index 847c905e..e4caee49 100644 --- a/i_entrance/manage/Action.js +++ b/i_entrance/manage/Action.js @@ -20,7 +20,7 @@ function EntranceManage_Init() { function EntranceManage_Update() { Popup_Wait(function() { PostJSON( - HOME+I+ENTRANCE+W+MANAGE+W+'Get.php', { + "../../i_entrance/manage/Get.php", { }, function(response, textStatus) { if(response.result == "SUCCESS") { @@ -82,7 +82,7 @@ function EntranceManage_ChangePw() { Popup_Confirm('정말 실행하시겠습니까?', function() { Popup_Wait(function() { PostJSON( - HOME+I+ENTRANCE+W+MANAGE+W+"password"+POST, { + "../../i_entrance/manage/passwordPost.php", { pw: hex_md5(pw+""+pw), newPw: hex_md5(pw1+""+pw1) }, @@ -112,7 +112,7 @@ function EntranceManage_DeleteIcon() { Popup_Confirm('정말 실행하시겠습니까?', function() { Popup_Wait(function() { PostJSON( - HOME+I+ENTRANCE+W+MANAGE+W+"delete"+POST, { + "../../i_entrance/manage/deletePost.php", { }, function(response, textStatus) { Popup_WaitShow(response.msg, function() { @@ -138,13 +138,13 @@ function EntranceManage_Quit() { Popup_Confirm('정말 탈퇴하시겠습니까?', function() { Popup_Wait(function() { PostJSON( - HOME+I+ENTRANCE+W+MANAGE+W+"quit"+POST, { + "../../i_entrance/manage/quitPost.php", { pw: hex_md5(pw+""+pw) }, function(response, textStatus) { if(response.result == "SUCCESS") { Popup_WaitShow(response.msg, function() { - ReplaceFrame(HOME); + ReplaceFrame("../../"); }); } else { Popup_WaitShow(response.msg, function() { diff --git a/i_entrance/member/Action.js b/i_entrance/member/Action.js index 0dcb3c9d..b0d8abbf 100644 --- a/i_entrance/member/Action.js +++ b/i_entrance/member/Action.js @@ -42,7 +42,7 @@ function EntranceMember_Order() { function EntranceMember_UpdateMember(select) { Popup_Wait(function() { GetJSON( - HOME+I+ENTRANCE+W+MEMBER+W+GET, { + "../../i_entrance/member/Get.php", { select: select }, function(response, textStatus) { @@ -67,7 +67,7 @@ function EntranceMember_Post(select) { Popup_Confirm('정말 실행하시겠습니까?', function() { Popup_Wait(function() { PostJSON( - HOME+I+ENTRANCE+W+MEMBER+W+POST, { + "../../i_entrance/member/Post.php", { select: select, no: no }, diff --git a/i_entrance/member/Frame.php b/i_entrance/member/Frame.php index 59939ff1..5d84e126 100644 --- a/i_entrance/member/Frame.php +++ b/i_entrance/member/Frame.php @@ -3,8 +3,8 @@ require_once('_common.php'); ?> diff --git a/i_entrance/user_info.php b/i_entrance/user_info.php index e69de29b..a4abe2da 100644 --- a/i_entrance/user_info.php +++ b/i_entrance/user_info.php @@ -0,0 +1,2 @@ +queryFirstRow('SELECT `REG`, `LOGIN` FROM `SYSTEM` WHERE $(document).ready(Login); function Login() { - //ImportView("body", ""+W+I+POPUP+W+FRAME); - //ImportView("body", FRAME); + //ImportView("body", "/i_popup/Frame.php"); + //ImportView("body", "Frame.php"); Popup_Import(); Popup_Init(); diff --git a/js/join.js b/js/join.js index 5a764d4d..6e886a74 100644 --- a/js/join.js +++ b/js/join.js @@ -110,7 +110,7 @@ $(document).ready( function () { alert('정상적으로 가입되었습니다.'); } - window.location.href = '../'; + window.location.href = "../"; }); console.log('Yes!'); diff --git a/oauth_kakao/index.php b/oauth_kakao/index.php index 1be2b7fc..5caa624f 100644 --- a/oauth_kakao/index.php +++ b/oauth_kakao/index.php @@ -57,7 +57,7 @@ function doLoginUsingOAuth(retry=false){ } } else{ - window.location.href = '../'; + window.location.href = "../"; } }); }