Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ARSnova Backend
Manage
Activity
Members
Labels
Plan
Issues
27
Issue boards
Milestones
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Privacy
Imprint
Contact
Snippets
Groups
Projects
Show more breadcrumbs
ARSnova
ARSnova Backend
Commits
5883c410
Commit
5883c410
authored
5 years ago
by
Daniel Gerhardt
Browse files
Options
Downloads
Patches
Plain Diff
Fix URL pattern for account mails
String placeholders were numbered incorrectly. Fixes
#47
.
parent
9bbff2ed
No related merge requests found
Pipeline
#29783
passed with warnings with stages
in 1 minute and 42 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/de/thm/arsnova/service/UserServiceImpl.java
+2
-2
2 additions, 2 deletions
src/main/java/de/thm/arsnova/service/UserServiceImpl.java
with
2 additions
and
2 deletions
src/main/java/de/thm/arsnova/service/UserServiceImpl.java
+
2
−
2
View file @
5883c410
...
@@ -462,7 +462,7 @@ public class UserServiceImpl extends DefaultEntityServiceImpl<UserProfile> imple
...
@@ -462,7 +462,7 @@ public class UserServiceImpl extends DefaultEntityServiceImpl<UserProfile> imple
private
void
sendActivationEmail
(
final
UserProfile
userProfile
)
{
private
void
sendActivationEmail
(
final
UserProfile
userProfile
)
{
final
String
activationKey
=
userProfile
.
getAccount
().
getActivationKey
();
final
String
activationKey
=
userProfile
.
getAccount
().
getActivationKey
();
final
String
activationUrl
=
MessageFormat
.
format
(
final
String
activationUrl
=
MessageFormat
.
format
(
"{0}{1}/login?action=activate&username={
3
}&key={
4
}"
,
"{0}{1}/login?action=activate&username={
2
}&key={
3
}"
,
rootUrl
,
rootUrl
,
customizationPath
,
customizationPath
,
UriUtils
.
encodeQueryParam
(
userProfile
.
getLoginId
(),
"UTF-8"
),
UriUtils
.
encodeQueryParam
(
userProfile
.
getLoginId
(),
"UTF-8"
),
...
@@ -570,7 +570,7 @@ public class UserServiceImpl extends DefaultEntityServiceImpl<UserProfile> imple
...
@@ -570,7 +570,7 @@ public class UserServiceImpl extends DefaultEntityServiceImpl<UserProfile> imple
}
}
final
String
resetPasswordUrl
=
MessageFormat
.
format
(
final
String
resetPasswordUrl
=
MessageFormat
.
format
(
"{0}{1}/login?action=resetpassword&username={
3
}&key={
4
}"
,
"{0}{1}/login?action=resetpassword&username={
2
}&key={
3
}"
,
rootUrl
,
rootUrl
,
customizationPath
,
customizationPath
,
UriUtils
.
encodeQueryParam
(
userProfile
.
getLoginId
(),
"UTF-8"
),
account
.
getPasswordResetKey
());
UriUtils
.
encodeQueryParam
(
userProfile
.
getLoginId
(),
"UTF-8"
),
account
.
getPasswordResetKey
());
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment