zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-passwall: sync upstream

Browse Source 
last commit: 099ed58cd5
This commit is contained in:
gitea-action 2025-05-05 13:30:22 +08:00
parent f5c79a4061
commit 0d27b439e8
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-passwall/luasrc/model/cbi/passwall/client/acl_config.lua
View File

@ -250,7 +250,7 @@ o.validate = port_validate
o:depends({ use_global_config = true }) o:depends({ use_global_config = true })
o:depends({ _udp_node_bool = "1" }) o:depends({ _udp_node_bool = "1" })
o = s:option(DummyValue, "tips", " ") o = s:option(DummyValue, "tips", "　")
o.rawhtml = true o.rawhtml = true
o.cfgvalue = function(t, n) o.cfgvalue = function(t, n)
return string.format('<font color="red">%s</font>', return string.format('<font color="red">%s</font>',

2
luci-app-passwall/luasrc/model/cbi/passwall/client/app_update.lua
View File

@ -23,7 +23,7 @@ for _, k in ipairs(com.order) do
end end
end end
o = s:option(DummyValue, "tips", " ") o = s:option(DummyValue, "tips", "　")
o.rawhtml = true o.rawhtml = true
o.cfgvalue = function(t, n) o.cfgvalue = function(t, n)
return string.format('<font color="red">%s</font>', translate("if you want to run from memory, change the path, /tmp beginning then save the application and update it manually.")) return string.format('<font color="red">%s</font>', translate("if you want to run from memory, change the path, /tmp beginning then save the application and update it manually."))

6
luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
View File

@ -284,7 +284,7 @@ if (has_singbox or has_xray) and #nodes_table > 0 then
end end
end end
else else
local tips = s:taboption("Main", DummyValue, "tips", " ") local tips = s:taboption("Main", DummyValue, "tips", "　")
tips.rawhtml = true tips.rawhtml = true
tips.cfgvalue = function(t, n) tips.cfgvalue = function(t, n)
return string.format('<a style="color: red">%s</a>', translate("There are no available nodes, please add or subscribe nodes first.")) return string.format('<a style="color: red">%s</a>', 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.default = "1"
o.rmempty = false o.rmempty = false
o = s:taboption("Proxy", DummyValue, "_proxy_tips", " ") o = s:taboption("Proxy", DummyValue, "_proxy_tips", "　")
o.rawhtml = true o.rawhtml = true
o.cfgvalue = function(t, n) o.cfgvalue = function(t, n)
return string.format('<a style="color: red" href="%s">%s</a>', api.url("acl"), translate("Want different devices to use different proxy modes/ports/nodes? Please use access control.")) return string.format('<a style="color: red" href="%s">%s</a>', 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.default = "0"
o.rmempty = false o.rmempty = false
o = s:taboption("log", DummyValue, "_log_tips", " ") o = s:taboption("log", DummyValue, "_log_tips", "　")
o.rawhtml = true o.rawhtml = true
o.cfgvalue = function(t, n) o.cfgvalue = function(t, n)
return string.format('<font color="red">%s</font>', translate("It is recommended to disable logging during regular use to reduce system overhead.")) return string.format('<font color="red">%s</font>', translate("It is recommended to disable logging during regular use to reduce system overhead."))

2
luci-app-passwall/luasrc/model/cbi/passwall/client/haproxy.lua
View File

@ -78,7 +78,7 @@ o = s:option(Value, "health_check_inter", translate("Health Check Inter"), trans
o.default = "60" o.default = "60"
o:depends("balancing_enable", true) o:depends("balancing_enable", true)
o = s:option(DummyValue, "health_check_tips", " ") o = s:option(DummyValue, "health_check_tips", "　")
o.rawhtml = true o.rawhtml = true
o.cfgvalue = function(t, n) o.cfgvalue = function(t, n)
return string.format('<span style="color: red">%s</span>', 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.")) return string.format('<span style="color: red">%s</span>', 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."))

2
luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua
View File

@ -107,7 +107,7 @@ o:value("1:65535", translate("All"))
o:value("53", "DNS") o:value("53", "DNS")
o.validate = port_validate o.validate = port_validate
o = s:option(DummyValue, "tips", " ") o = s:option(DummyValue, "tips", "　")
o.rawhtml = true o.rawhtml = true
o.cfgvalue = function(t, n) o.cfgvalue = function(t, n)
return string.format('<font color="red">%s</font>', return string.format('<font color="red">%s</font>',

2
luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua
View File

@ -219,7 +219,7 @@ m.uci:foreach(appname, "shunt_rules", function(e)
end end
end) end)
o = s:option(DummyValue, _n("shunt_tips"), " ") o = s:option(DummyValue, _n("shunt_tips"), "　")
o.not_rewrite = true o.not_rewrite = true
o.rawhtml = true o.rawhtml = true
o.cfgvalue = function(t, n) o.cfgvalue = function(t, n)

2
luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua
View File

@ -193,7 +193,7 @@ m.uci:foreach(appname, "shunt_rules", function(e)
end end
end) end)
o = s:option(DummyValue, _n("shunt_tips"), " ") o = s:option(DummyValue, _n("shunt_tips"), "　")
o.not_rewrite = true o.not_rewrite = true
o.rawhtml = true o.rawhtml = true
o.cfgvalue = function(t, n) o.cfgvalue = function(t, n)

2
patch-luci-app-passwall.patch
View File

@ -20,7 +20,7 @@ index b0a2282..bab556b 100644
define Package/$(PKG_NAME)/postrm 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 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 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua
+++ b/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)") @@ -506,6 +506,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)")