diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2021-01-28 22:37:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-28 22:37:52 +0300 |
| commit | 57b78f57a1d4d0bc26ee051896076cf2f14d7a7f (patch) | |
| tree | 2979f13d7b808e2b58a85596bf3e3f32a8f2f98f /apps | |
| parent | 62fa85c7bf1aba1cae637a10af8b2f3dfe5338f3 (diff) | |
| parent | 90d82b03efcfabe90b3f09a593f06b937c16722a (diff) | |
Merge pull request #25361 from nextcloud/fix/noid/typehint-break-fp
fix parameter provided as string not array
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/user_ldap/lib/Group_LDAP.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/Group_LDAP.php b/apps/user_ldap/lib/Group_LDAP.php index be2fbecad85..c84f22bdd30 100644 --- a/apps/user_ldap/lib/Group_LDAP.php +++ b/apps/user_ldap/lib/Group_LDAP.php @@ -222,7 +222,7 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I $pos = strpos($memberURLs[0], '('); if ($pos !== false) { $memberUrlFilter = substr($memberURLs[0], $pos); - $foundMembers = $this->access->searchUsers($memberUrlFilter, 'dn'); + $foundMembers = $this->access->searchUsers($memberUrlFilter, ['dn']); $dynamicMembers = []; foreach ($foundMembers as $value) { $dynamicMembers[$value['dn'][0]] = 1; @@ -915,6 +915,7 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I $attrs = $this->access->userManager->getAttributes(true); foreach ($members as $member) { switch ($this->ldapGroupMemberAssocAttr) { + /** @noinspection PhpMissingBreakStatementInspection */ case 'zimbramailforwardingaddress': //we get email addresses and need to convert them to uids $parts = explode('@', $member); @@ -1088,6 +1089,7 @@ class Group_LDAP extends BackendUtility implements GroupInterface, IGroupLDAP, I if (!$this->enabled) { return []; } + $search = $this->access->escapeFilterPart($search, true); $cacheKey = 'getGroups-' . $search . '-' . $limit . '-' . $offset; //Check cache before driving unnecessary searches |