🔥 Sync 2026-08-09 18:34:37

This commit is contained in:
github-actions[bot] committed 2026-08-09 18:34:37 +08:00
1 parent a97de40c9f
commit 8c45caf1d9
8 files changed
+11 -11

No files matched your search

+1 -1
View File
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall PKG_NAME:=luci-app-passwall
PKG_VERSION:=26.8.1 PKG_VERSION:=26.8.1
PKG_RELEASE:=207 PKG_RELEASE:=208
PKG_PO_VERSION:=$(PKG_VERSION) PKG_PO_VERSION:=$(PKG_VERSION)
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
@@ -48,7 +48,7 @@
protocol: getOption("<%=self.config%>", "<%=self.section%>", name).value, protocol: getOption("<%=self.config%>", "<%=self.section%>", name).value,
}, node_config_url); }, node_config_url);
} else { } else {
window.location.href = node_config_url + "?select_proto=" + el.value; window.location.href = node_config_url + "?select_proto=" + encodeURIComponent(el.value);
} }
} }
}); });
@@ -1255,11 +1255,11 @@ table td, .table .td {
this.section = cbi_id; this.section = cbi_id;
document.getElementById("set_node_div").style.display="block"; document.getElementById("set_node_div").style.display="block";
const node_name = document.getElementById("cbid.<%=appname%>." + cbi_id + ".remarks").value; 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() { close() {
document.getElementById("set_node_div").style.display="none"; document.getElementById("set_node_div").style.display="none";
document.getElementById("set_node_name").innerHTML = ""; document.getElementById("set_node_name").textContent = "";
}, },
set(protocol) { set(protocol) {
if (confirm('<%:Are you sure set to%> ' + protocol.toUpperCase() + ' <%:the server?%>') == true){ if (confirm('<%:Are you sure set to%> ' + protocol.toUpperCase() + ' <%:the server?%>') == true){
+1 -1
View File
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall2 PKG_NAME:=luci-app-passwall2
PKG_VERSION:=26.8.7 PKG_VERSION:=26.8.7
PKG_RELEASE:=71 PKG_RELEASE:=72
PKG_PO_VERSION:=$(PKG_VERSION) PKG_PO_VERSION:=$(PKG_VERSION)
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \
@@ -261,7 +261,7 @@ function gen_outbound(flag, node, tag, proxy_table)
fragment = fragment, fragment = fragment,
record_fragment = record_fragment, record_fragment = record_fragment,
certificate = (node.tls_certificate == "1" and node.tls_certificate_pem ~= "") and split(node.tls_certificate_pem, "\n") or nil, 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() ech = (node.ech == "1") and (function()
local function get_ech_domain(s) --兼容xray "域名+DNS" 格式ech local function get_ech_domain(s) --兼容xray "域名+DNS" 格式ech
local domain, dns = s:match("^([^+]+)%+(.+)$") local domain, dns = s:match("^([^+]+)%+(.+)$")
@@ -38,7 +38,7 @@
text-align: right; text-align: right;
} }
#cbi-passwall+.cbi-page-actions.control-group.fixed { #cbi-passwall2+.cbi-page-actions.control-group.fixed {
bottom: 3.3rem; bottom: 3.3rem;
} }
@@ -48,7 +48,7 @@
protocol: getOption("<%=self.config%>", "<%=self.section%>", name).value, protocol: getOption("<%=self.config%>", "<%=self.section%>", name).value,
}, node_config_url); }, node_config_url);
} else { } else {
window.location.href = node_config_url + "?select_proto=" + el.value; window.location.href = node_config_url + "?select_proto=" + encodeURIComponent(el.value);
} }
} }
}); });
@@ -1257,16 +1257,16 @@ table td, .table .td {
this.section = cbi_id; this.section = cbi_id;
document.getElementById("set_node_div").style.display="block"; document.getElementById("set_node_div").style.display="block";
const node_name = document.getElementById("cbid.<%=appname%>." + cbi_id + ".remarks").value; 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() { close() {
document.getElementById("set_node_div").style.display="none"; document.getElementById("set_node_div").style.display="none";
document.getElementById("set_node_name").innerHTML = ""; document.getElementById("set_node_name").textContent = "";
}, },
set(type, config) { set(type, config) {
if (confirm('<%:Are you sure set this node?%>') == true){ if (confirm('<%:Are you sure set this node?%>') == true){
ajax.abortAll(); ajax.abortAll();
window.location.href = '<%=api.url("set_node")%>?type=' + type + '&config=' + config + '&section=' + section; window.location.href = '<%=api.url("set_node")%>?type=' + type + '&config=' + config + '&section=' + this.section;
} }
} }
} }