From 05a638a3d93afbadfeaaa7c294729db1766fa374 Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Mon, 17 Dec 2018 20:46:53 +0100
Subject: [PATCH] Fix delete server

---
 .../luasrc/controller/openmptcprouter.lua              | 10 ++++++----
 .../luasrc/view/openmptcprouter/wizard.htm             |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 53e24e320..bac386a15 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -42,11 +42,12 @@ function wizard_add()
 	end
 
 	-- Remove existing server
-	local delete_server = luci.http.formvaluetable("delete_server") or ""
+	local delete_server = luci.http.formvaluetable("deleteserver") or ""
 	if delete_server ~= "" then
-		for server, _ in pairs(delete_server) do
-			ucic:delete("openmptcprouter",server)
+		for serverdel, _ in pairs(delete_server) do
+			luci.sys.call("uci -q del openmptcprouter." .. serverdel)
 		end
+		gostatus = false
 	end
 
 	-- Add new interface
@@ -135,6 +136,7 @@ function wizard_add()
 	local delete_intf = luci.http.formvaluetable("delete") or ""
 	if delete_intf ~= "" then
 		for intf, _ in pairs(delete_intf) do
+			local defif = ucic:set("network",intf,"ifname")
 			ucic:delete("network",intf)
 			ucic:delete("network",intf .. "_dev")
 			ucic:save("network")
@@ -145,7 +147,7 @@ function wizard_add()
 			ucic:delete("qos",intf)
 			ucic:save("qos")
 			ucic:commit("qos")
-			luci.sys.call("uci -q del_list vnstat.@vnstat[-1].interface=" .. intf)
+			luci.sys.call("uci -q del_list vnstat.@vnstat[-1].interface=" .. defif)
 			gostatus = false
 		end
 	end
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
index cd7ac6768..2c10c6d3d 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm
@@ -58,7 +58,7 @@ end
 		    servername = s[".name"]
 	    %>
 	    <div class="cbi-section-remove right">
-		<input type="submit" name="delete_server.<%=servername%>" onclick="this.form.cbi_state='del-section'; return true" value="<%:Delete%>" class="cbi-button" />
+		<input type="submit" name="deleteserver.<%=servername%>" value="<%:Delete%>" class="cbi-button" />
 		<input type="hidden" name="server.<%=servername%>" value="<%=servername%>" />
 	    </div>
 	    <h3><%=servername%></h3>
@@ -249,9 +249,9 @@ end
 		    <label class="cbi-value-title"><%:Protocol%></label>
 		    <div class="cbi-value-field">
 			<select class="cbi-input-select" data-update="change" id="cbid.network.<%=ifname%>.proto" name="cbid.network.<%=ifname%>.proto" size="1">
-			    <option id="cbid.network.<%=ifname%>.proto-static" value="static"<% if uci:get("network",ifname,"proto") == "static" then %>selected="selected"<% end %>><%:Static address%></option>
-			    <option id="cbid.network.<%=ifname%>.proto-dhcp" value="dhcp"<% if uci:get("network",ifname,"proto") == "dhcp" then %>selected="selected"<% end %>><%:DHCP%></option>
-			    <option id="cbid.network.<%=ifname%>.proto-other" value="other"<% if uci:get("network",ifname,"proto") ~= "static" and uci:get("network",ifname,"proto") ~= "dhcp" then %>selected="selected"<% end %>><%:Other%></option>
+			    <option id="cbid.network.<%=ifname%>.proto-static" value="static"<% if uci:get("network",ifname,"proto") == "static" then %> selected="selected"<% end %>><%:Static address%></option>
+			    <option id="cbid.network.<%=ifname%>.proto-dhcp" value="dhcp"<% if uci:get("network",ifname,"proto") == "dhcp" then %> selected="selected"<% end %>><%:DHCP%></option>
+			    <option id="cbid.network.<%=ifname%>.proto-other" value="other"<% if uci:get("network",ifname,"proto") ~= "static" and uci:get("network",ifname,"proto") ~= "dhcp" then %> selected="selected"<% end %>><%:Other%></option>
 			</select>
 			<br />
 			<div class="cbi-value-description">