AY 4 vuotta sitten
vanhempi
commit
2669b05242

BIN
__debug_bin


+ 7 - 7
mc_add.go

@@ -14,7 +14,7 @@ func AddBanIP(w http.ResponseWriter, r *http.Request) {
 	Expires := "forever"
 	Reason, _ := mv(r, "reason", false)
 	Config.WriteBannedIP(IP, Created, Source, Expires, Reason)
-	sendJSONResponse(w, "OK")
+	sendTextResponse(w, "OK")
 }
 
 func AddBanPlayer(w http.ResponseWriter, r *http.Request) {
@@ -26,9 +26,9 @@ func AddBanPlayer(w http.ResponseWriter, r *http.Request) {
 	Reason, _ := mv(r, "reason", false)
 	if IsValidUUID(UUID) {
 		Config.WriteBannedPlayer(UUID, Name, Created, Source, Expires, Reason)
-		sendJSONResponse(w, "OK")
+		sendTextResponse(w, "OK")
 	} else {
-		sendJSONResponse(w, "Incorrect UUID.")
+		sendTextResponse(w, "Incorrect UUID.")
 	}
 
 }
@@ -42,9 +42,9 @@ func AddOps(w http.ResponseWriter, r *http.Request) {
 	BypassesPlayerLimitB, _ := strconv.ParseBool(BypassesPlayerLimit)
 	if IsValidUUID(UUID) {
 		Config.WriteOps(UUID, Name, LevelI, BypassesPlayerLimitB)
-		sendJSONResponse(w, "OK")
+		sendTextResponse(w, "OK")
 	} else {
-		sendJSONResponse(w, "Incorrect UUID.")
+		sendTextResponse(w, "Incorrect UUID.")
 	}
 }
 
@@ -53,9 +53,9 @@ func AddWhitelist(w http.ResponseWriter, r *http.Request) {
 	Name, _ := mv(r, "name", false)
 	if IsValidUUID(UUID) {
 		Config.WriteWhitelist(UUID, Name)
-		sendJSONResponse(w, "OK")
+		sendTextResponse(w, "OK")
 	} else {
-		sendJSONResponse(w, "Incorrect UUID.")
+		sendTextResponse(w, "Incorrect UUID.")
 	}
 }
 

+ 4 - 4
mc_del.go

@@ -8,26 +8,26 @@ func RemoveBanIP(w http.ResponseWriter, r *http.Request) {
 	search, _ := mv(r, "search", false)
 	field, _ := mv(r, "field", false)
 	Config.RemoveBannedIP(search, field)
-	sendJSONResponse(w, "OK")
+	sendTextResponse(w, "OK")
 }
 
 func RemoveBanPlayer(w http.ResponseWriter, r *http.Request) {
 	search, _ := mv(r, "search", false)
 	field, _ := mv(r, "field", false)
 	Config.RemoveBannedPlayer(search, field)
-	sendJSONResponse(w, "OK")
+	sendTextResponse(w, "OK")
 }
 
 func RemoveOps(w http.ResponseWriter, r *http.Request) {
 	search, _ := mv(r, "search", false)
 	field, _ := mv(r, "field", false)
 	Config.RemoveOps(search, field)
-	sendJSONResponse(w, "OK")
+	sendTextResponse(w, "OK")
 }
 
 func RemoveWhitelist(w http.ResponseWriter, r *http.Request) {
 	search, _ := mv(r, "search", false)
 	field, _ := mv(r, "field", false)
 	Config.RemoveWhitelist(search, field)
-	sendJSONResponse(w, "OK")
+	sendTextResponse(w, "OK")
 }

+ 2 - 2
mc_edit.go

@@ -9,12 +9,12 @@ func ChangeEULA(w http.ResponseWriter, r *http.Request) {
 	value, _ := mv(r, "value", false)
 	Convertedvalue, _ := strconv.ParseBool(value)
 	Config.WriteEULA(Convertedvalue)
-	sendJSONResponse(w, "OK")
+	sendTextResponse(w, "OK")
 }
 
 func ChangeProperties(w http.ResponseWriter, r *http.Request) {
 	key, _ := mv(r, "key", false)
 	value, _ := mv(r, "value", false)
 	Config.ChangeProperties(key, value)
-	sendJSONResponse(w, "OK")
+	sendTextResponse(w, "OK")
 }

+ 1 - 1
mod/config/banIP.go

@@ -85,7 +85,7 @@ func (mch *Handler) RemoveBannedIP(search string, field string) bool {
 		}
 		if fieldValue == search {
 			if len(mch.bannedIPs)-1 != i {
-				mch.bannedIPs = append(mch.bannedIPs[:i], mch.bannedIPs[i+1])
+				mch.bannedIPs = append(mch.bannedIPs[:i], mch.bannedIPs[i+1:]...)
 			} else {
 				// if it is the last item, just remove it
 				mch.bannedIPs = mch.bannedIPs[:i]

+ 4 - 1
mod/config/banPlayer.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
+	"log"
 	"os"
 	"strings"
 )
@@ -88,8 +89,10 @@ func (mch *Handler) RemoveBannedPlayer(search string, field string) bool {
 			fieldValue = ""
 		}
 		if fieldValue == search {
+			log.Println(len(mch.bannedPlayers)-1, i, mch.bannedPlayers)
 			if len(mch.bannedPlayers)-1 != i {
-				mch.bannedPlayers = append(mch.bannedPlayers[:i], mch.bannedPlayers[i+1])
+				log.Println("Runned")
+				mch.bannedPlayers = append(mch.bannedPlayers[:i], mch.bannedPlayers[i+1:]...)
 			} else {
 				// if it is the last item, just remove it
 				mch.bannedPlayers = mch.bannedPlayers[:i]

+ 1 - 1
mod/config/ops.go

@@ -81,7 +81,7 @@ func (mch *Handler) RemoveOps(search string, field string) bool {
 		}
 		if fieldValue == search {
 			if len(mch.ops)-1 != i {
-				mch.ops = append(mch.ops[:i], mch.ops[i+1])
+				mch.ops = append(mch.ops[:i], mch.ops[i+1:]...)
 			} else {
 				// if it is the last item, just remove it
 				mch.ops = mch.ops[:i]

+ 2 - 2
mod/config/whitelist.go

@@ -69,8 +69,8 @@ func (mch *Handler) RemoveWhitelist(search string, field string) bool {
 			fieldValue = ""
 		}
 		if fieldValue == search {
-			if len(mch.ops)-1 != i {
-				mch.whitelists = append(mch.whitelists[:i], mch.whitelists[i+1])
+			if len(mch.whitelists)-1 != i {
+				mch.whitelists = append(mch.whitelists[:i], mch.whitelists[i+1:]...)
 			} else {
 				// if it is the last item, just remove it
 				mch.whitelists = mch.whitelists[:i]

+ 1 - 1
webroot/js/alert.js

@@ -1,4 +1,4 @@
-function msg(content) {
+function msgbox(content) {
     $.uiAlert({
         textHead: "Info",
         text: content,

+ 17 - 3
webroot/setting/banip.html

@@ -47,7 +47,7 @@
                 $("#userlist").html(`
                     <div class="item">
                         <div class="content">
-                            <div class="header"No record.</div>
+                            <div class="header">No record.</div>
                         </div>
                     </div>
                 `)
@@ -75,13 +75,27 @@
 
     function unban(btn) {
         var data = $(btn).parent().attr("ip");
-        $.get("/ban-ip/remove?field=ip&search=" + data);
+        $.get("/ban-ip/remove?field=ip&search=" + data, function(data) {
+            if (data == "OK") {
+                msgbox("Removed");
+            } else {
+                errmsg("Fail to remove the item.");
+            }
+            updateInfo();
+        });
     }
 
     function submit() {
         var ip = $("#ip").val();
         var reason = $("#reason").val();
-        $.get("/ban-ip/add?ip=" + ip + "&reason=" + reason);
+        $.get("/ban-ip/add?ip=" + ip + "&reason=" + reason, function(data) {
+            if (data == "OK") {
+                msgbox("Added");
+            } else {
+                errmsg("Fail to add the item.");
+            }
+            updateInfo();
+        });
     }
 </script>
 

+ 17 - 3
webroot/setting/banplayer.html

@@ -47,7 +47,7 @@
                 $("#userlist").html(`
                     <div class="item">
                         <div class="content">
-                            <div class="header">No one here :(</div>
+                            <div class="header">No record.</div>
                         </div>
                     </div>
                 `)
@@ -79,14 +79,28 @@
 
     function unban(btn) {
         var data = $(btn).parent().attr("username");
-        $.get("/ban-player/remove?field=name&search=" + data);
+        $.get("/ban-player/remove?field=name&search=" + data, function(data) {
+            if (data == "OK") {
+                msgbox("Removed");
+            } else {
+                errmsg("Fail to remove the item.");
+            }
+            updateInfo();
+        });
     }
 
     function submit() {
         var uuid = $("#uuid").val();
         var name = $("#name").val();
         var reason = $("#reason").val();
-        $.get("/ban-player/add?uuid=" + uuid + "&name=" + name + "&reason=" + reason);
+        $.get("/ban-player/add?uuid=" + uuid + "&name=" + name + "&reason=" + reason, function(data) {
+            if (data == "OK") {
+                msgbox("Added");
+            } else {
+                errmsg("Fail to add the item.");
+            }
+            updateInfo();
+        });
     }
 </script>
 

+ 9 - 1
webroot/setting/eula.html

@@ -26,6 +26,7 @@
     <div id="settings" class="ui form">
     </div>
     <div class="ui button" onclick="submit()">Update</div>
+    <div style="height:30px"></div>
 </body>
 <script>
     updateInfo();
@@ -53,7 +54,14 @@
 
     function submit() {
         var value = $("#eula").val();
-        $.get("/eula/change?value=" + value)
+        $.get("/eula/change?value=" + value, function(data) {
+            if (data == "OK") {
+                msgbox("Added");
+            } else {
+                errmsg("Fail to add the item.");
+            }
+            updateInfo();
+        });
     }
 </script>
 

+ 17 - 3
webroot/setting/ops.html

@@ -49,7 +49,7 @@
                 $("#userlist").html(`
                     <div class="item">
                         <div class="content">
-                            <div class="header">No one here :(</div>
+                            <div class="header">No record.</div>
                         </div>
                     </div>
                 `)
@@ -80,7 +80,14 @@
 
     function deop(btn) {
         var data = $(btn).parent().attr("username");
-        $.get("/ops/remove?field=name&search=" + data);
+        $.get("/ops/remove?field=name&search=" + data, function(data) {
+            if (data == "OK") {
+                msgbox("Removed");
+            } else {
+                errmsg("Fail to remove the item.");
+            }
+            updateInfo();
+        });
     }
 
     function submit() {
@@ -88,7 +95,14 @@
         var name = $("#name").val();
         var level = $("#level").val();
         var bypass = $("#bypass").val();
-        $.get("/ops/add?uuid=" + uuid + "&name=" + name + "&level=" + level + "&bypass=" + bypass);
+        $.get("/ops/add?uuid=" + uuid + "&name=" + name + "&level=" + level + "&bypass=" + bypass, function(data) {
+            if (data == "OK") {
+                msgbox("Added");
+            } else {
+                errmsg("Fail to add the item.");
+            }
+            updateInfo();
+        });
     }
 </script>
 

+ 9 - 1
webroot/setting/properties.html

@@ -25,6 +25,7 @@
     <div id="settings" class="ui form">
     </div>
     <div class="ui button" onclick="submit()">Update</div>
+    <div style="height:30px"></div>
 </body>
 <script>
     updateInfo()
@@ -57,7 +58,14 @@
         $.each($("input"), function(i, item) {
             var key = $(item).attr("id");
             var value = $(item).val();
-            $.get("/properties/change?key=" + key + "&value=" + value)
+            $.get("/properties/change?key=" + key + "&value=" + value, function(data) {
+                if (data == "OK") {
+                    msgbox("Added");
+                } else {
+                    errmsg("Fail to add the item.");
+                }
+                updateInfo();
+            });
         })
     }
 </script>

+ 17 - 3
webroot/setting/whitelist.html

@@ -45,7 +45,7 @@
                 $("#userlist").html(`
                     <div class="item">
                         <div class="content">
-                            <div class="header">No one here :(</div>
+                            <div class="header">No record.</div>
                         </div>
                     </div>
                 `)
@@ -75,13 +75,27 @@
 
     function dewhitelist(btn) {
         var data = $(btn).parent().attr("username");
-        $.get("/whitelist/remove?field=name&search=" + data);
+        $.get("/whitelist/remove?field=name&search=" + data, function(data) {
+            if (data == "OK") {
+                msgbox("Removed");
+            } else {
+                errmsg("Fail to remove the item.");
+            }
+            updateInfo();
+        });
     }
 
     function submit() {
         var uuid = $("#uuid").val();
         var name = $("#name").val();
-        $.get("/whitelist/add?uuid=" + uuid + "&name=" + name);
+        $.get("/whitelist/add?uuid=" + uuid + "&name=" + name, function(data) {
+            if (data == "OK") {
+                msgbox("Added");
+            } else {
+                errmsg("Fail to add the item.");
+            }
+            updateInfo();
+        });
     }
 </script>