Browse Source

#1579 change e-mail max length to 254

pull/1524/merge
Unknwon 9 years ago
parent
commit
07fe846c9f
  1. 1
      conf/locale/TRANSLATORS
  2. 2
      modules/auth/admin.go
  3. 8
      modules/auth/user_form.go
  4. 4
      templates/install.tmpl

1
conf/locale/TRANSLATORS

@ -4,6 +4,7 @@
Akihiro YAGASAKI <yaggytter@momiage.com> Akihiro YAGASAKI <yaggytter@momiage.com>
Alexander Steinhöfer <kontakt@lx-s.de> Alexander Steinhöfer <kontakt@lx-s.de>
Alexandre Magno <alexandre.mbm@gmail.com> Alexandre Magno <alexandre.mbm@gmail.com>
Barış Arda Yılmaz <ardayilmazgamer@gmail.com>
Christoph Kisfeld <christoph.kisfeld@gmail.com> Christoph Kisfeld <christoph.kisfeld@gmail.com>
Daniel Speichert <daniel@speichert.pl> Daniel Speichert <daniel@speichert.pl>
Gregor Santner <gdev@live.de> Gregor Santner <gdev@live.de>

2
modules/auth/admin.go

@ -12,7 +12,7 @@ import (
type AdminEditUserForm struct { type AdminEditUserForm struct {
FullName string `form:"fullname" binding:"MaxSize(100)"` FullName string `form:"fullname" binding:"MaxSize(100)"`
Email string `binding:"Required;Email;MaxSize(50)"` Email string `binding:"Required;Email;MaxSize(254)"`
Password string `binding:"OmitEmpty;MinSize(6);MaxSize(255)"` Password string `binding:"OmitEmpty;MinSize(6);MaxSize(255)"`
Website string `binding:"MaxSize(50)"` Website string `binding:"MaxSize(50)"`
Location string `binding:"MaxSize(50)"` Location string `binding:"MaxSize(50)"`

8
modules/auth/user_form.go

@ -59,7 +59,7 @@ func (f *InstallForm) Validate(ctx *macaron.Context, errs binding.Errors) bindin
type RegisterForm struct { type RegisterForm struct {
UserName string `form:"uname" binding:"Required;AlphaDashDot;MaxSize(35)"` UserName string `form:"uname" binding:"Required;AlphaDashDot;MaxSize(35)"`
Email string `form:"email" binding:"Required;Email;MaxSize(50)"` Email string `form:"email" binding:"Required;Email;MaxSize(254)"`
Password string `form:"password" binding:"Required;MaxSize(255)"` Password string `form:"password" binding:"Required;MaxSize(255)"`
Retype string `form:"retype"` Retype string `form:"retype"`
LoginType string `form:"logintype"` LoginType string `form:"logintype"`
@ -71,7 +71,7 @@ func (f *RegisterForm) Validate(ctx *macaron.Context, errs binding.Errors) bindi
} }
type SignInForm struct { type SignInForm struct {
UserName string `form:"uname" binding:"Required;MaxSize(35)"` UserName string `form:"uname" binding:"Required;MaxSize(254)"`
Password string `form:"password" binding:"Required;MaxSize(255)"` Password string `form:"password" binding:"Required;MaxSize(255)"`
Remember bool `form:"remember"` Remember bool `form:"remember"`
} }
@ -90,10 +90,10 @@ func (f *SignInForm) Validate(ctx *macaron.Context, errs binding.Errors) binding
type UpdateProfileForm struct { type UpdateProfileForm struct {
UserName string `form:"uname" binding:"Required;MaxSize(35)"` UserName string `form:"uname" binding:"Required;MaxSize(35)"`
FullName string `form:"fullname" binding:"MaxSize(100)"` FullName string `form:"fullname" binding:"MaxSize(100)"`
Email string `form:"email" binding:"Required;Email;MaxSize(50)"` Email string `form:"email" binding:"Required;Email;MaxSize(254)"`
Website string `form:"website" binding:"Url;MaxSize(100)"` Website string `form:"website" binding:"Url;MaxSize(100)"`
Location string `form:"location" binding:"MaxSize(50)"` Location string `form:"location" binding:"MaxSize(50)"`
Avatar string `form:"avatar" binding:"Required;Email;MaxSize(50)"` Avatar string `form:"avatar" binding:"Required;Email;MaxSize(254)"`
} }
func (f *UpdateProfileForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { func (f *UpdateProfileForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {

4
templates/install.tmpl

@ -89,7 +89,7 @@
</div> </div>
<div class="inline required field"> <div class="inline required field">
<label for="domain">{{.i18n.Tr "install.domain"}}</label> <label for="domain">{{.i18n.Tr "install.domain"}}</label>
<input id="domain" name="domain" value="{{.domain}}" required> <input id="domain" name="domain" value="{{.domain}}" placeholder="e.g. try.gogs.io" required>
<span class="help">{{.i18n.Tr "install.domain_helper"}}</span> <span class="help">{{.i18n.Tr "install.domain_helper"}}</span>
</div> </div>
<div class="inline required field"> <div class="inline required field">
@ -104,7 +104,7 @@
</div> </div>
<div class="inline required field"> <div class="inline required field">
<label for="app_url">{{.i18n.Tr "install.app_url"}}</label> <label for="app_url">{{.i18n.Tr "install.app_url"}}</label>
<input id="app_url" name="app_url" value="{{.app_url}}" required> <input id="app_url" name="app_url" value="{{.app_url}}" placeholder="e.g. https://try.gogs.io" required>
<span class="help">{{.i18n.Tr "install.app_url_helper"}}</span> <span class="help">{{.i18n.Tr "install.app_url_helper"}}</span>
</div> </div>

Loading…
Cancel
Save