new type API
This commit is contained in:
parent
7b82372a2d
commit
2f5f0caff1
|
@ -2981,27 +2981,28 @@ class posixAccount extends baseModule implements passwordService {
|
|||
if ($this->groupCache != null) {
|
||||
return $this->groupCache;
|
||||
}
|
||||
$typeSettings = $_SESSION['config']->get_typeSettings();
|
||||
$this->groupCache = array();
|
||||
$typeManager = new TypeManager();
|
||||
foreach ($typeManager->getConfiguredTypesForScope('group') as $type) {
|
||||
$filter = '(objectClass=posixGroup)';
|
||||
if ($this->isWindows()) {
|
||||
$filter = '(&(objectClass=group)(gidNumber=*))';
|
||||
}
|
||||
if (!empty($typeSettings['filter_group'])) {
|
||||
$typeFilter = $typeSettings['filter_group'];
|
||||
$typeFilter = $type->getAdditionalLdapFilter();
|
||||
if (!empty($typeFilter)) {
|
||||
if (strpos($typeFilter, '(') !== 0) {
|
||||
$typeFilter = '(' . $typeFilter . ')';
|
||||
}
|
||||
$filter = '(&' . $filter . $typeFilter . ')';
|
||||
}
|
||||
$results = searchLDAPByFilter($filter, array('cn', 'gidnumber'), array('group'));
|
||||
$return = array();
|
||||
$results = searchLDAP($type->getSuffix(), $filter, array('cn', 'gidnumber'));
|
||||
for ($i = 0; $i < sizeof($results); $i++) {
|
||||
if (isset($results[$i]['cn'][0]) && isset($results[$i]['gidnumber'][0])) {
|
||||
$return[] = array($results[$i]['gidnumber'][0], $results[$i]['cn'][0]);
|
||||
$this->groupCache[] = array($results[$i]['gidnumber'][0], $results[$i]['cn'][0]);
|
||||
}
|
||||
}
|
||||
$this->groupCache = $return;
|
||||
return $return;
|
||||
}
|
||||
return $this->groupCache;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue