Merge pull request #470 from nickago/MM-1945

MM-1945 Added a link to error page that returns users to the root page

api/context.go

@@ -4,14 +4,15 @@
 package api
 
 import (
-	l4g "code.google.com/p/log4go"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
 	"net"
 	"net/http"
 	"net/url"
 	"strings"
+
+	l4g "code.google.com/p/log4go"
+	"github.com/mattermost/platform/model"
+	"github.com/mattermost/platform/store"
+	"github.com/mattermost/platform/utils"
 )
 
 var sessionCache *utils.Cache = utils.NewLru(model.SESSION_CACHE_SIZE)
@@ -431,10 +432,22 @@ func IsPrivateIpAddress(ipAddress string) bool {
 }
 
 func RenderWebError(err *model.AppError, w http.ResponseWriter, r *http.Request) {
+
+	protocol := "http"
+	if utils.Cfg.ServiceSettings.UseSSL {
+		forwardProto := r.Header.Get(model.HEADER_FORWARDED_PROTO)
+		if forwardProto != "http" {
+			protocol = "https"
+		}
+	}
+
+	SiteURL := protocol + "://" + r.Host
+
 	m := make(map[string]string)
 	m["Message"] = err.Message
 	m["Details"] = err.DetailedError
 	m["SiteName"] = utils.Cfg.ServiceSettings.SiteName
+	m["SiteURL"] = SiteURL
 
 	w.WriteHeader(err.StatusCode)
 	ServerTemplates.ExecuteTemplate(w, "error.html", m)

api/templates/error.html

@@ -14,6 +14,7 @@
 			<div class="error__icon"><i class="fa fa-exclamation-triangle"></i></div>
 			<h2>{{ .SiteName }} needs your help:</h2>
 			<p>{{.Message}}</p>
+			<a href="{{.SiteURL}}">Go back to team site</a>
 		</div>
 	</div>
 </body>