upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-13 14:19:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #7479 from nextcloud/fix-7400

Browse source 
Fixes bin2hex() in LDAP
This commit is contained in:
Morris Jobke 2017-12-13 13:37:08 +01:00 committed by GitHub
commit a3120d428b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/user_ldap/lib/Access.php
View file

@ -1253,11 +1253,13 @@ class Access extends LDAPUtility implements IUserTools {
unset($item[$key]['count']);
}
if($key !== 'dn') {
$selection[$i][$key] = $this->resemblesDN($key) ?
$this->helper->sanitizeDN($item[$key])
: $key === 'objectguid' || $key === 'guid' ?
$selection[$i][$key] = $this->convertObjectGUID2Str($item[$key])
: $item[$key];
if($this->resemblesDN($key)) {
$selection[$i][$key] = $this->helper->sanitizeDN($item[$key]);
} else if($key === 'objectguid' || $key === 'guid') {
$selection[$i][$key] = [$this->convertObjectGUID2Str($item[$key][0])];
} else {
$selection[$i][$key] = $item[$key];
}
} else {
$selection[$i][$key] = [$this->helper->sanitizeDN($item[$key])];
}