1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-13 11:01:50 +00:00

Fix delete server

This commit is contained in:
Ycarus 2018-12-17 20:46:53 +01:00
parent 107c8405fb
commit 05a638a3d9
2 changed files with 10 additions and 8 deletions

View file

@ -42,11 +42,12 @@ function wizard_add()
end end
-- Remove existing server -- Remove existing server
local delete_server = luci.http.formvaluetable("delete_server") or "" local delete_server = luci.http.formvaluetable("deleteserver") or ""
if delete_server ~= "" then if delete_server ~= "" then
for server, _ in pairs(delete_server) do for serverdel, _ in pairs(delete_server) do
ucic:delete("openmptcprouter",server) luci.sys.call("uci -q del openmptcprouter." .. serverdel)
end end
gostatus = false
end end
-- Add new interface -- Add new interface
@ -135,6 +136,7 @@ function wizard_add()
local delete_intf = luci.http.formvaluetable("delete") or "" local delete_intf = luci.http.formvaluetable("delete") or ""
if delete_intf ~= "" then if delete_intf ~= "" then
for intf, _ in pairs(delete_intf) do for intf, _ in pairs(delete_intf) do
local defif = ucic:set("network",intf,"ifname")
ucic:delete("network",intf) ucic:delete("network",intf)
ucic:delete("network",intf .. "_dev") ucic:delete("network",intf .. "_dev")
ucic:save("network") ucic:save("network")
@ -145,7 +147,7 @@ function wizard_add()
ucic:delete("qos",intf) ucic:delete("qos",intf)
ucic:save("qos") ucic:save("qos")
ucic:commit("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 gostatus = false
end end
end end

View file

@ -58,7 +58,7 @@ end
servername = s[".name"] servername = s[".name"]
%> %>
<div class="cbi-section-remove right"> <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%>" /> <input type="hidden" name="server.<%=servername%>" value="<%=servername%>" />
</div> </div>
<h3><%=servername%></h3> <h3><%=servername%></h3>
@ -249,9 +249,9 @@ end
<label class="cbi-value-title"><%:Protocol%></label> <label class="cbi-value-title"><%:Protocol%></label>
<div class="cbi-value-field"> <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"> <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-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-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-other" value="other"<% if uci:get("network",ifname,"proto") ~= "static" and uci:get("network",ifname,"proto") ~= "dhcp" then %> selected="selected"<% end %>><%:Other%></option>
</select> </select>
<br /> <br />
<div class="cbi-value-description"> <div class="cbi-value-description">