diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/InactiveAccount.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/InactiveAccount.java index f87e52952128185be8e930ceeb88a331e466a812..1dfa4a3b13e88b56c990b9802ae3b729b79f1d34 100644 --- a/src/main/java/org/nrg/xnat/turbine/modules/screens/InactiveAccount.java +++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/InactiveAccount.java @@ -19,8 +19,6 @@ package org.nrg.xnat.turbine.modules.screens;/* * Created 10/29/13 12:00 PM */ -import java.sql.SQLException; - import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.apache.turbine.modules.screens.VelocitySecureScreen; @@ -36,6 +34,8 @@ import org.nrg.xdat.turbine.utils.AdminUtils; import org.nrg.xdat.turbine.utils.TurbineUtils; import org.nrg.xft.security.UserI; +import java.sql.SQLException; + public class InactiveAccount extends VelocitySecureScreen { @Override @@ -53,7 +53,7 @@ public class InactiveAccount extends VelocitySecureScreen { !TurbineUtils.getUser(data).getUsername().equalsIgnoreCase("guest") && !TurbineUtils.HasPassedParameter("a", data) && !TurbineUtils.HasPassedParameter("s", data)) { context.put("login", TurbineUtils.getUser(data).getUsername()); - context.put("topMessage", "Your account has been disabled due to inactivity.<br>" + + context.put("topMessage", "Your account is not currently enabled, possibly due to inactivity.<br>" + "Enter your email address to send a reactivation email."); } else { UserI user = XDAT.getUserDetails(); @@ -103,7 +103,7 @@ public class InactiveAccount extends VelocitySecureScreen { } } } - context.put("topMessage", "Your account has been disabled due to inactivity.<br>" + + context.put("topMessage", "Your account is not currently enabled, possibly due to inactivity.<br>" + "Enter your email address to resend the verification email."); } } catch (Exception e) {