llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-07-03 12:30:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve "%{user.friendlyName}" handling

Browse Source
This commit is contained in:
Yang Luo
2024-03-25 21:26:36 +08:00
parent 39ad1bc593
commit 94743246a1
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/service.go
View File

@ -125,9 +125,11 @@ func (c *ApiController) SendEmail() {
return return
} }
var userString = "Hi"
if user != nil { if user != nil {
content = strings.Replace(content, "%{user.friendlyName}", user.GetFriendlyName(), 1) userString = user.GetFriendlyName()
} }
content = strings.Replace(content, "%{user.friendlyName}", userString, 1)
} }
} }

5
object/verification.go
View File

@ -92,9 +92,12 @@ func SendVerificationCodeToEmail(organization *Organization, user *User, provide
// "You have requested a verification code at Casdoor. Here is your code: %s, please enter in 5 minutes." // "You have requested a verification code at Casdoor. Here is your code: %s, please enter in 5 minutes."
content := strings.Replace(provider.Content, "%s", code, 1) content := strings.Replace(provider.Content, "%s", code, 1)
var userString = "Hi"
if user != nil { if user != nil {
content = strings.Replace(content, "%{user.friendlyName}", user.GetFriendlyName(), 1) userString = user.GetFriendlyName()
} }
content = strings.Replace(content, "%{user.friendlyName}", userString, 1)
err := IsAllowSend(user, remoteAddr, provider.Category) err := IsAllowSend(user, remoteAddr, provider.Category)
if err != nil { if err != nil {