Fixed spelling mistake in Start TLS. Removed duplicate require login setting.

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;
 
 }

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

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:

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: ""