Remove macaron dependent on models (#6940)

diff --git a/models/login_source.go b/models/login_source.go
index 69602b8b16c45474732febb2eed814c8a7c5eed0..9b8173b84dfb58e41664602922dce750a74fd0f8 100644 (file)
--- a/models/login_source.go
+++ b/models/login_source.go
@@ -11,10 +11,10 @@ import (
        "fmt"
        "net/smtp"
        "net/textproto"
+       "regexp"
        "strings"
 
        "github.com/Unknwon/com"
-       "github.com/go-macaron/binding"
        "github.com/go-xorm/core"
        "github.com/go-xorm/xorm"
 
@@ -384,6 +384,10 @@ func composeFullName(firstname, surname, username string) string {
        }
 }
 
+var (
+       alphaDashDotPattern = regexp.MustCompile("[^\\w-\\.]")
+)
+
 // LoginViaLDAP queries if login/password is valid against the LDAP directory pool,
 // and create a local user if success when enabled.
 func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoRegister bool) (*User, error) {
@@ -408,7 +412,7 @@ func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoR
                sr.Username = login
        }
        // Validate username make sure it satisfies requirement.
-       if binding.AlphaDashDotPattern.MatchString(sr.Username) {
+       if alphaDashDotPattern.MatchString(sr.Username) {
                return nil, fmt.Errorf("Invalid pattern for attribute 'username' [%s]: must be valid alpha or numeric or dash(-_) or dot characters", sr.Username)
        }
 

diff --git a/models/mail.go b/models/mail.go
index b3e1e0d83302ff07543ef6de0a331595d6d26b18..6be0df95ba51c2a29ed8cbf0035f130551555cd9 100644 (file)
--- a/models/mail.go
+++ b/models/mail.go
@@ -33,7 +33,7 @@ const (
 
 var templates *template.Template
 
-// InitMailRender initializes the macaron mail renderer
+// InitMailRender initializes the mail renderer
 func InitMailRender(tmpls *template.Template) {
        templates = tmpls
 }