Change trigger of "Disalbe mail resolve is enalbed" from "When system settings check-box is ON" to "When mail attribute is empty".

src/main/scala/app/SystemSettingsController.scala

@@ -35,8 +35,7 @@ trait SystemSettingsControllerBase extends ControllerBase {
         "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))),
+        "mailAttribute"            -> trim(label("Mail address attribute", optional(text()))),
-        "disableMailResolve"       -> trim(label("Disable Mail Resolve", optional(boolean()))),
         "tls"                      -> trim(label("Enable TLS", optional(boolean()))),
         "keystore"                 -> trim(label("Keystore", optional(text())))
     )(Ldap.apply))

src/main/scala/service/AccountService.scala

@@ -40,7 +40,7 @@ trait AccountService {
         // Create or update account by LDAP information
         getAccountByUserName(userName, true) match {
           case Some(x) if(!x.isRemoved) => {
-            if(settings.ldap.get.disableMailResolve.getOrElse(false)) {
+            if(settings.ldap.get.mailAttribute.getOrElse("").isEmpty) {
               updateAccount(x.copy(fullName = ldapUserInfo.fullName))
             } else {
               updateAccount(x.copy(mailAddress = ldapUserInfo.mailAddress, fullName = ldapUserInfo.fullName))

src/main/scala/service/SystemSettingsService.scala

@@ -41,8 +41,7 @@ trait SystemSettingsService {
           props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
           ldap.additionalFilterCondition.foreach(x => props.setProperty(LdapAdditionalFilterCondition, x))
           ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x))
-          props.setProperty(LdapMailAddressAttribute, ldap.mailAttribute)
+          ldap.mailAttribute.foreach(x => props.setProperty(LdapMailAddressAttribute, x.toString))
-          ldap.disableMailResolve.foreach(x => props.setProperty(LdapDisableMailResolve, x.toString))
           ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString))
           ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
         }
@@ -85,8 +84,7 @@ trait SystemSettingsService {
             getValue(props, LdapUserNameAttribute, ""),
             getOptionValue(props, LdapAdditionalFilterCondition, None),
             getOptionValue(props, LdapFullNameAttribute, None),
-            getValue(props, LdapMailAddressAttribute, ""),
+            getOptionValue(props, LdapMailAddressAttribute, None),
-            getOptionValue[Boolean](props, LdapDisableMailResolve, None),
             getOptionValue[Boolean](props, LdapTls, None),
             getOptionValue(props, LdapKeystore, None)))
         } else {
@@ -119,8 +117,7 @@ object SystemSettingsService {
     userNameAttribute: String,
     additionalFilterCondition: Option[String],
     fullNameAttribute: Option[String],
-    mailAttribute: String,
+    mailAttribute: Option[String],
-    disableMailResolve: Option[Boolean],
     tls: Option[Boolean],
     keystore: Option[String])
 
@@ -157,7 +154,6 @@ object SystemSettingsService {
   private val LdapAdditionalFilterCondition = "ldap.additional_filter_condition"
   private val LdapFullNameAttribute = "ldap.fullname_attribute"
   private val LdapMailAddressAttribute = "ldap.mail_attribute"
-  private val LdapDisableMailResolve = "ldap.disable_mail_resolve"
   private val LdapTls = "ldap.tls"
   private val LdapKeystore = "ldap.keystore"
 

src/main/scala/util/LDAPUtil.scala

@@ -47,7 +47,7 @@ object LDAPUtil {
       keystore = ldapSettings.keystore.getOrElse(""),
       error    = "User LDAP Authentication Failed."
     ){ conn =>
-      if(ldapSettings.disableMailResolve.getOrElse(false)) {
+      if(ldapSettings.mailAttribute.getOrElse("").isEmpty) {
         Right(LDAPUserInfo(
           userName    = userName,
           fullName    = ldapSettings.fullNameAttribute.flatMap { fullNameAttribute =>
@@ -55,7 +55,7 @@ object LDAPUtil {
           }.getOrElse(userName),
           mailAddress = AccountUtil.getLdapDummyMailAddress(userName)))
       } else {
-        findMailAddress(conn, userDN, ldapSettings.mailAttribute) match {
+        findMailAddress(conn, userDN, ldapSettings.mailAttribute.get) match {
           case Some(mailAddress) => Right(LDAPUserInfo(
             userName    = userName,
             fullName    = ldapSettings.fullNameAttribute.flatMap { fullNameAttribute =>

src/main/twirl/admin/system.scala.html

@@ -130,13 +130,6 @@
                 <span id="error-ldap_mailAttribute" class="error"></span>
               </div>
             </div>
-            <div class="control-group">
-              <div class="controls">
-                <label class="checkbox">
-                  <input type="checkbox" name="ldap.disableMailResolve"@if(settings.ldap.flatMap(_.disableMailResolve).getOrElse(false)){ checked}/> Disable mail resolve
-                </label>
-              </div>
-            </div>
             <div class="control-group">
               <div class="controls">
                 <label class="checkbox">