diff options
| -rw-r--r-- | go-src/user.go | 12 | ||||
| -rw-r--r-- | go-src/windows.go | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/go-src/user.go b/go-src/user.go index 78501c7..9b49fd1 100644 --- a/go-src/user.go +++ b/go-src/user.go @@ -17,8 +17,8 @@ type User struct { type UserProp int const ( - passwordProp UserProp = iota + 1 - nameProp + userPasswordProp UserProp = iota + 1 + userNameProp ) func (u User) ValidatePassword(password string) bool { @@ -35,9 +35,9 @@ func (u User) updateProp(currentPassword string, newValue string, userProp UserP var fileContents []byte switch userProp { - case passwordProp: + case userPasswordProp: fileContents = []byte(u.Username + "\n" + newValue + "\n" + u.Name) - case nameProp: + case userNameProp: fileContents = []byte(u.Username + "\n" + currentPassword + "\n" + newValue) default: return false @@ -51,11 +51,11 @@ func (u User) updateProp(currentPassword string, newValue string, userProp UserP } func (u User) UpdatePassword(oldPassword string, newPassword string) bool { - return u.updateProp(oldPassword, newPassword, passwordProp) + return u.updateProp(oldPassword, newPassword, userPasswordProp) } func (u User) UpdateName(password string, newName string) bool { - return u.updateProp(password, newName, nameProp) + return u.updateProp(password, newName, userNameProp) } func logoutUser() { diff --git a/go-src/windows.go b/go-src/windows.go index 5463cd2..1b4e49e 100644 --- a/go-src/windows.go +++ b/go-src/windows.go @@ -340,12 +340,12 @@ func accountWindow(values ...string) { if nextWindow == nil { defer validatedMultiForm(input, accountWindow, - multiFormProp{int(passwordProp), editPasswordNavTitle, + multiFormProp{int(userPasswordProp), editPasswordNavTitle, formInput{newPasswordInName, passwordSpec, stringValidPassword}, func(values []string) bool { return loggedInUser.UpdatePassword(values[0], values[1]) }, nil, }, - multiFormProp{int(nameProp), editNameNavTitle, + multiFormProp{int(userNameProp), editNameNavTitle, formInput{newNameInName, nameSpec, stringValidName}, func(values []string) bool { return loggedInUser.UpdateName(values[0], values[1]) }, func(values []string) { loggedInUser.Name = values[1] }, |