X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=application%2Fsecurity%2FLoginManager.php;fp=application%2Fsecurity%2FLoginManager.php;h=16ef3878ca24c64d430a13dbbf136df82d251cf4;hb=21e5df5ee8f302ab96d4ca46ac3070405dd9aafb;hp=2cea3f1083434e8b1a3ec21f919d42ad66fb1c4b;hpb=46846fd4fcc391f46f17037d69d0699567ae769e;p=github%2Fshaarli%2FShaarli.git

diff --git a/application/security/LoginManager.php b/application/security/LoginManager.php
index 2cea3f10..16ef3878 100644
--- a/application/security/LoginManager.php
+++ b/application/security/LoginManager.php
@@ -147,8 +147,10 @@ class LoginManager
 
         // Check credentials
         try {
-            if (($this->configManager->get('ldap.host') != "" && $this->checkCredentialsFromLdap($login, $password))
-                || ($this->configManager->get('ldap.host') == "" && $this->checkCredentialsFromLocalConfig($login, $password))) {
+            $useLdapLogin = !empty($this->configManager->get('ldap.host'));
+            if ((false === $useLdapLogin && $this->checkCredentialsFromLocalConfig($login, $password))
+                || (true === $useLdapLogin && $this->checkCredentialsFromLdap($login, $password))
+            ) {
                     $this->sessionManager->storeLoginInfo($clientIpId);
                     logm(
                         $this->configManager->get('resource.log'),