X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-upnp%2Fluasrc%2Fmodel%2Fcbi%2Fupnp%2Fupnp.lua;h=5d61dcecba2b262040292ab10c6c2f0955cadd67;hp=0d07a564ad5e88cd1981844773171c5d705b19e4;hb=e9362b83f18ef7b2e53caf778efb83da62f6aef5;hpb=9b01a6e862d119b999ce57173f8de55c15cc8818

diff --git a/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua b/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
index 0d07a564a..5d61dcecb 100644
--- a/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
+++ b/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
@@ -2,7 +2,7 @@
 LuCI - Lua Configuration Interface
 
 Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -12,22 +12,36 @@ You may obtain a copy of the License at
 
 $Id$
 ]]--
-m = Map("upnpd", translate("upnpd"), translate("upnpd_desc"))
+
+m = Map("upnpd", translate("Universal Plug & Play"),
+	translate("UPnP allows clients in the local network to automatically configure the router."))
+
+m:section(SimpleSection).template  = "upnp_status"
 
 s = m:section(NamedSection, "config", "upnpd", "")
-e = s:option(Flag, "enabled", translate("enable"))
-function e.write(self, section, value)
-	local cmd = (value == "1") and "enable" or "disable"
-	os.execute("/etc/init.d/miniupnpd " .. cmd)
-end
+s.addremove = false
+
+e = s:option(Flag, "enabled", translate("Enable UPnP Service"))
+e.rmempty  = false
+e.enabled  = "1"
+e.disabled = "0"
 
-function e.cfgvalue(self, section)
-	return (os.execute("/etc/init.d/miniupnpd enabled") == 0) and "1" or "0"
+function e.write(self, section, value)
+	if value == "1" then
+		luci.sys.call("/etc/init.d/miniupnpd enable")
+		luci.sys.call("/etc/init.d/miniupnpd start")
+	else
+		luci.sys.call("/etc/init.d/miniupnpd stop")
+		luci.sys.call("/etc/init.d/miniupnpd disable")
+	end
+
+	Value.write(self, section, value)
 end
 
-s:option(Flag, "secure_mode").rmempty = true
-s:option(Flag, "log_output").rmempty = true
-s:option(Value, "download").rmempty = true
-s:option(Value, "upload").rmempty = true
+s:option(Flag, "enable_natpmp", translate("Enable NAT-PMP")).rmempty = true
+s:option(Flag, "secure_mode", translate("Enable secure mode")).rmempty = true
+s:option(Flag, "log_output", translate("Log output")).rmempty = true
+s:option(Value, "download", translate("Downlink"), "kByte/s").rmempty = true
+s:option(Value, "upload", translate("Uplink"), "kByte/s").rmempty = true
 
 return m