From c5c21368f284e3f8baf55739336ba70cbad5db95 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 00:26:46 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=BD=20Sync=202024-05-31=2000:26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../luasrc/model/cbi/passwall/client/acl.lua | 1 - .../model/cbi/passwall/client/acl_config.lua | 1 - .../model/cbi/passwall/client/app_update.lua | 1 - .../luasrc/model/cbi/passwall/client/global.lua | 1 - .../luasrc/model/cbi/passwall/client/haproxy.lua | 1 - .../model/cbi/passwall/client/node_config.lua | 1 - .../model/cbi/passwall/client/node_list.lua | 1 - .../model/cbi/passwall/client/node_subscribe.lua | 1 - .../passwall/client/node_subscribe_config.lua | 1 - .../luasrc/model/cbi/passwall/client/other.lua | 1 - .../luasrc/model/cbi/passwall/client/rule.lua | 2 -- .../model/cbi/passwall/client/rule_list.lua | 1 - .../model/cbi/passwall/client/shunt_rules.lua | 1 - .../model/cbi/passwall/client/socks_config.lua | 1 - .../luasrc/model/cbi/passwall/server/index.lua | 1 - .../luasrc/model/cbi/passwall/server/user.lua | 1 - luci-app-passwall/luasrc/passwall/api.lua | 16 ---------------- .../root/etc/init.d/unblockneteasemusic | 1 - 18 files changed, 34 deletions(-) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl.lua index c303efe3..6b4319ef 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl.lua @@ -3,7 +3,6 @@ local appname = "passwall" local sys = api.sys m = Map(appname) -api.set_apply_on_parse(m) s = m:section(TypedSection, "global", translate("ACLs"), "" .. translate("ACLs is a tools which used to designate specific IP proxy mode.") .. "") s.anonymous = true diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua index 22a76c66..6b10651f 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua @@ -13,7 +13,6 @@ local port_validate = function(self, value, t) end m = Map(appname) -api.set_apply_on_parse(m) local nodes_table = {} for k, e in ipairs(api.get_valid_nodes()) do diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/app_update.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/app_update.lua index 8a59a431..9d475621 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/app_update.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/app_update.lua @@ -2,7 +2,6 @@ local api = require "luci.passwall.api" local appname = "passwall" m = Map(appname) -api.set_apply_on_parse(m) -- [[ App Settings ]]-- s = m:section(TypedSection, "global_app", translate("App Update"), diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua index d2b8593b..89378eec 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -9,7 +9,6 @@ local has_chnlist = api.fs.access("/usr/share/passwall/rules/chnlist") local has_chnroute = api.fs.access("/usr/share/passwall/rules/chnroute") m = Map(appname) -api.set_apply_on_parse(m) local nodes_table = {} for k, e in ipairs(api.get_valid_nodes()) do diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua index 563df4d0..4f3bd9a9 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua @@ -16,7 +16,6 @@ for k, e in ipairs(api.get_valid_nodes()) do end m = Map(appname) -api.set_apply_on_parse(m) -- [[ Haproxy Settings ]]-- s = m:section(TypedSection, "global_haproxy") diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua index 4f1ff1a1..98504b8b 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua @@ -10,7 +10,6 @@ end m = Map(appname, translate("Node Config")) m.redirect = api.url() -api.set_apply_on_parse(m) s = m:section(NamedSection, arg[1], "nodes", "") s.addremove = false diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua index 041814f7..b37587f5 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua @@ -4,7 +4,6 @@ local sys = api.sys local datatypes = api.datatypes m = Map(appname) -api.set_apply_on_parse(m) -- [[ Other Settings ]]-- s = m:section(TypedSection, "global_other") diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua index 96825026..c8688e22 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua @@ -44,7 +44,6 @@ if has_hysteria2 then end m = Map(appname) -api.set_apply_on_parse(m) -- [[ Subscribe Settings ]]-- s = m:section(TypedSection, "global_subscribe", "") diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua index 4d07ef46..d4d8c2c4 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe_config.lua @@ -45,7 +45,6 @@ end m = Map(appname) m.redirect = api.url("node_subscribe") -api.set_apply_on_parse(m) s = m:section(NamedSection, arg[1]) s.addremove = false diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua index 72997c34..04b70f30 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua @@ -11,7 +11,6 @@ local port_validate = function(self, value, t) end m = Map(appname) -api.set_apply_on_parse(m) -- [[ Delay Settings ]]-- s = m:section(TypedSection, "global_delay", translate("Delay Settings")) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua index 8e6947d6..505f6890 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule.lua @@ -4,8 +4,6 @@ local has_xray = api.finded_com("xray") local has_singbox = api.finded_com("singbox") m = Map(appname) -api.set_apply_on_parse(m) - -- [[ Rule Settings ]]-- s = m:section(TypedSection, "global_rules", translate("Rule status")) s.anonymous = true diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua index f6570bf7..92a9178d 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/rule_list.lua @@ -9,7 +9,6 @@ local chnlist_path = "/usr/share/passwall/rules/chnlist" local chnroute_path = "/usr/share/passwall/rules/chnroute" m = Map(appname) -api.set_apply_on_parse(m) -- [[ Rule List Settings ]]-- s = m:section(TypedSection, "global_rules") diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua index 8e516384..ba7735e6 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/shunt_rules.lua @@ -4,7 +4,6 @@ local datatypes = api.datatypes m = Map(appname, "Sing-Box/Xray " .. translate("Shunt Rule")) m.redirect = api.url() -api.set_apply_on_parse(m) s = m:section(NamedSection, arg[1], "shunt_rules", "") s.addremove = false diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua index b390eac2..62d7495e 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/socks_config.lua @@ -5,7 +5,6 @@ local has_singbox = api.finded_com("singbox") local has_xray = api.finded_com("xray") m = Map(appname) -api.set_apply_on_parse(m) local nodes_table = {} for k, e in ipairs(api.get_valid_nodes()) do diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua b/luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua index 5491e424..d18b7544 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/server/index.lua @@ -1,7 +1,6 @@ local api = require "luci.passwall.api" m = Map("passwall_server", translate("Server-Side")) -api.set_apply_on_parse(m) t = m:section(NamedSection, "global", "global") t.anonymous = true diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua b/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua index 7c462591..b4371db3 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/server/user.lua @@ -4,7 +4,6 @@ local types_dir = "/usr/lib/lua/luci/model/cbi/passwall/server/type/" m = Map("passwall_server", translate("Server Config")) m.redirect = api.url("server") -api.set_apply_on_parse(m) s = m:section(NamedSection, arg[1], "user", "") s.addremove = false diff --git a/luci-app-passwall/luasrc/passwall/api.lua b/luci-app-passwall/luasrc/passwall/api.lua index 0a3f8e1c..d0b2f857 100644 --- a/luci-app-passwall/luasrc/passwall/api.lua +++ b/luci-app-passwall/luasrc/passwall/api.lua @@ -999,22 +999,6 @@ function to_check_self() } end -function is_js_luci() - return sys.call('[ -f "/www/luci-static/resources/uci.js" ]') == 0 -end - -function set_apply_on_parse(map) - if is_js_luci() == true then - map.apply_on_parse = false - map.on_after_apply = function(self) - if self.redirect then - os.execute("sleep 1") - luci.http.redirect(self.redirect) - end - end - end -end - function luci_types(id, m, s, type_name, option_prefix) local rewrite_option_table = {} for key, value in pairs(s.fields) do diff --git a/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic b/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic index fa653a0b..8c8c5111 100755 --- a/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic +++ b/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic @@ -76,7 +76,6 @@ start_service() { local update_time config_get update_time "config" "update_time" "3" sed -i "/$NAME/d" /etc/crontabs/root - echo -e "30 2 * * * /etc/init.d/unblockneteasemusic" >> "/etc/crontabs/root" ! is_enabled "config" "auto_update" || echo -e "0 ${update_time} * * * $UNM_DIR/update.sh update_core" >> "/etc/crontabs/root" /etc/init.d/cron restart