|
@@ -33,6 +33,7 @@ func InitOptionMap() {
|
|
|
common.OptionMap["TurnstileCheckEnabled"] = strconv.FormatBool(common.TurnstileCheckEnabled)
|
|
common.OptionMap["TurnstileCheckEnabled"] = strconv.FormatBool(common.TurnstileCheckEnabled)
|
|
|
common.OptionMap["RegisterEnabled"] = strconv.FormatBool(common.RegisterEnabled)
|
|
common.OptionMap["RegisterEnabled"] = strconv.FormatBool(common.RegisterEnabled)
|
|
|
common.OptionMap["SMTPServer"] = ""
|
|
common.OptionMap["SMTPServer"] = ""
|
|
|
|
|
+ common.OptionMap["SMTPFrom"] = ""
|
|
|
common.OptionMap["SMTPPort"] = strconv.Itoa(common.SMTPPort)
|
|
common.OptionMap["SMTPPort"] = strconv.Itoa(common.SMTPPort)
|
|
|
common.OptionMap["SMTPAccount"] = ""
|
|
common.OptionMap["SMTPAccount"] = ""
|
|
|
common.OptionMap["SMTPToken"] = ""
|
|
common.OptionMap["SMTPToken"] = ""
|
|
@@ -58,6 +59,9 @@ 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 {
|
|
@@ -120,6 +124,8 @@ func updateOptionMap(key string, value string) (err error) {
|
|
|
common.SMTPPort = intValue
|
|
common.SMTPPort = intValue
|
|
|
case "SMTPAccount":
|
|
case "SMTPAccount":
|
|
|
common.SMTPAccount = value
|
|
common.SMTPAccount = value
|
|
|
|
|
+ case "SMTPFrom":
|
|
|
|
|
+ common.SMTPFrom = value
|
|
|
case "SMTPToken":
|
|
case "SMTPToken":
|
|
|
common.SMTPToken = value
|
|
common.SMTPToken = value
|
|
|
case "ServerAddress":
|
|
case "ServerAddress":
|