diff options
author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-09-21 17:03:08 -0700 |
---|---|---|
committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-09-21 17:03:08 -0700 |
commit | b4be8eb554d4de1de5b4928a37cb72c34d565487 (patch) | |
tree | 90da0008e571282dd9186c7f7240bf2c7b3083db /web/web.go | |
parent | dda30e407aca321f369f27078076d3e05fd28b19 (diff) | |
download | chat-b4be8eb554d4de1de5b4928a37cb72c34d565487.tar.gz chat-b4be8eb554d4de1de5b4928a37cb72c34d565487.tar.bz2 chat-b4be8eb554d4de1de5b4928a37cb72c34d565487.zip |
Minor changes to how resend status is passed
Diffstat (limited to 'web/web.go')
-rw-r--r-- | web/web.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/web/web.go b/web/web.go index b204708b0..9d1946283 100644 --- a/web/web.go +++ b/web/web.go @@ -355,6 +355,7 @@ func getChannel(c *api.Context, w http.ResponseWriter, r *http.Request) { func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) { resend := r.URL.Query().Get("resend") + resendSuccess := r.URL.Query().Get("resend_success") name := r.URL.Query().Get("teamname") email := r.URL.Query().Get("email") hashedId := r.URL.Query().Get("hid") @@ -376,8 +377,7 @@ func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) { user := result.Data.(*model.User) api.FireAndForgetVerifyEmail(user.Id, user.Email, team.Name, team.DisplayName, c.GetSiteURL(), c.GetTeamURLFromTeam(team)) - newAddress := strings.Replace(r.URL.String(), "?resend=true", "?resend_success=true", -1) - newAddress = strings.Replace(newAddress, "&resend=true", "&resend_success=true", -1) + newAddress := strings.Replace(r.URL.String(), "&resend=true", "&resend_success=true", -1) http.Redirect(w, r, newAddress, http.StatusFound) return } @@ -403,6 +403,7 @@ func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) { page.Props["IsVerified"] = isVerified page.Props["TeamURL"] = c.GetTeamURLFromTeam(team) page.Props["UserEmail"] = email + page.Props["ResendSuccess"] = resendSuccess page.Render(c, w) } |