From 02316f6f67de19450515a7a724fffc4ff26510bd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 9 Aug 2026 18:34:37 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Sync=202026-08-09=2018:34:37?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luci-app-passwall/Makefile | 2 +- .../luasrc/view/passwall/node_config/footer.htm | 2 +- .../luasrc/view/passwall/node_list/node_list.htm | 4 ++-- luci-app-passwall2/Makefile | 2 +- luci-app-passwall2/luasrc/passwall2/util_sing-box.lua | 2 +- .../luasrc/view/passwall2/global/status_bottom.htm | 2 +- .../luasrc/view/passwall2/node_config/footer.htm | 2 +- .../luasrc/view/passwall2/node_list/node_list.htm | 6 +++--- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index f8fa80d3..030e4829 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=26.8.1 -PKG_RELEASE:=207 +PKG_RELEASE:=208 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/luasrc/view/passwall/node_config/footer.htm b/luci-app-passwall/luasrc/view/passwall/node_config/footer.htm index 819243f9..5c0737fd 100644 --- a/luci-app-passwall/luasrc/view/passwall/node_config/footer.htm +++ b/luci-app-passwall/luasrc/view/passwall/node_config/footer.htm @@ -48,7 +48,7 @@ protocol: getOption("<%=self.config%>", "<%=self.section%>", name).value, }, node_config_url); } else { - window.location.href = node_config_url + "?select_proto=" + el.value; + window.location.href = node_config_url + "?select_proto=" + encodeURIComponent(el.value); } } }); diff --git a/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm b/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm index f005c294..85eb3e85 100644 --- a/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm +++ b/luci-app-passwall/luasrc/view/passwall/node_list/node_list.htm @@ -1255,11 +1255,11 @@ table td, .table .td { this.section = cbi_id; document.getElementById("set_node_div").style.display="block"; const node_name = document.getElementById("cbid.<%=appname%>." + cbi_id + ".remarks").value; - document.getElementById("set_node_name").innerHTML = node_name; + document.getElementById("set_node_name").textContent = node_name; }, close() { document.getElementById("set_node_div").style.display="none"; - document.getElementById("set_node_name").innerHTML = ""; + document.getElementById("set_node_name").textContent = ""; }, set(protocol) { if (confirm('<%:Are you sure set to%> ' + protocol.toUpperCase() + ' <%:the server?%>') == true){ diff --git a/luci-app-passwall2/Makefile b/luci-app-passwall2/Makefile index 1b86a41b..b07c45b6 100644 --- a/luci-app-passwall2/Makefile +++ b/luci-app-passwall2/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall2 PKG_VERSION:=26.8.7 -PKG_RELEASE:=71 +PKG_RELEASE:=72 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua b/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua index f6f87fd8..23847872 100644 --- a/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua +++ b/luci-app-passwall2/luasrc/passwall2/util_sing-box.lua @@ -261,7 +261,7 @@ function gen_outbound(flag, node, tag, proxy_table) fragment = fragment, record_fragment = record_fragment, certificate = (node.tls_certificate == "1" and node.tls_certificate_pem ~= "") and split(node.tls_certificate_pem, "\n") or nil, - cipher_suites = node.cipherSuites or nil, + cipher_suites = (node.cipherSuites and node.cipherSuites ~= "") and api.split(node.cipherSuites, ":") or nil, ech = (node.ech == "1") and (function() local function get_ech_domain(s) --兼容xray "域名+DNS" 格式ech local domain, dns = s:match("^([^+]+)%+(.+)$") diff --git a/luci-app-passwall2/luasrc/view/passwall2/global/status_bottom.htm b/luci-app-passwall2/luasrc/view/passwall2/global/status_bottom.htm index cd962d7c..0a5aea90 100644 --- a/luci-app-passwall2/luasrc/view/passwall2/global/status_bottom.htm +++ b/luci-app-passwall2/luasrc/view/passwall2/global/status_bottom.htm @@ -38,7 +38,7 @@ text-align: right; } -#cbi-passwall+.cbi-page-actions.control-group.fixed { +#cbi-passwall2+.cbi-page-actions.control-group.fixed { bottom: 3.3rem; } diff --git a/luci-app-passwall2/luasrc/view/passwall2/node_config/footer.htm b/luci-app-passwall2/luasrc/view/passwall2/node_config/footer.htm index b2cfd367..85585217 100644 --- a/luci-app-passwall2/luasrc/view/passwall2/node_config/footer.htm +++ b/luci-app-passwall2/luasrc/view/passwall2/node_config/footer.htm @@ -48,7 +48,7 @@ protocol: getOption("<%=self.config%>", "<%=self.section%>", name).value, }, node_config_url); } else { - window.location.href = node_config_url + "?select_proto=" + el.value; + window.location.href = node_config_url + "?select_proto=" + encodeURIComponent(el.value); } } }); diff --git a/luci-app-passwall2/luasrc/view/passwall2/node_list/node_list.htm b/luci-app-passwall2/luasrc/view/passwall2/node_list/node_list.htm index d9c91c7c..d2d42741 100644 --- a/luci-app-passwall2/luasrc/view/passwall2/node_list/node_list.htm +++ b/luci-app-passwall2/luasrc/view/passwall2/node_list/node_list.htm @@ -1257,16 +1257,16 @@ table td, .table .td { this.section = cbi_id; document.getElementById("set_node_div").style.display="block"; const node_name = document.getElementById("cbid.<%=appname%>." + cbi_id + ".remarks").value; - document.getElementById("set_node_name").innerHTML = node_name; + document.getElementById("set_node_name").textContent = node_name; }, close() { document.getElementById("set_node_div").style.display="none"; - document.getElementById("set_node_name").innerHTML = ""; + document.getElementById("set_node_name").textContent = ""; }, set(type, config) { if (confirm('<%:Are you sure set this node?%>') == true){ ajax.abortAll(); - window.location.href = '<%=api.url("set_node")%>?type=' + type + '&config=' + config + '§ion=' + section; + window.location.href = '<%=api.url("set_node")%>?type=' + type + '&config=' + config + '§ion=' + this.section; } } }