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 2013/09/08 05:09:34 UTC
svn commit: r1520833 -
/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Author: solomax
Date: Sun Sep 8 03:09:32 2013
New Revision: 1520833
URL: http://svn.apache.org/r1520833
Log:
[OPENMEETINGS-785] sendEmailAtRegister is checked to display "You have successfully signed up. An email with a verification code will be sent to your mailbox" popup.
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1520833&r1=1520832&r2=1520833&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java Sun Sep 8 03:09:32 2013
@@ -88,6 +88,7 @@ public class RegisterDialog extends Abst
final MessageDialog confirmRegistration;
private boolean sendConfirmation = false;
+ private boolean sendEmailAtRegister = false;
public RegisterDialog(String id) {
super(id, WebSession.getString(113));
@@ -95,6 +96,13 @@ public class RegisterDialog extends Abst
lang = WebSession.get().getLanguageByBrowserLocale();
state = WebSession.get().getCountryByBrowserLocale();
tzDropDown.setOutputMarkupId(true);
+ String baseURL = WebSession.get().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;
@@ -106,7 +114,7 @@ public class RegisterDialog extends Abst
}
public void onOpen(AjaxRequestTarget target) {
- this.setTitle(Model.of(sendConfirmation ? WebSession.getString(674) : WebSession.getString(236)));
+ this.setTitle(Model.of(sendConfirmation && sendEmailAtRegister ? WebSession.getString(674) : WebSession.getString(236)));
}
public void onClose(AjaxRequestTarget target, DialogButton button) {
@@ -172,12 +180,6 @@ public class RegisterDialog extends Abst
String redirectPage = getRequestCycle().urlFor(ActivatePage.class, new PageParameters().add("u", hash)).toString().substring(2);
String baseURL = WebSession.get().getBaseUrl() + redirectPage;
-
- sendConfirmation = baseURL != null
- && !baseURL.isEmpty()
- && 1 == getBean(ConfigurationDao.class).getConfValue(
- "sendEmailWithVerficationCode", Integer.class, "0");
-
try {
getBean(UserManager.class).registerUserInit(3, 1, 0, 1,
login, password, lastName,