luci-app-vpnbypass: ACL update

[project/luci.git] / applications / luci-app-vpnbypass / luasrc / controller / vpnbypass.lua

diff --git a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua
index d5f4a8cafd7cefeedfcf5042ef74f0324bd37c8e..057aee787f1ce0d82786192b2a9824a1d30aa97b 100644 (file)
--- a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua
+++ b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua
@@ -4,7 +4,6 @@ function index()
                local e = entry({"admin", "vpn"}, firstchild(), _("VPN"), 60)
                e.dependent = false
                e.acl_depends = { "luci-app-vpnbypass" }
-
                entry({"admin", "vpn", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass"))
                entry({"admin", "vpn", "vpnbypass", "action"}, call("vpnbypass_action"), nil).leaf = true
        end
@@ -12,18 +11,24 @@ end
 
 function vpnbypass_action(name)
        local packageName = "vpnbypass"
+       local http = require "luci.http"
+       local sys = require "luci.sys"
+       local uci = require "luci.model.uci".cursor()
+       local util = require "luci.util"
        if name == "start" then
-               luci.sys.init.start(packageName)
+               sys.init.start(packageName)
        elseif name == "action" then
-               luci.util.exec("/etc/init.d/" .. packageName .. " restart >/dev/null 2>&1")
-               luci.util.exec("/etc/init.d/dnsmasq restart >/dev/null 2>&1")
+               util.exec("/etc/init.d/" .. packageName .. " restart >/dev/null 2>&1")
+               util.exec("/etc/init.d/dnsmasq restart >/dev/null 2>&1")
        elseif name == "stop" then
-               luci.sys.init.stop(packageName)
+               sys.init.stop(packageName)
        elseif name == "enable" then
-               luci.util.exec("uci set " .. packageName .. ".config.enabled=1; uci commit " .. packageName)
+               uci:set(packageName, "config", "enabled", "1")
+               uci:commit(packageName)
        elseif name == "disable" then
-               luci.util.exec("uci set " .. packageName .. ".config.enabled=0; uci commit " .. packageName)
+               uci:set(packageName, "config", "enabled", "0")
+               uci:commit(packageName)
        end
-       luci.http.prepare_content("text/plain")
-       luci.http.write("0")
+       http.prepare_content("text/plain")
+       http.write("0")
 end