From 8df28edee184db4dbdaef8b9a3ee960fda0b6bb3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 20 Sep 2026 11:04:31 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=B8=20Sync=202026-09-20=2011:04:31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luci-app-passwall/Makefile | 2 +- .../model/cbi/passwall/server/type/1_sing-box.lua | 15 --------------- .../model/cbi/passwall/server/type/2_xray.lua | 15 --------------- .../cbi/passwall/server/type/5_hysteria2.lua | 15 --------------- .../luasrc/view/passwall/server/config_header.htm | 7 ------- luci-app-passwall/po/zh-cn/passwall.po | 3 --- luci-app-wwand/Makefile | 6 +++--- .../resources/view/dashboard/css/custom.css | 8 ++++---- luci-proto-wwand/Makefile | 6 +++--- wwand/Makefile | 6 +++--- 10 files changed, 14 insertions(+), 69 deletions(-) diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index eeea08bf2..f5b98da35 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.9.16 -PKG_RELEASE:=283 +PKG_RELEASE:=284 PKG_PO_VERSION:=$(PKG_VERSION) PKG_CONFIG_DEPENDS:= \ diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/1_sing-box.lua b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/1_sing-box.lua index 3cafc9a39..65e69f993 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/1_sing-box.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/1_sing-box.lua @@ -83,21 +83,6 @@ o = s:option(DynamicList, "users", translate("User")) for i, v in ipairs(user_list) do o:value(v[".name"], v.username) end -o.validate = function(self, value, t) - if type(value) == "string" then value = {value} end - if type(value) == "table" then - for _, u in ipairs(value) do - local found = false - for _, v in ipairs(user_list) do - if u == v[".name"] then found = true; break end - end - if not found then - return nil, translate("Please configure user info on the User Management page.") - end - end - end - return value -end o:depends({ protocol = "mixed" }) o:depends({ protocol = "socks" }) o:depends({ protocol = "http" }) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/2_xray.lua b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/2_xray.lua index 3374b1af4..b126f0211 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/2_xray.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/2_xray.lua @@ -76,21 +76,6 @@ o = s:option(DynamicList, "users", translate("User")) for i, v in ipairs(user_list) do o:value(v[".name"], v.username) end -o.validate = function(self, value, t) - if type(value) == "string" then value = {value} end - if type(value) == "table" then - for _, u in ipairs(value) do - local found = false - for _, v in ipairs(user_list) do - if u == v[".name"] then found = true; break end - end - if not found then - return nil, translate("Please configure user info on the User Management page.") - end - end - end - return value -end o:depends({ protocol = "http" }) o:depends({ protocol = "socks" }) o:depends({ protocol = "shadowsocks" }) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/5_hysteria2.lua b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/5_hysteria2.lua index 474415a05..b526498be 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/5_hysteria2.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/5_hysteria2.lua @@ -50,21 +50,6 @@ for i, v in ipairs(user_list) do o:value(v[".name"], v.username) end o:depends({ custom = false }) -o.validate = function(self, value, t) - if type(value) == "string" then value = {value} end - if type(value) == "table" then - for _, u in ipairs(value) do - local found = false - for _, v in ipairs(user_list) do - if u == v[".name"] then found = true; break end - end - if not found then - return nil, translate("Please configure user info on the User Management page.") - end - end - end - return value -end o = s:option(Flag, "realms", translate("Realms")) o.default = "0" diff --git a/luci-app-passwall/luasrc/view/passwall/server/config_header.htm b/luci-app-passwall/luasrc/view/passwall/server/config_header.htm index 97be8a2c4..742b71514 100644 --- a/luci-app-passwall/luasrc/view/passwall/server/config_header.htm +++ b/luci-app-passwall/luasrc/view/passwall/server/config_header.htm @@ -3,13 +3,6 @@ local map = self.map local api = map.api local section = self.section -%> -