diff --git a/package/lean/luci-app-accesscontrol/luasrc/controller/mia.lua b/package/lean/luci-app-accesscontrol/luasrc/controller/mia.lua index 38dc02a26..20096f5fb 100644 --- a/package/lean/luci-app-accesscontrol/luasrc/controller/mia.lua +++ b/package/lean/luci-app-accesscontrol/luasrc/controller/mia.lua @@ -5,14 +5,13 @@ function index() return end - entry({"admin","services","mia"},cbi("mia"),_("Internet Access Schedule Control"),30).dependent=true - entry({"admin","services","mia","status"},call("act_status")).leaf=true - + entry({"admin", "services", "mia"}, cbi("mia"), _("Internet Access Schedule Control"),30).dependent = true + entry({"admin", "services", "mia", "status"}, call("act_status")).leaf = true end function act_status() - local e={} + local e={} e.running=luci.sys.call("iptables -L INPUT |grep MIA >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + luci.http.prepare_content("application/json") + luci.http.write_json(e) end diff --git a/package/lean/luci-app-adbyby-plus/luasrc/controller/adbyby.lua b/package/lean/luci-app-adbyby-plus/luasrc/controller/adbyby.lua index bdf7b408d..0e39bfdd6 100644 --- a/package/lean/luci-app-adbyby-plus/luasrc/controller/adbyby.lua +++ b/package/lean/luci-app-adbyby-plus/luasrc/controller/adbyby.lua @@ -6,31 +6,31 @@ function index() return end - entry({"admin", "services", "adbyby"}, alias("admin", "services", "adbyby", "base"),_("ADBYBY Plus +"), 9).dependent = true + entry({"admin", "services", "adbyby"}, alias("admin", "services", "adbyby", "base"), _("ADBYBY Plus +"), 9).dependent = true - entry({"admin", "services", "adbyby", "base"}, cbi("adbyby/base"), _("Base Setting"), 10).leaf=true - entry({"admin", "services", "adbyby", "advanced"}, cbi("adbyby/advanced"), _("Advance Setting"), 20).leaf=true - entry({"admin", "services", "adbyby", "help"}, form("adbyby/help"), _("Plus+ Domain List"), 30).leaf=true - entry({"admin", "services", "adbyby", "esc"}, form("adbyby/esc"), _("Bypass Domain List"), 40).leaf=true - entry({"admin", "services", "adbyby", "black"}, form("adbyby/black"), _("Block Domain List"), 50).leaf=true - entry({"admin", "services", "adbyby", "block"}, form("adbyby/block"), _("Block IP List"), 60).leaf=true - entry({"admin", "services", "adbyby", "user"}, form("adbyby/user"), _("User-defined Rule"), 70).leaf=true + entry({"admin", "services", "adbyby", "base"}, cbi("adbyby/base"), _("Base Setting"), 10).leaf = true + entry({"admin", "services", "adbyby", "advanced"}, cbi("adbyby/advanced"), _("Advance Setting"), 20).leaf = true + entry({"admin", "services", "adbyby", "help"}, form("adbyby/help"), _("Plus+ Domain List"), 30).leaf = true + entry({"admin", "services", "adbyby", "esc"}, form("adbyby/esc"), _("Bypass Domain List"), 40).leaf = true + entry({"admin", "services", "adbyby", "black"}, form("adbyby/black"), _("Block Domain List"), 50).leaf = true + entry({"admin", "services", "adbyby", "block"}, form("adbyby/block"), _("Block IP List"), 60).leaf = true + entry({"admin", "services", "adbyby", "user"}, form("adbyby/user"), _("User-defined Rule"), 70).leaf = true entry({"admin", "services", "adbyby", "refresh"}, call("refresh_data")) - entry({"admin","services","adbyby","run"},call("act_status")).leaf=true + entry({"admin", "services", "adbyby", "run"}, call("act_status")).leaf = true end function act_status() - local e={} - e.running=luci.sys.call("pgrep adbyby >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("pgrep adbyby >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end function refresh_data() -local set =luci.http.formvalue("set") -local icount =0 + local set =luci.http.formvalue("set") + local icount =0 if set == "rule_data" then luci.sys.exec("/usr/share/adbyby/rule-update") diff --git a/package/lean/luci-app-airplay2/luasrc/controller/shairport-sync.lua b/package/lean/luci-app-airplay2/luasrc/controller/shairport-sync.lua index 22d0ffa0e..177351c32 100644 --- a/package/lean/luci-app-airplay2/luasrc/controller/shairport-sync.lua +++ b/package/lean/luci-app-airplay2/luasrc/controller/shairport-sync.lua @@ -9,14 +9,12 @@ function index() end entry({"admin", "services", "shairport-sync"}, cbi("shairport-sync"), _("AirPlay 2 Receiver")).dependent = true - - entry({"admin","services","shairport-sync","run"},call("act_status")).leaf=true - + entry({"admin", "services", "shairport-sync", "run"}, call("act_status")).leaf = true end function act_status() - local e={} - e.running=luci.sys.call("pgrep shairport-sync >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("pgrep shairport-sync >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end diff --git a/package/lean/luci-app-amule/luasrc/controller/amule.lua b/package/lean/luci-app-amule/luasrc/controller/amule.lua index 1728c4eaa..98465aa39 100644 --- a/package/lean/luci-app-amule/luasrc/controller/amule.lua +++ b/package/lean/luci-app-amule/luasrc/controller/amule.lua @@ -19,17 +19,14 @@ function index() return end - entry({"admin", "nas"}, firstchild(), "NAS", 45).dependent = false - - local page = entry({"admin", "nas", "amule"}, cbi("amule"), _("aMule Settings")) - page.dependent = true - entry( {"admin", "nas", "amule", "logview"}, call("logread") ).leaf = true - entry( {"admin", "nas", "amule", "status"}, call("get_pid") ).leaf = true - entry( {"admin", "nas", "amule", "amulecmd"}, call("amulecmd") ).leaf = true - entry( {"admin", "nas", "amule", "startstop"}, post("startstop") ).leaf = true - entry( {"admin", "nas", "amule", "down_kad"}, post("down_kad") ).leaf = true - entry( {"admin", "nas", "amule", "down_ed2k"}, post("down_ed2k") ).leaf = true - + entry({"admin", "nas"}, firstchild(), "NAS", 45).dependent = false + entry({"admin", "nas", "amule"}, cbi("amule"), _("aMule Settings")).dependent = true + entry({"admin", "nas", "amule", "logview"}, call("logread")).leaf = true + entry({"admin", "nas", "amule", "status"}, call("get_pid")).leaf = true + entry({"admin", "nas", "amule", "amulecmd"}, call("amulecmd")).leaf = true + entry({"admin", "nas", "amule", "startstop"}, post("startstop")).leaf = true + entry({"admin", "nas", "amule", "down_kad"}, post("down_kad")).leaf = true + entry({"admin", "nas", "amule", "down_ed2k"}, post("down_ed2k")).leaf = true end -- called by XHR.get from detail_logview.htm @@ -69,50 +66,50 @@ end function down_kad() url = uci:get("amule", "main", "kad_nodes_url") - data_path = configdir .. "/nodes.dat" - proto = string.gsub(url, "://%S*", "") - proto_opt = ( proto == "https" ) and " --no-check-certificate" or "" - cmd = "wget -O /tmp/down_nodes.dat \"" .. url .. "\"" .. proto_opt .. - " && cat /tmp/down_nodes.dat > " .. "\"" .. data_path .. "\"" - luci.sys.call(cmd) + data_path = configdir .. "/nodes.dat" + proto = string.gsub(url, "://%S*", "") + proto_opt = ( proto == "https" ) and " --no-check-certificate" or "" + cmd = "wget -O /tmp/down_nodes.dat \"" .. url .. "\"" .. proto_opt .. + " && cat /tmp/down_nodes.dat > " .. "\"" .. data_path .. "\"" + luci.sys.call(cmd) end function down_ed2k() url = uci:get("amule", "main", "ed2k_servers_url") data_path = configdir .. "/server.met" - proto = string.gsub(url, "://%S*", "") - proto_opt = ( proto == "https" ) and " --no-check-certificate" or "" - cmd = "wget -O /tmp/down_server.met \"" .. url .. "\"" .. proto_opt .. - " && cat /tmp/down_server.met > " .. "\"" .. data_path .. "\"" - luci.sys.call(cmd) + proto = string.gsub(url, "://%S*", "") + proto_opt = ( proto == "https" ) and " --no-check-certificate" or "" + cmd = "wget -O /tmp/down_server.met \"" .. url .. "\"" .. proto_opt .. + " && cat /tmp/down_server.met > " .. "\"" .. data_path .. "\"" + luci.sys.call(cmd) end -- called by XHR.poll from detail_startstop.htm -- and from lua (with parameter "true") function get_pid(from_lua) local pid_amuled = tonumber(luci.sys.exec("pidof amuled")) or 0 - local amuled_stat =false + local amuled_stat =false if pid_amuled > 0 and not nixio.kill(pid_amuled, 0) then pid_amuled = 0 end - if pid_amuled > 0 then - amuled_stat =true - else - amuled_stat =false - end + if pid_amuled > 0 then + amuled_stat =true + else + amuled_stat =false + end local pid_amuleweb = tonumber(luci.sys.exec("pidof amuleweb")) or 0 - local amuleweb_stat = false + local amuleweb_stat = false if pid_amuleweb > 0 and not nixio.kill(pid_amuleweb, 0) then pid_amuleweb = 0 end - if pid_amuleweb > 0 then - amuleweb_stat =true - else - amuleweb_stat =false - end + if pid_amuleweb > 0 then + amuleweb_stat =true + else + amuleweb_stat =false + end local status = { amuled = amuled_stat, @@ -128,7 +125,6 @@ function get_pid(from_lua) end end - function amulecmd() local re ="" local rv = { } diff --git a/package/lean/luci-app-arpbind/luasrc/controller/arpbind.lua b/package/lean/luci-app-arpbind/luasrc/controller/arpbind.lua index 2358fa50a..b35fbcd62 100644 --- a/package/lean/luci-app-arpbind/luasrc/controller/arpbind.lua +++ b/package/lean/luci-app-arpbind/luasrc/controller/arpbind.lua @@ -9,5 +9,6 @@ function index() if not nixio.fs.access("/etc/config/arpbind") then return end + entry({"admin", "network", "arpbind"}, cbi("arpbind"), _("IP/MAC Binding"), 45).dependent = true end diff --git a/package/lean/luci-app-autoreboot/luasrc/controller/autoreboot.lua b/package/lean/luci-app-autoreboot/luasrc/controller/autoreboot.lua index e0429f34f..93d3607d7 100644 --- a/package/lean/luci-app-autoreboot/luasrc/controller/autoreboot.lua +++ b/package/lean/luci-app-autoreboot/luasrc/controller/autoreboot.lua @@ -1,4 +1,8 @@ module("luci.controller.autoreboot",package.seeall) function index() -entry({"admin","system","autoreboot"},cbi("autoreboot"),_("Scheduled Reboot"),88) + if not nixio.fs.access("/etc/config/autoreboot") then + return + end + + entry({"admin", "system", "autoreboot"}, cbi("autoreboot"), _("Scheduled Reboot"),88) end diff --git a/package/lean/luci-app-baidupcs-web/luasrc/controller/baidupcs-web.lua b/package/lean/luci-app-baidupcs-web/luasrc/controller/baidupcs-web.lua index 805269dd1..146eda920 100644 --- a/package/lean/luci-app-baidupcs-web/luasrc/controller/baidupcs-web.lua +++ b/package/lean/luci-app-baidupcs-web/luasrc/controller/baidupcs-web.lua @@ -4,8 +4,9 @@ function index() if not nixio.fs.access("/etc/config/baidupcs-web") then return end + entry({"admin", "nas", "baidupcs-web"}, cbi("baidupcs-web"), _("BaiduPCS Web"), 300).dependent = true - entry({"admin","nas","baidupcs-web","status"},call("act_status")).leaf=true + entry({"admin", "nas", "baidupcs-web", "status"}, call("act_status")).leaf = true end function act_status() diff --git a/package/lean/luci-app-cifs-mount/luasrc/controller/cifs.lua b/package/lean/luci-app-cifs-mount/luasrc/controller/cifs.lua index 5164e1f51..9594b6709 100644 --- a/package/lean/luci-app-cifs-mount/luasrc/controller/cifs.lua +++ b/package/lean/luci-app-cifs-mount/luasrc/controller/cifs.lua @@ -5,9 +5,6 @@ function index() if not nixio.fs.access("/etc/config/cifs") then return end - - local page - - page = entry({"admin", "nas", "cifs"}, cbi("cifs"), _("Mount SMB NetShare")) - page.dependent = true + + entry({"admin", "nas", "cifs"}, cbi("cifs"), _("Mount SMB NetShare")).dependent = true end diff --git a/package/lean/luci-app-cifsd/luasrc/controller/cifsd.lua b/package/lean/luci-app-cifsd/luasrc/controller/cifsd.lua index a0a59dfe1..5777a1f8e 100644 --- a/package/lean/luci-app-cifsd/luasrc/controller/cifsd.lua +++ b/package/lean/luci-app-cifsd/luasrc/controller/cifsd.lua @@ -7,11 +7,6 @@ function index() return end - entry({"admin","nas"},firstchild(),"NAS",44).dependent=false - - local page - - page = entry({"admin", "nas", "cifsd"}, cbi("cifsd"), _("Network Shares")) - page.dependent = true + entry({"admin", "nas"}, firstchild(),"NAS", 44).dependent = false + entry({"admin", "nas", "cifsd"}, cbi("cifsd"), _("Network Shares")).dependent = true end - diff --git a/package/lean/luci-app-cpufreq/luasrc/controller/cpufreq.lua b/package/lean/luci-app-cpufreq/luasrc/controller/cpufreq.lua index 1b13e01a2..cba0b52d8 100644 --- a/package/lean/luci-app-cpufreq/luasrc/controller/cpufreq.lua +++ b/package/lean/luci-app-cpufreq/luasrc/controller/cpufreq.lua @@ -6,5 +6,5 @@ function index() return end - entry({"admin", "services", "cpufreq"}, cbi("cpufreq"), _("CPU Freq"), 900).dependent=false + entry({"admin", "services", "cpufreq"}, cbi("cpufreq"), _("CPU Freq"), 900).dependent = false end diff --git a/package/lean/luci-app-dnsforwarder/luasrc/controller/dnsforwarder.lua b/package/lean/luci-app-dnsforwarder/luasrc/controller/dnsforwarder.lua index a04c8b1f3..115871d99 100644 --- a/package/lean/luci-app-dnsforwarder/luasrc/controller/dnsforwarder.lua +++ b/package/lean/luci-app-dnsforwarder/luasrc/controller/dnsforwarder.lua @@ -1,10 +1,10 @@ -module("luci.controller.dnsforwarder", package.seeall) -function index() - if not nixio.fs.access("/etc/config/dnsforwarder") then - return - end - entry({"admin", "services", "dnsforwarder"},alias("admin", "services", "dnsforwarder","general"),_("Dnsforwarder")).dependent = true - entry({"admin", "services", "dnsforwarder","general"}, cbi("dnsforwarder/general"),_("General"),10).leaf = true - entry({"admin", "services", "dnsforwarder","log"}, cbi("dnsforwarder/log"),_("LOG"),30).leaf = true - +module("luci.controller.dnsforwarder", package.seeall) +function index() + if not nixio.fs.access("/etc/config/dnsforwarder") then + return + end + + entry({"admin", "services", "dnsforwarder"}, alias("admin", "services", "dnsforwarder", "general"), _("Dnsforwarder")).dependent = true + entry({"admin", "services", "dnsforwarder", "general"}, cbi("dnsforwarder/general"), _("General") ,10).leaf = true + entry({"admin", "services", "dnsforwarder", "log"}, cbi("dnsforwarder/log"), _("LOG"), 30).leaf = true end \ No newline at end of file diff --git a/package/lean/luci-app-docker/luasrc/controller/docker.lua b/package/lean/luci-app-docker/luasrc/controller/docker.lua index 93b8f6618..31d531ac8 100644 --- a/package/lean/luci-app-docker/luasrc/controller/docker.lua +++ b/package/lean/luci-app-docker/luasrc/controller/docker.lua @@ -6,12 +6,12 @@ function index() end entry({"admin", "services", "docker"}, cbi("docker"), _("Docker CE Container"), 199).dependent = true - entry({"admin","services","docker","status"},call("act_status")).leaf=true + entry({"admin", "services", "docker", "status"}, call("act_status")).leaf = true end function act_status() - local e={} - e.running=luci.sys.call("pgrep /usr/bin/dockerd >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("pgrep /usr/bin/dockerd >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end \ No newline at end of file diff --git a/package/lean/luci-app-familycloud/luasrc/controller/familycloud.lua b/package/lean/luci-app-familycloud/luasrc/controller/familycloud.lua index 0270652c7..8d3a77218 100644 --- a/package/lean/luci-app-familycloud/luasrc/controller/familycloud.lua +++ b/package/lean/luci-app-familycloud/luasrc/controller/familycloud.lua @@ -6,18 +6,18 @@ function index() return end - entry({"admin", "services", "familycloud"},firstchild(), _("天翼家庭云/云盘提速"), 80).dependent = false + entry({"admin", "services", "familycloud"}, firstchild(), _("天翼家庭云/云盘提速"), 80).dependent = false - entry({"admin", "services", "familycloud", "general"},cbi("familycloud/familycloud"), _("Base Setting"), 1) - entry({"admin", "services", "familycloud", "log"},form("familycloud/familycloudlog"), _("Log"), 2) - - entry({"admin","services","familycloud","status"},call("act_status")).leaf=true + entry({"admin", "services", "familycloud", "general"}, cbi("familycloud/familycloud"), _("Base Setting"), 1) + entry({"admin", "services", "familycloud", "log"}, form("familycloud/familycloudlog"), _("Log"), 2) + + entry({"admin", "services", "familycloud", "status"}, call("act_status")).leaf = true end function act_status() - local e={} - e.running=luci.sys.call("ps | grep speedup.sh | grep -v grep >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("ps | grep speedup.sh | grep -v grep >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end diff --git a/package/lean/luci-app-filetransfer/luasrc/controller/filetransfer.lua b/package/lean/luci-app-filetransfer/luasrc/controller/filetransfer.lua index 8ff7a5427..d79806928 100644 --- a/package/lean/luci-app-filetransfer/luasrc/controller/filetransfer.lua +++ b/package/lean/luci-app-filetransfer/luasrc/controller/filetransfer.lua @@ -8,5 +8,6 @@ Modify: ayongwifi@126.com www.openwrtdl.com module("luci.controller.filetransfer", package.seeall) function index() - entry({"admin", "system", "filetransfer"}, form("filetransfer"), _("FileTransfer"),89) + + entry({"admin", "system", "filetransfer"}, form("filetransfer"), _("FileTransfer"), 89) end diff --git a/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua b/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua index e837d96d4..b59d9509e 100644 --- a/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua +++ b/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua @@ -4,11 +4,8 @@ function index() if not nixio.fs.access("/etc/config/flowoffload") then return end - local page - page = entry({"admin", "network", "flowoffload"}, cbi("flowoffload"), _("Turbo ACC Center"), 1001) - page.i18n = "flowoffload" - page.dependent = true + entry({"admin", "network", "flowoffload"}, cbi("flowoffload"), _("Turbo ACC Center"), 1001).dependent = true entry({"admin", "network", "flowoffload", "status"}, call("action_status")) end diff --git a/package/lean/luci-app-frpc/luasrc/controller/frp.lua b/package/lean/luci-app-frpc/luasrc/controller/frp.lua index 41df2c8cb..f2adb9266 100644 --- a/package/lean/luci-app-frpc/luasrc/controller/frp.lua +++ b/package/lean/luci-app-frpc/luasrc/controller/frp.lua @@ -5,14 +5,14 @@ function index() return end - entry({"admin","services","frp"},cbi("frp/frp"), _("Frp Setting"),100).dependent=true - entry({"admin","services","frp","config"},cbi("frp/config")).leaf=true - entry({"admin","services","frp","status"},call("status")).leaf=true + entry({"admin", "services", "frp"}, cbi("frp/frp"), _("Frp Setting"), 100).dependent = true + entry({"admin", "services", "frp", "config"}, cbi("frp/config")).leaf = true + entry({"admin", "services", "frp", "status"}, call("status")).leaf = true end function status() -local e={} -e.running=luci.sys.call("pidof frpc > /dev/null")==0 -luci.http.prepare_content("application/json") -luci.http.write_json(e) + local e={} + e.running=luci.sys.call("pidof frpc > /dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end diff --git a/package/lean/luci-app-frps/luasrc/controller/frps.lua b/package/lean/luci-app-frps/luasrc/controller/frps.lua index e9c15cd77..6662ea6cf 100644 --- a/package/lean/luci-app-frps/luasrc/controller/frps.lua +++ b/package/lean/luci-app-frps/luasrc/controller/frps.lua @@ -12,14 +12,10 @@ function index() return end - entry({"admin", "services", "frps"}, - firstchild(), _("Frps")).dependent = false + entry({"admin", "services", "frps"}, firstchild(), _("Frps")).dependent = false - entry({"admin", "services", "frps", "common"}, - cbi("frps/common"), _("Settings"), 1) - - entry({"admin", "services", "frps", "server"}, - cbi("frps/server"), _("Server"), 2).leaf = true + entry({"admin", "services", "frps", "common"}, cbi("frps/common"), _("Settings"), 1) + entry({"admin", "services", "frps", "server"}, cbi("frps/server"), _("Server"), 2).leaf = true entry({"admin", "services", "frps", "status"}, call("action_status")) end diff --git a/package/lean/luci-app-guest-wifi/luasrc/controller/guest-wifi.lua b/package/lean/luci-app-guest-wifi/luasrc/controller/guest-wifi.lua index 887512f6a..27f5d3896 100644 --- a/package/lean/luci-app-guest-wifi/luasrc/controller/guest-wifi.lua +++ b/package/lean/luci-app-guest-wifi/luasrc/controller/guest-wifi.lua @@ -1,14 +1,9 @@ module("luci.controller.guest-wifi", package.seeall) function index() - require("luci.i18n") - luci.i18n.loadc("guest-wifi") if not nixio.fs.access("/etc/config/guest-wifi") then return end - local page = entry({"admin", "network", "guest-wifi"}, cbi("guest-wifi"), translate("Guest-wifi"), 19) - page.i18n = "guest-wifi" - page.dependent = true - + entry({"admin", "network", "guest-wifi"}, cbi("guest-wifi"), translate("Guest-wifi"), 19).dependent = true end diff --git a/package/lean/luci-app-haproxy-tcp/luasrc/controller/haproxy.lua b/package/lean/luci-app-haproxy-tcp/luasrc/controller/haproxy.lua index 5549e754b..7beb8cf43 100755 --- a/package/lean/luci-app-haproxy-tcp/luasrc/controller/haproxy.lua +++ b/package/lean/luci-app-haproxy-tcp/luasrc/controller/haproxy.lua @@ -1,7 +1,8 @@ module("luci.controller.haproxy", package.seeall) function index() - if not nixio.fs.access("/etc/config/haproxy") then - return - end - entry({"admin", "services", "haproxy"}, cbi("haproxy"), _("HAProxy")).dependent = true + if not nixio.fs.access("/etc/config/haproxy") then + return + end + + entry({"admin", "services", "haproxy"}, cbi("haproxy"), _("HAProxy")).dependent = true end \ No newline at end of file diff --git a/package/lean/luci-app-ipsec-vpnd/luasrc/controller/ipsec-server.lua b/package/lean/luci-app-ipsec-vpnd/luasrc/controller/ipsec-server.lua index 2925194c6..8b8000883 100644 --- a/package/lean/luci-app-ipsec-vpnd/luasrc/controller/ipsec-server.lua +++ b/package/lean/luci-app-ipsec-vpnd/luasrc/controller/ipsec-server.lua @@ -7,13 +7,13 @@ function index() end entry({"admin", "vpn"}, firstchild(), "VPN", 45).dependent = false - entry({"admin", "vpn", "ipsec-server"}, cbi("ipsec-server/ipsec-server"), _("IPSec VPN Server"), 80).dependent=false - entry({"admin", "vpn", "ipsec-server","status"},call("act_status")).leaf=true + entry({"admin", "vpn", "ipsec-server"}, cbi("ipsec-server/ipsec-server"), _("IPSec VPN Server"), 80).dependent = false + entry({"admin", "vpn", "ipsec-server", "status"}, call("act_status")).leaf = true end function act_status() - local e={} - e.running=luci.sys.call("pgrep ipsec >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("pgrep ipsec >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end diff --git a/package/lean/luci-app-kodexplorer/LICENSE b/package/lean/luci-app-kodexplorer/LICENSE deleted file mode 100644 index e72bfddab..000000000 --- a/package/lean/luci-app-kodexplorer/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. \ No newline at end of file diff --git a/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua b/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua index b8b2347c8..911340be9 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua +++ b/package/lean/luci-app-kodexplorer/luasrc/controller/kodexplorer.lua @@ -5,42 +5,44 @@ local http = require "luci.http" local api = require "luci.model.cbi.kodexplorer.api" function index() - if not nixio.fs.access("/etc/config/kodexplorer") then return end + if not nixio.fs.access("/etc/config/kodexplorer") then + return + end - entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false - entry({"admin", "nas", "kodexplorer"}, cbi("kodexplorer/settings"), _("KodExplorer"), 3).dependent = true + entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false + entry({"admin", "nas", "kodexplorer"}, cbi("kodexplorer/settings"), _("KodExplorer"), 3).dependent = true - entry({"admin", "nas", "kodexplorer", "check"}, call("action_check")).leaf = true - entry({"admin", "nas", "kodexplorer", "download"}, call("action_download")).leaf = true - entry({"admin", "nas", "kodexplorer", "status"}, call("act_status")).leaf = true + entry({"admin", "nas", "kodexplorer", "check"}, call("action_check")).leaf = true + entry({"admin", "nas", "kodexplorer", "download"}, call("action_download")).leaf = true + entry({"admin", "nas", "kodexplorer", "status"}, call("act_status")).leaf = true end local function http_write_json(content) - http.prepare_content("application/json") - http.write_json(content or {code = 1}) + http.prepare_content("application/json") + http.write_json(content or {code = 1}) end function act_status() - local e = {} - e.nginx_status = luci.sys.call("ps -w | grep nginx | grep kodexplorer | grep -v grep > /dev/null") == 0 - e.php_status = luci.sys.call("ps -w | grep php | grep kodexplorer | grep -v grep > /dev/null") == 0 - http_write_json(e) + local e = {} + e.nginx_status = luci.sys.call("ps -w | grep nginx | grep kodexplorer | grep -v grep > /dev/null") == 0 + e.php_status = luci.sys.call("ps -w | grep php | grep kodexplorer | grep -v grep > /dev/null") == 0 + http_write_json(e) end function action_check() - local json = api.to_check() - http_write_json(json) + local json = api.to_check() + http_write_json(json) end function action_download() - local json = nil - local task = http.formvalue("task") - if task == "extract" then - json = api.to_extract(http.formvalue("file")) - elseif task == "move" then - json = api.to_move(http.formvalue("file")) - else - json = api.to_download(http.formvalue("url")) - end - http_write_json(json) + local json = nil + local task = http.formvalue("task") + if task == "extract" then + json = api.to_extract(http.formvalue("file")) + elseif task == "move" then + json = api.to_move(http.formvalue("file")) + else + json = api.to_download(http.formvalue("url")) + end + http_write_json(json) end diff --git a/package/lean/luci-app-music-remote-center/luasrc/controller/forked-daapd.lua b/package/lean/luci-app-music-remote-center/luasrc/controller/forked-daapd.lua index 744c54e8f..9f07e77c8 100644 --- a/package/lean/luci-app-music-remote-center/luasrc/controller/forked-daapd.lua +++ b/package/lean/luci-app-music-remote-center/luasrc/controller/forked-daapd.lua @@ -1,5 +1,4 @@ - module("luci.controller.forked-daapd", package.seeall) function index() @@ -8,14 +7,12 @@ function index() end entry({"admin", "nas", "forked-daapd"}, cbi("forked-daapd"), _("Music Remote Center")).dependent = true - - entry({"admin","nas","forked-daapd","run"},call("act_status")).leaf=true - + entry({"admin", "nas", "forked-daapd", "run"}, call("act_status")).leaf = true end function act_status() - local e={} - e.running=luci.sys.call("pgrep forked-daapd >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("pgrep forked-daapd >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end \ No newline at end of file diff --git a/package/lean/luci-app-mwan3helper/luasrc/controller/mwan3helper.lua b/package/lean/luci-app-mwan3helper/luasrc/controller/mwan3helper.lua index f2068d228..9ddc22219 100644 --- a/package/lean/luci-app-mwan3helper/luasrc/controller/mwan3helper.lua +++ b/package/lean/luci-app-mwan3helper/luasrc/controller/mwan3helper.lua @@ -8,20 +8,15 @@ function index() return end - - entry({"admin", "services", "mwan3helper"},alias("admin", "services", "mwan3helper", "client"),_("MWAN3 Helper"), 300).dependent = true - - entry({"admin", "services", "mwan3helper", "client"},cbi("mwan3helper/client"),_("Settings"), 10).leaf = true - - entry({"admin", "services", "mwan3helper", "lists"},cbi("mwan3helper/list"),_("IPSet Lists"), 20).leaf = true - - entry({"admin","services","mwan3helper","status"},call("act_status")).leaf=true - + entry({"admin", "services", "mwan3helper"}, alias("admin", "services", "mwan3helper", "client"), _("MWAN3 Helper"), 300).dependent = true + entry({"admin", "services", "mwan3helper", "client"}, cbi("mwan3helper/client"), _("Settings"), 10).leaf = true + entry({"admin", "services", "mwan3helper", "lists"}, cbi("mwan3helper/list"), _("IPSet Lists"), 20).leaf = true + entry({"admin", "services", "mwan3helper", "status"}, call("act_status")).leaf = true end function act_status() - local e={} - e.running=luci.sys.call("pgrep mwan3dns >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("pgrep mwan3dns >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end diff --git a/package/lean/luci-app-n2n_v2/luasrc/controller/n2n_v2.lua b/package/lean/luci-app-n2n_v2/luasrc/controller/n2n_v2.lua index b761feec5..637aa1ff5 100644 --- a/package/lean/luci-app-n2n_v2/luasrc/controller/n2n_v2.lua +++ b/package/lean/luci-app-n2n_v2/luasrc/controller/n2n_v2.lua @@ -12,10 +12,7 @@ function index() entry({"admin", "vpn"}, firstchild(), "VPN", 45).dependent = false entry({"admin", "vpn", "n2n_v2", "status"}, call("n2n_status")).leaf = true - - local page - page = entry({"admin", "vpn", "n2n_v2"}, cbi("n2n_v2"), _("N2N v2 VPN"), 45) - page.dependent = true + entry({"admin", "vpn", "n2n_v2"}, cbi("n2n_v2"), _("N2N v2 VPN"), 45).dependent = true end function n2n_status() diff --git a/package/lean/luci-app-netdata/luasrc/controller/netdata.lua b/package/lean/luci-app-netdata/luasrc/controller/netdata.lua index 84d9b8e73..975255860 100644 --- a/package/lean/luci-app-netdata/luasrc/controller/netdata.lua +++ b/package/lean/luci-app-netdata/luasrc/controller/netdata.lua @@ -2,5 +2,5 @@ module("luci.controller.netdata", package.seeall) function index() - entry({"admin","status","netdata"},template("netdata/netdata"),_("NetData"),10).leaf=true + entry({"admin", "status", "netdata"}, template("netdata/netdata"), _("NetData"), 10).leaf = true end \ No newline at end of file diff --git a/package/lean/luci-app-nfs/luasrc/controller/nfs.lua b/package/lean/luci-app-nfs/luasrc/controller/nfs.lua index 9807fb213..60fab8d81 100644 --- a/package/lean/luci-app-nfs/luasrc/controller/nfs.lua +++ b/package/lean/luci-app-nfs/luasrc/controller/nfs.lua @@ -4,5 +4,6 @@ function index() if not nixio.fs.access("/etc/config/nfs") then return end + entry({"admin", "nas", "nfs"}, cbi("nfs"), _("NFS Manage"), 5).dependent = true end diff --git a/package/lean/luci-app-nft-qos/luasrc/controller/nft-qos.lua b/package/lean/luci-app-nft-qos/luasrc/controller/nft-qos.lua index 637eb1173..2fb6e1024 100644 --- a/package/lean/luci-app-nft-qos/luasrc/controller/nft-qos.lua +++ b/package/lean/luci-app-nft-qos/luasrc/controller/nft-qos.lua @@ -8,12 +8,9 @@ function index() return end - entry({"admin", "status", "realtime", "rate"}, - template("nft-qos/rate"), _("Rate"), 5).leaf = true - entry({"admin", "status", "realtime", "rate_status"}, - call("action_rate")).leaf = true - entry({"admin", "services", "nft-qos"}, cbi("nft-qos/nft-qos"), - _("Qos over Nftables"), 60) + entry({"admin", "status", "realtime", "rate"}, template("nft-qos/rate"), _("Rate"), 5).leaf = true + entry({"admin", "status", "realtime", "rate_status"}, call("action_rate")).leaf = true + entry({"admin", "services", "nft-qos"}, cbi("nft-qos/nft-qos"), _("Qos over Nftables"), 60) end function _action_rate(rv, n) diff --git a/package/lean/luci-app-nps/luasrc/controller/nps.lua b/package/lean/luci-app-nps/luasrc/controller/nps.lua index 04fb7ced2..de4c3c276 100755 --- a/package/lean/luci-app-nps/luasrc/controller/nps.lua +++ b/package/lean/luci-app-nps/luasrc/controller/nps.lua @@ -1,17 +1,16 @@ module("luci.controller.nps",package.seeall) function index() -if not nixio.fs.access("/etc/config/nps")then -return -end -local e -e=entry({"admin","services","nps"},cbi("nps"),_("Nps Setting"),100) -e.i18n="nps" -e.dependent=true -entry({"admin","services","nps","status"},call("status")).leaf=true + if not nixio.fs.access("/etc/config/nps") then + return + end + + entry({"admin", "services", "nps"}, cbi("nps"), _("Nps Setting"), 100).dependent = true + entry({"admin", "services", "nps", "status"}, call("status")).leaf = true end + function status() -local e={} -e.running=luci.sys.call("pgrep npc > /dev/null")==0 -luci.http.prepare_content("application/json") -luci.http.write_json(e) + local e={} + e.running=luci.sys.call("pgrep npc > /dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end diff --git a/package/lean/luci-app-openvpn-server/luasrc/controller/openvpn-server.lua b/package/lean/luci-app-openvpn-server/luasrc/controller/openvpn-server.lua index 3d05765f3..ddcda3d52 100644 --- a/package/lean/luci-app-openvpn-server/luasrc/controller/openvpn-server.lua +++ b/package/lean/luci-app-openvpn-server/luasrc/controller/openvpn-server.lua @@ -7,16 +7,13 @@ function index() end entry({"admin", "vpn"}, firstchild(), "VPN", 45).dependent = false - - local page - - entry({"admin", "vpn", "openvpn-server"}, cbi("openvpn-server/openvpn-server"), _("OpenVPN Server"), 80).dependent=false - entry({"admin", "vpn", "openvpn-server","status"},call("act_status")).leaf=true + entry({"admin", "vpn", "openvpn-server"}, cbi("openvpn-server/openvpn-server"), _("OpenVPN Server"), 80).dependent = false + entry({"admin", "vpn", "openvpn-server", "status"}, call("act_status")).leaf = true end function act_status() - local e={} - e.running=luci.sys.call("pgrep openvpn >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("pgrep openvpn >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end \ No newline at end of file diff --git a/package/lean/luci-app-pppoe-relay/luasrc/controller/pppoe-relay.lua b/package/lean/luci-app-pppoe-relay/luasrc/controller/pppoe-relay.lua index f3a2760e7..0a23768a6 100644 --- a/package/lean/luci-app-pppoe-relay/luasrc/controller/pppoe-relay.lua +++ b/package/lean/luci-app-pppoe-relay/luasrc/controller/pppoe-relay.lua @@ -1,10 +1,9 @@ module("luci.controller.pppoe-relay",package.seeall) function index() - if not nixio.fs.access("/etc/config/pppoe-relay")then - return -end + if not nixio.fs.access("/etc/config/pppoe-relay") then + return + end -entry({"admin","services","pppoe-relay"},cbi("pppoe-relay"),_("PPPoE Relay"),90).dependent=true - -end \ No newline at end of file + entry({"admin", "services", "pppoe-relay"}, cbi("pppoe-relay"), _("PPPoE Relay"), 90).dependent = true +end \ No newline at end of file diff --git a/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua b/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua index 66dc6307a..737af05fa 100644 --- a/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua +++ b/package/lean/luci-app-ps3netsrv/luasrc/controller/ps3netsrv.lua @@ -1,21 +1,18 @@ module("luci.controller.ps3netsrv",package.seeall) function index() -if not nixio.fs.access("/etc/config/ps3netsrv")then - return -end + if not nixio.fs.access("/etc/config/ps3netsrv") then + return + end -entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false - -local page - -entry({"admin", "nas","ps3netsrv"},cbi("ps3netsrv"),_("PS3 NET Server"),40).dependent=true -entry({"admin", "nas","ps3netsrv","status"},call("act_status")).leaf=true + entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false + entry({"admin", "nas", "ps3netsrv"}, cbi("ps3netsrv"), _("PS3 NET Server"), 40).dependent = true + entry({"admin", "nas", "ps3netsrv", "status"}, call("act_status")).leaf = true end function act_status() - local e={} - e.running=luci.sys.call("ps | grep ps3netsrv |grep -v grep >/dev/null") == 0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("ps | grep ps3netsrv |grep -v grep >/dev/null") == 0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end diff --git a/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua b/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua index 77d58b971..eab196270 100644 --- a/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua +++ b/package/lean/luci-app-qbittorrent/luasrc/controller/qbittorrent.lua @@ -1,16 +1,17 @@ module("luci.controller.qbittorrent",package.seeall) function index() - if not nixio.fs.access("/etc/config/qbittorrent")then - return - end - entry({"admin","nas","qBittorrent"},cbi("qbittorrent"),_("qBittorrent")) - entry({"admin","nas","qBittorrent","status"},call("act_status")).leaf=true + if not nixio.fs.access("/etc/config/qbittorrent") then + return + end + + entry({"admin", "nas", "qBittorrent"}, cbi("qbittorrent"), _("qBittorrent")) + entry({"admin", "nas", "qBittorrent", "status"}, call("act_status")).leaf = true end function act_status() - local e={} - e.running=luci.sys.call("pgrep qbittorrent-nox >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("pgrep qbittorrent-nox >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end \ No newline at end of file diff --git a/package/lean/luci-app-ramfree/luasrc/controller/release_ram.lua b/package/lean/luci-app-ramfree/luasrc/controller/release_ram.lua index 17e95ce40..cf9cde080 100644 --- a/package/lean/luci-app-ramfree/luasrc/controller/release_ram.lua +++ b/package/lean/luci-app-ramfree/luasrc/controller/release_ram.lua @@ -1,8 +1,10 @@ module("luci.controller.release_ram",package.seeall) function index() - entry({"admin","status","release_ram"}, call("release_ram"), _("Release Ram"), 9999) + + entry({"admin", "status", "release_ram"}, call("release_ram"), _("Release Ram"), 9999) end + function release_ram() luci.sys.call("sync && echo 3 > /proc/sys/vm/drop_caches") luci.http.redirect(luci.dispatcher.build_url("admin/status")) diff --git a/package/lean/luci-app-rclone/luasrc/controller/rclone.lua b/package/lean/luci-app-rclone/luasrc/controller/rclone.lua index 5b1028066..fab9ae4d3 100644 --- a/package/lean/luci-app-rclone/luasrc/controller/rclone.lua +++ b/package/lean/luci-app-rclone/luasrc/controller/rclone.lua @@ -1,7 +1,10 @@ module("luci.controller.rclone", package.seeall) function index() - if not nixio.fs.access("/etc/config/rclone") then return end + if not nixio.fs.access("/etc/config/rclone") then + return + end + entry({"admin", "nas"}, firstchild(), _("NAS") , 45).dependent = false - entry({"admin", "nas", "rclone"}, cbi("rclone"), _("Rclone"), 100 ).dependent = false + entry({"admin", "nas", "rclone"}, cbi("rclone"), _("Rclone"), 100).dependent = false end diff --git a/package/lean/luci-app-samba4/luasrc/controller/samba4.lua b/package/lean/luci-app-samba4/luasrc/controller/samba4.lua index 8ad0e52e3..2de221e98 100644 --- a/package/lean/luci-app-samba4/luasrc/controller/samba4.lua +++ b/package/lean/luci-app-samba4/luasrc/controller/samba4.lua @@ -7,8 +7,5 @@ function index() return end - local page - - page = entry({"admin", "services", "samba4"}, cbi("samba4"), _("Network Shares")) - page.dependent = true + entry({"admin", "services", "samba4"}, cbi("samba4"), _("Network Shares")).dependent = true end diff --git a/package/lean/luci-app-sfe/luasrc/controller/sfe.lua b/package/lean/luci-app-sfe/luasrc/controller/sfe.lua index ab389583d..631d5fc05 100644 --- a/package/lean/luci-app-sfe/luasrc/controller/sfe.lua +++ b/package/lean/luci-app-sfe/luasrc/controller/sfe.lua @@ -4,11 +4,8 @@ function index() if not nixio.fs.access("/etc/config/sfe") then return end - local page - page = entry({"admin", "network", "sfe"}, cbi("sfe"), _("Turbo ACC Center"), 1000) - page.i18n = "sfe" - page.dependent = true - + + entry({"admin", "network", "sfe"}, cbi("sfe"), _("Turbo ACC Center"), 1000).dependent = true entry({"admin", "network", "sfe", "status"}, call("action_status")) end diff --git a/package/lean/luci-app-softethervpn/luasrc/controller/softethervpn.lua b/package/lean/luci-app-softethervpn/luasrc/controller/softethervpn.lua index d4ec9bc88..8a5dd036f 100644 --- a/package/lean/luci-app-softethervpn/luasrc/controller/softethervpn.lua +++ b/package/lean/luci-app-softethervpn/luasrc/controller/softethervpn.lua @@ -1,13 +1,13 @@ module("luci.controller.softethervpn",package.seeall) function index() - if not nixio.fs.access("/etc/config/softethervpn")then + if not nixio.fs.access("/etc/config/softethervpn") then return end - entry({"admin","vpn"}, firstchild(), "VPN", 45).dependent = false - entry({"admin","vpn","softethervpn"},cbi("softethervpn"),_("SoftEther VPN"),50).dependent=true - entry({"admin","vpn","softethervpn","status"},call("status")).leaf=true + entry({"admin", "vpn"}, firstchild(), "VPN", 45).dependent = false + entry({"admin", "vpn", "softethervpn"}, cbi("softethervpn"), _("SoftEther VPN"), 50).dependent = true + entry({"admin", "vpn", "softethervpn", "status"}, call("status")).leaf = true end function status() diff --git a/package/lean/luci-app-ssrserver-python/luasrc/controller/ssrs.lua b/package/lean/luci-app-ssrserver-python/luasrc/controller/ssrs.lua index 281b85de9..29f46f9fb 100644 --- a/package/lean/luci-app-ssrserver-python/luasrc/controller/ssrs.lua +++ b/package/lean/luci-app-ssrserver-python/luasrc/controller/ssrs.lua @@ -1,21 +1,18 @@ module("luci.controller.ssrs",package.seeall) function index() -if not nixio.fs.access("/etc/config/ssrs")then - return -end + if not nixio.fs.access("/etc/config/ssrs") then + return + end -entry({"admin", "vpn"}, firstchild(), "VPN", 45).dependent = false - -local page - -entry({"admin","vpn","ssrs"},cbi("ssrs"),_("SSR Python Server"),4).dependent=true -entry({"admin","vpn","ssrs","status"},call("act_status")).leaf=true + entry({"admin", "vpn"}, firstchild(), "VPN", 45).dependent = false + entry({"admin", "vpn", "ssrs"}, cbi("ssrs"), _("SSR Python Server"), 4).dependent = true + entry({"admin", "vpn", "ssrs", "status"}, call("act_status")).leaf = true end function act_status() - local e={} - e.running=luci.sys.call("ps -w | grep ssrs.json |grep -v grep >/dev/null") == 0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("ps -w | grep ssrs.json |grep -v grep >/dev/null") == 0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end diff --git a/package/lean/luci-app-syncdial/luasrc/controller/syncdial.lua b/package/lean/luci-app-syncdial/luasrc/controller/syncdial.lua index 9e6c70768..1ef74ad0f 100644 --- a/package/lean/luci-app-syncdial/luasrc/controller/syncdial.lua +++ b/package/lean/luci-app-syncdial/luasrc/controller/syncdial.lua @@ -1,14 +1,13 @@ module("luci.controller.syncdial",package.seeall) function index() -if not nixio.fs.access("/etc/config/syncdial")then -return -end -local e -e=entry({"admin","network","syncdial"},cbi("syncdial"),_("多线多拨"),103) -e.dependent=true -e=entry({"admin","network","macvlan_redial"},call("redial"),nil) -e.leaf=true + if not nixio.fs.access("/etc/config/syncdial") then + return + end + + entry({"admin", "network", "syncdial"}, cbi("syncdial"), _("多线多拨"), 103).dependent = true + entry({"admin", "network", "macvlan_redial"}, call("redial"), nil).leaf = true end + function redial() -os.execute("killall -9 pppd") + os.execute("killall -9 pppd") end diff --git a/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua index 2ad39847f..f57543443 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/controller/unblockmusic.lua @@ -6,17 +6,17 @@ function index() return end - entry({"admin", "services", "unblockmusic"},firstchild(), _("Unblock Netease Music"), 50).dependent = false + entry({"admin", "services", "unblockmusic"}, firstchild(), _("Unblock Netease Music"), 50).dependent = false - entry({"admin", "services", "unblockmusic", "general"},cbi("unblockmusic/unblockmusic"), _("Base Setting"), 1) - entry({"admin", "services", "unblockmusic", "log"},form("unblockmusic/unblockmusiclog"), _("Log"), 2) + entry({"admin", "services", "unblockmusic", "general"}, cbi("unblockmusic/unblockmusic"), _("Base Setting"), 1) + entry({"admin", "services", "unblockmusic", "log"}, form("unblockmusic/unblockmusiclog"), _("Log"), 2) - entry({"admin", "services", "unblockmusic", "status"},call("act_status")).leaf=true + entry({"admin", "services", "unblockmusic", "status"}, call("act_status")).leaf = true end function act_status() - local e={} - e.running=luci.sys.call("busybox ps -w | grep UnblockNeteaseMusic | grep -v grep | grep -v logcheck.sh >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("busybox ps -w | grep UnblockNeteaseMusic | grep -v grep | grep -v logcheck.sh >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end diff --git a/package/lean/luci-app-usb-printer/luasrc/controller/usb_printer.lua b/package/lean/luci-app-usb-printer/luasrc/controller/usb_printer.lua index ebcee4f79..c678858da 100644 --- a/package/lean/luci-app-usb-printer/luasrc/controller/usb_printer.lua +++ b/package/lean/luci-app-usb-printer/luasrc/controller/usb_printer.lua @@ -21,9 +21,6 @@ function index() return end - entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false - - local page - - page = entry({"admin", "nas", "usb_printer"}, cbi("usb_printer"), _("USB Printer Server"), 50) + entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false + entry({"admin", "nas", "usb_printer"}, cbi("usb_printer"), _("USB Printer Server"), 50) end diff --git a/package/lean/luci-app-uugamebooster/luasrc/controller/uuplugin.lua b/package/lean/luci-app-uugamebooster/luasrc/controller/uuplugin.lua index f67e4cb7e..f6325d503 100644 --- a/package/lean/luci-app-uugamebooster/luasrc/controller/uuplugin.lua +++ b/package/lean/luci-app-uugamebooster/luasrc/controller/uuplugin.lua @@ -1,15 +1,17 @@ module("luci.controller.uuplugin",package.seeall) function index() - if not nixio.fs.access("/etc/config/uuplugin") then return end + if not nixio.fs.access("/etc/config/uuplugin") then + return + end - entry({"admin", "services", "uuplugin"}, cbi("uuplugin/uuplugin"), ("UU GameAcc"),99).dependent=true - entry({"admin","services","uuplugin","status"},call("act_status")).leaf=true + entry({"admin", "services", "uuplugin"}, cbi("uuplugin/uuplugin"), ("UU GameAcc"), 99).dependent = true + entry({"admin", "services", "uuplugin", "status"}, call("act_status")).leaf = true end function act_status() - local e={} - e.running=luci.sys.call("pgrep -f uuplugin >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("pgrep -f uuplugin >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end diff --git a/package/lean/luci-app-v2ray-server/luasrc/controller/v2ray_server.lua b/package/lean/luci-app-v2ray-server/luasrc/controller/v2ray_server.lua index 10de893a1..9b07df5ab 100644 --- a/package/lean/luci-app-v2ray-server/luasrc/controller/v2ray_server.lua +++ b/package/lean/luci-app-v2ray-server/luasrc/controller/v2ray_server.lua @@ -4,53 +4,56 @@ local http = require "luci.http" local v2ray = require "luci.model.cbi.v2ray_server.api.v2ray" function index() - if not nixio.fs.access("/etc/config/v2ray_server") then return end - entry({"admin", "services", "v2ray_server"}, cbi("v2ray_server/index"), _("V2ray Server"), 3).dependent = true - entry({"admin", "services", "v2ray_server", "config"}, cbi("v2ray_server/user")).leaf = true - entry({"admin", "services", "v2ray_server", "users_status"}, call("users_status")).leaf = true - entry({"admin", "services", "v2ray_server", "check"}, call("v2ray_check")).leaf = true - entry({"admin", "services", "v2ray_server", "update"}, call("v2ray_update")).leaf = true - entry({"admin", "services", "v2ray_server", "get_log"}, call("get_log")).leaf = true - entry({"admin", "services", "v2ray_server", "clear_log"}, call("clear_log")).leaf = true + if not nixio.fs.access("/etc/config/v2ray_server") then + return + end + + entry({"admin", "services", "v2ray_server"}, cbi("v2ray_server/index"), _("V2ray Server"), 3).dependent = true + entry({"admin", "services", "v2ray_server", "config"}, cbi("v2ray_server/user")).leaf = true + entry({"admin", "services", "v2ray_server", "users_status"}, call("users_status")).leaf = true + entry({"admin", "services", "v2ray_server", "check"}, call("v2ray_check")).leaf = true + entry({"admin", "services", "v2ray_server", "update"}, call("v2ray_update")).leaf = true + entry({"admin", "services", "v2ray_server", "get_log"}, call("get_log")).leaf = true + entry({"admin", "services", "v2ray_server", "clear_log"}, call("clear_log")).leaf = true end local function http_write_json(content) - http.prepare_content("application/json") - http.write_json(content or {code = 1}) + http.prepare_content("application/json") + http.write_json(content or {code = 1}) end function get_log() - luci.http.write(luci.sys.exec("[ -f '/var/log/v2ray_server/app.log' ] && cat /var/log/v2ray_server/app.log")) + luci.http.write(luci.sys.exec("[ -f '/var/log/v2ray_server/app.log' ] && cat /var/log/v2ray_server/app.log")) end function clear_log() - luci.sys.call("echo '' > /var/log/v2ray_server/app.log") + luci.sys.call("echo '' > /var/log/v2ray_server/app.log") end function users_status() - local e = {} - e.index = luci.http.formvalue("index") - e.status = luci.sys.call("ps -w| grep -v grep | grep '/var/etc/v2ray_server/" .. luci.http.formvalue("id") .. "' >/dev/null") == 0 - http_write_json(e) + local e = {} + e.index = luci.http.formvalue("index") + e.status = luci.sys.call("ps -w| grep -v grep | grep '/var/etc/v2ray_server/" .. luci.http.formvalue("id") .. "' >/dev/null") == 0 + http_write_json(e) end function v2ray_check() - local json = v2ray.to_check("") - http_write_json(json) + local json = v2ray.to_check("") + http_write_json(json) end function v2ray_update() - local json = nil - local task = http.formvalue("task") - if task == "extract" then - json = - v2ray.to_extract(http.formvalue("file"), http.formvalue("subfix")) - elseif task == "move" then - json = v2ray.to_move(http.formvalue("file")) - else - json = v2ray.to_download(http.formvalue("url")) - end + local json = nil + local task = http.formvalue("task") + if task == "extract" then + json = + v2ray.to_extract(http.formvalue("file"), http.formvalue("subfix")) + elseif task == "move" then + json = v2ray.to_move(http.formvalue("file")) + else + json = v2ray.to_download(http.formvalue("url")) + end - http_write_json(json) + http_write_json(json) end diff --git a/package/lean/luci-app-verysync/luasrc/controller/verysync.lua b/package/lean/luci-app-verysync/luasrc/controller/verysync.lua index 04518d5bb..26d0da7ba 100644 --- a/package/lean/luci-app-verysync/luasrc/controller/verysync.lua +++ b/package/lean/luci-app-verysync/luasrc/controller/verysync.lua @@ -6,7 +6,7 @@ function index() end entry({"admin", "nas", "verysync"}, cbi("verysync"), _("Verysync"), 10).dependent = true - entry({"admin","nas","verysync","status"},call("act_status")).leaf=true + entry({"admin", "nas", "verysync", "status"}, call("act_status")).leaf = true end function act_status() diff --git a/package/lean/luci-app-vlmcsd/luasrc/controller/vlmcsd.lua b/package/lean/luci-app-vlmcsd/luasrc/controller/vlmcsd.lua index f540847cb..2a8ab5b13 100644 --- a/package/lean/luci-app-vlmcsd/luasrc/controller/vlmcsd.lua +++ b/package/lean/luci-app-vlmcsd/luasrc/controller/vlmcsd.lua @@ -4,16 +4,14 @@ function index() if not nixio.fs.access("/etc/config/vlmcsd") then return end - local page - page = entry({"admin", "services", "vlmcsd"}, cbi("vlmcsd"), _("KMS Server"), 100) - page.i18n = "vlmcsd" - page.dependent = true - entry({"admin","services","vlmcsd","status"},call("act_status")).leaf=true + + entry({"admin", "services", "vlmcsd"}, cbi("vlmcsd"), _("KMS Server"), 100).dependent = true + entry({"admin", "services", "vlmcsd", "status"}, call("act_status")).leaf = true end function act_status() - local e={} - e.running=luci.sys.call("pgrep vlmcsd >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("pgrep vlmcsd >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end diff --git a/package/lean/luci-app-vsftpd/luasrc/controller/vsftpd.lua b/package/lean/luci-app-vsftpd/luasrc/controller/vsftpd.lua index de44711dc..5bec1816d 100644 --- a/package/lean/luci-app-vsftpd/luasrc/controller/vsftpd.lua +++ b/package/lean/luci-app-vsftpd/luasrc/controller/vsftpd.lua @@ -22,26 +22,10 @@ function index() end entry({"admin", "nas"}, firstchild(), "NAS", 44).dependent = false - entry({"admin", "nas", "vsftpd"}, - alias("admin", "nas", "vsftpd", "general"), - _("FTP Server")) - - entry({"admin", "nas", "vsftpd", "general"}, - cbi("vsftpd/general"), - _("General Settings"), 10).leaf = true - - entry({"admin", "nas", "vsftpd", "users"}, - cbi("vsftpd/users"), - _("Virtual Users"), 20).leaf = true - - entry({"admin", "nas", "vsftpd", "anonymous"}, - cbi("vsftpd/anonymous"), - _("Anonymous User"), 30).leaf = true - - entry({"admin", "nas", "vsftpd", "log"}, - cbi("vsftpd/log"), - _("Log Settings"), 40).leaf = true - - entry({"admin", "nas", "vsftpd", "item"}, - cbi("vsftpd/item"), nil).leaf = true + entry({"admin", "nas", "vsftpd"}, alias("admin", "nas", "vsftpd", "general"), _("FTP Server")) + entry({"admin", "nas", "vsftpd", "general"}, cbi("vsftpd/general"), _("General Settings"), 10).leaf = true + entry({"admin", "nas", "vsftpd", "users"}, cbi("vsftpd/users"), _("Virtual Users"), 20).leaf = true + entry({"admin", "nas", "vsftpd", "anonymous"}, cbi("vsftpd/anonymous"), _("Anonymous User"), 30).leaf = true + entry({"admin", "nas", "vsftpd", "log"}, cbi("vsftpd/log"), _("Log Settings"), 40).leaf = true + entry({"admin", "nas", "vsftpd", "item"}, cbi("vsftpd/item"), nil).leaf = true end diff --git a/package/lean/luci-app-webadmin/luasrc/controller/webadmin.lua b/package/lean/luci-app-webadmin/luasrc/controller/webadmin.lua index 5e3d17d4d..3da17247b 100644 --- a/package/lean/luci-app-webadmin/luasrc/controller/webadmin.lua +++ b/package/lean/luci-app-webadmin/luasrc/controller/webadmin.lua @@ -8,10 +8,6 @@ function index() return end - local page - - page = entry({"admin", "system", "webadmin"}, cbi("webadmin"), _("Web Admin"), 1) - page.leaf = true - + entry({"admin", "system", "webadmin"}, cbi("webadmin"), _("Web Admin"), 1).leaf = true end diff --git a/package/lean/luci-app-wrtbwmon/luasrc/controller/wrtbwmon.lua b/package/lean/luci-app-wrtbwmon/luasrc/controller/wrtbwmon.lua index be60c32ab..2687e6ad7 100644 --- a/package/lean/luci-app-wrtbwmon/luasrc/controller/wrtbwmon.lua +++ b/package/lean/luci-app-wrtbwmon/luasrc/controller/wrtbwmon.lua @@ -1,43 +1,44 @@ module("luci.controller.wrtbwmon", package.seeall) function index() - entry({"admin", "nlbw", "usage"}, alias("admin", "nlbw", "usage", "details"), _("Usage"), 60) - entry({"admin", "nlbw", "usage", "details"}, template("wrtbwmon/wrtbwmon"), _("Details"), 10).leaf=true - entry({"admin", "nlbw", "usage", "config"}, cbi("wrtbwmon/config"), _("Configuration"), 20).leaf=true - entry({"admin", "nlbw", "usage", "custom"}, form("wrtbwmon/custom"), _("User file"), 30).leaf=true - entry({"admin", "nlbw", "usage", "check_dependency"}, call("check_dependency")).dependent=true - entry({"admin", "nlbw", "usage", "usage_data"}, call("usage_data")).dependent=true - entry({"admin", "nlbw", "usage", "usage_reset"}, call("usage_reset")).dependent=true + + entry({"admin", "nlbw", "usage"}, alias("admin", "nlbw", "usage", "details"), _("Usage"), 60) + entry({"admin", "nlbw", "usage", "details"}, template("wrtbwmon/wrtbwmon"), _("Details"), 10).leaf = true + entry({"admin", "nlbw", "usage", "config"}, cbi("wrtbwmon/config"), _("Configuration"), 20).leaf = true + entry({"admin", "nlbw", "usage", "custom"}, form("wrtbwmon/custom"), _("User file"), 30).leaf = true + entry({"admin", "nlbw", "usage", "check_dependency"}, call("check_dependency")).dependent = true + entry({"admin", "nlbw", "usage", "usage_data"}, call("usage_data")).dependent = true + entry({"admin", "nlbw", "usage", "usage_reset"}, call("usage_reset")).dependent = true end function usage_database_path() - local cursor = luci.model.uci.cursor() - if cursor:get("wrtbwmon", "general", "persist") == "1" then - return "/etc/config/usage.db" - else - return "/tmp/usage.db" - end + local cursor = luci.model.uci.cursor() + if cursor:get("wrtbwmon", "general", "persist") == "1" then + return "/etc/config/usage.db" + else + return "/tmp/usage.db" + end end function check_dependency() - local ret = "0" - if require("luci.model.ipkg").installed('iptables') then - ret = "1" - end - luci.http.prepare_content("text/plain") - luci.http.write(ret) + local ret = "0" + if require("luci.model.ipkg").installed('iptables') then + ret = "1" + end + luci.http.prepare_content("text/plain") + luci.http.write(ret) end function usage_data() - local db = usage_database_path() - local publish_cmd = "wrtbwmon publish " .. db .. " /tmp/usage.htm /etc/config/wrtbwmon.user" - local cmd = "wrtbwmon update " .. db .. " && " .. publish_cmd .. " && cat /tmp/usage.htm" - luci.http.prepare_content("text/html") - luci.http.write(luci.sys.exec(cmd)) + local db = usage_database_path() + local publish_cmd = "wrtbwmon publish " .. db .. " /tmp/usage.htm /etc/config/wrtbwmon.user" + local cmd = "wrtbwmon update " .. db .. " && " .. publish_cmd .. " && cat /tmp/usage.htm" + luci.http.prepare_content("text/html") + luci.http.write(luci.sys.exec(cmd)) end function usage_reset() - local db = usage_database_path() - local ret = luci.sys.call("wrtbwmon update " .. db .. " && rm " .. db) - luci.http.status(204) + local db = usage_database_path() + local ret = luci.sys.call("wrtbwmon update " .. db .. " && rm " .. db) + luci.http.status(204) end diff --git a/package/lean/luci-app-xlnetacc/luasrc/controller/xlnetacc.lua b/package/lean/luci-app-xlnetacc/luasrc/controller/xlnetacc.lua index 1656cce58..f4800b52e 100644 --- a/package/lean/luci-app-xlnetacc/luasrc/controller/xlnetacc.lua +++ b/package/lean/luci-app-xlnetacc/luasrc/controller/xlnetacc.lua @@ -4,13 +4,12 @@ function index() if not nixio.fs.access("/etc/config/xlnetacc") then return end - local e=entry({"admin","services","xlnetacc"},firstchild(),_("XLNetAcc")) - e.dependent=false - e.acl_depends={ "luci-app-xlnetacc" } - entry({"admin","services","xlnetacc","general"},cbi("xlnetacc"),_("Settings"),1) - entry({"admin","services","xlnetacc","log"},template("xlnetacc/logview"),_("Log"),2) - entry({"admin","services","xlnetacc","status"},call("action_status")) - entry({"admin","services","xlnetacc","logdata"},call("action_log")) + + entry({"admin", "services", "xlnetacc"}, firstchild(), _("XLNetAcc")).dependent = false + entry({"admin", "services", "xlnetacc", "general"}, cbi("xlnetacc"), _("Settings"), 1) + entry({"admin", "services", "xlnetacc", "log"}, template("xlnetacc/logview"), _("Log"), 2) + entry({"admin", "services", "xlnetacc", "status"}, call("action_status")) + entry({"admin", "services", "xlnetacc", "logdata"}, call("action_log")) end function action_status() diff --git a/package/lean/luci-app-zerotier/luasrc/controller/zerotier.lua b/package/lean/luci-app-zerotier/luasrc/controller/zerotier.lua index e02a4f793..3ff3eb208 100644 --- a/package/lean/luci-app-zerotier/luasrc/controller/zerotier.lua +++ b/package/lean/luci-app-zerotier/luasrc/controller/zerotier.lua @@ -1,23 +1,23 @@ module("luci.controller.zerotier",package.seeall) function index() - if not nixio.fs.access("/etc/config/zerotier")then -return -end + if not nixio.fs.access("/etc/config/zerotier") then + return + end -entry({"admin","vpn"}, firstchild(), "VPN", 45).dependent = false + entry({"admin","vpn"}, firstchild(), "VPN", 45).dependent = false -entry({"admin", "vpn", "zerotier"},firstchild(), _("ZeroTier")).dependent = false + entry({"admin", "vpn", "zerotier"},firstchild(), _("ZeroTier")).dependent = false -entry({"admin", "vpn", "zerotier", "general"},cbi("zerotier/settings"), _("Base Setting"), 1) -entry({"admin", "vpn", "zerotier", "log"},form("zerotier/info"), _("Interface Info"), 2) + entry({"admin", "vpn", "zerotier", "general"}, cbi("zerotier/settings"), _("Base Setting"), 1) + entry({"admin", "vpn", "zerotier", "log"}, form("zerotier/info"), _("Interface Info"), 2) -entry({"admin","vpn","zerotier","status"},call("act_status")) + entry({"admin", "vpn", "zerotier", "status"}, call("act_status")) end function act_status() -local e={} - e.running=luci.sys.call("pgrep /usr/bin/zerotier-one >/dev/null")==0 - luci.http.prepare_content("application/json") - luci.http.write_json(e) + local e={} + e.running=luci.sys.call("pgrep /usr/bin/zerotier-one >/dev/null")==0 + luci.http.prepare_content("application/json") + luci.http.write_json(e) end