1.1.14

* Provide domainName for searched users - only if needed (more than 1 domain configured)
Commifreak · Sep 30, 2020 · 8072fde · 8072fde
1 parent 03b4464
commit 8072fde
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/LdapAuth.php b/src/LdapAuth.php
@@ -264,7 +264,12 @@ public function searchUser($searchFor, $attributes = "", $searchFilter = "", $au
                         continue;
                     }
                     $sid = self::SIDtoString($entry['objectsid'][0]);
-                    array_push($return, array_merge(['sid' => $sid, 'dn' => $entry['dn'], 'domainKey' => $i, 'domainName' => $this->domains[$i]['name']], self::handleEntry($entry)));
+                    $additionalData = ['sid' => $sid, 'dn' => $entry['dn'], 'domainKey' => $i];
+                    if (count($this->domains) > 1) {
+                        // Enable domainName output if more than one domains configured
+                        $additionalData['domainName'] = $this->domains[$i]['name'];
+                    }
+                    array_push($return, array_merge($additionalData, self::handleEntry($entry)));
                 }
             }
             $i++;