From 2a449bd4b12545b904cfdd591fcf17afebf6a3c6 Mon Sep 17 00:00:00 2001
From: Bwko <bouwko@gmail.com>
Date: Mon, 21 Nov 2016 20:08:21 +0100
Subject: [PATCH] Fix typos
---
models/issue.go | 2 +-
models/login_source.go | 12 ++++++------
modules/auth/repo_form.go | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/models/issue.go b/models/issue.go
index 09ecb2e6d3..00221b1add 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -650,7 +650,7 @@ func newIssue(e *xorm.Session, opts NewIssueOptions) (err error) {
}
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.
labels := make([]*Label, 0, len(opts.LableIDs))
if err = e.In("id", opts.LableIDs).Find(&labels); err != nil {
diff --git a/models/login_source.go b/models/login_source.go
index 774cb7f4db..14af038fd9 100644
--- a/models/login_source.go
+++ b/models/login_source.go
@@ -292,8 +292,8 @@ func composeFullName(firstname, surname, username string) string {
// 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, passowrd string, source *LoginSource, autoRegister bool) (*User, error) {
- username, fn, sn, mail, isAdmin, succeed := source.Cfg.(*LDAPConfig).SearchEntry(login, passowrd, source.Type == LoginDLDAP)
+func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoRegister bool) (*User, error) {
+ username, fn, sn, mail, isAdmin, succeed := source.Cfg.(*LDAPConfig).SearchEntry(login, password, source.Type == LoginDLDAP)
if !succeed {
// User not in LDAP, do nothing
return nil, ErrUserNotExist{0, login, 0}
@@ -505,7 +505,7 @@ func ExternalUserLogin(user *User, login, password string, source *LoginSource,
}
// UserSignIn validates user name and password.
-func UserSignIn(username, passowrd string) (*User, error) {
+func UserSignIn(username, password string) (*User, error) {
var user *User
if strings.Contains(username, "@") {
user = &User{Email: strings.ToLower(username)}
@@ -521,7 +521,7 @@ func UserSignIn(username, passowrd string) (*User, error) {
if hasUser {
switch user.LoginType {
case LoginNoType, LoginPlain:
- if user.ValidatePassword(passowrd) {
+ if user.ValidatePassword(password) {
return user, nil
}
@@ -536,7 +536,7 @@ func UserSignIn(username, passowrd string) (*User, error) {
return nil, ErrLoginSourceNotExist{user.LoginSource}
}
- return ExternalUserLogin(user, user.LoginName, passowrd, &source, false)
+ return ExternalUserLogin(user, user.LoginName, password, &source, false)
}
}
@@ -546,7 +546,7 @@ func UserSignIn(username, passowrd string) (*User, error) {
}
for _, source := range sources {
- authUser, err := ExternalUserLogin(nil, username, passowrd, source, true)
+ authUser, err := ExternalUserLogin(nil, username, password, source, true)
if err == nil {
return authUser, nil
}
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index 1f5330d23a..94c99d8fb9 100644
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -52,7 +52,7 @@ func (f *MigrateRepoForm) Validate(ctx *macaron.Context, errs binding.Errors) bi
}
// 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
// is actually a local path.
func (f MigrateRepoForm) ParseRemoteAddr(user *models.User) (string, error) {