diff options
| author | Corey Hulen <corey@hulen.com> | 2015-08-24 10:43:45 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-08-24 10:43:45 -0700 |
| commit | cd3f316697d2ec8bf31d50b52d06b3b001a194dc (patch) | |
| tree | 09f461b6ee7575c04655a47a0d8f804fd09a2fb5 | |
| parent | 9280dfb9352bb491236d394dfc3adac618e2694a (diff) | |
| parent | ae3f9cdb0a997e3de9cd0f70bfa0520bb81e1495 (diff) | |
| download | chat-cd3f316697d2ec8bf31d50b52d06b3b001a194dc.tar.gz chat-cd3f316697d2ec8bf31d50b52d06b3b001a194dc.tar.bz2 chat-cd3f316697d2ec8bf31d50b52d06b3b001a194dc.zip | |
Merge pull request #455 from nickago/MM-1604
MM-1604 Changed 1 hour expire time to 30 days
| -rw-r--r-- | web/web.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/web/web.go b/web/web.go index e449d2d3a..dc2b5dced 100644 --- a/web/web.go +++ b/web/web.go @@ -4,18 +4,19 @@ package web import ( - l4g "code.google.com/p/log4go" "fmt" + "html/template" + "net/http" + "strconv" + "strings" + + l4g "code.google.com/p/log4go" "github.com/gorilla/mux" "github.com/mattermost/platform/api" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" "github.com/mssola/user_agent" "gopkg.in/fsnotify.v1" - "html/template" - "net/http" - "strconv" - "strings" ) var Templates *template.Template @@ -214,7 +215,7 @@ func signupTeamComplete(c *api.Context, w http.ResponseWriter, r *http.Request) props := model.MapFromJson(strings.NewReader(data)) t, err := strconv.ParseInt(props["time"], 10, 64) - if err != nil || model.GetMillis()-t > 1000*60*60 { // one hour + if err != nil || model.GetMillis()-t > 1000*60*60*24*30 { // 30 days c.Err = model.NewAppError("signupTeamComplete", "The signup link has expired", "") return } |