foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 12:54:53 -05:00
Code Issues Wiki Activity

Merge pull request #246 from Bwko/fix/typo

Browse source 
Fix typos
This commit is contained in:
Thomas Boerger 2016-11-25 12:54:57 +01:00 committed by GitHub
commit e9c6053b86
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
models/issue.go
View file

@ -664,7 +664,7 @@ func newIssue(e *xorm.Session, opts NewIssueOptions) (err error) {
} }
if len(opts.LableIDs) > 0 { if len(opts.LableIDs) > 0 {
// During the session, SQLite3 dirver cannot handle retrieve objects after update something. // During the session, SQLite3 driver cannot handle retrieve objects after update something.
// So we have to get all needed labels first. // So we have to get all needed labels first.
labels := make([]*Label, 0, len(opts.LableIDs)) labels := make([]*Label, 0, len(opts.LableIDs))
if err = e.In("id", opts.LableIDs).Find(&labels); err != nil { if err = e.In("id", opts.LableIDs).Find(&labels); err != nil {

12
models/login_source.go
View file

@ -328,8 +328,8 @@ func composeFullName(firstname, surname, username string) string {
// LoginViaLDAP queries if login/password is valid against the LDAP directory pool, // LoginViaLDAP queries if login/password is valid against the LDAP directory pool,
// and create a local user if success when enabled. // and create a local user if success when enabled.
func LoginViaLDAP(user *User, login, passowrd string, source *LoginSource, autoRegister bool) (*User, error) { func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoRegister bool) (*User, error) {
username, fn, sn, mail, isAdmin, succeed := source.Cfg.(*LDAPConfig).SearchEntry(login, passowrd, source.Type == LoginDLDAP) username, fn, sn, mail, isAdmin, succeed := source.Cfg.(*LDAPConfig).SearchEntry(login, password, source.Type == LoginDLDAP)
if !succeed { if !succeed {
// User not in LDAP, do nothing // User not in LDAP, do nothing
return nil, ErrUserNotExist{0, login, 0} return nil, ErrUserNotExist{0, login, 0}
@ -545,7 +545,7 @@ func ExternalUserLogin(user *User, login, password string, source *LoginSource,
} }
// UserSignIn validates user name and password. // UserSignIn validates user name and password.
func UserSignIn(username, passowrd string) (*User, error) { func UserSignIn(username, password string) (*User, error) {
var user *User var user *User
if strings.Contains(username, "@") { if strings.Contains(username, "@") {
user = &User{Email: strings.ToLower(username)} user = &User{Email: strings.ToLower(username)}
@ -561,7 +561,7 @@ func UserSignIn(username, passowrd string) (*User, error) {
if hasUser { if hasUser {
switch user.LoginType { switch user.LoginType {
case LoginNoType, LoginPlain: case LoginNoType, LoginPlain:
if user.ValidatePassword(passowrd) { if user.ValidatePassword(password) {
return user, nil return user, nil
} }
@ -576,7 +576,7 @@ func UserSignIn(username, passowrd string) (*User, error) {
return nil, ErrLoginSourceNotExist{user.LoginSource} return nil, ErrLoginSourceNotExist{user.LoginSource}
} }
return ExternalUserLogin(user, user.LoginName, passowrd, &source, false) return ExternalUserLogin(user, user.LoginName, password, &source, false)
} }
} }
@ -586,7 +586,7 @@ func UserSignIn(username, passowrd string) (*User, error) {
} }
for _, source := range sources { for _, source := range sources {
authUser, err := ExternalUserLogin(nil, username, passowrd, source, true) authUser, err := ExternalUserLogin(nil, username, password, source, true)
if err == nil { if err == nil {
return authUser, nil return authUser, nil
} }

2
modules/auth/repo_form.go
View file

@ -52,7 +52,7 @@ func (f *MigrateRepoForm) Validate(ctx *macaron.Context, errs binding.Errors) bi
} }
// ParseRemoteAddr checks if given remote address is valid, // ParseRemoteAddr checks if given remote address is valid,
// and returns composed URL with needed username and passowrd. // and returns composed URL with needed username and password.
// It also checks if given user has permission when remote address // It also checks if given user has permission when remote address
// is actually a local path. // is actually a local path.
func (f MigrateRepoForm) ParseRemoteAddr(user *models.User) (string, error) { func (f MigrateRepoForm) ParseRemoteAddr(user *models.User) (string, error) {