X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/3f5dc10cd4cf901b44b1cf8c9e2626bf0425d488..refs/pull/5721/head:/app/Access/Ldap.php?ds=sidebyside diff --git a/app/Access/Ldap.php b/app/Access/Ldap.php index 12a3d1e71..d14f68821 100644 --- a/app/Access/Ldap.php +++ b/app/Access/Ldap.php @@ -52,13 +52,25 @@ class Ldap * * @param resource|\LDAP\Connection $ldapConnection * - * @return resource|\LDAP\Result + * @return \LDAP\Result|array|false */ - public function search($ldapConnection, string $baseDn, string $filter, array $attributes = null) + public function search($ldapConnection, string $baseDn, string $filter, array $attributes = []) { return ldap_search($ldapConnection, $baseDn, $filter, $attributes); } + /** + * Read an entry from the LDAP tree. + * + * @param resource|\Ldap\Connection $ldapConnection + * + * @return \LDAP\Result|array|false + */ + public function read($ldapConnection, string $baseDn, string $filter, array $attributes = []) + { + return ldap_read($ldapConnection, $baseDn, $filter, $attributes); + } + /** * Get entries from an LDAP search result. * @@ -75,7 +87,7 @@ class Ldap * * @param resource|\LDAP\Connection $ldapConnection */ - public function searchAndGetEntries($ldapConnection, string $baseDn, string $filter, array $attributes = null): array|false + public function searchAndGetEntries($ldapConnection, string $baseDn, string $filter, array $attributes = []): array|false { $search = $this->search($ldapConnection, $baseDn, $filter, $attributes); @@ -87,7 +99,7 @@ class Ldap * * @param resource|\LDAP\Connection $ldapConnection */ - public function bind($ldapConnection, string $bindRdn = null, string $bindPassword = null): bool + public function bind($ldapConnection, ?string $bindRdn = null, ?string $bindPassword = null): bool { return ldap_bind($ldapConnection, $bindRdn, $bindPassword); }