diff --git a/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch index 7c6de78cd..63b4ca886 100644 --- a/patch-luci-app-passwall.patch +++ b/patch-luci-app-passwall.patch @@ -23,55 +23,11 @@ index e52338c..7c71fff 100644 local code = tonumber(luci.sys.exec("echo -n '" .. result .. "' | awk -F ':' '{print $1}'") or "0") if code ~= 0 then local use_time = luci.sys.exec("echo -n '" .. result .. "' | awk -F ':' '{print $2}'") -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 c303efe..6b4319e 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 22a76c6..6b10651 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 8a59a43..9d47562 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 d2b8593..1204cbe 100644 +index 89378ee..1204cbe 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 -@@ -333,6 +332,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9-Recommended)") +@@ -332,6 +332,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9-Recommended)") o:value("149.112.112.112", "149.112.112.112 (Quad9-Recommended)") o:value("208.67.220.220", "208.67.220.220 (OpenDNS)") o:value("208.67.222.222", "208.67.222.222 (OpenDNS)") @@ -84,178 +40,6 @@ index d2b8593..1204cbe 100644 o:depends({dns_mode = "dns2socks"}) o:depends({dns_mode = "tcp"}) o:depends({dns_mode = "udp"}) -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 563df4d..4f3bd9a 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 4f1ff1a..98504b8 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 041814f..b37587f 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 9682502..c8688e2 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 4d07ef4..d4d8c2c 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 72997c3..04b70f3 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 8e6947d..505f689 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 f6570bf..92a9178 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 8e51638..ba7735e 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 b390eac..62d7495 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 5491e42..d18b754 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 7c46259..b4371db 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 0a3f8e1..d0b2f85 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-passwall/luasrc/view/passwall/app_update/app_version.htm b/luci-app-passwall/luasrc/view/passwall/app_update/app_version.htm index c49ab6f..1591b79 100644 --- a/luci-app-passwall/luasrc/view/passwall/app_update/app_version.htm