summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/config.go22
-rw-r--r--utils/mail.go2
2 files changed, 14 insertions, 10 deletions
diff --git a/utils/config.go b/utils/config.go
index 46daf203c..36301264c 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -109,16 +109,18 @@ type PrivacySettings struct {
}
type TeamSettings struct {
- MaxUsersPerTeam int
- AllowPublicLink bool
- AllowValetDefault bool
- TermsLink string
- PrivacyLink string
- AboutLink string
- HelpLink string
- ReportProblemLink string
- TourLink string
- DefaultThemeColor string
+ MaxUsersPerTeam int
+ AllowPublicLink bool
+ AllowValetDefault bool
+ TermsLink string
+ PrivacyLink string
+ AboutLink string
+ HelpLink string
+ ReportProblemLink string
+ TourLink string
+ DefaultThemeColor string
+ DisableTeamCreation bool
+ RestrictCreationToDomains string
}
type Config struct {
diff --git a/utils/mail.go b/utils/mail.go
index 783a2de8c..7cb178626 100644
--- a/utils/mail.go
+++ b/utils/mail.go
@@ -12,6 +12,7 @@ import (
"net"
"net/mail"
"net/smtp"
+ "time"
)
func CheckMailSettings() *model.AppError {
@@ -101,6 +102,7 @@ func SendMail(to, subject, body string) *model.AppError {
headers["Subject"] = html.UnescapeString(subject)
headers["MIME-version"] = "1.0"
headers["Content-Type"] = "text/html"
+ headers["Date"] = time.Now().Format(time.RFC1123Z)
message := ""
for k, v := range headers {