diff options
Diffstat (limited to 'cmd/web.go')
| -rw-r--r-- | cmd/web.go | 19 |
1 files changed, 10 insertions, 9 deletions
@@ -74,10 +74,11 @@ func checkVersion() { // Check dependency version. checkers := []VerChecker{ - {"github.com/Unknwon/macaron", macaron.Version, "0.4.7"}, - {"github.com/macaron-contrib/binding", binding.Version, "0.0.2"}, - {"github.com/macaron-contrib/i18n", i18n.Version, "0.0.3"}, - {"github.com/macaron-contrib/session", session.Version, "0.0.5"}, + {"github.com/Unknwon/macaron", macaron.Version, "0.4.9"}, + {"github.com/macaron-contrib/binding", binding.Version, "0.0.4"}, + {"github.com/macaron-contrib/csrf", csrf.Version, "0.0.1"}, + {"github.com/macaron-contrib/i18n", i18n.Version, "0.0.5"}, + {"github.com/macaron-contrib/session", session.Version, "0.1.1"}, } for _, c := range checkers { ver := strings.Join(strings.Split(c.Version(), ".")[:3], ".") @@ -132,11 +133,8 @@ func newMacaron() *macaron.Macaron { m.Use(captcha.Captchaer(captcha.Options{ SubURL: setting.AppSubUrl, })) - m.Use(session.Sessioner(session.Options{ - Provider: setting.SessionProvider, - Config: *setting.SessionConfig, - })) - m.Use(csrf.Generate(csrf.Options{ + m.Use(session.Sessioner(setting.SessionConfig)) + m.Use(csrf.Csrfer(csrf.Options{ Secret: setting.SecretKey, SetCookie: true, Header: "X-Csrf-Token", @@ -241,6 +239,8 @@ func runWeb(*cli.Context) { m.Get("", user.Settings) m.Post("", bindIgnErr(auth.UpdateProfileForm{}), user.SettingsPost) m.Post("/avatar", binding.MultipartForm(auth.UploadAvatarForm{}), user.SettingsAvatar) + m.Get("/email", user.SettingsEmails) + m.Post("/email", bindIgnErr(auth.AddEmailForm{}), user.SettingsEmailPost) m.Get("/password", user.SettingsPassword) m.Post("/password", bindIgnErr(auth.ChangePasswordForm{}), user.SettingsPasswordPost) m.Get("/ssh", user.SettingsSSHKeys) @@ -252,6 +252,7 @@ func runWeb(*cli.Context) { m.Group("/user", func() { // r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds) m.Any("/activate", user.Activate) + m.Any("/activate_email", user.ActivateEmail) m.Get("/email2user", user.Email2User) m.Get("/forget_password", user.ForgotPasswd) m.Post("/forget_password", user.ForgotPasswdPost) |