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 7bd9fb349..0259d8fdc 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/global.lua @@ -347,6 +347,7 @@ o:value("180.184.1.1") o:value("180.184.2.2") o:value("114.114.114.114") o:value("114.114.115.115") +o:value("119.28.28.28") o:depends("direct_dns_mode", "tcp") o = s:taboption("DNS", Value, "direct_dns_dot", translate("Direct DNS DoT")) @@ -388,7 +389,7 @@ end ---- SmartDNS Forward Mode if api.is_finded("smartdns") then o = s:taboption("DNS", ListValue, "smartdns_dns_mode", translate("Filter Mode")) - o:value("socks", "SOCKS") + o:value("socks", "Socks") if has_singbox then o:value("sing-box", "Sing-Box") end diff --git a/luci-app-passwall/luasrc/view/passwall/rule_list/js.htm b/luci-app-passwall/luasrc/view/passwall/rule_list/js.htm index 63b1fcaff..c950646dd 100644 --- a/luci-app-passwall/luasrc/view/passwall/rule_list/js.htm +++ b/luci-app-passwall/luasrc/view/passwall/rule_list/js.htm @@ -9,7 +9,7 @@ local total_lines_text = translate("Total Lines") fetch('<%= api.url("read_rulelist") %>?type=gfw') .then(response => response.text()) .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'); textarea.innerHTML = data; //textarea.scrollTop = textarea.scrollHeight; @@ -22,7 +22,7 @@ local total_lines_text = translate("Total Lines") fetch('<%= api.url("read_rulelist") %>?type=chn') .then(response => response.text()) .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'); textarea.innerHTML = data; //textarea.scrollTop = textarea.scrollHeight; @@ -35,7 +35,7 @@ local total_lines_text = translate("Total Lines") fetch('<%= api.url("read_rulelist") %>?type=chnroute') .then(response => response.text()) .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'); textarea.innerHTML = data; //textarea.scrollTop = textarea.scrollHeight; diff --git a/patch-luci-app-passwall.patch b/patch-luci-app-passwall.patch index 652348a6c..501ae8d80 100644 --- a/patch-luci-app-passwall.patch +++ b/patch-luci-app-passwall.patch @@ -33,10 +33,10 @@ index 99c620f..ba84fc9 100644 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/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 +++ 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("208.67.220.220", "208.67.220.220 (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 = "tcp"}) 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 o = s:taboption("DNS", Flag, "dns_redirect", translate("DNS Redirect"), translate("Force special DNS server to need proxy devices."))