Merge pull request #752 from mattermost/PLT-11-email

PLT-11 Cleaned up config file and added ability to makes changes from the admin console.

1 files changed, 29 insertions, 2 deletions

diff --git a/api/admin.go b/api/admin.go
index 646597755..568d8f6e8 100644
--- a/api/admin.go
+++ b/api/admin.go
@@ -24,6 +24,7 @@ func InitAdmin(r *mux.Router) {
 	sr.Handle("/config", ApiUserRequired(getConfig)).Methods("GET")
 	sr.Handle("/save_config", ApiUserRequired(saveConfig)).Methods("POST")
 	sr.Handle("/client_props", ApiAppHandler(getClientProperties)).Methods("GET")
+	sr.Handle("/test_email", ApiUserRequired(testEmail)).Methods("POST")
 }
 
 func getLogs(c *Context, w http.ResponseWriter, r *http.Request) {
@@ -34,7 +35,7 @@ func getLogs(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	var lines []string
 
-	if utils.Cfg.LogSettings.FileEnable {
+	if utils.Cfg.LogSettings.EnableFile {
 
 		file, err := os.Open(utils.GetLogFileLocation(utils.Cfg.LogSettings.FileLocation))
 		if err != nil {
@@ -81,7 +82,7 @@ func saveConfig(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if len(cfg.ServiceSettings.Port) == 0 {
+	if len(cfg.ServiceSettings.ListenAddress) == 0 {
 		c.SetInvalidParam("saveConfig", "config")
 		return
 	}
@@ -98,3 +99,29 @@ func saveConfig(c *Context, w http.ResponseWriter, r *http.Request) {
 	json := utils.Cfg.ToJson()
 	w.Write([]byte(json))
 }
+
+func testEmail(c *Context, w http.ResponseWriter, r *http.Request) {
+	if !c.HasSystemAdminPermissions("testEmail") {
+		return
+	}
+
+	cfg := model.ConfigFromJson(r.Body)
+	if cfg == nil {
+		c.SetInvalidParam("testEmail", "config")
+		return
+	}
+
+	if result := <-Srv.Store.User().Get(c.Session.UserId); result.Err != nil {
+		c.Err = result.Err
+		return
+	} else {
+		if err := utils.SendMailUsingConfig(result.Data.(*model.User).Email, "Mattermost - Testing Email Settings", "<br/><br/><br/>It appears your Mattermost email is setup correctly!", cfg); err != nil {
+			c.Err = err
+			return
+		}
+	}
+
+	m := make(map[string]string)
+	m["SUCCESS"] = "true"
+	w.Write([]byte(model.MapToJson(m)))
+}