diff --git a/app/Global.java b/app/Global.java index 7411fb9..b92ca36 100644 --- a/app/Global.java +++ b/app/Global.java @@ -66,7 +66,7 @@ public F.Promise onError(Http.RequestHeader requestHeader, Throwab if(userId != null) { log.error("Internal server error. Logged In UserId: " + userId + " User Email: " + userEmail, throwable); - UserManagement.sendMail(PlayConfWrapper.errorHandlingEmail(),"Exception in "+ PlayConfWrapper.portalUrl(),"Internal server error in "+ PlayConfWrapper.portalUrl() + "\n Date and time in US/ET: " + dateFormat.format(date) + " \n Logged In UserId: " + userId + " \n User Email: " + userEmail + "\n Error: " + throwable.getCause()); + UserManagement. sendMail(PlayConfWrapper.errorHandlingEmail(),"Exception in "+ PlayConfWrapper.portalUrl(),"Internal server error in "+ PlayConfWrapper.portalUrl() + "\n Date and time in US/ET: " + dateFormat.format(date) + " \n Logged In UserId: " + userId + " \n User Email: " + userEmail + "\n Error: " + throwable.getCause()); } else { log.error("Internal server error.", throwable); UserManagement.sendMail(PlayConfWrapper.errorHandlingEmail(),"Exception in "+ PlayConfWrapper.portalUrl(),"Internal server error in "+ PlayConfWrapper.portalUrl() +"\n Date and time in US/ET: " + dateFormat.format(date) +" \n Error: "+ throwable.getCause()); diff --git a/app/controllers/HTRCPortal.java b/app/controllers/HTRCPortal.java index eea0f5b..2aaa4bb 100755 --- a/app/controllers/HTRCPortal.java +++ b/app/controllers/HTRCPortal.java @@ -64,7 +64,7 @@ public static Result login() throws IOException, JAXBException { if(!userManager.roleNameExists(userId)){ return ok(gotopage.render("Looks like you have not activated your account. Your account activation link has sent to " + userEmail + ". Please check your email and activate account. " + "If you have not received your activation link, please contact us by email " + - " ", "mailto:htrc-tech-help-l@list.indiana.edu?Subject=Issue_with_account_activation_link", "(htrc-tech-help-l@list.indiana.edu).",null)); + " ", "mailto:"+PlayConfWrapper.supportEmail()+"?Subject=Issue_with_account_activation_link", PlayConfWrapper.supportEmail(),null)); } log.debug("Role name exists: " + userManager.roleNameExists(userId)); log.info("Logged in user:"+ userId + ", Email:" + userEmail + ", Remote address:" + request().remoteAddress()); diff --git a/app/controllers/UserManagement.java b/app/controllers/UserManagement.java index 73e0791..cab2760 100644 --- a/app/controllers/UserManagement.java +++ b/app/controllers/UserManagement.java @@ -44,7 +44,7 @@ public static Result signUp() { return ok(gotopage.render("Welcome to HTRC! You account activation link was sent to " + signUpForm.get().email + ". If you don't receive your activation link within 5 minutes, please contact us by email " + - " ", "mailto:htrc-tech-help-l@list.indiana.edu?Subject=Issue_with_account_activation_link", "(htrc-tech-help-l@list.indiana.edu).", null)); + " ", "mailto:"+PlayConfWrapper.supportEmail()+"?Subject=Issue_with_account_activation_link", PlayConfWrapper.supportEmail(), null)); } public static Result activateAccount(String token) { @@ -61,7 +61,7 @@ public static Result activateAccount(String token) { } return ok(gotopage.render("Your account is activated successfully. Click on the login link to begin:", "login", "Login", null)); } - return ok(gotopage.render("It looks like you have already activated your account or some error on your activation link. Please try to login with your user credentials. If you can't login or activate your account, please contact us by email.", "mailto:htrc-tech-help-l@list.indiana.edu?Subject=Issue_with_account_activation_link", "(htrc-tech-help-l@list.indiana.edu).", null)); + return ok(gotopage.render("It looks like you have already activated your account or some error on your activation link. Please try to login with your user credentials. If you can't login or activate your account, please contact us by email.", "mailto:"+PlayConfWrapper.supportEmail()+"?Subject=Issue_with_account_activation_link", PlayConfWrapper.supportEmail(), null)); } public static Result createAccountRequestForm() { diff --git a/app/views/error500.scala.html b/app/views/error500.scala.html index 85e86d4..b145f1a 100644 --- a/app/views/error500.scala.html +++ b/app/views/error500.scala.html @@ -1,5 +1,5 @@ @(t: Throwable, userId: String) - + @import edu.indiana.d2i.htrc.portal.PlayConfWrapper @main("Internal Server Error", userId) {
@@ -8,6 +8,6 @@

@*Oops, looks like something went wrong. It's not you. It's us.*@

If you would like to help, please report what you were doing just before - the problem to our support email htrc-tech-help-l@@list.indiana.edu

+ the problem to our support email @PlayConfWrapper.supportEmail()

} \ No newline at end of file diff --git a/app/views/main.scala.html b/app/views/main.scala.html index ffd60dc..c0157f6 100755 --- a/app/views/main.scala.html +++ b/app/views/main.scala.html @@ -136,7 +136,7 @@ Knowledge Base
  • -
  • +
  • Contact