From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 4 Dec 2009 23:17:09 +0000 (+0000)
Subject: luci-0.9: merge r5605
X-Git-Tag: 0.9.0~93
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e02b2c07b71b72d87f99bd6ead17543edd6dd9a2;p=oweals%2Fluci.git

luci-0.9: merge r5605
---

diff --git a/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua b/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
index 97fe88e6c..5ab232c78 100644
--- a/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
+++ b/applications/luci-upnp/luasrc/model/cbi/upnp/upnp.lua
@@ -18,18 +18,6 @@ s = m:section(NamedSection, "config", "upnpd", "")
 e = s:option(Flag, "enabled", translate("enable"))
 e.rmempty = false
 
-function e.write(self, section, value)
-	local cmd = (value == "1") and "enable" or "disable"
-	if value ~= "1" then
-		os.execute("/etc/init.d/miniupnpd stop")
-	end
-	os.execute("/etc/init.d/miniupnpd " .. cmd)
-end
-
-function e.cfgvalue(self, section)
-	return (os.execute("/etc/init.d/miniupnpd enabled") == 0) and "1" or "0"
-end
-
 s:option(Flag, "secure_mode").rmempty = true
 s:option(Flag, "log_output").rmempty = true
 s:option(Value, "download", nil, "kByte/s").rmempty = true
diff --git a/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua b/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua
index 3e19b9573..f39917f38 100644
--- a/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua
+++ b/applications/luci-upnp/luasrc/model/cbi/upnp/upnpmini.lua
@@ -18,18 +18,6 @@ s = m:section(NamedSection, "config", "upnpd", "")
 e = s:option(Flag, "enabled", translate("enable"))
 e.rmempty = false
 
-function e.write(self, section, value)
-	local cmd = (value == "1") and "enable" or "disable"
-	if value ~= "1" then
-		os.execute("/etc/init.d/miniupnpd stop")
-	end
-	os.execute("/etc/init.d/miniupnpd " .. cmd)
-end
-
-function e.cfgvalue(self, section)
-	return (os.execute("/etc/init.d/miniupnpd enabled") == 0) and "1" or "0"
-end
-
 s:option(Value, "download", nil, "kByte/s").rmempty = true
 s:option(Value, "upload", nil, "kByte/s").rmempty = true