update 2026-08-14 04:36:07

luci-app-passwall2/luasrc/model/cbi/passwall2/server/user_config.lua

@@ -1,24 +1,33 @@
 api = require "luci.passwall2.api"
-appname = api.appname
-fs = api.fs
-
 api.set_default_cbi()
 
-m = Map("passwall2_server", translate("User Config"))
+m = Map(api.s_config)
 m.redirect = api.url("server")
-api.set_apply_on_parse(m)
 
 if not arg[1] or not m:get(arg[1]) then
 	luci.http.redirect(m.redirect)
 end
 
-s = m:section(NamedSection, arg[1], "user", "")
+s = m:section(NamedSection, arg[1], "user", translate("User Config"))
 s.addremove = false
 s.dynamic = false
 
 o = s:option(Value, "username", translate("Username"))
 o.datatype = "and(uciname,maxlength(24))"
 o.rmempty = false
+function o.validate(self, value, section)
+	local exists = false
+	m:foreach("user", function(s)
+		if s[".name"] ~= section and s.username == value then
+			exists = true
+			return false
+		end
+	end)
+	if exists then
+		return nil, translate("This username already exists.")
+	end
+	return value
+end
 
 o = s:option(Value, "password",  translate("Password"))
 o.rmempty = false