DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #8730 from winstan/patch-1

Browse source 
Fixed #8699: exclude blank LDAP attributes from searches
This commit is contained in:
Brady Wetherington 2020-11-12 11:26:19 -08:00 committed by GitHub
parent c8d588871c cc79bb1449
commit 5ad6234584
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Services/LdapAd.php
View file

@ -398,7 +398,7 @@ class LdapAd extends LdapAdConfiguration
{ {
/** @var Schema $schema */ /** @var Schema $schema */
$schema = new $this->ldapConfig['schema']; $schema = new $this->ldapConfig['schema'];
return [ return array_values(array_filter([
$this->ldapSettings['ldap_username_field'], $this->ldapSettings['ldap_username_field'],
$this->ldapSettings['ldap_fname_field'], $this->ldapSettings['ldap_fname_field'],
$this->ldapSettings['ldap_lname_field'], $this->ldapSettings['ldap_lname_field'],
@ -409,7 +409,7 @@ class LdapAd extends LdapAdConfiguration
$schema->userAccountControl(), $schema->userAccountControl(),
$schema->title(), $schema->title(),
$schema->telephone(), $schema->telephone(),
]; ]));
} }
/** /**