Author: solomax
Date: Sat Oct 8 16:37:12 2016
New Revision: 1763919
URL: http://svn.apache.org/viewvc?rev=1763919&view=rev
Log:
[OPENMEETINGS-1487] password is not being sended via email
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
Sat Oct 8 16:37:12 2016
@@ -60,7 +60,7 @@ public class EmailManager {
* @return
* @throws Exception
*/
- public String sendMail(String username, String userpass, String email,
String hash, Boolean sendEmailWithVerficationCode, Long langId) {
+ public String sendMail(String username, String email, String hash,
Boolean sendEmailWithVerficationCode, Long langId) {
log.debug("sendMail:: username = {}, email = {}", username,
email);
Integer sendEmailAtRegister =
configurationDao.getConfValue("sendEmailAtRegister", Integer.class, "0");
@@ -70,7 +70,7 @@ public class EmailManager {
ensureApplication(langId != null ? langId :
configurationDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1"));
mailHandler.send(email, getString(512)
- , RegisterUserTemplate.getEmail(username,
userpass, email, sendEmailWithVerficationCode ? link : null));
+ , RegisterUserTemplate.getEmail(username,
email, sendEmailWithVerficationCode ? link : null));
}
return "success";
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
Sat Oct 8 16:37:12 2016
@@ -25,7 +25,6 @@
<br />
<b><wicket:message key="507" /></b><br />
<wicket:message key="508" /> <span wicket:id="username"></span><br />
- <wicket:message key="509" /> <span wicket:id="userpass"></span><br />
<wicket:message key="510" /> <span wicket:id="email"></span><br />
<br />
<div wicket:id="verification">
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java
Sat Oct 8 16:37:12 2016
@@ -25,11 +25,10 @@ import org.apache.wicket.markup.html.lin
public class RegisterUserTemplate extends AbstractTemplatePanel {
private static final long serialVersionUID = 1L;
- public RegisterUserTemplate(String username, String userpass, String
email, String verification_url) {
+ public RegisterUserTemplate(String username, String email, String
verification_url) {
super(getOmSession().getOmLanguage());
add(new Label("registrationLbl", getString(506, langId)));
add(new Label("username", username));
- add(new Label("userpass", userpass));
add(new Label("email", email));
WebMarkupContainer verification = new
WebMarkupContainer("verification");
add(verification.add(new Label("verification_url2",
verification_url))
@@ -38,7 +37,7 @@ public class RegisterUserTemplate extend
add(new Label("groupLbl", getString(511, langId)));
}
- public static String getEmail(String username, String userpass, String
email, String verification_url) {
- return renderPanel(new RegisterUserTemplate(username, userpass,
email, verification_url)).toString();
+ public static String getEmail(String username, String email, String
verification_url) {
+ return renderPanel(new RegisterUserTemplate(username, email,
verification_url)).toString();
}
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
Sat Oct 8 16:37:12 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.service.user;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
@@ -25,7 +26,6 @@ import static org.apache.openmeetings.ut
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.Date;
@@ -84,7 +84,7 @@ public class UserManager implements IUse
private EntityManager em;
@Autowired
- private SessiondataDao sessiondataDao;
+ private SessiondataDao sessionDao;
@Autowired
private ConfigurationDao cfgDao;
@Autowired
@@ -143,14 +143,13 @@ public class UserManager implements IUse
public User loginUserByRemoteHash(String SID, String remoteHash) {
try {
- Sessiondata sessionData = sessiondataDao
- .get(remoteHash);
+ Sessiondata sessionData = sessionDao.check(remoteHash);
if (sessionData != null) {
User u = userDao.get(sessionData.getUserId());
- sessiondataDao.updateUserWithoutSession(SID,
u.getId());
+ sessionDao.updateUserWithoutSession(SID,
u.getId());
return u;
}
@@ -163,7 +162,7 @@ public class UserManager implements IUse
@Override
public Long logout(String SID, long userId) {
- sessiondataDao.updateUser(SID, null, false, 0);
+ sessionDao.updateUser(SID, null, false, 0);
return -12L;
}
@@ -373,7 +372,7 @@ public class UserManager implements IUse
link += "activate?u=" + hash;
if (sendWelcomeMessage && email.length() != 0) {
- String sendMail =
emailManagement.sendMail(login, password, email, link, sendConfirmation,
languageId);
+ String sendMail =
emailManagement.sendMail(login, email, link, sendConfirmation, languageId);
if (!sendMail.equals("success")) {
return -19L;
}
@@ -395,7 +394,7 @@ public class UserManager implements IUse
}
log.debug("Added user-Id " + u.getId());
- if (adr.getId() > 0 && u.getId() > 0) {
+ if (adr.getId() != null && u.getId() != null) {
return u.getId();
} else {
return -16L;
@@ -412,19 +411,19 @@ public class UserManager implements IUse
}
/**
- * @param admin
+ * @param sid
* @param room_id
* @return
*/
@Override
- public boolean kickUserByStreamId(String SID, Long room_id) {
+ public boolean kickUserByStreamId(String sid, Long room_id) {
try {
- Long users_id = sessiondataDao.check(SID);
+ Long users_id = sessionDao.check(SID);
// admins only
if
(AuthLevelUtil.hasAdminLevel(userDao.getRights(users_id))) {
- sessiondataDao.clearSessionByRoomId(room_id);
+ sessionDao.clearSessionByRoomId(room_id);
for (Client rcl :
sessionManager.getClientListByRoom(room_id)) {
if (rcl == null) {
@@ -450,9 +449,9 @@ public class UserManager implements IUse
}
@Override
- public boolean kickUserByPublicSID(String SID, String publicSID) {
+ public boolean kickUserByPublicSID(String sid, String publicSID) {
try {
- Long userId = sessiondataDao.check(SID);
+ Long userId = sessionDao.check(sid);
// admins only
if
(AuthLevelUtil.hasWebServiceLevel(userDao.getRights(userId))) {
@@ -521,7 +520,7 @@ public class UserManager implements IUse
for (int i = 0; i < rawPass.length; ++i) {
rawPass[i] = (byte) ('!' + rnd.nextInt(93));
}
- String pass = new String(rawPass, StandardCharsets.UTF_8);
+ String pass = new String(rawPass, UTF_8);
// check if the user already exists and register new one if
it's needed
if (u == null) {
u = userDao.getNewUserInstance(null);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
Sat Oct 8 16:37:12 2016
@@ -115,8 +115,7 @@ public class UserForm extends AdminBaseF
boolean sendEmailAtRegister = (1 ==
getBean(ConfigurationDao.class).getConfValue("sendEmailAtRegister",
Integer.class, "0"));
if (isNew && sendEmailAtRegister) {
String link =
getBean(ConfigurationDao.class).getBaseUrl();
- String sendMail =
getBean(EmailManager.class).sendMail(login.getValue(),
-
generalForm.getPasswordField().getConvertedInput(), generalForm.getEmail(),
link, false, null);
+ String sendMail =
getBean(EmailManager.class).sendMail(login.getValue(), generalForm.getEmail(),
link, false, null);
if (!sendMail.equals("success")) {
throw new Exception("Mail for new user
is not sent");
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
Sat Oct 8 16:37:12 2016
@@ -60,7 +60,7 @@ public class EmailManager {
* @return
* @throws Exception
*/
- public String sendMail(String username, String userpass, String email,
String hash, Boolean sendEmailWithVerficationCode, Long langId) {
+ public String sendMail(String username, String email, String hash,
Boolean sendEmailWithVerficationCode, Long langId) {
log.debug("sendMail:: username = {}, email = {}", username,
email);
Integer sendEmailAtRegister =
configurationDao.getConfValue("sendEmailAtRegister", Integer.class, "0");
@@ -70,7 +70,7 @@ public class EmailManager {
ensureApplication(langId != null ? langId :
configurationDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1"));
mailHandler.send(email, getString(512)
- , RegisterUserTemplate.getEmail(username,
userpass, email, sendEmailWithVerficationCode ? link : null));
+ , RegisterUserTemplate.getEmail(username,
email, sendEmailWithVerficationCode ? link : null));
}
return "success";
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
Sat Oct 8 16:37:12 2016
@@ -25,7 +25,6 @@
<br />
<b><wicket:message key="507" /></b><br />
<wicket:message key="508" /> <span wicket:id="username"></span><br />
- <wicket:message key="509" /> <span wicket:id="userpass"></span><br />
<wicket:message key="510" /> <span wicket:id="email"></span><br />
<br />
<div wicket:id="verification">
@@ -35,4 +34,4 @@
</div>
<span wicket:id="groupLbl"></span>
</wicket:extend>
-</html>
\ No newline at end of file
+</html>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java
Sat Oct 8 16:37:12 2016
@@ -25,11 +25,10 @@ import org.apache.wicket.markup.html.lin
public class RegisterUserTemplate extends AbstractTemplatePanel {
private static final long serialVersionUID = 1L;
- public RegisterUserTemplate(String username, String userpass, String
email, String verification_url) {
+ public RegisterUserTemplate(String username, String email, String
verification_url) {
super(getOmSession().getOmLanguage());
add(new Label("registrationLbl", getString(506, langId)));
add(new Label("username", username));
- add(new Label("userpass", userpass));
add(new Label("email", email));
WebMarkupContainer verification = new
WebMarkupContainer("verification");
add(verification.add(new Label("verification_url2",
verification_url))
@@ -38,7 +37,7 @@ public class RegisterUserTemplate extend
add(new Label("groupLbl", getString(511, langId)));
}
- public static String getEmail(String username, String userpass, String
email, String verification_url) {
- return renderPanel(new RegisterUserTemplate(username, userpass,
email, verification_url)).toString();
+ public static String getEmail(String username, String email, String
verification_url) {
+ return renderPanel(new RegisterUserTemplate(username, email,
verification_url)).toString();
}
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
Sat Oct 8 16:37:12 2016
@@ -372,7 +372,7 @@ public class UserManager implements IUse
link += "activate?u=" + hash;
if (sendWelcomeMessage && email.length() != 0) {
- String sendMail =
emailManagement.sendMail(login, password, email, link, sendConfirmation,
languageId);
+ String sendMail =
emailManagement.sendMail(login, email, link, sendConfirmation, languageId);
if (!sendMail.equals("success")) {
return -19L;
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
Sat Oct 8 16:37:12 2016
@@ -115,8 +115,7 @@ public class UserForm extends AdminBaseF
boolean sendEmailAtRegister = (1 ==
getBean(ConfigurationDao.class).getConfValue("sendEmailAtRegister",
Integer.class, "0"));
if (isNew && sendEmailAtRegister) {
String link =
getBean(ConfigurationDao.class).getBaseUrl();
- String sendMail =
getBean(EmailManager.class).sendMail(login.getValue(),
-
generalForm.getPasswordField().getConvertedInput(), generalForm.getEmail(),
link, false, null);
+ String sendMail =
getBean(EmailManager.class).sendMail(login.getValue(), generalForm.getEmail(),
link, false, null);
if (!sendMail.equals("success")) {
throw new Exception("Mail for new user
is not sent");
}
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
Sat Oct 8 16:37:12 2016
@@ -60,7 +60,7 @@ public class EmailManager {
* @return
* @throws Exception
*/
- public String sendMail(String username, String userpass, String email,
String hash, Boolean sendEmailWithVerficationCode, Long langId) {
+ public String sendMail(String username, String email, String hash,
Boolean sendEmailWithVerficationCode, Long langId) {
log.debug("sendMail:: username = {}, email = {}", username,
email);
Integer sendEmailAtRegister =
configurationDao.getConfValue("sendEmailAtRegister", Integer.class, "0");
@@ -70,7 +70,7 @@ public class EmailManager {
ensureApplication(langId != null ? langId :
configurationDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1"));
mailHandler.send(email, getString(512)
- , RegisterUserTemplate.getEmail(username,
userpass, email, sendEmailWithVerficationCode ? link : null));
+ , RegisterUserTemplate.getEmail(username,
email, sendEmailWithVerficationCode ? link : null));
}
return "success";
}
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
Sat Oct 8 16:37:12 2016
@@ -25,7 +25,6 @@
<br />
<b><wicket:message key="507" /></b><br />
<wicket:message key="508" /> <span wicket:id="username"></span><br />
- <wicket:message key="509" /> <span wicket:id="userpass"></span><br />
<wicket:message key="510" /> <span wicket:id="email"></span><br />
<br />
<div wicket:id="verification">
@@ -35,4 +34,4 @@
</div>
<span wicket:id="groupLbl"></span>
</wicket:extend>
-</html>
\ No newline at end of file
+</html>
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java
Sat Oct 8 16:37:12 2016
@@ -25,11 +25,10 @@ import org.apache.wicket.markup.html.lin
public class RegisterUserTemplate extends AbstractTemplatePanel {
private static final long serialVersionUID = 1L;
- public RegisterUserTemplate(String username, String userpass, String
email, String verification_url) {
+ public RegisterUserTemplate(String username, String email, String
verification_url) {
super(getOmSession().getOmLanguage());
add(new Label("registrationLbl", getString(506, langId)));
add(new Label("username", username));
- add(new Label("userpass", userpass));
add(new Label("email", email));
WebMarkupContainer verification = new
WebMarkupContainer("verification");
add(verification.add(new Label("verification_url2",
verification_url))
@@ -38,7 +37,7 @@ public class RegisterUserTemplate extend
add(new Label("groupLbl", getString(511, langId)));
}
- public static String getEmail(String username, String userpass, String
email, String verification_url) {
- return renderPanel(new RegisterUserTemplate(username, userpass,
email, verification_url)).toString();
+ public static String getEmail(String username, String email, String
verification_url) {
+ return renderPanel(new RegisterUserTemplate(username, email,
verification_url)).toString();
}
}
Modified:
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
(original)
+++
openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
Sat Oct 8 16:37:12 2016
@@ -372,7 +372,7 @@ public class UserManager implements IUse
link += "activate?u=" + hash;
if (sendWelcomeMessage && email.length() != 0) {
- String sendMail =
emailManagement.sendMail(login, password, email, link, sendConfirmation,
languageId);
+ String sendMail =
emailManagement.sendMail(login, email, link, sendConfirmation, languageId);
if (!sendMail.equals("success")) {
return -19L;
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1763919&r1=1763918&r2=1763919&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
Sat Oct 8 16:37:12 2016
@@ -115,8 +115,7 @@ public class UserForm extends AdminBaseF
boolean sendEmailAtRegister = (1 ==
getBean(ConfigurationDao.class).getConfValue("sendEmailAtRegister",
Integer.class, "0"));
if (isNew && sendEmailAtRegister) {
String link =
getBean(ConfigurationDao.class).getBaseUrl();
- String sendMail =
getBean(EmailManager.class).sendMail(login.getValue(),
-
generalForm.getPasswordField().getConvertedInput(), generalForm.getEmail(),
link, false, null);
+ String sendMail =
getBean(EmailManager.class).sendMail(login.getValue(), generalForm.getEmail(),
link, false, null);
if (!sendMail.equals("success")) {
throw new Exception("Mail for new user
is not sent");
}
