diff options
author | Kevin Chabowski <kevin@kch42.de> | 2013-09-15 13:58:39 +0200 |
---|---|---|
committer | Kevin Chabowski <kevin@kch42.de> | 2013-09-15 13:58:39 +0200 |
commit | 3fa06b548e6808f286020c484a268beaf83ed781 (patch) | |
tree | f4c669a9fcb7349468388a032cafeb13addde087 /pwreset.go | |
parent | 8800e05585c0f280064b5fff125084e831d3848b (diff) | |
download | mailremind-3fa06b548e6808f286020c484a268beaf83ed781.tar.gz mailremind-3fa06b548e6808f286020c484a268beaf83ed781.tar.bz2 mailremind-3fa06b548e6808f286020c484a268beaf83ed781.zip |
Better error messages.
Diffstat (limited to 'pwreset.go')
-rw-r--r-- | pwreset.go | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -14,7 +14,7 @@ type pwresetTpldata struct { func pwreset(user model.User, sess *sessions.Session, req *http.Request) (interface{}, model.User) { if err := req.ParseForm(); err != nil { - return &pwresetTpldata{Error: "Could not understand formdata."}, user + return &pwresetTpldata{Error: "Form data corrupted."}, user } code := req.FormValue("Code") @@ -58,13 +58,13 @@ func pwreset(user model.User, sess *sessions.Session, req *http.Request) (interf hash, err := bcrypt.GenerateFromPassword([]byte(pw1), bcrypt.DefaultCost) if err != nil { log.Printf("Could not has password: %s", err) - outdata.Error = "Failed hashing you password. If this happens again, please contact support." + outdata.Error = "Could not save password." return outdata, user } if err := user.SetPWHash(hash); err != nil { - log.Printf("Error while storing new password: %s", err) - outdata.Error = "Could not store password. If this happens again, please contact support." + log.Printf("Error while hashing password: %s", err) + outdata.Error = "Could not save password." return outdata, user } @@ -86,7 +86,7 @@ func forgotpw(user model.User, sess *sessions.Session, req *http.Request) (inter } if err := req.ParseForm(); err != nil { - return &forgotpwTpldata{Error: "Could not understand formdata."}, user + return &forgotpwTpldata{Error: "Form data corrupted."}, user } email := req.FormValue("Mail") @@ -102,11 +102,11 @@ func forgotpw(user model.User, sess *sessions.Session, req *http.Request) (inter key := genAcCode() if err := user.SetActivationCode(key); err != nil { log.Printf("Could not store pwreset key: %s", err) - return &forgotpwTpldata{Error: "Could not store keyword reset code. If this happens again, please contact support."}, user + return &forgotpwTpldata{Error: "Could not generate a keyword reset code."}, user } if !SendPwresetLink(user.Email(), key, user.ID()) { - return &forgotpwTpldata{Error: "Could not send reset E-Mail. If this happens again, please contact support."}, user + return &forgotpwTpldata{Error: "Could not send reset E-Mail."}, user } return &forgotpwTpldata{Success: "We sent you an E-Mail with further instructions."}, user |