Changeset 8333

Timestamp:

03/07/12 14:06:17 (16 months ago)

Author:

jow

Message:

applications/luci-multiwan: use new uci disable option instead of disabling the init script

Location:

luci/trunk/applications/luci-multiwan/luasrc/model/cbi/multiwan

Files:

• multiwan.lua (modified) (1 diff)
• multiwanmini.lua (modified) (1 diff)

luci/trunk/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwan.lua

@@ -5 +5 @@
 
 s = m:section(NamedSection, "config", "multiwan", "")
+
 e = s:option(Flag, "enabled", translate("Enable"))
 e.rmempty = false
+e.default = e.enabled
 
 function e.write(self, section, value)
-        local cmd = (value == "1") and "enable" or "disable"
-        if value ~= "1" then
-                os.execute("/etc/init.d/multiwan stop")
-        end
-        os.execute("/etc/init.d/multiwan " .. cmd)
-end
-
-function e.cfgvalue(self, section)
-        return (os.execute("/etc/init.d/multiwan enabled") == 0) and "1" or "0"
+    if value == "0" then
+        os.execute("/etc/init.d/multiwan stop")
+    else
+        os.execute("/etc/init.d/multiwan enable")
+    end
+    Flag.write(self, section, value)
 end
 

luci/trunk/applications/luci-multiwan/luasrc/model/cbi/multiwan/multiwanmini.lua

@@ -5 +5 @@
 
 s = m:section(NamedSection, "config", "multiwan", "")
+
 e = s:option(Flag, "enabled", translate("Enable"))
 e.rmempty = false
+e.default = "1"
 
 function e.write(self, section, value)
-        local cmd = (value == "1") and "enable" or "disable"
-        if value ~= "1" then
-                os.execute("/etc/init.d/multiwan stop")
-        end
-        os.execute("/etc/init.d/multiwan " .. cmd)
-end
-
-function e.cfgvalue(self, section)
-        return (os.execute("/etc/init.d/multiwan enabled") == 0) and "1" or "0"
+    if value == "0" then
+        os.execute("/etc/init.d/multiwan stop")
+    else
+        os.execute("/etc/init.d/multiwan enable")
+    end
+    Flag.write(self, section, value)
 end