Batch updates

diff --git a/README.md b/README.md
index 89a346d60273c0001fc46708a623b871be959b09..325c3a9736917ec670db92ff265ff23dc318f065 100644 (file)
--- a/README.md
+++ b/README.md
@@ -43,8 +43,8 @@ There are two ways to install Gogs:
 ## Acknowledgments
 
 - Logo is inspired by [martini](https://github.com/martini-contrib).
-- Mail Service is based on [WeTalk](https://github.com/beego/wetalk).
-- System Monitor Status is based on [GoBlog](https://github.com/fuxiaohei/goblog).
+- Mail Service, modules design is inspired by [WeTalk](https://github.com/beego/wetalk).
+- System Monitor Status is inspired by [GoBlog](https://github.com/fuxiaohei/goblog).
 
 ## Contributors
 

diff --git a/conf/app.ini b/conf/app.ini
index 7f283012fdef1164da89017b6ddc106c55e624ca..b051557f41b4b3f56fea6a961b34e70257bb966d 100644 (file)
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -107,7 +107,7 @@ SERVICE = server
 PATH = data/pictures
 
 [log]
-; Either "console", "file", "conn" or "smtp", default is "console"
+; Either "console", "file", "conn", "smtp" or "database", default is "console"
 MODE = console
 ; Buffer length of channel, keep it as it is if you don't know what it is.
 BUFFER_LEN = 10000
@@ -156,4 +156,10 @@ HOST =
 USER = 
 PASSWD =
 ; Receivers, can be one or more, e.g. ["1@example.com","2@example.com"]
-RECEIVERS = 
\ No newline at end of file
+RECEIVERS = 
+
+; For "database" mode only
+[log.database]
+LEVEL = 
+Driver = 
+CONN = 
\ No newline at end of file

diff --git a/modules/base/conf.go b/modules/base/conf.go
index cdbe2b36ce7e7a50da61ada96d61f81db0f2bb73..19f587077b1f36718dd4c130e7c50e60993d991f 100644 (file)
--- a/modules/base/conf.go
+++ b/modules/base/conf.go
@@ -143,6 +143,10 @@ func newLogService() {
                        Cfg.MustValue(modeSec, "HOST", "127.0.0.1:25"),
                        Cfg.MustValue(modeSec, "RECEIVERS", "[]"),
                        Cfg.MustValue(modeSec, "SUBJECT", "Diagnostic message from serve"))
+       case "database":
+               LogConfig = fmt.Sprintf(`{"level":%s,"driver":%s,"conn":%s}`, level,
+                       Cfg.MustValue(modeSec, "Driver"),
+                       Cfg.MustValue(modeSec, "CONN"))
        }
 
        log.NewLogger(Cfg.MustInt64("log", "BUFFER_LEN", 10000), LogMode, LogConfig)

diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index 3224b3df91a261f36fcabbf95a234b9c32ed3c69..82c3367c48a094b490499b5abf2f091b10bd8b32 100644 (file)
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -5,6 +5,8 @@
 package middleware
 
 import (
+       "net/url"
+
        "github.com/codegangsta/martini"
 
        "github.com/gogits/gogs/modules/base"
@@ -35,6 +37,7 @@ func Toggle(options *ToggleOptions) martini.Handler {
 
                if options.SignInRequire {
                        if !ctx.IsSigned {
+                               ctx.SetCookie("redirect_to", "/"+url.QueryEscape(ctx.Req.RequestURI))
                                ctx.Redirect("/user/login")
                                return
                        } else if !ctx.User.IsActive && base.Service.RegisterEmailConfirm {

diff --git a/routers/admin/user.go b/routers/admin/user.go
index fa27d116648dcf6d596894c7c88eb3b68bd475f4..7f66c5528ca068bc17008dfcc9886e1311be4d41 100644 (file)
--- a/routers/admin/user.go
+++ b/routers/admin/user.go
@@ -140,5 +140,5 @@ func DeleteUser(ctx *middleware.Context, params martini.Params) {
        log.Trace("%s User deleted by admin(%s): %s", ctx.Req.RequestURI,
                ctx.User.LowerName, ctx.User.LowerName)
 
-       ctx.Redirect("/admin/users", 302)
+       ctx.Redirect("/admin/users")
 }

diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 154e8308abae04981f1488a36d90d47df766f7dd..4cc007e9eeedea89dce5215c7e6c5cb5054e46b5 100644 (file)
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -56,7 +56,7 @@ func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
                form.IssueName, form.Labels, form.Content, false)
        if err == nil {
                log.Trace("%s Issue created: %d", form.RepoId, issue.Id)
-               ctx.Redirect(fmt.Sprintf("/%s/%s/issues/%d", params["username"], params["reponame"], issue.Index), 302)
+               ctx.Redirect(fmt.Sprintf("/%s/%s/issues/%d", params["username"], params["reponame"], issue.Index))
                return
        }
        ctx.Handle(200, "issue.CreateIssue", err)

diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index c436d387145cd2ba99855b59dad5ecb0720f782b..4782d64f70c17c93851a0b572ca8228479eb5722 100644 (file)
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -40,7 +40,7 @@ func Create(ctx *middleware.Context, form auth.CreateRepoForm) {
                form.Language, form.License, form.Visibility == "private", form.InitReadme == "on")
        if err == nil {
                log.Trace("%s Repository created: %s/%s", ctx.Req.RequestURI, ctx.User.LowerName, form.RepoName)
-               ctx.Redirect("/"+ctx.User.Name+"/"+form.RepoName, 302)
+               ctx.Redirect("/" + ctx.User.Name + "/" + form.RepoName)
                return
        } else if err == models.ErrRepoAlreadyExist {
                ctx.RenderWithErr("Repository name has already been used", "repo/create", &form)
@@ -73,7 +73,7 @@ func SettingPost(ctx *middleware.Context) {
        }
 
        log.Trace("%s Repository deleted: %s/%s", ctx.Req.RequestURI, ctx.User.LowerName, ctx.Repo.Repository.LowerName)
-       ctx.Redirect("/", 302)
+       ctx.Redirect("/")
 }
 
 func Branches(ctx *middleware.Context, params martini.Params) {
@@ -113,8 +113,8 @@ func Single(ctx *middleware.Context, params martini.Params) {
        treename := params["_1"]
 
        if len(treename) > 0 && treename[len(treename)-1] == '/' {
-               ctx.Redirect("/"+ctx.Repo.Owner.LowerName+"/"+
-                       ctx.Repo.Repository.Name+"/src/"+params["branchname"]+"/"+treename[:len(treename)-1], 302)
+               ctx.Redirect("/" + ctx.Repo.Owner.LowerName + "/" +
+                       ctx.Repo.Repository.Name + "/src/" + params["branchname"] + "/" + treename[:len(treename)-1])
                return
        }
 

diff --git a/routers/user/user.go b/routers/user/user.go
index 56bc5f8e375121a864b5dae0cfd0447e704294a7..c34b529ec336b06c49ebc071ae86b1430af6322d 100644 (file)
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -6,6 +6,7 @@ package user
 
 import (
        "fmt"
+       "net/url"
        "strings"
 
        "github.com/codegangsta/martini"
@@ -109,7 +110,13 @@ func SignIn(ctx *middleware.Context, form auth.LogInForm) {
                isSucceed = true
                ctx.Session.Set("userId", user.Id)
                ctx.Session.Set("userName", user.Name)
-               ctx.Redirect("/")
+               redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to"))
+               if len(redirectTo) > 0 {
+                       ctx.SetCookie("redirect_to", "", -1)
+                       ctx.Redirect(redirectTo)
+               } else {
+                       ctx.Redirect("/")
+               }
                return
        }
 
@@ -139,12 +146,20 @@ func SignIn(ctx *middleware.Context, form auth.LogInForm) {
 
        ctx.Session.Set("userId", user.Id)
        ctx.Session.Set("userName", user.Name)
-       ctx.Redirect("/")
+       redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to"))
+       if len(redirectTo) > 0 {
+               ctx.SetCookie("redirect_to", "", -1)
+               ctx.Redirect(redirectTo)
+       } else {
+               ctx.Redirect("/")
+       }
 }
 
 func SignOut(ctx *middleware.Context) {
        ctx.Session.Delete("userId")
        ctx.Session.Delete("userName")
+       ctx.SetCookie(base.CookieUserName, "", -1)
+       ctx.SetCookie(base.CookieRememberName, "", -1)
        ctx.Redirect("/")
 }
 
@@ -314,7 +329,7 @@ func Activate(ctx *middleware.Context) {
 
                ctx.Session.Set("userId", user.Id)
                ctx.Session.Set("userName", user.Name)
-               ctx.Redirect("/", 302)
+               ctx.Redirect("/")
                return
        }