aboutsummaryrefslogtreecommitdiffstats
path: root/routers/user/user.go
diff options
context:
space:
mode:
Diffstat (limited to 'routers/user/user.go')
-rw-r--r--routers/user/user.go36
1 files changed, 24 insertions, 12 deletions
diff --git a/routers/user/user.go b/routers/user/user.go
index c43cf84a24..2d6bcedce5 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -6,6 +6,7 @@ package user
import (
"fmt"
+ "strings"
"github.com/codegangsta/martini"
"github.com/martini-contrib/render"
@@ -14,6 +15,7 @@ import (
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/base"
+ "github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/middleware"
)
@@ -129,12 +131,14 @@ func SignUp(ctx *middleware.Context, form auth.RegisterForm) {
}
u := &models.User{
- Name: form.UserName,
- Email: form.Email,
- Passwd: form.Password,
+ Name: form.UserName,
+ Email: form.Email,
+ Passwd: form.Password,
+ IsActive: !base.Service.RegisterEmailConfirm,
}
- if err := models.RegisterUser(u); err != nil {
+ var err error
+ if u, err = models.RegisterUser(u); err != nil {
switch err.Error() {
case models.ErrUserAlreadyExist.Error():
ctx.RenderWithErr("Username has been already taken", "user/signup", &form)
@@ -146,11 +150,19 @@ func SignUp(ctx *middleware.Context, form auth.RegisterForm) {
return
}
+ log.Trace("%s User created: %s", ctx.Req.RequestURI, strings.ToLower(form.UserName))
+
+ // Send confirmation e-mail.
+ if base.Service.RegisterEmailConfirm {
+ auth.SendRegisterMail(u)
+ }
ctx.Render.Redirect("/user/login")
}
func Delete(ctx *middleware.Context) {
ctx.Data["Title"] = "Delete Account"
+ ctx.Data["PageIsUserSetting"] = true
+ ctx.Data["IsUserPageSettingDelete"] = true
if ctx.Req.Method == "GET" {
ctx.Render.HTML(200, "user/delete", ctx.Data)
@@ -182,7 +194,7 @@ func Delete(ctx *middleware.Context) {
}
const (
- feedTpl = `<i class="icon fa fa-%s"></i>
+ TPL_FEED = `<i class="icon fa fa-%s"></i>
<div class="info"><span class="meta">%s</span><br>%s</div>`
)
@@ -194,20 +206,20 @@ func Feeds(ctx *middleware.Context, form auth.FeedsForm) {
feeds := make([]string, len(actions))
for i := range actions {
- feeds[i] = fmt.Sprintf(feedTpl, base.ActionIcon(actions[i].OpType),
+ feeds[i] = fmt.Sprintf(TPL_FEED, base.ActionIcon(actions[i].OpType),
base.TimeSince(actions[i].Created), base.ActionDesc(actions[i], ctx.User.AvatarLink()))
}
ctx.Render.JSON(200, &feeds)
}
-func Issues(ctx *middleware.Context) string {
- return "This is issues page"
+func Issues(ctx *middleware.Context) {
+ ctx.Render.HTML(200, "user/issues", ctx.Data)
}
-func Pulls(ctx *middleware.Context) string {
- return "This is pulls page"
+func Pulls(ctx *middleware.Context) {
+ ctx.Render.HTML(200, "user/pulls", ctx.Data)
}
-func Stars(ctx *middleware.Context) string {
- return "This is stars page"
+func Stars(ctx *middleware.Context) {
+ ctx.Render.HTML(200, "user/stars", ctx.Data)
}