svn commit: r1696920 - in /openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service: mail/EmailManager.java user/UserManager.java

[vdegtyarev]

Author: vdegtyarev
Date: Fri Aug 21 10:00:23 2015
New Revision: 1696920

URL: http://svn.apache.org/r1696920
Log:
OPENMEETINGS-954 self registration changes merge to trunk.

Modified:
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
    
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java?rev=1696920&r1=1696919&r2=1696920&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
 Fri Aug 21 10:00:23 2015
@@ -58,13 +58,14 @@ public class EmailManager {
         * @return
         * @throws Exception
         */
-       public String sendMail(String username, String userpass, String email, 
String hash, Boolean sendEmailWithVerficationCode) {
+       public String sendMail(String username, String userpass, String email, 
String hash, Boolean sendEmailWithVerficationCode, Long langId) {
                log.debug("sendMail:: username = {}, email = {}", username, 
email);
                Integer sendEmailAtRegister = 
configurationDao.getConfValue("sendEmailAtRegister", Integer.class, "0");
 
                String link = 
((IApplication)Application.get(wicketApplicationName)).urlForActivatePage(new 
PageParameters().add("u",  hash));
                
                if (sendEmailAtRegister == 1) {
+                       RegisterUserTemplate.ensureApplication(langId);
                        mailHandler.send(email, getString(512)
                                , RegisterUserTemplate.getEmail(username, 
userpass, email, sendEmailWithVerficationCode ? link : null));
                }

Modified: 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1696920&r1=1696919&r2=1696920&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
 Fri Aug 21 10:00:23 2015
@@ -384,7 +384,7 @@ public class UserManager implements IUse
                                link += "activate?u=" + hash;
 
                                if (sendWelcomeMessage && email.length() != 0) {
-                                       String sendMail = 
emailManagement.sendMail(login, password, email, link, sendConfirmation);
+                                       String sendMail = 
emailManagement.sendMail(login, password, email, link, sendConfirmation, 
languageId);
                                        if (!sendMail.equals("success")) {
                                                return -19L;
                                        }