Merge branch 'master' of github.com:gogits/gogs

This commit is contained in:
Lunny Xiao 2014-03-06 16:17:28 +08:00
commit 245e806679
3 changed files with 53 additions and 50 deletions

View File

@ -7,6 +7,7 @@ package auth
import ( import (
"net/http" "net/http"
"reflect" "reflect"
"strings"
"github.com/codegangsta/martini" "github.com/codegangsta/martini"
@ -17,11 +18,59 @@ import (
) )
type RegisterForm struct { type RegisterForm struct {
UserName string `form:"username" binding:"Required;AlphaDash;MinSize(5);MaxSize(30)"` Username string `form:"username" binding:"Required;AlphaDash;MinSize(5);MaxSize(30)"`
Email string `form:"email" binding:"Required;Email;MaxSize(50)"` Email string `form:"email" binding:"Required;Email;MaxSize(50)"`
Password string `form:"passwd" binding:"Required;MinSize(6);MaxSize(30)"` Password string `form:"passwd" binding:"Required;MinSize(6);MaxSize(30)"`
} }
func getMinMaxSize(field reflect.StructField) string {
for _, rule := range strings.Split(field.Tag.Get("binding"), ";") {
if strings.HasPrefix(rule, "MinSize(") || strings.HasPrefix(rule, "MaxSize(") {
return rule[8 : len(rule)-1]
}
}
return ""
}
func validate(errors *binding.Errors, data base.TmplData, form interface{}) {
typ := reflect.TypeOf(form)
val := reflect.ValueOf(form)
if typ.Kind() == reflect.Ptr {
typ = typ.Elem()
val = val.Elem()
}
for i := 0; i < typ.NumField(); i++ {
field := typ.Field(i)
fieldName := field.Tag.Get("form")
// Allow ignored fields in the struct
if fieldName == "-" {
continue
}
if err, ok := errors.Fields[field.Name]; ok {
data["Err_"+field.Name] = true
switch err {
case binding.RequireError:
data["ErrorMsg"] = field.Name + " cannot be empty"
case binding.AlphaDashError:
data["ErrorMsg"] = field.Name + " must be valid alpha or numeric or dash(-_) characters"
case binding.MinSizeError:
data["ErrorMsg"] = field.Name + " must contain at least has " + getMinMaxSize(field) + " characters"
case binding.MaxSizeError:
data["ErrorMsg"] = field.Name + " must contain at most has " + getMinMaxSize(field) + " characters"
case binding.EmailError:
data["ErrorMsg"] = field.Name + " is not valid"
default:
data["ErrorMsg"] = "Unknown error: " + err
}
return
}
}
}
func (r *RegisterForm) Validate(errors *binding.Errors, req *http.Request, context martini.Context) { func (r *RegisterForm) Validate(errors *binding.Errors, req *http.Request, context martini.Context) {
if req.Method == "GET" || errors.Count() == 0 { if req.Method == "GET" || errors.Count() == 0 {
return return
@ -38,53 +87,7 @@ func (r *RegisterForm) Validate(errors *binding.Errors, req *http.Request, conte
return return
} }
if err, ok := errors.Fields["UserName"]; ok { validate(errors, data, r)
data["Err_Username"] = true
switch err {
case binding.RequireError:
data["ErrorMsg"] = "Username cannot be empty"
case binding.AlphaDashError:
data["ErrorMsg"] = "Username must be valid alpha or numeric or dash(-_) characters"
case binding.MinSizeError:
data["ErrorMsg"] = "Username at least has 5 characters"
case binding.MaxSizeError:
data["ErrorMsg"] = "Username at most has 30 characters"
default:
data["ErrorMsg"] = "Unknown error: " + err
}
return
}
if err, ok := errors.Fields["Email"]; ok {
data["Err_Email"] = true
switch err {
case binding.RequireError:
data["ErrorMsg"] = "E-mail address cannot be empty"
case binding.EmailError:
data["ErrorMsg"] = "E-mail address is not valid"
case binding.MaxSizeError:
data["ErrorMsg"] = "E-mail address at most has 50 characters"
default:
data["ErrorMsg"] = "Unknown error: " + err
}
return
}
if err, ok := errors.Fields["Password"]; ok {
data["Err_Passwd"] = true
switch err {
case binding.RequireError:
data["ErrorMsg"] = "Password cannot be empty"
case binding.MinSizeError:
data["ErrorMsg"] = "Password at least has 6 characters"
case binding.MaxSizeError:
data["ErrorMsg"] = "Password at most has 30 characters"
default:
data["ErrorMsg"] = "Unknown error: " + err
}
return
}
} }
// AssignForm assign form values back to the template data. // AssignForm assign form values back to the template data.

View File

@ -87,7 +87,7 @@ func SignUp(form auth.RegisterForm, data base.TmplData, req *http.Request, r ren
//Front-end should do double check of password. //Front-end should do double check of password.
u := &models.User{ u := &models.User{
Name: form.UserName, Name: form.Username,
Email: form.Email, Email: form.Email,
Passwd: form.Password, Passwd: form.Password,
} }

View File

@ -19,7 +19,7 @@
</div> </div>
</div> </div>
<div class="form-group {{if .Err_Passwd}}has-error has-feedback{{end}}"> <div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
<label class="col-md-4 control-label">Password: </label> <label class="col-md-4 control-label">Password: </label>
<div class="col-md-6"> <div class="col-md-6">
<input name="passwd" type="password" class="form-control" placeholder="Type your password"> <input name="passwd" type="password" class="form-control" placeholder="Type your password">