Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-vpnbypass: better service control & buttons styling

Browse source 
Signed-off-by: Stan Grishin <stangri@melmac.net>
This commit is contained in:
Stan Grishin 2020-04-03 12:32:24 +00:00
parent 015712bba0
commit b7900cf207
6 changed files with 135 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-vpnbypass/Makefile
View file

@ -10,7 +10,7 @@ LUCI_TITLE:=VPN Bypass Web UI
LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service. LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service.
LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpnbypass LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpnbypass
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_RELEASE:=14 PKG_RELEASE:=16
include ../../luci.mk include ../../luci.mk

3
applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua
View file

@ -1,6 +1,7 @@
module("luci.controller.vpnbypass", package.seeall) module("luci.controller.vpnbypass", package.seeall)
function index() function index()
if nixio.fs.access("/etc/config/vpnbypass") then 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"}, cbi("vpnbypass"), _("VPN Bypass"))
entry({"admin", "vpn", "vpnbypass", "action"}, call("vpnbypass_action"), nil).leaf = true entry({"admin", "vpn", "vpnbypass", "action"}, call("vpnbypass_action"), nil).leaf = true
end end
@ -11,7 +12,7 @@ function vpnbypass_action(name)
if name == "start" then if name == "start" then
luci.sys.init.start(packageName) luci.sys.init.start(packageName)
elseif name == "action" then 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") luci.util.exec("/etc/init.d/dnsmasq restart >/dev/null 2>&1")
elseif name == "stop" then elseif name == "stop" then
luci.sys.init.stop(packageName) luci.sys.init.stop(packageName)

41
applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua
View file

@ -4,27 +4,42 @@ local sys = require "luci.sys"
local util = require "luci.util" local util = require "luci.util"
local packageName = "vpnbypass" local packageName = "vpnbypass"
local tmpfsVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'"))) local packageVersion, statusText = nil, nil
if not tmpfsVersion or tmpfsVersion == "" then packageVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'")))
tmpfsStatusCode = -1 if not packageVersion or packageVersion == "" then
tmpfsVersion = "" packageVersion = ""
tmpfsStatus = packageName .. " " .. translate("is not installed or not found") statusText = packageName .. " " .. translate("is not installed or not found")
else else
tmpfsVersion = " [" .. packageName .. " " .. tmpfsVersion .. "]" packageVersion = " [" .. packageName .. " " .. packageVersion .. "]"
end end
local tmpfsStatus = "Stopped"
if sys.call("iptables -t mangle -L | grep -q VPNBYPASS") == 0 then local serviceRunning, serviceEnabled = false, false
tmpfsStatus = "Running" 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 end
m = Map("vpnbypass", translate("VPN Bypass Settings")) 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 = h:option(DummyValue, "_dummy", translate("Service Status"))
ss.template = packageName .. "/status" ss.template = packageName .. "/status"
ss.value = tmpfsStatus ss.value = statusText
buttons = h:option(DummyValue, "_dummy") if packageVersion ~= "" then
buttons.template = packageName .. "/buttons" buttons = h:option(DummyValue, "_dummy")
buttons.template = packageName .. "/buttons"
end
s = m:section(NamedSection, "config", "vpnbypass", translate("VPN Bypass Rules")) s = m:section(NamedSection, "config", "vpnbypass", translate("VPN Bypass Rules"))
-- Local Ports -- Local Ports

96
applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm
View file

@ -1,53 +1,77 @@
<%# <%# Copyright 2020 Stan Grishin <stangri@melmac.net> -%>
Copyright 2019 Stan Grishin <stangri@melmac.net>
-%>
<%-
local packageName = "vpnbypass"
local tmpfsStatus = "Stopped"
local enabledFlag = luci.model.uci.cursor():get(packageName, "config", "enabled")
if luci.sys.call("iptables -t mangle -L | grep -q " .. packageName:upper()) == 0 then
tmpfsStatus = "Running"
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"
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"
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"
else
btn_enable_style = "cbi-button cbi-button-apply -disabled"
btn_disable_style = "cbi-button cbi-button-reset important"
end
-%>
<%+vpnbypass/css%> <%+vpnbypass/css%>
<%+vpnbypass/js%> <%+vpnbypass/js%>
<%-
local packageName = "vpnbypass"
local serviceRunning, serviceEnabled = false, false;
if luci.sys.call("iptables -t mangle -L | grep -q " .. packageName:upper()) == 0 then
serviceRunning = true
end
if luci.model.uci.cursor():get(packageName, "config", "enabled") == "1" then
serviceEnabled = true
end
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_status = false
btn_action_status = false
btn_stop_status = false
btn_enable_status = true
btn_disable_status = false
end
if serviceRunning then
btn_start_status = false
btn_action_status = true
btn_stop_status = true
else
btn_action_status = false
btn_stop_status = false
end
-%>
<div class="cbi-value"><label class="cbi-value-title">Service Control</label> <div class="cbi-value"><label class="cbi-value-title">Service Control</label>
<div class="cbi-value-field"> <div class="cbi-value-field">
<input type="button" class="<%=btn_start_style%>" id="btn_start" name="start" value="<%:Start%>" onclick="button_action(this)" /> <input type="button" class="cbi-button cbi-button-apply" id="btn_start" name="start" value="<%:Start%>"
onclick="button_action(this)" />
<span id="btn_start_spinner" class="btn_spinner"></span> <span id="btn_start_spinner" class="btn_spinner"></span>
<input type="button" class="<%=btn_action_style%>" id="btn_action" name="action" value="<%:Reload%>" onclick="button_action(this)" /> <input type="button" class="cbi-button cbi-button-apply" id="btn_action" name="action" value="<%:Restart%>"
onclick="button_action(this)" />
<span id="btn_action_spinner" class="btn_spinner"></span> <span id="btn_action_spinner" class="btn_spinner"></span>
<input type="button" class="<%=btn_stop_style%>" id="btn_stop" name="stop" value="<%:Stop%>" onclick="button_action(this)" /> <input type="button" class="cbi-button cbi-button-reset" id="btn_stop" name="stop" value="<%:Stop%>"
onclick="button_action(this)" />
<span id="btn_stop_spinner" class="btn_spinner"></span> <span id="btn_stop_spinner" class="btn_spinner"></span>
&nbsp; &nbsp;
&nbsp; &nbsp;
&nbsp; &nbsp;
&nbsp; &nbsp;
<input type="button" class="<%=btn_enable_style%>" id="btn_enable" name="enable" value="<%:Enable%>" onclick="button_action(this)" /> <input type="button" class="cbi-button cbi-button-apply" id="btn_enable" name="enable" value="<%:Enable%>"
onclick="button_action(this)" />
<span id="btn_enable_spinner" class="btn_spinner"></span> <span id="btn_enable_spinner" class="btn_spinner"></span>
<input type="button" class="<%=btn_disable_style%>" id="btn_disable" name="disable" value="<%:Disable%>" onclick="button_action(this)" /> <input type="button" class="cbi-button cbi-button-reset" id="btn_disable" name="disable" value="<%:Disable%>"
onclick="button_action(this)" />
<span id="btn_disable_spinner" class="btn_spinner"></span> <span id="btn_disable_spinner" class="btn_spinner"></span>
</div> </div>
</div> </div>
<%-if not btn_start_status then%>
<script type="text/javascript">document.getElementById("btn_start").disabled = true;</script>
<%-end%>
<%-if not btn_action_status then%>
<script type="text/javascript">document.getElementById("btn_action").disabled = true;</script>
<%-end%>
<%-if not btn_stop_status then%>
<script type="text/javascript">document.getElementById("btn_stop").disabled = true;</script>
<%-end%>
<%-if not btn_enable_status then%>
<script type="text/javascript">document.getElementById("btn_enable").disabled = true;</script>
<%-end%>
<%-if not btn_disable_status then%>
<script type="text/javascript">document.getElementById("btn_disable").disabled = true;</script>
<%-end%>

64
applications/luci-app-vpnbypass/po/templates/vpnbypass.pot
View file

@ -1,19 +1,19 @@
msgid "" msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8" 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" msgid "Disable"
msgstr "" 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" msgid "Domains to Bypass"
msgstr "" 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" msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr "" msgstr ""
#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:48 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:54
msgid "Enable" msgid "Enable"
msgstr "" msgstr ""
@ -21,76 +21,92 @@ msgstr ""
msgid "Loading" msgid "Loading"
msgstr "" 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" msgid "Local IP Addresses to Bypass"
msgstr "" msgstr ""
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:45 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:60
msgid "" msgid ""
"Local IP addresses or subnets with direct internet access (outside of the " "Local IP addresses or subnets with direct internet access (outside of the "
"VPN tunnel)" "VPN tunnel)"
msgstr "" 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" msgid "Local Ports to Bypass"
msgstr "" 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" msgid "Local ports to trigger VPN Bypass"
msgstr "" msgstr ""
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:65 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:80
msgid "README" msgid "README"
msgstr "" msgstr ""
#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:40 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:67
msgid "Reload"
msgstr ""
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:52
msgid "Remote IP Addresses to Bypass" msgid "Remote IP Addresses to Bypass"
msgstr "" msgstr ""
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:52 #: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:67
msgid "" msgid ""
"Remote IP addresses or subnets which will be accessed directly (outside of " "Remote IP addresses or subnets which will be accessed directly (outside of "
"the VPN tunnel)" "the VPN tunnel)"
msgstr "" 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" msgid "Remote Ports to Bypass"
msgstr "" 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" msgid "Remote ports to trigger VPN Bypass"
msgstr "" msgstr ""
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:22 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:44
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:23 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" msgid "Service Status"
msgstr "" msgstr ""
#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:38 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:41
msgid "Start" msgid "Start"
msgstr "" msgstr ""
#: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:42 #: applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm:47
msgid "Stop" msgid "Stop"
msgstr "" msgstr ""
#: applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua:27
msgid "Stopped"
msgstr ""
#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:4 #: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:4
msgid "VPN"
msgstr ""
#: applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua:5
msgid "VPN Bypass" msgid "VPN Bypass"
msgstr "" 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" msgid "VPN Bypass Rules"
msgstr "" 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" msgid "VPN Bypass Settings"
msgstr "" 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" msgid "for syntax"
msgstr "" msgstr ""

4
applications/luci-app-vpnbypass/root/etc/uci-defaults/40_luci-vpnbypass Normal file
View file

@ -0,0 +1,4 @@
#!/bin/sh
rm -rf /var/luci-modulecache/; rm -f /var/luci-indexcache;
exit 0