Revision 49836
Added by Sofia Baltzi over 6 years ago
| modules/dnet-openaire-users/trunk/src/main/java/eu/dnetlib/openaire/usermanagement/RemindUsernameServlet.java | ||
|---|---|---|
| 49 | 49 |
String username = ldapActions.getUsername(formEmail); |
| 50 | 50 |
if (username != null && !username.isEmpty()) {
|
| 51 | 51 |
|
| 52 |
String verificationCodeMsg = "Hello,\n" + |
|
| 53 |
"\n" + "A username reminder has been requested for your OpenAIRE account.\n" + |
|
| 54 |
" Your username is "+ username + ". Thank you. "; |
|
| 52 |
String verificationCodeMsg = "<p>Hello,</p>" + |
|
| 53 |
"<p> A username reminder has been requested for your OpenAIRE account.</p>" + |
|
| 54 |
"<p> Your username is "+ username + ".</p>" + |
|
| 55 |
"<p> Thank you </p>"; |
|
| 55 | 56 |
|
| 56 | 57 |
String verificationCodeSubject = "Your OpenAIRE username"; |
| 57 | 58 |
|
| modules/dnet-openaire-users/trunk/src/main/java/eu/dnetlib/openaire/usermanagement/ForgotPasswordServlet.java | ||
|---|---|---|
| 73 | 73 |
verificationActions.updateVerificationEntry(username, verificationCode.toString(), timestamp); |
| 74 | 74 |
} |
| 75 | 75 |
|
| 76 |
String verificationCodeMsg = "Hello,\n" + |
|
| 77 |
"\n" + |
|
| 78 |
"A request has been made to reset your OpenAIRE account password. To reset your\n" + |
|
| 79 |
"password, you will need to submit this verification code in order to verify that the\n" + |
|
| 80 |
"request was legitimate.\n" + |
|
| 81 |
"\n" + |
|
| 82 |
"The verification code is " + verificationCode.toString() + "\n Thank you"; |
|
| 76 |
String scheme = request.getScheme(); |
|
| 77 |
String serverName = request.getServerName(); |
|
| 78 |
int portNumber = request.getServerPort(); |
|
| 79 |
String contextPath = request.getContextPath(); |
|
| 83 | 80 |
|
| 81 |
String resultPath = scheme + "://" +serverName + ":" +portNumber + contextPath + "/verify.jsp"; |
|
| 82 |
|
|
| 83 |
String verificationCodeMsg = "<p>Hello,</p>" + |
|
| 84 |
"<p> A request has been made to reset your OpenAIRE account password. To reset your " + |
|
| 85 |
"password, you will need to submit this verification code in order to verify that the " + |
|
| 86 |
"request was legitimate.</p>" + |
|
| 87 |
"<p> The verification code is " + verificationCode.toString() + "</p>" + |
|
| 88 |
"Select the URL below and proceed with verification." + |
|
| 89 |
"<p><a href=" + resultPath + ">" + resultPath + "</a></p>" + |
|
| 90 |
"<p>Thank you</p>"; |
|
| 91 |
|
|
| 84 | 92 |
String verificationCodeSubject = "Your OpenAIRE password reset request"; |
| 85 | 93 |
|
| 86 | 94 |
emailSender.sendEmail(formEmail, verificationCodeSubject, verificationCodeMsg); |
| modules/dnet-openaire-users/trunk/src/main/java/eu/dnetlib/openaire/usermanagement/RegisterServlet.java | ||
|---|---|---|
| 87 | 87 |
String resultPath = scheme + "://" +serverName + ":" +portNumber + contextPath + "/activate.jsp"; |
| 88 | 88 |
|
| 89 | 89 |
String verificationCodeMsg = "<p>Hello " + username + ",</p>" + |
| 90 |
"<p> " + |
|
| 91 |
"A request has been made to verify your email and activate your OpenAIRE account. To activate your " + |
|
| 90 |
"<p> A request has been made to verify your email and activate your OpenAIRE account. To activate your " + |
|
| 92 | 91 |
"account, you will need to submit your username and this activation code in order to verify that the" + |
| 93 | 92 |
"request was legitimate.</p>" + |
| 94 | 93 |
"<p>" + |
| 95 | 94 |
"The activation code is " + verificationCode.toString() + |
| 96 | 95 |
"</p>" + |
| 97 | 96 |
"Select the URL below and proceed with activating your password." + |
| 98 |
"<p><a href=" + resultPath + ">" + resultPath + "</a></p>" |
|
| 99 |
+"<p>Thank you</p>";
|
|
| 97 |
"<p><a href=" + resultPath + ">" + resultPath + "</a></p>" +
|
|
| 98 |
"<p>Thank you</p>"; |
|
| 100 | 99 |
|
| 101 | 100 |
String verificationCodeSubject = "Activate your OpenAIRE account"; |
| 102 | 101 |
|
Also available in: Unified diff
Change email format and add link for verification