refactor template code (#7860)

api/api.go

@@ -10,7 +10,6 @@ import (
 	"github.com/gorilla/mux"
 	"github.com/mattermost/mattermost-server/app"
 	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/mattermost-server/utils"
 
 	_ "github.com/nicksnyder/go-i18n/i18n"
 )
@@ -113,8 +112,6 @@ func Init(a *app.App, root *mux.Router) *API {
 	// 404 on any api route before web.go has a chance to serve it
 	root.Handle("/api/{anything:.*}", http.HandlerFunc(Handle404))
 
-	utils.InitHTML()
-
 	a.InitEmailBatching()
 
 	if *a.Config().ServiceSettings.EnableAPIv3 {

api/user.go

@@ -1040,7 +1040,7 @@ func updateMfa(c *Context, w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		if err := app.SendMfaChangeEmail(user.Email, activate, user.Locale, utils.GetSiteURL()); err != nil {
+		if err := c.App.SendMfaChangeEmail(user.Email, activate, user.Locale, utils.GetSiteURL()); err != nil {
 			l4g.Error(err.Error())
 		}
 	})