From 7aa212ee472f51126047717f47c23f4f738bd9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?=
 =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?=
 <jisangs@gmail.com>
Date: Thu, 12 Jul 2018 07:30:26 +0900
Subject: [PATCH] Fix: revised php code to maestro login

---
 src/web/admin/admin_register_list.html    |  2 --
 src/web/maestro/login.html                |  1 +
 src/web/maestro/main_menu.html            |  3 +-
 src/web/maestro/register.html             |  1 +
 src/web/module/maestro_section_login.html | 36 +++++++++--------------
 5 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/web/admin/admin_register_list.html b/src/web/admin/admin_register_list.html
index 326eeb2..7dac0de 100644
--- a/src/web/admin/admin_register_list.html
+++ b/src/web/admin/admin_register_list.html
@@ -46,7 +46,6 @@
 				}
 
 			);
-
 		}
 
 		function updateMaestroList(jsonList) {
@@ -96,7 +95,6 @@
 			// let maestroName = name.val();
 			// console.log(maestroName);
 
-
 			sendRequestServer(	//url, sendParams, onSuccess, onFail, isDebugMode);
 				"./../server/admin/register_maestro.php",
 				"maestro_id=" + maestroID,
diff --git a/src/web/maestro/login.html b/src/web/maestro/login.html
index 330fc07..2355ebb 100644
--- a/src/web/maestro/login.html
+++ b/src/web/maestro/login.html
@@ -10,6 +10,7 @@
 
 	<script type="text/javascript" src="./../../../resources/jquery/jquery-3.3.1.min.js"></script>
 	<script type="text/javascript" src="./../js/main.js"></script>
+	<script type="text/javascript" src="./../js/request_server.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$("#header").load("./../module/header.html");
diff --git a/src/web/maestro/main_menu.html b/src/web/maestro/main_menu.html
index fa00773..fe330b3 100644
--- a/src/web/maestro/main_menu.html
+++ b/src/web/maestro/main_menu.html
@@ -6,11 +6,12 @@
 	<link rel="icon" href="/favicon.ico" type="image/x-icon" />
 	<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
 	<link rel="stylesheet" type="text/css" href="./../css/module.css">
-	<link rel="stylesheet" type="text/css" href="./../css/maestro_main.css">
 	<link rel="stylesheet" type="text/css" href="./../css/color_button.css">
+	<link rel="stylesheet" type="text/css" href="./../css/maestro_main.css">
 
 	<script type="text/javascript" src="./../../../resources/jquery/jquery-3.3.1.min.js"></script>
 	<script type="text/javascript" src="./../js/main.js"></script>
+	<script type="text/javascript" src="./../js/request_server.js"></script>
 	<script type="text/javascript" src="./../js/maestro_main.js"></script>
 	<script type="text/javascript" src="./../js/player_list.js"></script>
 	<script type="text/javascript" src="./../js/player_list_navigator.js"></script>
diff --git a/src/web/maestro/register.html b/src/web/maestro/register.html
index 29c3855..5f32ad6 100644
--- a/src/web/maestro/register.html
+++ b/src/web/maestro/register.html
@@ -10,6 +10,7 @@
 
 	<script type="text/javascript" src="./../../../resources/jquery/jquery-3.3.1.min.js"></script>
 	<script type="text/javascript" src="./../js/main.js"></script>
+	<script type="text/javascript" src="./../js/request_server.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$("#header").load("./../module/header.html");
diff --git a/src/web/module/maestro_section_login.html b/src/web/module/maestro_section_login.html
index 0dfb64b..c7b7b2e 100644
--- a/src/web/module/maestro_section_login.html
+++ b/src/web/module/maestro_section_login.html
@@ -16,31 +16,25 @@ function login() {
 	let name = $("#maestro_name").val();
 	let password = $("#password").val();
 
-	let xhr = new XMLHttpRequest(); //new로 생성.
-	xhr.open('POST', './../server/maestro/login.php', true);
-	xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-	xhr.send("maestro_name=" + name + "&password=" + password);
-	xhr.onload = function() {
-		if(xhr.readyState === 4 && xhr.status === 200) {
-			let replyJSON = JSON.parse(xhr.responseText);
-			// console.log(replyJSON);
+	sendRequestServer(	//url, sendParams, onSuccess, onFail, isDebugMode);
+		"./../server/maestro/login.php",
+		"maestro_name=" + name + "&password=" + password,
 
-			// if(replyJSON !== null)
-			// 	console.log(replyJSON);
+		(jsonData) => {
+			maestroID = jsonData["maestroID"];
+			sessionStorage.setItem("maestroID", maestroID);
+			location.href = './../maestro/main_menu.html';
+		},
 
-			// if(replyJSON["MaestroID"] !== undefined)
-			// 	console.log(replyJSON["MaestroID"]);
-
-			if(replyJSON !== null && replyJSON["MaestroID"] !== undefined && replyJSON["MaestroID"] !== null) {
-				maestroID = replyJSON["MaestroID"];
-				sessionStorage.setItem("maestroID", maestroID);
-				location.href = './../maestro/main_menu.html';
-			} else {
-				$("#error_message").val(replyJSON["ERROR"]);
+		(errorMessage) => {
+			if($("#error_message").length) {
+				$("#error_message").text(errorMessage);
 			}
 		}
-	}
+
+	);
 }
+
 </script>
 
 
@@ -64,7 +58,6 @@ function login() {
 	</div>
 
 
-
 	<div class="register">
 
 		<div class="col alignCenter" style="float: center;">
@@ -83,6 +76,5 @@ function login() {
 			</li>
 		</ol>
 
-
 	</div>
 </div>