diff --git a/src/main/scala/app/SystemSettingsController.scala b/src/main/scala/app/SystemSettingsController.scala index d19c146..3d30aff 100644 --- a/src/main/scala/app/SystemSettingsController.scala +++ b/src/main/scala/app/SystemSettingsController.scala @@ -6,7 +6,7 @@ import jp.sf.amateras.scalatra.forms._ class SystemSettingsController extends SystemSettingsControllerBase -with SystemSettingsService with AccountService with AdminAuthenticator + with SystemSettingsService with AccountService with AdminAuthenticator trait SystemSettingsControllerBase extends ControllerBase { self: SystemSettingsService with AccountService with AdminAuthenticator => @@ -17,28 +17,28 @@ "gravatar" -> trim(label("Gravatar", boolean())), "notification" -> trim(label("Notification", boolean())), "smtp" -> optionalIfNotChecked("notification", mapping( - "host" -> trim(label("SMTP Host", text(required))), - "port" -> trim(label("SMTP Port", optional(number()))), - "user" -> trim(label("SMTP User", optional(text()))), - "password" -> trim(label("SMTP Password", optional(text()))), - "ssl" -> trim(label("Enable SSL", optional(boolean()))), - "fromAddress" -> trim(label("FROM Address", optional(text()))), - "fromName" -> trim(label("FROM Name", optional(text()))) + "host" -> trim(label("SMTP Host", text(required))), + "port" -> trim(label("SMTP Port", optional(number()))), + "user" -> trim(label("SMTP User", optional(text()))), + "password" -> trim(label("SMTP Password", optional(text()))), + "ssl" -> trim(label("Enable SSL", optional(boolean()))), + "fromAddress" -> trim(label("FROM Address", optional(text()))), + "fromName" -> trim(label("FROM Name", optional(text()))) )(Smtp.apply)), "ldapAuthentication" -> trim(label("LDAP", boolean())), "ldap" -> optionalIfNotChecked("ldapAuthentication", mapping( - "host" -> trim(label("LDAP host", text(required))), - "port" -> trim(label("LDAP port", optional(number()))), - "bindDN" -> trim(label("Bind DN", optional(text()))), - "bindPassword" -> trim(label("Bind Password", optional(text()))), - "baseDN" -> trim(label("Base DN", text(required))), - "userNameAttribute" -> trim(label("User name attribute", text(required))), - "additionalFilterCondition"-> trim(label("Additional filter condition", optional(text()))), - "fullNameAttribute" -> trim(label("Full name attribute", optional(text()))), - "mailAttribute" -> trim(label("Mail address attribute", text(required))), - "disableMailResolve" -> trim(label("Disable Mail Resolve", optional(boolean()))), - "tls" -> trim(label("Enable TLS", optional(boolean()))), - "keystore" -> trim(label("Keystore", optional(text()))) + "host" -> trim(label("LDAP host", text(required))), + "port" -> trim(label("LDAP port", optional(number()))), + "bindDN" -> trim(label("Bind DN", optional(text()))), + "bindPassword" -> trim(label("Bind Password", optional(text()))), + "baseDN" -> trim(label("Base DN", text(required))), + "userNameAttribute" -> trim(label("User name attribute", text(required))), + "additionalFilterCondition"-> trim(label("Additional filter condition", optional(text()))), + "fullNameAttribute" -> trim(label("Full name attribute", optional(text()))), + "mailAttribute" -> trim(label("Mail address attribute", text(required))), + "disableMailResolve" -> trim(label("Disable Mail Resolve", optional(boolean()))), + "tls" -> trim(label("Enable TLS", optional(boolean()))), + "keystore" -> trim(label("Keystore", optional(text()))) )(Ldap.apply)) )(SystemSettings.apply) diff --git a/src/main/scala/util/LDAPUtil.scala b/src/main/scala/util/LDAPUtil.scala index e0d42ad..9f23919 100644 --- a/src/main/scala/util/LDAPUtil.scala +++ b/src/main/scala/util/LDAPUtil.scala @@ -69,7 +69,7 @@ } private def bind[A](host: String, port: Int, dn: String, password: String, tls: Boolean, keystore: String, error: String) - (f: LDAPConnection => Either[String, A]): Either[String, A] = { + (f: LDAPConnection => Either[String, A]): Either[String, A] = { if (tls) { // Dynamically set Sun as the security provider Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider()) diff --git a/src/main/twirl/admin/system.scala.html b/src/main/twirl/admin/system.scala.html index dbafeb4..257ec69 100644 --- a/src/main/twirl/admin/system.scala.html +++ b/src/main/twirl/admin/system.scala.html @@ -228,4 +228,4 @@ $('.ldap input').prop('disabled', !$(this).prop('checked')); }).change(); }); - + \ No newline at end of file