update 2026-10-31 18:07:25

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

@@ -886,17 +886,17 @@ function read_rulelist()
 end
 
 local backup_files = {
-    "/etc/config/passwall",
+	"/etc/config/passwall",
-    "/etc/config/passwall_server",
+	"/etc/config/passwall_server",
-    "/etc/passwall/rules/block_host",
+	"/etc/passwall/rules/block_host",
-    "/etc/passwall/rules/block_ip",
+	"/etc/passwall/rules/block_ip",
-    "/etc/passwall/rules/direct_host",
+	"/etc/passwall/rules/direct_host",
-    "/etc/passwall/rules/direct_ip",
+	"/etc/passwall/rules/direct_ip",
-    "/etc/passwall/rules/proxy_host",
+	"/etc/passwall/rules/proxy_host",
-    "/etc/passwall/rules/proxy_ip",
+	"/etc/passwall/rules/proxy_ip",
-    "/etc/passwall/rules/lanlist_ipv4",
+	"/etc/passwall/rules/lanlist_ipv4",
-    "/etc/passwall/rules/lanlist_ipv6",
+	"/etc/passwall/rules/lanlist_ipv6",
-    "/etc/passwall/rules/domains_excluded"
+	"/etc/passwall/rules/domains_excluded"
 }
 
 function create_backup()

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

@@ -119,7 +119,7 @@ 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"))
+		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>")

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

@@ -68,9 +68,9 @@ o.validate = port_validate
 
 ---- UDP No Redir Ports
 o = s:option(Value, "udp_no_redir_ports", translate("UDP No Redir Ports"),
-			 "<font color='red'>" .. translate(
+			"<font color='red'>" .. translate(
-				 "Fill in the ports you don't want to be forwarded by the agent, with the highest priority.") ..
+				"Fill in the ports you don't want to be forwarded by the agent, with the highest priority.") ..
-				 "</font>")
+				"</font>")
 o.default = "disable"
 o:value("disable", translate("No patterns are used"))
 o:value("1:65535", translate("All"))

luci-app-passwall/luasrc/model/cbi/passwall/client/type/0_socks.lua

@@ -18,7 +18,7 @@ s.type_name = type_name
 s.option_prefix = "socks_"
 api.set_type_cbi(s)
 
-o = s:option(ListValue, "del_protocol", "¡¡") --ʼÖÕÒþ²Ø£¬ÓÃÓÚɾ³ý protocol
+o = s:option(ListValue, "del_protocol", "　") --始终隐藏，用于删除 protocol
 o:depends({ __hide = "1" })
 o.rewrite_option = "protocol"
 

luci-app-passwall/luasrc/passwall/util_sing-box.lua

@@ -2178,7 +2178,7 @@ function gen_config(var)
 							local remote_dns_server = api.clone(remote_server)
 							remote_dns_server.tag = value.shunt_tag
 							local is_local = (remote_server.address and api.is_local_ip(remote_server.address)) or
-									 (remote_server.server and api.is_local_ip(remote_server.server))  --dns为本地ip，不走代理
+									(remote_server.server and api.is_local_ip(remote_server.server))  --dns为本地ip，不走代理
 							remote_dns_server.detour = is_local and "direct" or value.outboundTag
 							table.insert(dns.servers, remote_dns_server)
 							dns_rule.server = remote_dns_server.tag

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

@@ -175,7 +175,7 @@
 		const ctx = canvas.getContext('2d', { willReadFrequently: true });
 		return function(colorStr) {
 			if (!colorStr)
-			   return null;
+				return null;
 			ctx.clearRect(0, 0, 1, 1);
 			// 2. Apply the color
 			ctx.fillStyle = colorStr;

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

@@ -169,7 +169,7 @@
 		const ctx = canvas.getContext('2d', { willReadFrequently: true });
 		return function(colorStr) {
 			if (!colorStr)
-			   return null;
+				return null;
 			ctx.clearRect(0, 0, 1, 1);
 			// 2. Apply the color
 			ctx.fillStyle = colorStr;

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

@@ -125,7 +125,7 @@
 		const ctx = canvas.getContext('2d', { willReadFrequently: true });
 		return function(colorStr) {
 			if (!colorStr)
-			   return null;
+				return null;
 			ctx.clearRect(0, 0, 1, 1);
 			// 2. Apply the color
 			ctx.fillStyle = colorStr;

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

@@ -137,7 +137,7 @@ local dropdown_data = {
 		</select>
 	</div>
 	<!-- 隐藏 input（保存实际配置值） -->
- 	<input type="text" id="<%=cbid%>" name="<%=cbid%>" value="<%=current_key%>" data-update="change" style="display:none !important;" />
+	<input type="text" id="<%=cbid%>" name="<%=cbid%>" value="<%=current_key%>" data-update="change" style="display:none !important;" />
 	<!-- 模拟 ListValue 控件外观 -->
 	<div class="cbi-input-value cbi-input-select v-dropdown-display" id="<%=cbid%>.display" tabindex="0">
 		<span id="<%=cbid%>.label" class="v-dropdown-label" title="<%=pcdata(current_label)%>">

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

@@ -164,7 +164,7 @@
 		const ctx = canvas.getContext('2d', { willReadFrequently: true });
 		return function(colorStr) {
 			if (!colorStr)
-			   return null;
+				return null;
 			ctx.clearRect(0, 0, 1, 1);
 			// 2. Apply the color
 			ctx.fillStyle = colorStr;

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

@@ -5,11 +5,11 @@ local appname = map.config
 local sid = "@global[0]"
 -%>
 <style>
- #cbi-<%=appname%>-socks .td.cbi-value-field > div { 
+#cbi-<%=appname%>-socks .td.cbi-value-field > div {
 	white-space: nowrap;
 }
 @media (max-width: 1152px) {
-	 #cbi-<%=appname%>-socks .td.cbi-value-field > div {
+	#cbi-<%=appname%>-socks .td.cbi-value-field > div {
 		white-space: normal;
 	}
 }

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

@@ -187,7 +187,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
 				</div>
 			</div>
 		</div>
-	  </div>
+	</div>
 	<script>
 		//<![CDATA[
 		var imgs = document.getElementsByTagName('img');

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

@@ -133,7 +133,7 @@ local has_old_geosite = fs.access("/tmp/bak_v2ray/geosite.dat")
 		var checkBoxList = [];
 		var len = domList.length;
 		while(len--) {
-			var dom = domList[len];　　
+			var dom = domList[len];
 			if(dom.type == 'checkbox' && dom.checked) {
 				checkBoxList.push(dom.name);
 			}
@@ -162,7 +162,7 @@ local has_old_geosite = fs.access("/tmp/bak_v2ray/geosite.dat")
 		var checkBoxList = [];
 		var len = domList.length;
 		while(len--) {
-			var dom = domList[len];　　
+			var dom = domList[len];
 			if(dom.type == 'checkbox' && dom.checked) {
 				if(type == 'geoip' && (dom.name === 'chnroute' || dom.name === 'chnroute6')) {
 					checkBoxList.push(dom.name);

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

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

luci-app-passwall/root/usr/share/passwall/app.sh

@@ -1088,7 +1088,7 @@ start_dns() {
 	local ACL_RULE_DNSMASQ=0
 	for acl_section in $(uci show ${CONFIG} | grep "=acl_rule" | cut -d '.' -sf 2 | cut -d '=' -sf 1); do
 		if [ "$(config_n_get $acl_section enabled)" = "1" ] && \
-		   [ "$(config_n_get $acl_section dns_shunt)" = "dnsmasq" ]; then
+			[ "$(config_n_get $acl_section dns_shunt)" = "dnsmasq" ]; then
 			ACL_RULE_DNSMASQ=1
 			break
 		fi

luci-app-passwall/root/usr/share/passwall/helper_smartdns_add.lua

@@ -172,9 +172,7 @@ local auto_config_lines = {}
 -- 直连规则显式覆盖远程兜底的缓存、IPv6、测速和双栈优选设置。
 local DIRECT_RULE_OPTIONS = " -enable-cache -address -6 -speed-check-mode ping,tcp:80,tcp:443 -response-mode first-ping -d yes"
 --设置默认 DNS 分组(兜底组)，全局代理模式仍使用远程组。
-local DEFAULT_DNS_GROUP = (USE_DEFAULT_DNS == "direct" and "direct") or
+local DEFAULT_DNS_GROUP = (USE_DEFAULT_DNS == "direct" and "direct") or (USE_DEFAULT_DNS == "remote" and "proxy") or (USE_DEFAULT_DNS == "auto" and AUTO_GROUP)
-                          (USE_DEFAULT_DNS == "remote" and "proxy") or
-                          (USE_DEFAULT_DNS == "auto" and AUTO_GROUP)
 local only_global = (DEFAULT_PROXY_MODE == "proxy" and CHN_LIST == "0" and USE_GFW_LIST == "0") and 1
 if only_global == 1 then
 	DEFAULT_DNS_GROUP = "proxy"

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

@@ -197,20 +197,20 @@ insert_nftset() {
 			RS = "[ \t\n\r]+"
 			ORS = ""
 		}
-        $0 != "" {
+		$0 != "" {
-            if (!first) {
+			if (!first) {
-                printf "add element %s %s { \n", t, n
+				printf "add element %s %s { \n", t, n
 				first = 1
-            } else {
+			} else {
-                print ",\n"
+				print ",\n"
-            }
+			}
-            printf " %s", $0
+			printf " %s", $0
-        }
+		}
-        END {
+		END {
-            if (first) {
+			if (first) {
-                print "\n }\n"
+				print "\n }\n"
-            }
+			}
-        }' | nft -f -
+		}' | nft -f -
 }
 
 gen_nftset() {
@@ -1502,7 +1502,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 "PSW_" | awk -F '# handle ' '{print$2}')
+		local handles=$(nft -a list chain $NFTABLE_NAME ${nft} 2>/dev/null | grep -E "PSW_" | awk -F '# handle ' '{print$2}')
 		for handle in $handles; do
 			nft delete rule $NFTABLE_NAME ${nft} handle ${handle} 2>/dev/null
 		done

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

@@ -114,7 +114,7 @@ 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"))
+		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>")

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

@@ -19,13 +19,13 @@ m.description = (m.description or "") .. [[
 <style>
 /* Scope to passwall2 CBI fields so it won't leak elsewhere */
 div[id^="cbid.passwall2."] .cbi-value-field {
-  display: flex;
+	display: flex;
-  flex-wrap: wrap;
+	flex-wrap: wrap;
-  gap: 1em;
+	gap: 1em;
 }
 div[id^="cbid.passwall2."] .cbi-checkbox {
-  display: inline-flex;
+	display: inline-flex;
-  align-items: center;
+	align-items: center;
 }
 </style>
 ]]

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

@@ -982,7 +982,7 @@ function gen_config(var)
 	local routing = nil
 	local observatory = nil
 	local burstObservatory = nil
- 	local strategy = nil
+	local strategy = nil
 	local COMMON = {}
 
 	local CACHE_TEXT_FILE = CACHE_PATH .. "/cache_" .. flag .. ".txt"

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

@@ -175,7 +175,7 @@
 		const ctx = canvas.getContext('2d', { willReadFrequently: true });
 		return function(colorStr) {
 			if (!colorStr)
-			   return null;
+				return null;
 			ctx.clearRect(0, 0, 1, 1);
 			// 2. Apply the color
 			ctx.fillStyle = colorStr;

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

@@ -169,7 +169,7 @@
 		const ctx = canvas.getContext('2d', { willReadFrequently: true });
 		return function(colorStr) {
 			if (!colorStr)
-			   return null;
+				return null;
 			ctx.clearRect(0, 0, 1, 1);
 			// 2. Apply the color
 			ctx.fillStyle = colorStr;

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

@@ -125,7 +125,7 @@
 		const ctx = canvas.getContext('2d', { willReadFrequently: true });
 		return function(colorStr) {
 			if (!colorStr)
-			   return null;
+				return null;
 			ctx.clearRect(0, 0, 1, 1);
 			// 2. Apply the color
 			ctx.fillStyle = colorStr;

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

@@ -137,7 +137,7 @@ local dropdown_data = {
 		</select>
 	</div>
 	<!-- 隐藏 input（保存实际配置值） -->
- 	<input type="text" id="<%=cbid%>" name="<%=cbid%>" value="<%=current_key%>" data-update="change" style="display:none !important;" />
+	<input type="text" id="<%=cbid%>" name="<%=cbid%>" value="<%=current_key%>" data-update="change" style="display:none !important;" />
 	<!-- 模拟 ListValue 控件外观 -->
 	<div class="cbi-input-value cbi-input-select v-dropdown-display" id="<%=cbid%>.display" tabindex="0">
 		<span id="<%=cbid%>.label" class="v-dropdown-label" title="<%=pcdata(current_label)%>">

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

@@ -164,7 +164,7 @@
 		const ctx = canvas.getContext('2d', { willReadFrequently: true });
 		return function(colorStr) {
 			if (!colorStr)
-			   return null;
+				return null;
 			ctx.clearRect(0, 0, 1, 1);
 			// 2. Apply the color
 			ctx.fillStyle = colorStr;

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

@@ -4,25 +4,25 @@ local api = map.api
 -%>
 <style>
 	.dns-con {
-	  padding: 1rem;
+		padding: 1rem;
 	}
 	.faq-title {
-	  color: var(--primary);
+		color: var(--primary);
-	  font-weight: bolder;
+		font-weight: bolder;
-	  margin-bottom: 0.5rem;
+		margin-bottom: 0.5rem;
-	  display: inline-block;
+		display: inline-block;
 	}
 	.reset-title {
-	 color: var(--primary)；
+		color: var(--primary)；
-	 font-weight: bolder;
+		font-weight: bolder;
-	 margin-bottom: 0.3rem;
+		margin-bottom: 0.3rem;
-	 display: inline-block;
+		display: inline-block;
-	 margin-top: 1.2rem;
+		margin-top: 1.2rem;
-	 text-decoration: underline;
+		text-decoration: underline;
 	}
 	.dns-item {
-	 margin-bottom: 0.8rem;
+		margin-bottom: 0.8rem;
-	 line-height:1.2rem;
+		line-height:1.2rem;
 	}
 	.dns-list {
 		text-indent:1rem;

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

@@ -5,11 +5,11 @@ local appname = map.config
 local sid = "@global[0]"
 -%>
 <style>
- #cbi-<%=appname%>-socks .td.cbi-value-field > div { 
+#cbi-<%=appname%>-socks .td.cbi-value-field > div {
 	white-space: nowrap;
 }
 @media (max-width: 1152px) {
-	 #cbi-<%=appname%>-socks .td.cbi-value-field > div {
+	#cbi-<%=appname%>-socks .td.cbi-value-field > div {
 		white-space: normal;
 	}
 }

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

@@ -132,7 +132,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
 				</div>
 			</div>
 		</div>
-	  </div>
+	</div>
 	<script>
 		//<![CDATA[
 		var imgs = document.getElementsByTagName('img');

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

@@ -87,9 +87,9 @@ local has_old_geosite = fs.access("/tmp/bak_v2ray/geosite.dat")
 		var checkBoxList = [];
 		var len = domList.length;
 		while(len--) {
-			var dom = domList[len];　　
+			var dom = domList[len];
-			if(dom.type == 'checkbox' && dom.checked) {　　
+			if(dom.type == 'checkbox' && dom.checked) {
-				checkBoxList.push(dom.name);　　
+				checkBoxList.push(dom.name);
 			}
 		}
 		XHR.get('<%=api.url("update_rules")%>', {

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

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

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

@@ -157,20 +157,20 @@ insert_nftset() {
 			RS = "[ \t\n\r]+"
 			ORS = ""
 		}
-        $0 != "" {
+		$0 != "" {
-            if (!first) {
+			if (!first) {
-                printf "add element %s %s { \n", t, n
+				printf "add element %s %s { \n", t, n
 				first = 1
-            } else {
+			} else {
-                print ",\n"
+				print ",\n"
-            }
+			}
-            printf " %s", $0
+			printf " %s", $0
-        }
+		}
-        END {
+		END {
-            if (first) {
+			if (first) {
-                print "\n }\n"
+				print "\n }\n"
-            }
+			}
-        }' | nft -f -
+		}' | nft -f -
 }
 
 gen_nftset() {