|
|
@@ -879,7 +879,7 @@ class Access extends LDAPUtility { |
|
|
|
}); |
|
|
|
} |
|
|
|
$this->batchApplyUserAttributes($recordsToUpdate); |
|
|
|
return $this->fetchList($ldapRecords, count($attr) > 1); |
|
|
|
return $this->fetchList($ldapRecords, $this->manyAttributes($attr)); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
@@ -922,7 +922,7 @@ class Access extends LDAPUtility { |
|
|
|
* @return array |
|
|
|
*/ |
|
|
|
public function fetchListOfGroups($filter, $attr, $limit = null, $offset = null) { |
|
|
|
return $this->fetchList($this->searchGroups($filter, $attr, $limit, $offset), count($attr) > 1); |
|
|
|
return $this->fetchList($this->searchGroups($filter, $attr, $limit, $offset), $this->manyAttributes($attr)); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
@@ -2011,4 +2011,17 @@ class Access extends LDAPUtility { |
|
|
|
return $pagedSearchOK; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* Is more than one $attr used for search? |
|
|
|
* |
|
|
|
* @param string|string[]|null $attr |
|
|
|
* @return bool |
|
|
|
*/ |
|
|
|
private function manyAttributes($attr) { |
|
|
|
if (\is_array($attr)) { |
|
|
|
return \count($attr) > 1; |
|
|
|
} |
|
|
|
return false; |
|
|
|
} |
|
|
|
|
|
|
|
} |