From 9e980f204717c7d38007e5773df70ae0b3d04221 Mon Sep 17 00:00:00 2001
From: Mike McKay <mfmckay@wustl.edu>
Date: Fri, 27 May 2016 15:31:41 -0500
Subject: [PATCH] Fixed spelling mistake in Start TLS. Removed duplicate
require login setting.
---
.../event/listeners/methods/SmtpHandlerMethod.java | 12 ++++++------
.../META-INF/xnat/spawner/site-admin-elements.yaml | 12 +++---------
.../META-INF/xnat/spawner/site-setup-elements.yaml | 2 +-
src/main/webapp/setup/site-setup.yaml | 2 +-
4 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/nrg/xnat/event/listeners/methods/SmtpHandlerMethod.java b/src/main/java/org/nrg/xnat/event/listeners/methods/SmtpHandlerMethod.java
index d2772164..ecd38705 100644
--- a/src/main/java/org/nrg/xnat/event/listeners/methods/SmtpHandlerMethod.java
+++ b/src/main/java/org/nrg/xnat/event/listeners/methods/SmtpHandlerMethod.java
@@ -39,11 +39,11 @@ public class SmtpHandlerMethod extends AbstractNotificationsPreferenceHandlerMet
private void updateSmtp(){
try {
- _mailSender.setHost(XDAT.getNotificationsPreferences().getHostname());
- _mailSender.setPort(XDAT.getNotificationsPreferences().getPort());
- _mailSender.setUsername(XDAT.getNotificationsPreferences().getUsername());
- _mailSender.setPassword(XDAT.getNotificationsPreferences().getPassword());
- _mailSender.setProtocol(XDAT.getNotificationsPreferences().getProtocol());
+ mailSender.setHost(XDAT.getNotificationsPreferences().getHostname());
+ mailSender.setPort(XDAT.getNotificationsPreferences().getPort());
+ mailSender.setUsername(XDAT.getNotificationsPreferences().getUsername());
+ mailSender.setPassword(XDAT.getNotificationsPreferences().getPassword());
+ mailSender.setProtocol(XDAT.getNotificationsPreferences().getProtocol());
} catch (Exception e1) {
_log.error("", e1);
@@ -58,6 +58,6 @@ public class SmtpHandlerMethod extends AbstractNotificationsPreferenceHandlerMet
private JdbcTemplate _template;
@Inject
- private JavaMailSenderImpl _mailSender;
+ private JavaMailSenderImpl mailSender;
}
diff --git a/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml b/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
index 2567df22..8903335b 100644
--- a/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
+++ b/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
@@ -257,9 +257,9 @@ generalSecuritySettings:
element:
id: security-channel
title: Security Channel
- requireUserLogin:
+ requireLogin:
kind: panel.input.checkbox
- id: requireUserLogin
+ id: requireLogin
name: requireLogin
label: Require User Login
description: "If checked, then only registered users will be able to access your site. If false, anyone visiting your site will automatically be logged in as 'guest' with access to public data."
@@ -537,7 +537,7 @@ emailServerSettings:
smtpStartTls:
kind: panel.input.checkbox
name: mail.smtp.starttls.enable
- label: Smart TLS?
+ label: Start TLS?
smtpSSLTrust:
kind: panel.input.text
name: mail.smtp.ssl.trust
@@ -838,12 +838,6 @@ registrationOptions:
load: ?? XNAT.data.siteConfig
contentType: json
contents:
- requireLogin:
- kind: panel.input.checkbox
- id: requireLogin
- name: requireLogin
- label: "Require User Login?"
- disabled: true
requireEmailVerificationToRegister:
kind: panel.input.checkbox
id: requireEmailVerificationToRegister
diff --git a/src/main/resources/META-INF/xnat/spawner/site-setup-elements.yaml b/src/main/resources/META-INF/xnat/spawner/site-setup-elements.yaml
index 36e27b05..c3eac3d2 100644
--- a/src/main/resources/META-INF/xnat/spawner/site-setup-elements.yaml
+++ b/src/main/resources/META-INF/xnat/spawner/site-setup-elements.yaml
@@ -179,7 +179,7 @@ smtpServer:
smtpStartTls:
kind: panel.input.checkbox
name: mail.smtp.starttls.enable
- label: Smart TLS?
+ label: Start TLS?
#value: "?? XNAT:data:siteConfig:smtpServer:mail.smtp.starttls.enable"
smtpSSLTrust:
diff --git a/src/main/webapp/setup/site-setup.yaml b/src/main/webapp/setup/site-setup.yaml
index 68ab6caa..5cc5de97 100644
--- a/src/main/webapp/setup/site-setup.yaml
+++ b/src/main/webapp/setup/site-setup.yaml
@@ -199,7 +199,7 @@ siteSetup:
smtpStartTls:
kind: panel.input.checkbox
name: mail.smtp.starttls.enable
- label: Smart TLS?
+ label: Start TLS?
value: ?? XNAT:data:notifications:mail.smtp.starttls.enable
# value: ""
--
GitLab