diff options
Diffstat (limited to 'activate.go')
| -rw-r--r-- | activate.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/activate.go b/activate.go index cdc37a2..a3177ab 100644 --- a/activate.go +++ b/activate.go @@ -17,44 +17,44 @@ func activate(user model.User, sess *sessions.Session, req *http.Request) (inter if (_userid == "") || (code == "") { outdata.Msg = "User or code invalid. Check, if the activation link was correctly copied from the mail." - return outdata, user + return outdata, nil } userid, err := db.ParseDBID(_userid) if err != nil { outdata.Msg = "User or code invalid. Check, if the activation link was correctly copied from the mail." - return outdata, user + return outdata, nil } switch user, err = dbcon.UserByID(userid); err { case nil: case model.NotFound: outdata.Msg = "User not found." - return outdata, user + return outdata, nil default: log.Printf("Error while getting user by ID <%s>: %s", userid, err) outdata.Msg = "An unknown error occurred while loading user data." - return outdata, user + return outdata, nil } if user.ActivationCode() != code { outdata.Msg = "Wrong activation code." - return outdata, user + return outdata, nil } if err := user.SetActivationCode(""); err != nil { log.Printf("Error while resetting activation code: %s", err) outdata.Msg = "An unknown error occurred while activating the user." - return outdata, user + return outdata, nil } if err := user.SetActive(true); err != nil { log.Printf("Error while resetting activation code: %s", err) outdata.Msg = "An unknown error occurred while activating the user." - return outdata, user + return outdata, nil } outdata.Class = "success" outdata.Msg = "Account activated!" - return outdata, user + return outdata, nil } |