Commit d4a976d0 by JustSong

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

parent 86117cd7
...@@ -9,6 +9,9 @@ import ( ...@@ -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"+
......
...@@ -60,9 +60,6 @@ func InitOptionMap() { ...@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment