WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support groupOfMembers

This commit is contained in:
Roland Gruber 2015-05-23 13:34:08 +00:00
parent 209eeab251
commit bc97646569
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lam/HISTORY
View File

@ -4,9 +4,10 @@ June 2015
- Zarafa users: allow to change display format of "Send As" - Zarafa users: allow to change display format of "Send As"
- User list: support to filter by account status - User list: support to filter by account status
- Lamdaemon: update group of home directory if user's primary group changes - Lamdaemon: update group of home directory if user's primary group changes
- Personal: allow to add ou=addressbook subentry for users - Personal: allow to add ou=addressbook subentry for users (RFE 117)
- LAM Pro: - LAM Pro:
-> Password Self Reset: added 389 Directory Server schema file -> Password Self Reset: added 389 Directory Server schema file
-> Support for groupOfMembers (RFE 121)
31.03.2015 4.9 31.03.2015 4.9

10
lam/lib/modules/posixAccount.inc
View File

@ -260,7 +260,7 @@ class posixAccount extends baseModule implements passwordService {
$configContainerOptions->addElement(new htmlTableExtendedInputCheckbox('posixAccount_hidegecos', false, _('Gecos'), null, false)); $configContainerOptions->addElement(new htmlTableExtendedInputCheckbox('posixAccount_hidegecos', false, _('Gecos'), null, false));
if (isset($_SESSION['conf_config'])) { if (isset($_SESSION['conf_config'])) {
$confActiveGONModules = array_merge($_SESSION['conf_config']->get_AccountModules('group'), $_SESSION['conf_config']->get_AccountModules('gon')); $confActiveGONModules = array_merge($_SESSION['conf_config']->get_AccountModules('group'), $_SESSION['conf_config']->get_AccountModules('gon'));
if (in_array('groupOfNames', $confActiveGONModules) || in_array('groupOfUniqueNames', $confActiveGONModules)) { if (in_array('groupOfNames', $confActiveGONModules) || in_array('groupOfMembers', $confActiveGONModules) || in_array('groupOfUniqueNames', $confActiveGONModules)) {
$configContainerOptions->addElement(new htmlOutputText(' ')); $configContainerOptions->addElement(new htmlOutputText(' '));
$configContainerOptions->addElement(new htmlTableExtendedInputCheckbox('posixAccount_hidegon', false, _('Groups of names'), null, false)); $configContainerOptions->addElement(new htmlTableExtendedInputCheckbox('posixAccount_hidegon', false, _('Groups of names'), null, false));
$configContainerOptions->addElement(new htmlOutputText(' ')); $configContainerOptions->addElement(new htmlOutputText(' '));
@ -641,7 +641,7 @@ class posixAccount extends baseModule implements passwordService {
$types = array('gon', 'group'); $types = array('gon', 'group');
$gonList = array(); $gonList = array();
foreach ($types as $type) { foreach ($types as $type) {
$gonFilter = '(|(&(objectClass=groupOfNames)(member=' . $this->getAccountContainer()->dn_orig . '))(&(objectClass=groupOfUniqueNames)(uniqueMember=' . $this->getAccountContainer()->dn_orig . ')))'; $gonFilter = '(|(&(objectClass=groupOfNames)(member=' . $this->getAccountContainer()->dn_orig . '))(&(objectClass=groupOfMembers)(member=' . $this->getAccountContainer()->dn_orig . '))(&(objectClass=groupOfUniqueNames)(uniqueMember=' . $this->getAccountContainer()->dn_orig . ')))';
if (!empty($typeSettings['filter_' . $type])) { if (!empty($typeSettings['filter_' . $type])) {
$typeFilter = $typeSettings['filter_' . $type]; $typeFilter = $typeSettings['filter_' . $type];
if (strpos($typeFilter, '(') !== 0) { if (strpos($typeFilter, '(') !== 0) {
@ -2879,7 +2879,7 @@ class posixAccount extends baseModule implements passwordService {
$typeSettings = $_SESSION['config']->get_typeSettings(); $typeSettings = $_SESSION['config']->get_typeSettings();
if (sizeof($types) > 0) { if (sizeof($types) > 0) {
foreach ($types as $type) { foreach ($types as $type) {
$filter = '(|(objectClass=groupOfNames)(objectClass=groupOfUniqueNames))'; $filter = '(|(objectClass=groupOfNames)(objectClass=groupOfMembers)(objectClass=groupOfUniqueNames))';
if (!empty($typeSettings['filter_' . $type])) { if (!empty($typeSettings['filter_' . $type])) {
$typeFilter = $typeSettings['filter_' . $type]; $typeFilter = $typeSettings['filter_' . $type];
if (strpos($typeFilter, '(') !== 0) { if (strpos($typeFilter, '(') !== 0) {
@ -3001,13 +3001,13 @@ class posixAccount extends baseModule implements passwordService {
} }
if (in_array('group', $_SESSION['config']->get_ActiveTypes())) { if (in_array('group', $_SESSION['config']->get_ActiveTypes())) {
$groupModules = $_SESSION['config']->get_AccountModules('group'); $groupModules = $_SESSION['config']->get_AccountModules('group');
if (in_array('groupOfNames', $groupModules) || in_array('groupOfUniqueNames', $groupModules)) { if (in_array('groupOfNames', $groupModules) || in_array('groupOfMembers', $groupModules) || in_array('groupOfUniqueNames', $groupModules)) {
return true; return true;
} }
} }
if (in_array('gon', $_SESSION['config']->get_ActiveTypes())) { if (in_array('gon', $_SESSION['config']->get_ActiveTypes())) {
$gonModules = $_SESSION['config']->get_AccountModules('gon'); $gonModules = $_SESSION['config']->get_AccountModules('gon');
if (in_array('groupOfNames', $gonModules) || in_array('groupOfUniqueNames', $gonModules)) { if (in_array('groupOfNames', $gonModules) || in_array('groupOfMembers', $gonModules) || in_array('groupOfUniqueNames', $gonModules)) {
return true; return true;
} }
} }