Browse Source
Merge pull request #7479 from nextcloud/fix-7400
Fixes bin2hex() in LDAP
pull/7475/head
Morris Jobke
9 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
7 additions and
5 deletions
-
apps/user_ldap/lib/Access.php
|
|
|
@ -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])]; |
|
|
|
} |
|
|
|
|
