From 6c66d913367af8e468244762b83e274f5ea93e92 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 9 Aug 2012 10:16:03 +0000
Subject: [PATCH] applications/luci-firewall: javascript & validation fixes in
 quickaction forms

---
 .../luci-firewall/luasrc/view/firewall/cbi_addrule.htm         | 2 +-
 .../luci-firewall/luasrc/view/firewall/cbi_addsnat.htm         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/applications/luci-firewall/luasrc/view/firewall/cbi_addrule.htm b/applications/luci-firewall/luasrc/view/firewall/cbi_addrule.htm
index 473f9f451..463b2e05f 100644
--- a/applications/luci-firewall/luasrc/view/firewall/cbi_addrule.htm
+++ b/applications/luci-firewall/luasrc/view/firewall/cbi_addrule.htm
@@ -73,7 +73,7 @@
 		</table>
 
 		<script type="text/javascript">//<![CDATA[
-			cbi_validate_field('_newopen.extport', true, 'list(portrange)');
+			cbi_validate_field('_newopen.extport', true, 'list(neg(portrange))');
 			cbi_bind(document.getElementById('_newopen.extport'), 'blur',
 				function() {
 					var n = document.getElementById('_newopen.name');
diff --git a/applications/luci-firewall/luasrc/view/firewall/cbi_addsnat.htm b/applications/luci-firewall/luasrc/view/firewall/cbi_addsnat.htm
index 28bb22d40..4e1681c11 100644
--- a/applications/luci-firewall/luasrc/view/firewall/cbi_addsnat.htm
+++ b/applications/luci-firewall/luasrc/view/firewall/cbi_addsnat.htm
@@ -52,10 +52,11 @@
 
 		<script type="text/javascript">//<![CDATA[
 			cbi_validate_field('_newsnat.dport', true, 'portrange');
+			cbi_validate_field('_newsnat.dip', true, 'ip4addr');
 			cbi_combobox_init('_newsnat.dip', {
 				<% local c, k, v = 0; for k, v in ipairs(nw:get_interfaces()) do -%>
 					<%- local a; for k, a in ipairs(v:ipaddrs()) do c = c + 1 -%>
-						<% if c > 1 then %>,<% end %>'<%=a:host():string()%>': '<%=a:host():string()%> (<%=v:shortname()%>)',
+						<% if c > 1 then %>,<% end %>'<%=a:host():string()%>': '<%=a:host():string()%> (<%=v:shortname()%>)'
 					<%- end %>
 				<%- end %> }, '<%: -- Please choose -- %>', '<%: -- custom -- %>');
 		//]]></script>
-- 
2.25.1