fix: fix SMTPFrom not updated in some cases (close #34)

This commit is contained in:
JustSong 2023-05-13 22:04:36 +08:00
parent 9edc82bde0
commit e123c66bc7
2 changed files with 3 additions and 3 deletions

View File

@ -9,6 +9,9 @@ import (
) )
func SendEmail(subject string, receiver string, content string) error { func SendEmail(subject string, receiver string, content string) error {
if SMTPFrom == "" { // for compatibility
SMTPFrom = SMTPAccount
}
encodedSubject := fmt.Sprintf("=?UTF-8?B?%s?=", base64.StdEncoding.EncodeToString([]byte(subject))) encodedSubject := fmt.Sprintf("=?UTF-8?B?%s?=", base64.StdEncoding.EncodeToString([]byte(subject)))
mail := []byte(fmt.Sprintf("To: %s\r\n"+ mail := []byte(fmt.Sprintf("To: %s\r\n"+
"From: %s<%s>\r\n"+ "From: %s<%s>\r\n"+

View File

@ -60,9 +60,6 @@ func InitOptionMap() {
common.SysError("Failed to update option map: " + err.Error()) common.SysError("Failed to update option map: " + err.Error())
} }
} }
if common.SMTPFrom == "" { // for compatibility
common.SMTPFrom = common.SMTPAccount
}
} }
func UpdateOption(key string, value string) error { func UpdateOption(key string, value string) error {