You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2019/06/17 06:24:30 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2077] 'external
type' clean-up
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 98f54c4 [OPENMEETINGS-2077] 'external type' clean-up
98f54c4 is described below
commit 98f54c46c09e7eed589a8c299c04587c31c00b66
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Jun 17 13:24:20 2019 +0700
[OPENMEETINGS-2077] 'external type' clean-up
---
.../main/java/org/apache/openmeetings/web/app/UserManager.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
index 4b9e9b3..32abd6a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
@@ -152,12 +152,8 @@ public class UserManager implements IUserManager {
boolean checkEmail = Strings.isEmpty(email) || userDao.checkEmail(email, User.Type.user, null, null);
if (checkName && checkEmail) {
String ahash = Strings.isEmpty(hash) ? randomUUID().toString() : hash;
- if (Strings.isEmpty(u.getExternalType())) {
- if (!Strings.isEmpty(email)) {
- emailManager.sendMail(login, email, ahash, sendConfirmation(), u.getLanguageId());
- }
- } else {
- u.setType(Type.external);
+ if (Type.external != u.getType() && !Strings.isEmpty(email)) {
+ emailManager.sendMail(login, email, ahash, sendConfirmation(), u.getLanguageId());
}
// If this user needs first to click his E-Mail verification