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: a2f7c57d19
This commit is contained in:
gitea-action 2024-12-27 21:30:16 +08:00
parent 72802f37d9
commit 37607742b8
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,6 +347,7 @@ o:value("180.184.1.1")
o:value("180.184.2.2") o:value("180.184.2.2")
o:value("114.114.114.114") o:value("114.114.114.114")
o:value("114.114.115.115") o:value("114.114.115.115")
o:value("119.28.28.28")
o:depends("direct_dns_mode", "tcp") o:depends("direct_dns_mode", "tcp")
o = s:taboption("DNS", Value, "direct_dns_dot", translate("Direct DNS DoT")) o = s:taboption("DNS", Value, "direct_dns_dot", translate("Direct DNS DoT"))
@ -388,7 +389,7 @@ end
---- SmartDNS Forward Mode ---- SmartDNS Forward Mode
if api.is_finded("smartdns") then if api.is_finded("smartdns") then
o = s:taboption("DNS", ListValue, "smartdns_dns_mode", translate("Filter Mode")) o = s:taboption("DNS", ListValue, "smartdns_dns_mode", translate("Filter Mode"))
o:value("socks", "SOCKS") o:value("socks", "Socks")
if has_singbox then if has_singbox then
o:value("sing-box", "Sing-Box") o:value("sing-box", "Sing-Box")
end end

6
luci-app-passwall/luasrc/view/passwall/rule_list/js.htm
View File

@ -9,7 +9,7 @@ local total_lines_text = translate("Total Lines")
fetch('<%= api.url("read_rulelist") %>?type=gfw') fetch('<%= api.url("read_rulelist") %>?type=gfw')
.then(response => response.text()) .then(response => response.text())
.then(data => { .then(data => {
var total_lines = data.split("\n").length; var total_lines = data.split("\n").filter(line => line.trim() !== "").length;
var textarea = document.getElementById('gfw_textarea'); var textarea = document.getElementById('gfw_textarea');
textarea.innerHTML = data; textarea.innerHTML = data;
//textarea.scrollTop = textarea.scrollHeight; //textarea.scrollTop = textarea.scrollHeight;
@ -22,7 +22,7 @@ local total_lines_text = translate("Total Lines")
fetch('<%= api.url("read_rulelist") %>?type=chn') fetch('<%= api.url("read_rulelist") %>?type=chn')
.then(response => response.text()) .then(response => response.text())
.then(data => { .then(data => {
var total_lines = data.split("\n").length; var total_lines = data.split("\n").filter(line => line.trim() !== "").length;
var textarea = document.getElementById('chn_textarea'); var textarea = document.getElementById('chn_textarea');
textarea.innerHTML = data; textarea.innerHTML = data;
//textarea.scrollTop = textarea.scrollHeight; //textarea.scrollTop = textarea.scrollHeight;
@ -35,7 +35,7 @@ local total_lines_text = translate("Total Lines")
fetch('<%= api.url("read_rulelist") %>?type=chnroute') fetch('<%= api.url("read_rulelist") %>?type=chnroute')
.then(response => response.text()) .then(response => response.text())
.then(data => { .then(data => {
var total_lines = data.split("\n").length; var total_lines = data.split("\n").filter(line => line.trim() !== "").length;
var textarea = document.getElementById('chnroute_textarea'); var textarea = document.getElementById('chnroute_textarea');
textarea.innerHTML = data; textarea.innerHTML = data;
//textarea.scrollTop = textarea.scrollHeight; //textarea.scrollTop = textarea.scrollHeight;

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

@ -33,10 +33,10 @@ index 99c620f..ba84fc9 100644
if code ~= 0 then if code ~= 0 then
local use_time = luci.sys.exec("echo -n '" .. result .. "' | awk -F ':' '{print $2}'") local use_time = luci.sys.exec("echo -n '" .. result .. "' | awk -F ':' '{print $2}'")
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 ba3363e..7bd9fb3 100644 index d8719bb..0259d8f 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
@@ -491,6 +491,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)") @@ -492,6 +492,12 @@ o:value("9.9.9.9", "9.9.9.9 (Quad9)")
o:value("149.112.112.112", "149.112.112.112 (Quad9)") o:value("149.112.112.112", "149.112.112.112 (Quad9)")
o:value("208.67.220.220", "208.67.220.220 (OpenDNS)") o:value("208.67.220.220", "208.67.220.220 (OpenDNS)")
o:value("208.67.222.222", "208.67.222.222 (OpenDNS)") o:value("208.67.222.222", "208.67.222.222 (OpenDNS)")
@ -49,7 +49,7 @@ index ba3363e..7bd9fb3 100644
o:depends({dns_mode = "dns2socks"}) o:depends({dns_mode = "dns2socks"})
o:depends({dns_mode = "tcp"}) o:depends({dns_mode = "tcp"})
o:depends({dns_mode = "udp"}) o:depends({dns_mode = "udp"})
@@ -590,7 +596,7 @@ if api.is_finded("smartdns") then @@ -591,7 +597,7 @@ if api.is_finded("smartdns") then
end end
o = s:taboption("DNS", Flag, "dns_redirect", translate("DNS Redirect"), translate("Force special DNS server to need proxy devices.")) o = s:taboption("DNS", Flag, "dns_redirect", translate("DNS Redirect"), translate("Force special DNS server to need proxy devices."))