aboutsummaryrefslogtreecommitdiffstats
path: root/routers/web/admin
diff options
context:
space:
mode:
authorZettat123 <zettat123@gmail.com>2024-03-11 14:07:36 +0800
committerGitHub <noreply@github.com>2024-03-11 06:07:36 +0000
commit4129e0e79bbf30e4297efd33feb2602c40322d10 (patch)
tree8b9b9d18835cc3dfd290f204f8802e7df860a0f8 /routers/web/admin
parent8fc1a8f0eb642c574610a346e858d42c433ebe01 (diff)
downloadgitea-4129e0e79bbf30e4297efd33feb2602c40322d10.tar.gz
gitea-4129e0e79bbf30e4297efd33feb2602c40322d10.zip
Add a warning for disallowed email domains (#29658)
Resolve #29660 Follow #29522 and #29609 Add a warning for disallowed email domains when admins manually add/edit users. Thanks @yp05327 for the [comment](https://github.com/go-gitea/gitea/pull/29605#issuecomment-1980105119) ![image](https://github.com/go-gitea/gitea/assets/15528715/6737b221-a3a2-4180-9ef8-b846c10f96e0)
Diffstat (limited to 'routers/web/admin')
-rw-r--r--routers/web/admin/users.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go
index 671a0d8885..6dfcfc3d9a 100644
--- a/routers/web/admin/users.go
+++ b/routers/web/admin/users.go
@@ -202,6 +202,11 @@ func NewUserPost(ctx *context.Context) {
}
return
}
+
+ if !user_model.IsEmailDomainAllowed(u.Email) {
+ ctx.Flash.Warning(ctx.Tr("form.email_domain_is_not_allowed", u.Email))
+ }
+
log.Trace("Account created by admin (%s): %s", ctx.Doer.Name, u.Name)
// Send email notification.
@@ -425,6 +430,9 @@ func EditUserPost(ctx *context.Context) {
}
return
}
+ if !user_model.IsEmailDomainAllowed(form.Email) {
+ ctx.Flash.Warning(ctx.Tr("form.email_domain_is_not_allowed", form.Email))
+ }
}
opts := &user_service.UpdateOptions{