Revision 49846
Added by Sofia Baltzi over 6 years ago
| RegisterServlet.java | ||
|---|---|---|
| 62 | 62 |
|
| 63 | 63 |
try {
|
| 64 | 64 |
|
| 65 |
if (username.matches("^[a-zA-Z0-9][a-zA-Z0-9_-]{4,150}") && !ldapActions.usernameExists(username) && !ldapActions.emailExists(email)) {
|
|
| 65 |
if (username.matches("^[a-zA-Z0-9][a-zA-Z0-9_-]{4,150}") && !ldapActions.usernameExists(username) && !ldapActions.emailExists(email)
|
|
| 66 |
&& !ldapActions.isZombieUsersEmail(email) && !ldapActions.isZombieUsersUsername(username)) {
|
|
| 66 | 67 |
|
| 67 | 68 |
ldapActions.createZombieUser(username, email, firstName, lastName, organization, password); |
| 68 | 69 |
logger.info("Zombie user successfully created");
|
| ... | ... | |
| 118 | 119 |
} |
| 119 | 120 |
} |
| 120 | 121 |
|
| 121 |
if (ldapActions.usernameExists(username)) {
|
|
| 122 |
if (ldapActions.usernameExists(username) || ldapActions.isZombieUsersUsername(username)) {
|
|
| 122 | 123 |
request.getSession().setAttribute("username_message", "Username already exists! Choose another one.");
|
| 123 | 124 |
logger.info("Username already exists");
|
| 124 | 125 |
} |
| ... | ... | |
| 128 | 129 |
logger.info("There is another user with this email");
|
| 129 | 130 |
} |
| 130 | 131 |
|
| 132 |
if (ldapActions.isZombieUsersEmail(email)) {
|
|
| 133 |
request.getSession().setAttribute("email_message", "You have already registered with this email address! Please check your email to activate your account or contact OpenAIRE <a href=\"https://www.openaire.eu/support/helpdesk\">helpdesk</a>.");
|
|
| 134 |
logger.info("There is another user with this email");
|
|
| 135 |
} |
|
| 136 |
|
|
| 131 | 137 |
request.getSession().setAttribute("first_name", firstName);
|
| 132 | 138 |
request.getSession().setAttribute("last_name", lastName);
|
| 133 | 139 |
request.getSession().setAttribute("organization", organization);
|
Also available in: Unified diff
Check if it is zombie user's username or email