From 0055cbd3651ebde0f8b6cc70c9c44de56dc38830 Mon Sep 17 00:00:00 2001
From: Martin van Beurden <chadoe@gmail.com>
Date: Sun, 14 Sep 2014 19:35:22 +0200
Subject: Allow Gogs to run from a suburl behind a reverse proxy. e.g.
 http://mydomain.com/gogs/

Conflicts:
	modules/setting/setting.go

Conflicts:
	templates/repo/release/list.tmpl
	templates/user/dashboard/dashboard.tmpl

Conflicts:
	routers/repo/setting.go
---
 routers/user/setting.go | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'routers/user/setting.go')

diff --git a/routers/user/setting.go b/routers/user/setting.go
index 4e0e468f..a540f054 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -14,6 +14,7 @@ import (
 	"github.com/gogits/gogs/modules/base"
 	"github.com/gogits/gogs/modules/log"
 	"github.com/gogits/gogs/modules/middleware"
+	"github.com/gogits/gogs/modules/setting"
 )
 
 const (
@@ -55,7 +56,7 @@ func SettingsPost(ctx *middleware.Context, form auth.UpdateProfileForm) {
 		} else if err = models.ChangeUserName(ctx.User, form.UserName); err != nil {
 			if err == models.ErrUserNameIllegal {
 				ctx.Flash.Error(ctx.Tr("form.illegal_username"))
-				ctx.Redirect("/user/settings")
+				ctx.Redirect(setting.AppRootSubUrl + "/user/settings")
 				return
 			} else {
 				ctx.Handle(500, "ChangeUserName", err)
@@ -78,7 +79,7 @@ func SettingsPost(ctx *middleware.Context, form auth.UpdateProfileForm) {
 	}
 	log.Trace("User setting updated: %s", ctx.User.Name)
 	ctx.Flash.Success(ctx.Tr("settings.update_profile_success"))
-	ctx.Redirect("/user/settings")
+	ctx.Redirect(setting.AppRootSubUrl + "/user/settings")
 }
 
 func SettingsPassword(ctx *middleware.Context) {
@@ -119,7 +120,7 @@ func SettingsPasswordPost(ctx *middleware.Context, form auth.ChangePasswordForm)
 		ctx.Flash.Success(ctx.Tr("settings.change_password_success"))
 	}
 
-	ctx.Redirect("/user/settings/password")
+	ctx.Redirect(setting.AppRootSubUrl + "/user/settings/password")
 }
 
 func SettingsSSHKeys(ctx *middleware.Context) {
@@ -160,7 +161,7 @@ func SettingsSSHKeysPost(ctx *middleware.Context, form auth.AddSSHKeyForm) {
 			ctx.Handle(500, "DeletePublicKey", err)
 		} else {
 			log.Trace("SSH key deleted: %s", ctx.User.Name)
-			ctx.Redirect("/user/settings/ssh")
+			ctx.Redirect(setting.AppRootSubUrl + "/user/settings/ssh")
 		}
 		return
 	}
@@ -177,7 +178,7 @@ func SettingsSSHKeysPost(ctx *middleware.Context, form auth.AddSSHKeyForm) {
 
 		if ok, err := models.CheckPublicKeyString(cleanContent); !ok {
 			ctx.Flash.Error(ctx.Tr("form.invalid_ssh_key", err.Error()))
-			ctx.Redirect("/user/settings/ssh")
+			ctx.Redirect(setting.AppRootSubUrl + "/user/settings/ssh")
 			return
 		}
 
@@ -196,7 +197,7 @@ func SettingsSSHKeysPost(ctx *middleware.Context, form auth.AddSSHKeyForm) {
 		} else {
 			log.Trace("SSH key added: %s", ctx.User.Name)
 			ctx.Flash.Success(ctx.Tr("settings.add_key_success"))
-			ctx.Redirect("/user/settings/ssh")
+			ctx.Redirect(setting.AppRootSubUrl + "/user/settings/ssh")
 			return
 		}
 	}
@@ -217,7 +218,7 @@ func SettingsSocial(ctx *middleware.Context) {
 			return
 		}
 		ctx.Flash.Success(ctx.Tr("settings.unbind_success"))
-		ctx.Redirect("/user/settings/social")
+		ctx.Redirect(setting.AppRootSubUrl + "/user/settings/social")
 		return
 	}
 
@@ -248,13 +249,13 @@ func SettingsDelete(ctx *middleware.Context) {
 			switch err {
 			case models.ErrUserOwnRepos:
 				ctx.Flash.Error(ctx.Tr("form.still_own_repo"))
-				ctx.Redirect("/user/settings/delete")
+				ctx.Redirect(setting.AppRootSubUrl + "/user/settings/delete")
 			default:
 				ctx.Handle(500, "DeleteUser", err)
 			}
 		} else {
 			log.Trace("Account deleted: %s", ctx.User.Name)
-			ctx.Redirect("/")
+			ctx.Redirect(setting.AppRootSubUrl + "/")
 		}
 		return
 	}
-- 
cgit v1.2.3