From 12a93ac45876371affc393b320794e69a343c67d Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Mon, 7 Jan 2019 07:54:18 +0100
Subject: [PATCH] Fix open all ports

---
 .../luasrc/controller/openmptcprouter.lua                | 6 ++++--
 .../luasrc/view/openmptcprouter/settings.htm             | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
index 80b511b3e..6840d12fe 100644
--- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
+++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua
@@ -267,8 +267,8 @@ function wizard_add()
 	local ss_ip
 
 	for server, _ in pairs(servers) do
-		local server_ip = luci.http.formvalue("%s.server_ip" % server) or ""
 		local backup = luci.http.formvalue("%s.backup" % server) or "0"
+		local server_ip = luci.http.formvalue("%s.server_ip" % server) or ""
 		-- We have an IP, so set it everywhere
 		if server_ip ~= "" then
 			-- Check if we have more than one IP, in this case use Nginx HA
@@ -453,8 +453,10 @@ end
 
 function settings_add()
 	-- Redirects all ports from VPS to OpenMPTCProuter
+	local servers = luci.http.formvaluetable("server")
 	local redirect_ports = luci.http.formvaluetable("redirect_ports")
-	for server, value in pairs(redirect_ports) do
+	for server, _ in pairs(servers) do
+		local value = luci.http.formvalue("redirect_ports.%s" % server) or "0"
 		ucic:set("openmptcprouter",server,"redirect_ports",value)
 	end
 
diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
index 57485d529..f4f507388 100644
--- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
+++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm
@@ -47,8 +47,9 @@
 	    <div class="cbi-section-node">
 		<div class="cbi-section-descr"></div>
 		<div class="cbi-value">
-	    	    <label class="cbi-value-title"><%:Redirects all ports from server to OpenMPTCProuter%></label>
-	    	    <div class="cbi-value-field">
+		    <label class="cbi-value-title"><%:Redirects all ports from server to OpenMPTCProuter%></label>
+		    <div class="cbi-value-field">
+			<input type="hidden" name="server.<%=servername%>" value="<%=servername%>" />
 			<input type="checkbox" name="redirect_ports.<%=servername%>" class="cbi-input-checkbox" value="1" <% if luci.model.uci.cursor():get("openmptcprouter",servername,"redirect_ports") == "1" then %>checked<% end %>>
 		    </div>
 		</div>
@@ -62,10 +63,10 @@
 		    <input type="checkbox" name="obfs" class="cbi-input-checkbox" value="1" <% if luci.model.uci.cursor():get("shadowsocks-libev","tracker","obfs") == "1" then %>checked<% end %>>
 		    <br />
 		    <div class="cbi-value-description">
-		        <%:OBFS will be enabled on both side%>
+			<%:OBFS will be enabled on both side%>
 		    </div>
-		</div>
 	    </div>
+	</div>
 	</fieldset>
 	<fieldset class="cbi-section" id="networks">
 	<legend><%:Networks settings%></legend>