From 322e3681088b12f37314ce118518c8eacb35a63e Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Fri, 3 Apr 2020 12:32:36 +0000 Subject: [PATCH] luci-app-vpnbypass: better service control & buttons styling Signed-off-by: Stan Grishin --- applications/luci-app-vpnbypass/Makefile | 2 +- .../luasrc/controller/vpnbypass.lua | 3 +- .../luasrc/model/cbi/vpnbypass.lua | 41 +++++++--- .../luasrc/view/vpnbypass/buttons.htm | 80 ++++++++++++------- .../po/templates/vpnbypass.pot | 64 +++++++++------ .../root/etc/uci-defaults/40_luci-vpnbypass | 9 +-- 6 files changed, 124 insertions(+), 75 deletions(-) diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile index 14425ce98..cfcafec05 100644 --- a/applications/luci-app-vpnbypass/Makefile +++ b/applications/luci-app-vpnbypass/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=VPN Bypass Web UI LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service. LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpnbypass LUCI_PKGARCH:=all -PKG_RELEASE:=14 +PKG_RELEASE:=16 include ../../luci.mk diff --git a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua index c971ce651..77753020d 100644 --- a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua +++ b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua @@ -1,6 +1,7 @@ module("luci.controller.vpnbypass", package.seeall) function index() if nixio.fs.access("/etc/config/vpnbypass") then + entry({"admin", "vpn"}, firstchild(), _("VPN"), 60).dependent=false entry({"admin", "vpn", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass")) entry({"admin", "vpn", "vpnbypass", "action"}, call("vpnbypass_action"), nil).leaf = true end @@ -11,7 +12,7 @@ function vpnbypass_action(name) if name == "start" then luci.sys.init.start(packageName) elseif name == "action" then - luci.util.exec("/etc/init.d/" .. packageName .. " reload >/dev/null 2>&1") + luci.util.exec("/etc/init.d/" .. packageName .. " restart >/dev/null 2>&1") luci.util.exec("/etc/init.d/dnsmasq restart >/dev/null 2>&1") elseif name == "stop" then luci.sys.init.stop(packageName) diff --git a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua index 8aa222709..0afdd7b0e 100644 --- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua +++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua @@ -4,27 +4,42 @@ local sys = require "luci.sys" local util = require "luci.util" local packageName = "vpnbypass" -local tmpfsVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'"))) -if not tmpfsVersion or tmpfsVersion == "" then - tmpfsStatusCode = -1 - tmpfsVersion = "" - tmpfsStatus = packageName .. " " .. translate("is not installed or not found") +local packageVersion, statusText = nil, nil +packageVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'"))) +if not packageVersion or packageVersion == "" then + packageVersion = "" + statusText = packageName .. " " .. translate("is not installed or not found") else - tmpfsVersion = " [" .. packageName .. " " .. tmpfsVersion .. "]" + packageVersion = " [" .. packageName .. " " .. packageVersion .. "]" end -local tmpfsStatus = "Stopped" -if sys.call("iptables -t mangle -L | grep -q VPNBYPASS") == 0 then - tmpfsStatus = "Running" + +local serviceRunning, serviceEnabled = false, false +if uci:get(packageName, "config", "enabled") == "1" then + serviceEnabled = true +end +if sys.call("iptables -t mangle -L | grep -q " .. packageName:upper()) == 0 then + serviceRunning = true +end + +if serviceRunning then + statusText = translate("Running") +else + statusText = translate("Stopped") + if not serviceEnabled then + statusText = statusText .. " (" .. translate("disabled") .. ")" + end end m = Map("vpnbypass", translate("VPN Bypass Settings")) -h = m:section(NamedSection, "config", packageName, translate("Service Status") .. tmpfsVersion) +h = m:section(NamedSection, "config", packageName, translate("Service Status") .. packageVersion) ss = h:option(DummyValue, "_dummy", translate("Service Status")) ss.template = packageName .. "/status" -ss.value = tmpfsStatus -buttons = h:option(DummyValue, "_dummy") -buttons.template = packageName .. "/buttons" +ss.value = statusText +if packageVersion ~= "" then + buttons = h:option(DummyValue, "_dummy") + buttons.template = packageName .. "/buttons" +end s = m:section(NamedSection, "config", "vpnbypass", translate("VPN Bypass Rules")) -- Local Ports diff --git a/applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm b/applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm index baabb8f2a..c1f4d8279 100644 --- a/applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm +++ b/applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm @@ -1,53 +1,77 @@ -<%# - Copyright 2019 Stan Grishin --%> +<%# Copyright 2020 Stan Grishin -%> + +<%+vpnbypass/css%> +<%+vpnbypass/js%> <%- local packageName = "vpnbypass" - local tmpfsStatus = "Stopped" - local enabledFlag = luci.model.uci.cursor():get(packageName, "config", "enabled") + local serviceRunning, serviceEnabled = false, false; if luci.sys.call("iptables -t mangle -L | grep -q " .. packageName:upper()) == 0 then - tmpfsStatus = "Running" + serviceRunning = true + end + if luci.model.uci.cursor():get(packageName, "config", "enabled") == "1" then + serviceEnabled = true end - if tmpfsStatus == "Stopped" then - btn_start_style = "cbi-button cbi-button-apply important" - btn_action_style = "cbi-button cbi-button-apply important" - btn_stop_style = "cbi-button cbi-button-reset -disabled" + if serviceEnabled then + btn_start_status = true + btn_action_status = true + btn_stop_status = true + btn_enable_status = false + btn_disable_status = true else - btn_start_style = "cbi-button cbi-button-apply -disabled" - btn_action_style = "cbi-button cbi-button-apply important" - btn_stop_style = "cbi-button cbi-button-reset important" + btn_start_status = false + btn_action_status = false + btn_stop_status = false + btn_enable_status = true + btn_disable_status = false end - if enabledFlag ~= "1" then - btn_start_style = "cbi-button cbi-button-apply -disabled" - btn_action_style = "cbi-button cbi-button-apply -disabled" - btn_enable_style = "cbi-button cbi-button-apply important" - btn_disable_style = "cbi-button cbi-button-reset -disabled" + if serviceRunning then + btn_start_status = false + btn_action_status = true + btn_stop_status = true else - btn_enable_style = "cbi-button cbi-button-apply -disabled" - btn_disable_style = "cbi-button cbi-button-reset important" + btn_action_status = false + btn_stop_status = false end -%> -<%+vpnbypass/css%> -<%+vpnbypass/js%> -
- + - + - +         - + - +
+ +<%-if not btn_start_status then%> + +<%-end%> +<%-if not btn_action_status then%> + +<%-end%> +<%-if not btn_stop_status then%> + +<%-end%> +<%-if not btn_enable_status then%> + +<%-end%> +<%-if not btn_disable_status then%> + +<%-end%> \ No newline at end of file diff --git a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot index a723e187e..8778dc228 100644 --- a/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot +++ b/applications/luci-app-vpnbypass/po/templates/vpnbypass.pot @@ -1,19 +1,19 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" -#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:50 +#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:57 msgid "Disable" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:62 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:77 msgid "Domains to Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:63 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:78 msgid "Domains to be accessed directly (outside of the VPN tunnel), see" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:48 +#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:54 msgid "Enable" msgstr "" @@ -21,76 +21,92 @@ msgstr "" msgid "Loading" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:45 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "Local IP Addresses to Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:45 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60 msgid "" "Local IP addresses or subnets with direct internet access (outside of the " "VPN tunnel)" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Local Ports to Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:31 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:46 msgid "Local ports to trigger VPN Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:65 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:80 msgid "README" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:40 -msgid "Reload" -msgstr "" - -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:52 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:67 msgid "Remote IP Addresses to Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:52 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:67 msgid "" "Remote IP addresses or subnets which will be accessed directly (outside of " "the VPN tunnel)" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "Remote Ports to Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:38 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:53 msgid "Remote ports to trigger VPN Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:22 -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:23 +#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:44 +msgid "Restart" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:25 +msgid "Running" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:35 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:36 msgid "Service Status" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:38 +#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:41 msgid "Start" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:42 +#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:47 msgid "Stop" msgstr "" +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:27 +msgid "Stopped" +msgstr "" + #: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:4 +msgid "VPN" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5 msgid "VPN Bypass" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:29 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:44 msgid "VPN Bypass Rules" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:20 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:33 msgid "VPN Bypass Settings" msgstr "" -#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:65 +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:29 +msgid "disabled" +msgstr "" + +#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:80 msgid "for syntax" msgstr "" diff --git a/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass b/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass index 9455701a0..6df781033 100644 --- a/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass +++ b/applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass @@ -1,11 +1,4 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete ucitrack.@vpnbypass[-1] - add ucitrack vpnbypass - set ucitrack.@vpnbypass[-1].init=vpnbypass - commit ucitrack -EOF - -rm -f /tmp/luci-indexcache +rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache; exit 0 -- 2.25.1