update 2026-05-11 22:38:28

luci-app-passwall/Makefile

@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-passwall
-PKG_VERSION:=26.5.3
+PKG_VERSION:=26.5.11
 PKG_RELEASE:=1
 PKG_PO_VERSION:=$(PKG_VERSION)
 

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

@@ -52,7 +52,7 @@ function index()
 	entry({"admin", "services", appname, "socks_config"}, cbi(appname .. "/client/socks_config")).leaf = true
 	entry({"admin", "services", appname, "acl"}, cbi(appname .. "/client/acl"), _("Access control"), 98).leaf = true
 	entry({"admin", "services", appname, "acl_config"}, cbi(appname .. "/client/acl_config")).leaf = true
-	entry({"admin", "services", appname, "log"}, form(appname .. "/client/log"), _("Watch Logs"), 999).leaf = true
+	entry({"admin", "services", appname, "log"}, form(appname .. "/client/log"), _("Runtime Logs"), 999).leaf = true
 
 	--[[ Server ]]
 	entry({"admin", "services", appname, "server"}, cbi(appname .. "/server/index"), _("Server-Side"), 99).leaf = true

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

@@ -1267,6 +1267,9 @@ function gen_config(var)
 			else
 				ut_nodes = _node.urltest_node
 			end
+
+			api.log("  - 加载 Sing-Box URLTest 节点【" .. (_node.remarks or "") .. "】，子节点数量：" .. #(ut_nodes or {}))
+
 			local valid_nodes = {}
 			for i = 1, #(ut_nodes or {}) do
 				local ut_node_id = ut_nodes[i]

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

@@ -1011,6 +1011,9 @@ function gen_config(var)
 			else
 				blc_nodes = _node.balancing_node
 			end
+
+			api.log("  - 加载 Xray 负载均衡 节点【" .. (_node.remarks or "") .. "】，子节点数量：" .. #(blc_nodes or {}))
+
 			local valid_nodes = {}
 			for i = 1, #(blc_nodes or {}) do
 				local blc_node_id = blc_nodes[i]

luci-app-passwall/po/zh-cn/passwall.po

@@ -58,8 +58,8 @@ msgstr "规则列表"
 msgid "Access control"
 msgstr "访问控制"
 
-msgid "Watch Logs"
-msgstr "查看日志"
+msgid "Runtime Logs"
+msgstr "运行日志"
 
 msgid "Node Config"
 msgstr "节点配置"

luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/status.lua

@@ -117,7 +117,7 @@ if global_type == "socks5" and Process_list:find("ipt2socks") then
 	if Process_list:find("%-U") or Process_list:find("%-%-udp%-only") then
 		reudp_run = 1
 	end
-	if global_socks_enabled and (global_socks_server == "same" or global_socks_server == global_server) then
+	if global_socks_enabled and (global_socks_server == "same" and global_socks_server == global_server) then
 		sock5_run = 1
 	end
 end
@@ -125,7 +125,7 @@ end
 if (global_type == "clash" or global_type == "tuic" or global_type == "ss") and Process_list:find("ssr%-retcp") then
 	redir_run = 1
 	reudp_run = 1
-	if global_socks_enabled and (global_socks_server == "same" or global_socks_server == global_server) then
+	if global_socks_enabled and (global_socks_server == "same" and global_socks_server == global_server) then
 		sock5_run = 1
 	end
 end
@@ -133,7 +133,7 @@ end
 if (global_type == "clash" or global_type == "tuic" or global_type == "ss") and Process_list:find("mihomo") and (Process_list:find("/clash%-") or Process_list:find("/tuic%-") or Process_list:find("/ss%-")) then
 	redir_run = 1
 	reudp_run = 1
-	if global_socks_enabled and (global_socks_server == "same" or global_socks_server == global_server) then
+	if global_socks_enabled and (global_socks_server == "same" and global_socks_server == global_server) then
 		sock5_run = 1
 	end
 end

luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm

@@ -275,11 +275,15 @@ end
 		}
 		var input = document.getElementById(store);
 		var order = ids.join(" ");
+		var pageElem = document.getElementById('cbi-server-page');
+		var pageSizeElem = document.getElementById('cbi-server-page-size');
+		var server_page = pageElem ? pageElem.value : '<%=self.server_page or 1%>';
+		var server_page_size = pageSizeElem ? pageSizeElem.value : '<%=self.server_page_size or 0%>';
 		if (input) input.value = order;
 		XHR.post('<%=luci.dispatcher.build_url("admin/services/shadowsocksr/save_order")%>', {
 			order: order,
-			page: '<%=self.server_page or 1%>',
-			page_size: '<%=self.server_page_size or 0%>'
+			page: server_page,
+			page_size: server_page_size
 		}, function(x, result) {
 			result = result || {};
 			if (result.ret !== 1 && result.ret !== "1") {

luci-app-ssr-plus/luasrc/view/shadowsocksr/server_table.htm

@@ -165,6 +165,8 @@ function render_pager()
 			<% end %>
 		</span>
 	</div>
+	<input type="hidden" id="cbi-server-page" value="<%=page%>" />
+	<input type="hidden" id="cbi-server-page-size" value="<%=page_size%>" />
 	<%
 end
 -%>