fix: corrected error handling for LDAP, closes #3319

thorsten · Jan 10, 2025 · dcdacad · dcdacad
1 parent 4e156f9
commit dcdacad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/phpmyfaq/src/phpMyFAQ/Ldap.php b/phpmyfaq/src/phpMyFAQ/Ldap.php
@@ -142,6 +142,7 @@ public function bind(string $rdn = '', #[SensitiveParameter] string $password =
         if ('' === $rdn && '' === $password) {
             return ldap_bind($this->ds);
         }
+
         return ldap_bind($this->ds, $rdn, $password);
     }
 
@@ -163,6 +164,7 @@ public function getMail(string $username): bool|string
      */
     private function getLdapData(string $username, string $data): bool|string
     {
+
         if ($this->ds === false) {
             $this->error = 'The LDAP connection handler is not a valid resource.';
 

diff --git a/phpmyfaq/src/phpMyFAQ/User.php b/phpmyfaq/src/phpMyFAQ/User.php
@@ -479,7 +479,7 @@ public function getUserByLogin(string $login, bool $raiseError = true): bool
         $result = $this->configuration->getDb()->query($select);
         if ($this->configuration->getDb()->numRows($result) !== 1) {
             if ($raiseError) {
-                throw new Core\Exception(self::ERROR_USER_INCORRECT_LOGIN);
+                $this->errors[] = self::ERROR_USER_INCORRECT_LOGIN;
             }
 
             return false;