X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/e7a7d8cc1d77b032c4efe9d08ec6c749430b7b57..refs/pull/3391/head:/app/Auth/Access/Ldap.php diff --git a/app/Auth/Access/Ldap.php b/app/Auth/Access/Ldap.php index 352231df5..4bf6db474 100644 --- a/app/Auth/Access/Ldap.php +++ b/app/Auth/Access/Ldap.php @@ -1,4 +1,6 @@ -setOption($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, $version); } /** * Search LDAP tree using the provided filter. + * * @param resource $ldapConnection * @param string $baseDn * @param string $filter * @param array|null $attributes + * * @return resource */ public function search($ldapConnection, $baseDn, $filter, array $attributes = null) @@ -65,8 +65,10 @@ class Ldap /** * Get entries from an ldap search result. + * * @param resource $ldapConnection * @param resource $ldapSearchResult + * * @return array */ public function getEntries($ldapConnection, $ldapSearchResult) @@ -76,23 +78,28 @@ class Ldap /** * Search and get entries immediately. + * * @param resource $ldapConnection * @param string $baseDn * @param string $filter * @param array|null $attributes + * * @return resource */ public function searchAndGetEntries($ldapConnection, $baseDn, $filter, array $attributes = null) { $search = $this->search($ldapConnection, $baseDn, $filter, $attributes); + return $this->getEntries($ldapConnection, $search); } /** * Bind to LDAP directory. + * * @param resource $ldapConnection * @param string $bindRdn * @param string $bindPassword + * * @return bool */ public function bind($ldapConnection, $bindRdn = null, $bindPassword = null) @@ -102,8 +109,10 @@ class Ldap /** * Explode a LDAP dn string into an array of components. + * * @param string $dn - * @param int $withAttrib + * @param int $withAttrib + * * @return array */ public function explodeDn(string $dn, int $withAttrib) @@ -113,12 +122,14 @@ class Ldap /** * Escape a string for use in an LDAP filter. + * * @param string $value * @param string $ignore - * @param int $flags + * @param int $flags + * * @return string */ - public function escape(string $value, string $ignore = "", int $flags = 0) + public function escape(string $value, string $ignore = '', int $flags = 0) { return ldap_escape($value, $ignore, $flags); }