svn commit: r1696910 - in /openmeetings/branches/3.0.x/src: main/java/org/apache/openmeetings/data/user/EmailManager.java web/java/org/apache/openmeetings/web/mail/template/RegisterUserTemplate.java

[vdegtyarev]

Author: vdegtyarev
Date: Fri Aug 21 08:59:14 2015
New Revision: 1696910

URL: http://svn.apache.org/r1696910
Log:
OPENMEETINGS-954 self registration additional check in.

Modified:
    
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/EmailManager.java
    
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RegisterUserTemplate.java

Modified: 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/EmailManager.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/EmailManager.java?rev=1696910&r1=1696909&r2=1696910&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/EmailManager.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/user/EmailManager.java
 Fri Aug 21 08:59:14 2015
@@ -55,8 +55,9 @@ public class EmailManager {
                Integer sendEmailAtRegister = 
configurationDao.getConfValue("sendEmailAtRegister", Integer.class, "0");
 
                if (sendEmailAtRegister == 1) {
+                       RegisterUserTemplate.ensureApplication(langId);
                        mailHandler.send(email, langId == null ? 
Application.getString(512) : Application.getString(512, langId)  
-                               , RegisterUserTemplate.getEmail(username, 
userpass, email, sendEmailWithVerficationCode ? link : null, langId));
+                               , RegisterUserTemplate.getEmail(username, 
userpass, email, sendEmailWithVerficationCode ? link : null));
                }
                return "success";
        }

Modified: 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RegisterUserTemplate.java
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RegisterUserTemplate.java?rev=1696910&r1=1696909&r2=1696910&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RegisterUserTemplate.java
 (original)
+++ 
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/RegisterUserTemplate.java
 Fri Aug 21 08:59:14 2015
@@ -37,8 +37,7 @@ public class RegisterUserTemplate extend
                        .setVisible(verification_url != null));
        }
 
-       public static String getEmail(String username, String userpass, String 
email, String verification_url, Long langId) {
-               ensureApplication(langId);
+       public static String getEmail(String username, String userpass, String 
email, String verification_url) {
                return renderPanel(new RegisterUserTemplate(username, userpass, 
email, verification_url)).toString();
        }
 }