diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.go | 1 | ||||
| -rw-r--r-- | utils/diagnostic.go | 26 |
2 files changed, 9 insertions, 18 deletions
diff --git a/utils/config.go b/utils/config.go index 90e44259a..0eea6dd6a 100644 --- a/utils/config.go +++ b/utils/config.go @@ -191,6 +191,7 @@ func getClientProperties(c *model.Config) map[string]string { props["SendEmailNotifications"] = strconv.FormatBool(c.EmailSettings.SendEmailNotifications) props["EnableSignUpWithEmail"] = strconv.FormatBool(c.EmailSettings.EnableSignUpWithEmail) + props["RequireEmailVerification"] = strconv.FormatBool(c.EmailSettings.RequireEmailVerification) props["FeedbackEmail"] = c.EmailSettings.FeedbackEmail props["EnableSignUpWithGitLab"] = strconv.FormatBool(c.GitLabSettings.Enable) diff --git a/utils/diagnostic.go b/utils/diagnostic.go index 9a61ae934..e40948f62 100644 --- a/utils/diagnostic.go +++ b/utils/diagnostic.go @@ -5,41 +5,31 @@ package utils import ( "net/http" - - l4g "code.google.com/p/log4go" + "net/url" "github.com/mattermost/platform/model" ) const ( + DIAGNOSTIC_URL = "https://d7zmvsa9e04kk.cloudfront.net" + PROP_DIAGNOSTIC_ID = "id" PROP_DIAGNOSTIC_CATEGORY = "c" - VAL_DIAGNOSTIC_CATEGORY_DEFALUT = "d" + VAL_DIAGNOSTIC_CATEGORY_DEFAULT = "d" PROP_DIAGNOSTIC_BUILD = "b" PROP_DIAGNOSTIC_DATABASE = "db" PROP_DIAGNOSTIC_OS = "os" PROP_DIAGNOSTIC_USER_COUNT = "uc" ) -func SendDiagnostic(data model.StringMap) *model.AppError { - if Cfg.PrivacySettings.EnableDiagnostic && !model.IsOfficalBuild() { - - query := "?" - for name, value := range data { - if len(query) > 1 { - query += "&" - } +func SendDiagnostic(values url.Values) { + if Cfg.PrivacySettings.EnableSecurityFixAlert && model.IsOfficalBuild() { - query += name + "=" + UrlEncode(value) - } - - res, err := http.Get("http://d7zmvsa9e04kk.cloudfront.net/i" + query) + res, err := http.Get(DIAGNOSTIC_URL + "/i?" + values.Encode()) if err != nil { - l4g.Error("Failed to send diagnostics %v", err.Error()) + return } res.Body.Close() } - - return nil } |