1.1.14

robin.kluth · robin.kluth · commit 8072fde05a8e · 2020-09-30T12:29:44.000+02:00
* Provide domainName for searched users - only if needed (more than 1 domain configured)
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++;

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,12 @@ public function searchUser($searchFor, $attributes = "", $searchFilter = "", $au`
`264`	`264`	`continue;`
`265`	`265`	`}`
`266`	`266`	`$sid = self::SIDtoString($entry['objectsid'][0]);`
`267`		`- array_push($return, array_merge(['sid' => $sid, 'dn' => $entry['dn'], 'domainKey' => $i, 'domainName' => $this->domains[$i]['name']], self::handleEntry($entry)));`
	`267`	`+ $additionalData = ['sid' => $sid, 'dn' => $entry['dn'], 'domainKey' => $i];`
	`268`	`+ if (count($this->domains) > 1) {`
	`269`	`+ // Enable domainName output if more than one domains configured`
	`270`	`+ $additionalData['domainName'] = $this->domains[$i]['name'];`
	`271`	`+ }`
	`272`	`+ array_push($return, array_merge($additionalData, self::handleEntry($entry)));`
`268`	`273`	`}`
`269`	`274`	`}`
`270`	`275`	`$i++;`