From 0d27b439e82ad313f03ea2faa3c67fb6bbb3bf3f Mon Sep 17 00:00:00 2001 From: gitea-action Date: Mon, 5 May 2025 13:30:22 +0800 Subject: [PATCH] luci-app-passwall: sync upstream last commit: https://github.com/xiaorouji/openwrt-passwall/commit/099ed58cd564bdb8f1405cf55631015ac1ae21c6 --- .../luasrc/model/cbi/passwall/client/acl_config.lua | 2 +- .../luasrc/model/cbi/passwall/client/app_update.lua | 2 +- .../luasrc/model/cbi/passwall/client/global.lua | 6 +++--- .../luasrc/model/cbi/passwall/client/haproxy.lua | 2 +- .../luasrc/model/cbi/passwall/client/other.lua | 2 +- .../luasrc/model/cbi/passwall/client/type/ray.lua | 2 +- .../luasrc/model/cbi/passwall/client/type/sing-box.lua | 2 +- patch-luci-app-passwall.patch | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) 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 22d4b6fdb..48466286d 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 @@ -250,7 +250,7 @@ o.validate = port_validate o:depends({ use_global_config = true }) o:depends({ _udp_node_bool = "1" }) -o = s:option(DummyValue, "tips", " ") +o = s:option(DummyValue, "tips", "　") o.rawhtml = true o.cfgvalue = function(t, n) return string.format('%s', 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 f36ee513c..1c573b651 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 @@ -23,7 +23,7 @@ for _, k in ipairs(com.order) do end end -o = s:option(DummyValue, "tips", " ") +o = s:option(DummyValue, "tips", "　") o.rawhtml = true o.cfgvalue = function(t, n) return string.format('%s', translate("if you want to run from memory, change the path, /tmp beginning then save the application and update it manually.")) 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 4ff4fe270..b5aebe5f3 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -284,7 +284,7 @@ if (has_singbox or has_xray) and #nodes_table > 0 then end end else - local tips = s:taboption("Main", DummyValue, "tips", " ") + local tips = s:taboption("Main", DummyValue, "tips", "　") tips.rawhtml = true tips.cfgvalue = function(t, n) return string.format('%s', translate("There are no available nodes, please add or subscribe nodes first.")) @@ -686,7 +686,7 @@ o = s:taboption("Proxy", Flag, "client_proxy", translate("Client Proxy"), transl o.default = "1" o.rmempty = false -o = s:taboption("Proxy", DummyValue, "_proxy_tips", " ") +o = s:taboption("Proxy", DummyValue, "_proxy_tips", "　") o.rawhtml = true o.cfgvalue = function(t, n) return string.format('%s', api.url("acl"), translate("Want different devices to use different proxy modes/ports/nodes? Please use access control.")) @@ -732,7 +732,7 @@ o = s:taboption("log", Flag, "log_chinadns_ng", translate("Enable") .. " ChinaDN o.default = "0" o.rmempty = false -o = s:taboption("log", DummyValue, "_log_tips", " ") +o = s:taboption("log", DummyValue, "_log_tips", "　") o.rawhtml = true o.cfgvalue = function(t, n) return string.format('%s', translate("It is recommended to disable logging during regular use to reduce system overhead.")) 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 693fc560b..db31a67c3 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua @@ -78,7 +78,7 @@ o = s:option(Value, "health_check_inter", translate("Health Check Inter"), trans o.default = "60" o:depends("balancing_enable", true) -o = s:option(DummyValue, "health_check_tips", " ") +o = s:option(DummyValue, "health_check_tips", "　") o.rawhtml = true o.cfgvalue = function(t, n) return string.format('%s', translate("When the URL test is used, the load balancing node will be converted into a Socks node. when node list set customizing, must be a Socks node, otherwise the health check will be invalid.")) 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 f28af509e..d4f45b75e 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua @@ -107,7 +107,7 @@ o:value("1:65535", translate("All")) o:value("53", "DNS") o.validate = port_validate -o = s:option(DummyValue, "tips", " ") +o = s:option(DummyValue, "tips", "　") o.rawhtml = true o.cfgvalue = function(t, n) return string.format('%s', diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua index 325673ef8..fcd9c494f 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua @@ -219,7 +219,7 @@ m.uci:foreach(appname, "shunt_rules", function(e) end end) -o = s:option(DummyValue, _n("shunt_tips"), " ") +o = s:option(DummyValue, _n("shunt_tips"), "　") o.not_rewrite = true o.rawhtml = true o.cfgvalue = function(t, n) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua index d8e5f6868..38b7420d8 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua @@ -193,7 +193,7 @@ m.uci:foreach(appname, "shunt_rules", function(e) end end) -o = s:option(DummyValue, _n("shunt_tips"), " ") +o = s:option(DummyValue, _n("shunt_tips"), "　") o.not_rewrite = true o.rawhtml = true o.cfgvalue = function(t, n) diff --git a/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch index 3d401d2f5..aac765f8e 100644 --- a/patch-luci-app-passwall.patch +++ b/patch-luci-app-passwall.patch @@ -20,7 +20,7 @@ index b0a2282..bab556b 100644 define Package/$(PKG_NAME)/postrm 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 175a7e6..4ff4fe2 100644 +index 927a9fd..b5aebe5 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -506,6 +506,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)")