From a311db4555e7f397d7b40a46f6bb34d87b1ad1c2 Mon Sep 17 00:00:00 2001 From: hide_d Date: Mon, 23 Jul 2018 23:44:48 +0900 Subject: [PATCH] =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=B0=BD=EC=97=90=20=EC=97=90=EB=9F=AC=20=EB=A1=9C=EA=B7=B8=20?= =?UTF-8?q?=EB=B3=B4=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/_admin2_submit.php | 2 ++ hwe/j_install_db.php | 2 -- i_entrance/templates/server_panel.php | 5 ++++- js/admin_server.js | 9 +++++++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/hwe/_admin2_submit.php b/hwe/_admin2_submit.php index 18e44f84..9c87706d 100644 --- a/hwe/_admin2_submit.php +++ b/hwe/_admin2_submit.php @@ -6,6 +6,8 @@ include "func.php"; $btn = Util::getReq('btn'); $weap = Util::getReq('weap', 'int'); +$genlist = Util::getReq('genlist', 'array_int'); +$msg = Util::getReq('msg', 'string'); extractMissingPostToGlobals(); diff --git a/hwe/j_install_db.php b/hwe/j_install_db.php index 1aedad7f..e9e13860 100644 --- a/hwe/j_install_db.php +++ b/hwe/j_install_db.php @@ -19,8 +19,6 @@ $username = Util::getReq('db_id'); $password = Util::getReq('db_pw'); $dbName = Util::getReq('db_name'); -extractMissingPostToGlobals(); - if(!$host || !$port || !$username || !$password || !$dbName){ Json::die([ 'result'=>false, diff --git a/i_entrance/templates/server_panel.php b/i_entrance/templates/server_panel.php index 6d4133c9..a9650d15 100644 --- a/i_entrance/templates/server_panel.php +++ b/i_entrance/templates/server_panel.php @@ -1,5 +1,8 @@ - +diff --git a/js/admin_server.js b/js/admin_server.js index 037143ad..4467efc9 100644 --- a/js/admin_server.js +++ b/js/admin_server.js @@ -77,6 +77,11 @@ function serverUpdate(caller){ function drawServerAdminList(serverList){ var $table = $('#server_admin_list'); + var $showErrorLog = $('#showErrorLog'); + + if(serverList.grade >= 5){ + $showErrorLog.show(); + } $.each(serverList.server, function(idx, server){ console.log(server); var status = ''; @@ -103,7 +108,10 @@ function drawServerAdminList(serverList){ $tr.find('.valid_if_installed').prop('disabled', true); } + + var aclByServer = serverList.acl[server.name]; + $.each(aclByServer, function(idx, action){ console.log(action); if(action == 'update' || action == 'fullUpdate'){ @@ -111,6 +119,7 @@ function drawServerAdminList(serverList){ return true; } $tr.find('.serv_act_update').prop('disabled', false); + $showErrorLog.show(); } else if(action == 'openClose'){ if(!server.valid){
서 버 관 리 + 서 버 관 리 + +