* Add SUBJECT_PREFIX mailer config option * Add space between subject prefix and subject (Change from Gogs) Signed-off-by: Andrew Thornton <art27@cantab.net>tags/v1.9.0-rc1
@@ -411,8 +411,8 @@ PAGING_NUM = 10 | |||
ENABLED = false | |||
; Buffer length of channel, keep it as it is if you don't know what it is. | |||
SEND_BUFFER_LEN = 100 | |||
; Name displayed in mail title | |||
SUBJECT = %(APP_NAME)s | |||
; Prefix displayed before subject in mail | |||
SUBJECT_PREFIX = | |||
; Mail server | |||
; Gmail: smtp.gmail.com:587 | |||
; QQ: smtp.qq.com:465 |
@@ -241,14 +241,15 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. | |||
- `PASSWD`: **\<empty\>**: Password of mailing user. Use \`your password\` for quoting if you use special characters in the password. | |||
- `SKIP_VERIFY`: **\<empty\>**: Do not verify the self-signed certificates. | |||
- **Note:** Gitea only supports SMTP with STARTTLS. | |||
- `SUBJECT_PREFIX`: **\<empty\>**: Prefix to be placed before e-mail subject lines. | |||
- `MAILER_TYPE`: **smtp**: \[smtp, sendmail, dummy\] | |||
- **smtp** Use SMTP to send mail | |||
- **sendmail** Use the operating system's `sendmail` command instead of SMTP. | |||
This is common on linux systems. | |||
- **dummy** Send email messages to the log as a testing phase. | |||
- Note that enabling sendmail will ignore all other `mailer` settings except `ENABLED`, | |||
`FROM` and `SENDMAIL_PATH`. | |||
- Enabling dummy will ignore all settings except `ENABLED` and `FROM`. | |||
`FROM`, `SUBJECT_PREFIX` and `SENDMAIL_PATH`. | |||
- Enabling dummy will ignore all settings except `ENABLED`, `SUBJECT_PREFIX` and `FROM`. | |||
- `SENDMAIL_PATH`: **sendmail**: The location of sendmail on the operating system (can be | |||
command or full path). | |||
- ``IS_TLS_ENABLED`` : **false** : Decide if SMTP connections should use TLS. |
@@ -38,7 +38,11 @@ func NewMessageFrom(to []string, fromDisplayName, fromAddress, subject, body str | |||
msg := gomail.NewMessage() | |||
msg.SetAddressHeader("From", fromAddress, fromDisplayName) | |||
msg.SetHeader("To", to...) | |||
msg.SetHeader("Subject", subject) | |||
if len(setting.MailService.SubjectPrefix) > 0 { | |||
msg.SetHeader("Subject", setting.MailService.SubjectPrefix+" "+subject) | |||
} else { | |||
msg.SetHeader("Subject", subject) | |||
} | |||
msg.SetDateHeader("Date", time.Now()) | |||
msg.SetHeader("X-Auto-Response-Suppress", "All") | |||
@@ -21,6 +21,7 @@ type Mailer struct { | |||
FromEmail string | |||
SendAsPlainText bool | |||
MailerType string | |||
SubjectPrefix string | |||
// SMTP sender | |||
Host string | |||
@@ -65,6 +66,7 @@ func newMailService() { | |||
CertFile: sec.Key("CERT_FILE").String(), | |||
KeyFile: sec.Key("KEY_FILE").String(), | |||
IsTLSEnabled: sec.Key("IS_TLS_ENABLED").MustBool(), | |||
SubjectPrefix: sec.Key("SUBJECT_PREFIX").MustString(""), | |||
SendmailPath: sec.Key("SENDMAIL_PATH").MustString("sendmail"), | |||
} |