svn commit: r1560899 - /openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java

[vdegtyarev]

Author: vdegtyarev
Date: Fri Jan 24 04:46:01 2014
New Revision: 1560899

URL: http://svn.apache.org/r1560899
Log:
Verification url is attached to registration email for self registration users.

Modified:
    
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java

Modified: 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1560899&r1=1560898&r2=1560899&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 Fri Jan 24 04:46:01 2014
@@ -97,13 +97,7 @@ public class RegisterDialog extends Abst
                lang = WebSession.get().getLanguageByBrowserLocale();
                state = WebSession.get().getCountryByBrowserLocale();
                tzDropDown.setOutputMarkupId(true);
-               String baseURL = getBaseUrl();
                
-               sendEmailAtRegister = 1 == 
getBean(ConfigurationDao.class).getConfValue("sendEmailAtRegister", 
Integer.class, "0");
-               sendConfirmation = baseURL != null
-                               && !baseURL.isEmpty()
-                               && 1 == 
getBean(ConfigurationDao.class).getConfValue("sendEmailWithVerficationCode", 
Integer.class, "0");
-
                confirmRegistration = new MessageDialog("confirmRegistration", 
WebSession.getString(235), WebSession.getString(674), DialogButtons.OK, 
DialogIcon.INFO){
                        private static final long serialVersionUID = 1L;
 
@@ -150,6 +144,14 @@ public class RegisterDialog extends Abst
        protected List<DialogButton> getButtons() {
                return Arrays.asList(registerBtn, cancelBtn);
        }
+
+       public void onOpen(AjaxRequestTarget target) {
+               String baseURL = getBaseUrl();
+               sendEmailAtRegister = 1 == 
getBean(ConfigurationDao.class).getConfValue("sendEmailAtRegister", 
Integer.class, "0");
+               sendConfirmation = baseURL != null
+                               && !baseURL.isEmpty()
+                               && 1 == 
getBean(ConfigurationDao.class).getConfValue("sendEmailWithVerficationCode", 
Integer.class, "0");
+       }
        
        public void onClose(AjaxRequestTarget target, DialogButton button) {
                if (button != null && button.match(registerLbl)){