From 6ed5b724320dc87f222f793bcd554a2065b2c969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Schr=C3=B6der?= <martin.schroder@inteno.se>
Date: Fri, 22 May 2015 17:13:51 +0200
Subject: [PATCH] Fixed dmzhost

---
 luciexpress/htdocs/js/uci.js                                | 2 +-
 .../plugins/internet/pages/internet.exposed_host.html       | 6 +++---
 .../htdocs/plugins/internet/pages/internet.exposed_host.js  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/luciexpress/htdocs/js/uci.js b/luciexpress/htdocs/js/uci.js
index 29f0dc575..d5f9a1327 100644
--- a/luciexpress/htdocs/js/uci.js
+++ b/luciexpress/htdocs/js/uci.js
@@ -476,7 +476,7 @@
 			var self = this; 
 			if(!(".type" in item)) throw new Error("Missing '.type' parameter!"); 
 			var type = section_types[self[".name"]][item[".type"]]; 
-			if(!type) throw Error("Trying to create section of unrecognized type!"); 
+			if(!type) throw Error("Trying to create section of unrecognized type ("+self[".name"]+"."+item[".type"]+")"); 
 			
 			// TODO: validate values!
 			var values = {}; 
diff --git a/luciexpress/htdocs/plugins/internet/pages/internet.exposed_host.html b/luciexpress/htdocs/plugins/internet/pages/internet.exposed_host.html
index def2dff96..c61d627f3 100644
--- a/luciexpress/htdocs/plugins/internet/pages/internet.exposed_host.html
+++ b/luciexpress/htdocs/plugins/internet/pages/internet.exposed_host.html
@@ -7,11 +7,11 @@
 				<luci-config-info>{{'internet.exposed_host.info'|translate}}</luci-config-info>
 				<luci-config-lines>
 					<luci-config-line title="{{'Exposed Host Function'|translate}}">
-						<switch id="enabled" name="enabled" ng-model="firewall.dmzhost.enabled.value" class="green"></switch>
+						<switch id="enabled" name="enabled" ng-model="firewall.dmz.enabled.value" class="green"></switch>
 					</luci-config-line>
 				</luci-config-lines>
 			</luci-config-section>
-			<luci-config-section ng-show="firewall.dmzhost.enabled.value">
+			<luci-config-section ng-show="firewall.dmz.enabled.value">
 				<div class="alert alert-danger">
 					<p translate><span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> Warning: By using the exposed host function you bypass the firewall of your {{config.friendly_name}}. Please make sure that your computer is protected against attacks from Internet. The following ports will not be forwarded: {{ nonforwardedPorts || 'None'}}.</p>
 				</div>
@@ -21,7 +21,7 @@
 						<strong>{{wan.ip}}</strong>
 					</luci-config-line>
 					<luci-config-line title="{{'Local IP Address'|translate}}">
-						<input type="text" class="form-control" placeholder="{{'ip.address.label'|translate}}" ng-model="firewall.dmzhost.host.value"/>
+						<input type="text" class="form-control" placeholder="{{'ip.address.label'|translate}}" ng-model="firewall.dmz.host.value"/>
 					</luci-config-line>
 				</luci-config-lines>
 			<luci-config-apply></luci-config-apply>
diff --git a/luciexpress/htdocs/plugins/internet/pages/internet.exposed_host.js b/luciexpress/htdocs/plugins/internet/pages/internet.exposed_host.js
index b255df88f..3dc714b0b 100644
--- a/luciexpress/htdocs/plugins/internet/pages/internet.exposed_host.js
+++ b/luciexpress/htdocs/plugins/internet/pages/internet.exposed_host.js
@@ -10,11 +10,11 @@ $juci.module("internet")
 			}).always(function(){ next(); }); 
 		}, 
 		function(next){ 
-			if($uci.firewall.dmzhost == undefined){
-				$uci.firewall.create({".type": "dmzhost", ".name": "dmzhost"}).done(function(){
+			if($uci.firewall.dmz == undefined){
+				$uci.firewall.create({".type": "dmz", ".name": "dmz"}).done(function(){
 					next(); 
 				}).fail(function(){
-					throw new Error("Could not create required dmzhost section in config firewall!"); 
+					throw new Error("Could not create required dmz section in config firewall!"); 
 				}); 
 			} else {
 				next();