update 2026-08-25 00:29:42

luci-app-passwall/luasrc/model/cbi/passwall/client/node_list.lua

@@ -25,25 +25,25 @@ o:value("https://wifi.vivo.com.cn/generate_204", "VIVO (CN)")
 o.default = o.keylist[3]
 
 if true then
-    m:appendTemplate("/node_list/node_list")
+	m:appendTemplate("/node_list/node_list")
 
-    if luci.http.formvalue("cbi.submit") == "1" then
-        local group_order = {}
-        group_order = luci.http.formvaluetable("group.order")
-        if group_order then
-            for k, v in pairs(group_order) do
-                if v and v~= "" then
-                    local new_order = {}
-                    string.gsub(v, "[^" .. " " .. "]+", function(w)
-                        new_order[#new_order + 1] = w
-                    end)
-                    for idx, name in ipairs(new_order) do
-                        m.uci:reorder(m.config, name, idx - 1)
-                    end
-                end
-            end
-        end
-    end
+	if luci.http.formvalue("cbi.submit") == "1" then
+		local group_order = {}
+		group_order = luci.http.formvaluetable("group.order")
+		if group_order then
+			for k, v in pairs(group_order) do
+				if v and v~= "" then
+					local new_order = {}
+					string.gsub(v, "[^" .. " " .. "]+", function(w)
+						new_order[#new_order + 1] = w
+					end)
+					for idx, name in ipairs(new_order) do
+						m.uci:reorder(m.config, name, idx - 1)
+					end
+				end
+			end
+		end
+	end
 end
 
 return api.return_map(m)

luci-app-passwall/luasrc/model/cbi/passwall/client/node_subscribe.lua

@@ -117,9 +117,9 @@ end
 o = s:option(DummyValue, "_update", translate("Manual subscription All"))
 o.rawhtml = true
 o.cfgvalue = function(self, section)
-    return string.format([[
-        <input type="button" class="btn cbi-button cbi-button-apply" onclick="ManualSubscribeAll()" value="%s" />]],
-	 translate("Manual subscription All"))
+	return string.format([[
+		<input type="button" class="btn cbi-button cbi-button-apply" onclick="ManualSubscribeAll()" value="%s" />]],
+		 translate("Manual subscription All"))
 end
 
 s = m:section(TypedSection, "subscribe_list", "", "<font color='red'>" .. translate("When adding a new subscription, please save and apply before manually subscribing. If you only change the subscription URL, you can subscribe manually, and the system will save it automatically.") .. "</font>")
@@ -215,9 +215,9 @@ end
 o = s:option(DummyValue, "_update", translate("Manual subscription"))
 o.rawhtml = true
 o.cfgvalue = function(self, section)
-    return string.format([[
-        <input type="button" class="btn cbi-button cbi-button-apply" onclick="ManualSubscribe('%s')" value="%s" />]],
-	section, translate("Manual subscription"))
+	return string.format([[
+		<input type="button" class="btn cbi-button cbi-button-apply" onclick="ManualSubscribe('%s')" value="%s" />]],
+		section, translate("Manual subscription"))
 end
 
 m:appendTemplate("/cbi/sortable", {sectiontype = s.sectiontype})

luci-app-passwall/luasrc/passwall/server_app.lua

@@ -161,6 +161,7 @@ local function start()
 	end)
 	if firewall_num > 0 then
 		api.uci_save(uci, "firewall", true, true)
+		cmd("/etc/init.d/firewall reload >/dev/null 2>&1")
 	end
 end
 
@@ -176,6 +177,7 @@ local function stop()
 		end)
 		if num > 0 then
 			api.uci_save(uci, "firewall", true, true)
+			cmd("/etc/init.d/firewall reload >/dev/null 2>&1")
 		end
 	end
 	cmd(string.format("rm -rf %s %s", CONFIG_PATH, LOG_APP_FILE))

luci-app-passwall/luasrc/passwall/util_xray.lua

@@ -916,12 +916,12 @@ function gen_config(var)
 	if xray_settings.fragment == "1" then
 		local lengths, delays = {}, {}
 		api.trim(xray_settings.fragment_lengths):gsub("[^,]+", function(w)
-		    w = w:gsub("%s+", "")
-		    if w ~= "" then lengths[#lengths+1] = w end
+			w = w:gsub("%s+", "")
+			if w ~= "" then lengths[#lengths+1] = w end
 		end)
 		api.trim(xray_settings.fragment_delays):gsub("[^,]+", function(w)
-		    w = w:gsub("%s+", "")
-		    if w ~= "" then delays[#delays+1] = w end
+			w = w:gsub("%s+", "")
+			if w ~= "" then delays[#delays+1] = w end
 		end)
 		fragment_table = {
 			type = "fragment",

luci-app-passwall/luasrc/view/passwall/cbi/nodes_value_com.htm

@@ -534,7 +534,7 @@
 	//自定义框
 	function v_customEnter(cbid, labelSpan, hiddenInput, searchInput, panel, listContainer, customInput) {
 		let inputValue = customInput.value.trim();
-    	if (!inputValue) {
+		if (!inputValue) {
 			return;
 		}
 		const existingItems = listContainer.querySelectorAll('li[data-key="' + inputValue + '"]');

luci-app-passwall/luasrc/view/passwall/global/faq.htm

@@ -3,42 +3,42 @@ local map = self.map
 local api = map.api
 -%>
 <style>
-    .dns-con {
-      padding: 1rem;
-    }
-    .faq-title {
-      color: var(--primary);
-      font-weight: bolder;
-      margin-bottom: 0.5rem;
-      display: inline-block;
-    }
-    .reset-title {
-     color: var(--primary)；
-     font-weight: bolder;
-     margin-bottom: 0.3rem;
-     display: inline-block;
-     margin-top: 1.2rem;
-     text-decoration: underline;
-    }
-    .dns-item {
-     margin-bottom: 0.8rem;
-     line-height:1.2rem;
-    }
-    .dns-list {
+	.dns-con {
+		padding: 1rem;
+	}
+	.faq-title {
+		color: var(--primary);
+		font-weight: bolder;
+		margin-bottom: 0.5rem;
+		display: inline-block;
+	}
+	.reset-title {
+		color: var(--primary)；
+		font-weight: bolder;
+		margin-bottom: 0.3rem;
+		display: inline-block;
+		margin-top: 1.2rem;
+		text-decoration: underline;
+	}
+	.dns-item {
+		margin-bottom: 0.8rem;
+		line-height:1.2rem;
+	}
+	.dns-list {
 		text-indent:1rem;
 		line-height: 1.2rem;
-}
+	}
 </style>
 <div class="dns-con">
 	<div id="faq_dns">
 		<ul>
-            <b class="faq-title"><%:DNS related issues:%></b>
+			<b class="faq-title"><%:DNS related issues:%></b>
 			<li class="dns-item">1. <span><%:Certain browsers such as Chrome have built-in DNS service, which may affect DNS resolution settings. You can go to 'Settings -> Privacy and security -> Use secure DNS' menu to turn it off.%></span></li>
 			<li class="dns-item">2. <span><%:If you are unable to access the internet after reboot, please try clearing the cache of your terminal devices (make sure to close all open browser application windows first, this step is especially important):%></span>
-			    <ul><li class="dns-list"> ◦ <span><%:For Windows systems, open Command Prompt and run the command 'ipconfig /flushdns'.%></span></li>
-			        <li class="dns-list"> ◦ <span><%:For Mac systems, open Terminal and run the command 'sudo killall -HUP mDNSResponder'.%></span></li>
-			        <li class="dns-list"> ◦ <span><%:For mobile devices, you can clear it by reconnecting to the network, such as toggling Airplane Mode and reconnecting to WiFi.%></span></li>
-			    </ul>
+				<ul><li class="dns-list"> ◦ <span><%:For Windows systems, open Command Prompt and run the command 'ipconfig /flushdns'.%></span></li>
+					<li class="dns-list"> ◦ <span><%:For Mac systems, open Terminal and run the command 'sudo killall -HUP mDNSResponder'.%></span></li>
+					<li class="dns-list"> ◦ <span><%:For mobile devices, you can clear it by reconnecting to the network, such as toggling Airplane Mode and reconnecting to WiFi.%></span></li>
+				</ul>
 			</li>
 			<li class="dns-item">3. <span><%:Please make sure your device's network settings point both the DNS server and default gateway to this router, to ensure DNS queries are properly routed.%></span></li>
 		</ul>
@@ -58,7 +58,7 @@ local api = map.api
 	}
 	
 	var dom = document.getElementById("faq_reset");
-    if (dom) {
+	if (dom) {
 		var li = "";
 		li += "<a href='#' class='reset-title' onclick='hide()'>" + "<%: Hide in main menu:%>"+ "</a>" + "<br />" + "<%: Browser access: %>" + "<a href='#' onclick='hide()'>" + hide_url + "</a>" + "<br />";
 		li += "<a href='#' class='reset-title'>" + "<%: Show in main menu:%>"+ "</a>" + "<br />" +"<%: Browser access: %>" + "<a href='#'>" + show_url + "</a>" + "<br />";

luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm

@@ -43,7 +43,7 @@ table td, .table .td {
 	z-index: 99;
 	text-align: center;
 	background: white;
-    box-shadow: darkgrey 10px 10px 30px 5px;
+	box-shadow: darkgrey 10px 10px 30px 5px;
 	text-align: center;
 	padding: 0.5em;
 }
@@ -55,8 +55,8 @@ table td, .table .td {
 .ping a,
 .ping_value a,
 .tcping_value a {
-    text-decoration: none;
-    cursor: pointer;
+	text-decoration: none;
+	cursor: pointer;
 }
 
 @media (prefers-color-scheme: dark) {

luci-app-passwall/luasrc/view/passwall/rule/shunt_rule_list.htm

@@ -15,8 +15,8 @@ table th, .table .th {
 
 table td, .table .td {
 	text-align: center;
-    /* white-space: nowrap; */
-    word-break: keep-all;
+	/* white-space: nowrap; */
+	word-break: keep-all;
 }
 
 .td.cbi-section-actions {

luci-app-passwall/luasrc/view/passwall/rule_list/geoview.htm

@@ -75,7 +75,7 @@ local api = map.api
 		if (!value) {
 			alert("<%:Please enter query content!%>");
 			return;
-        }
+		}
 		lookup_btn.disabled = true;
 		extract_btn.disabled = true;
 		btn.value = '<%:Querying%>';

luci-app-passwall/root/etc/uci-defaults/luci-app-passwall

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -e "/etc/config/ucitrack" ]; then
-    uci -q batch <<-EOF
+	uci -q batch <<-EOF
  		delete ucitrack.@passwall[-1]
 		add ucitrack passwall
 		set ucitrack.@passwall[-1].init=passwall

luci-app-passwall/root/etc/uci-defaults/luci-app-passwall_server

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -e "/etc/config/ucitrack" ]; then
-    uci -q batch <<-EOF
+	uci -q batch <<-EOF
 		delete ucitrack.@passwall_server[-1]
 		add ucitrack passwall_server
 		set ucitrack.@passwall_server[-1].init=passwall_server

luci-app-passwall2/luasrc/model/cbi/passwall2/client/geoview.lua

@@ -6,13 +6,13 @@ local geo_dir = (api.uci_get_c("@global_rules[0]", "v2ray_location_asset") or "/
 local geosite_path = geo_dir .. "/geosite.dat"
 local geoip_path = geo_dir .. "/geoip.dat"
 if fs.access(geosite_path) and fs.access(geoip_path) then
-    f = SimpleForm(api.c_config)
-    f.reset = false
-    f.submit = false
+	f = SimpleForm(api.c_config)
+	f.reset = false
+	f.submit = false
 
-    local obj = Template(api.appname .. "/rule/geoview")
-    obj.api = api
-    f:append(obj)
+	local obj = Template(api.appname .. "/rule/geoview")
+	obj.api = api
+	f:append(obj)
 end
 
 return f

luci-app-passwall2/luasrc/model/cbi/passwall2/client/node_list.lua

@@ -25,25 +25,25 @@ o:value("https://wifi.vivo.com.cn/generate_204", "VIVO (CN)")
 o.default = o.keylist[3]
 
 if true then
-    m:appendTemplate("/node_list/node_list")
+	m:appendTemplate("/node_list/node_list")
 
-    if luci.http.formvalue("cbi.submit") == "1" then
-        local group_order = {}
-        group_order = luci.http.formvaluetable("group.order")
-        if group_order then
-            for k, v in pairs(group_order) do
-                if v and v~= "" then
-                    local new_order = {}
-                    string.gsub(v, "[^" .. " " .. "]+", function(w)
-                        new_order[#new_order + 1] = w
-                    end)
-                    for idx, name in ipairs(new_order) do
-                        m.uci:reorder(m.config, name, idx - 1)
-                    end
-                end
-            end
-        end
-    end
+	if luci.http.formvalue("cbi.submit") == "1" then
+		local group_order = {}
+		group_order = luci.http.formvaluetable("group.order")
+		if group_order then
+			for k, v in pairs(group_order) do
+				if v and v~= "" then
+					local new_order = {}
+					string.gsub(v, "[^" .. " " .. "]+", function(w)
+						new_order[#new_order + 1] = w
+					end)
+					for idx, name in ipairs(new_order) do
+						m.uci:reorder(m.config, name, idx - 1)
+					end
+				end
+			end
+		end
+	end
 end
 
 return api.return_map(m)

luci-app-passwall2/luasrc/model/cbi/passwall2/client/node_subscribe.lua

@@ -112,8 +112,8 @@ end
 o = s:option(DummyValue, "_update", translate("Manual subscription All"))
 o.rawhtml = true
 o.cfgvalue = function(self, section)
-    return string.format([[
-        <input type="button" class="btn cbi-button cbi-button-apply" onclick="ManualSubscribeAll()" value="%s" />]],
+	return string.format([[
+		<input type="button" class="btn cbi-button cbi-button-apply" onclick="ManualSubscribeAll()" value="%s" />]],
 	 translate("Manual subscription All"))
 end
 
@@ -210,8 +210,8 @@ end
 o = s:option(DummyValue, "_update", translate("Manual subscription"))
 o.rawhtml = true
 o.cfgvalue = function(self, section)
-    return string.format([[
-        <input type="button" class="btn cbi-button cbi-button-apply" onclick="ManualSubscribe('%s')" value="%s" />]],
+	return string.format([[
+		<input type="button" class="btn cbi-button cbi-button-apply" onclick="ManualSubscribe('%s')" value="%s" />]],
 	section, translate("Manual subscription"))
 end
 

luci-app-passwall2/luasrc/model/cbi/passwall2/server/server_config.lua

@@ -39,7 +39,7 @@ for filename in api.fs.dir(types_dir) do
 	table.insert(type_table, filename)
 end
 table.sort(type_table, function(a, b)
-    return a < b
+	return a < b
 end)
 
 for index, value in ipairs(type_table) do

luci-app-passwall2/luasrc/passwall2/api.lua

@@ -464,14 +464,14 @@ datatypes.json = is_json
 
 function is_timehhmm(str)
 	local hour, minute = string.match(str, "^(%d?%d):(%d%d)$")
-    if hour and minute then
-        hour = tonumber(hour)
-        minute = tonumber(minute)
-        if hour >= 0 and hour <= 23 and minute >= 0 and minute <= 59 then
-            return true
-        end
-    end
-    return false
+	if hour and minute then
+		hour = tonumber(hour)
+		minute = tonumber(minute)
+		if hour >= 0 and hour <= 23 and minute >= 0 and minute <= 59 then
+			return true
+		end
+	end
+	return false
 end
 datatypes.timehhmm = is_timehhmm
 

luci-app-passwall2/luasrc/passwall2/util_xray.lua

@@ -922,12 +922,12 @@ function gen_config(var)
 	if xray_settings.fragment == "1" then
 		local lengths, delays = {}, {}
 		api.trim(xray_settings.fragment_lengths):gsub("[^,]+", function(w)
-		    w = w:gsub("%s+", "")
-		    if w ~= "" then lengths[#lengths+1] = w end
+			w = w:gsub("%s+", "")
+			if w ~= "" then lengths[#lengths+1] = w end
 		end)
 		api.trim(xray_settings.fragment_delays):gsub("[^,]+", function(w)
-		    w = w:gsub("%s+", "")
-		    if w ~= "" then delays[#delays+1] = w end
+			w = w:gsub("%s+", "")
+			if w ~= "" then delays[#delays+1] = w end
 		end)
 		fragment_table = {
 			type = "fragment",

luci-app-passwall2/luasrc/view/passwall2/cbi/nodes_value_com.htm

@@ -534,7 +534,7 @@
 	//自定义框
 	function v_customEnter(cbid, labelSpan, hiddenInput, searchInput, panel, listContainer, customInput) {
 		let inputValue = customInput.value.trim();
-    	if (!inputValue) {
+		if (!inputValue) {
 			return;
 		}
 		const existingItems = listContainer.querySelectorAll('li[data-key="' + inputValue + '"]');

luci-app-passwall2/luasrc/view/passwall2/global/faq.htm

@@ -3,28 +3,28 @@ local map = self.map
 local api = map.api
 -%>
 <style>
-    .dns-con {
-      padding: 1rem;
-    }
-    .faq-title {
-      color: var(--primary);
-      font-weight: bolder;
-      margin-bottom: 0.5rem;
-      display: inline-block;
-    }
-    .reset-title {
-     color: var(--primary)；
-     font-weight: bolder;
-     margin-bottom: 0.3rem;
-     display: inline-block;
-     margin-top: 1.2rem;
-     text-decoration: underline;
-    }
-    .dns-item {
-     margin-bottom: 0.8rem;
-     line-height:1.2rem;
-    }
-    .dns-list {
+	.dns-con {
+	  padding: 1rem;
+	}
+	.faq-title {
+	  color: var(--primary);
+	  font-weight: bolder;
+	  margin-bottom: 0.5rem;
+	  display: inline-block;
+	}
+	.reset-title {
+	 color: var(--primary)；
+	 font-weight: bolder;
+	 margin-bottom: 0.3rem;
+	 display: inline-block;
+	 margin-top: 1.2rem;
+	 text-decoration: underline;
+	}
+	.dns-item {
+	 margin-bottom: 0.8rem;
+	 line-height:1.2rem;
+	}
+	.dns-list {
 		text-indent:1rem;
 		line-height: 1.2rem;
 }
@@ -32,13 +32,13 @@ local api = map.api
 <div class="dns-con">
 	<div id="faq_dns">
 		<ul>
-            <b class="faq-title"><%:DNS related issues:%></b>
+			<b class="faq-title"><%:DNS related issues:%></b>
 			<li class="dns-item">1. <span><%:Certain browsers such as Chrome have built-in DNS service, which may affect DNS resolution settings. You can go to 'Settings -> Privacy and security -> Use secure DNS' menu to turn it off.%></span></li>
 			<li class="dns-item">2. <span><%:If you are unable to access the internet after reboot, please try clearing the cache of your terminal devices (make sure to close all open browser application windows first, this step is especially important):%></span>
-			    <ul><li class="dns-list"> ◦ <span><%:For Windows systems, open Command Prompt and run the command 'ipconfig /flushdns'.%></span></li>
-			        <li class="dns-list"> ◦ <span><%:For Mac systems, open Terminal and run the command 'sudo killall -HUP mDNSResponder'.%></span></li>
-			        <li class="dns-list"> ◦ <span><%:For mobile devices, you can clear it by reconnecting to the network, such as toggling Airplane Mode and reconnecting to WiFi.%></span></li>
-			    </ul>
+				<ul><li class="dns-list"> ◦ <span><%:For Windows systems, open Command Prompt and run the command 'ipconfig /flushdns'.%></span></li>
+					<li class="dns-list"> ◦ <span><%:For Mac systems, open Terminal and run the command 'sudo killall -HUP mDNSResponder'.%></span></li>
+					<li class="dns-list"> ◦ <span><%:For mobile devices, you can clear it by reconnecting to the network, such as toggling Airplane Mode and reconnecting to WiFi.%></span></li>
+				</ul>
 			</li>
 			<li class="dns-item">3. <span><%:Please make sure your device's network settings point both the DNS server and default gateway to this router, to ensure DNS queries are properly routed.%></span></li>
 		</ul>
@@ -58,7 +58,7 @@ local api = map.api
 	}
 	
 	var dom = document.getElementById("faq_reset");
-    if (dom) {
+	if (dom) {
 		var li = "";
 		li += "<a href='#' class='reset-title' onclick='hide()'>" + "<%: Hide in main menu:%>"+ "</a>" + "<br />" + "<%: Browser access: %>" + "<a href='#' onclick='hide()'>" + hide_url + "</a>" + "<br />";
 		li += "<a href='#' class='reset-title'>" + "<%: Show in main menu:%>"+ "</a>" + "<br />" +"<%: Browser access: %>" + "<a href='#'>" + show_url + "</a>" + "<br />";

luci-app-passwall2/luasrc/view/passwall2/node_list/node_list.htm

@@ -29,8 +29,8 @@ table th, .table .th {
 
 table td, .table .td {
 	text-align: center;
-    /* white-space: nowrap; */
-    word-break: keep-all;
+	/* white-space: nowrap; */
+	word-break: keep-all;
 }
 
 #set_node_div {
@@ -41,7 +41,7 @@ table td, .table .td {
 	z-index: 99;
 	text-align: center;
 	background: white;
-    box-shadow: darkgrey 10px 10px 30px 5px;
+	box-shadow: darkgrey 10px 10px 30px 5px;
 	text-align: center;
 	padding: 0.5em;
 }
@@ -53,8 +53,8 @@ table td, .table .td {
 .ping a,
 .ping_value a,
 .tcping_value a {
-    text-decoration: none;
-    cursor: pointer;
+	text-decoration: none;
+	cursor: pointer;
 }
 
 @media (prefers-color-scheme: dark) {

luci-app-passwall2/luasrc/view/passwall2/rule/geoview.htm

@@ -74,7 +74,7 @@ local api = self.api
 		if (!value) {
 			alert("<%:Please enter query content!%>");
 			return;
-        }
+		}
 		lookup_btn.disabled = true;
 		extract_btn.disabled = true;
 		btn.value = '<%:Querying%>';

luci-app-passwall2/luasrc/view/passwall2/rule/shunt_rule_list.htm

@@ -11,8 +11,8 @@ table th, .table .th {
 
 table td, .table .td {
 	text-align: center;
-    /* white-space: nowrap; */
-    word-break: keep-all;
+	/* white-space: nowrap; */
+	word-break: keep-all;
 }
 
 .td.cbi-section-actions {

luci-app-passwall2/root/etc/uci-defaults/luci-app-passwall2

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -e "/etc/config/ucitrack" ]; then
-    uci -q batch <<-EOF
+	uci -q batch <<-EOF
  		delete ucitrack.@passwall2[-1]
 		add ucitrack passwall2
 		set ucitrack.@passwall2[-1].init=passwall2

luci-app-passwall2/root/etc/uci-defaults/luci-app-passwall2_server

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ -e "/etc/config/ucitrack" ]; then
-    uci -q batch <<-EOF
+	uci -q batch <<-EOF
 		delete ucitrack.@passwall2_server[-1]
 		add ucitrack passwall2_server
 		set ucitrack.@passwall2_server[-1].init=passwall2_server

luci-app-passwall2/root/usr/share/passwall2/i18n.lua

@@ -1,6 +1,6 @@
 if #arg > 0 then
-    local api = require "luci.passwall2.api"
-    local str = arg[1]
-    table.remove(arg, 1)
-    print(api.i18n.translatef(str, unpack(arg)))
+	local api = require "luci.passwall2.api"
+	local str = arg[1]
+	table.remove(arg, 1)
+	print(api.i18n.translatef(str, unpack(arg)))
 end

luci-app-passwall2/root/usr/share/passwall2/nftables.sh

@@ -891,7 +891,7 @@ add_firewall_rule() {
 
 del_firewall_rule() {
 	for nft in "dstnat" "srcnat" "nat_output" "mangle_prerouting" "mangle_output"; do
-        local handles=$(nft -a list chain $NFTABLE_NAME ${nft} 2>/dev/null | grep -E "PSW2_" | awk -F '# handle ' '{print$2}')
+		local handles=$(nft -a list chain $NFTABLE_NAME ${nft} 2>/dev/null | grep -E "PSW2_" | awk -F '# handle ' '{print$2}')
 		for handle in $handles; do
 			nft delete rule $NFTABLE_NAME ${nft} handle ${handle} 2>/dev/null
 		done