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

sync group of names must be global option

This commit is contained in:
Roland Gruber 2018-03-03 17:04:40 +01:00
parent 5925c71503
commit d12724179b
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lam/lib/modules/posixGroup.inc
View File

@ -200,7 +200,7 @@ class posixGroup extends baseModule implements passwordService {
$typeId = $this->getAccountContainer()->get_type()->getId(); $typeId = $this->getAccountContainer()->get_type()->getId();
if ($this->autoAddObjectClasses || (isset($this->attributes['objectClass']) && in_array('posixGroup', $this->attributes['objectClass']))) { if ($this->autoAddObjectClasses || (isset($this->attributes['objectClass']) && in_array('posixGroup', $this->attributes['objectClass']))) {
// auto sync group members // auto sync group members
if ($this->isBooleanConfigOptionSet('posixGroup_' . $typeId . '_autoSyncGon')) { if ($this->isBooleanConfigOptionSet('posixGroup_autoSyncGon')) {
$this->syncGon(); $this->syncGon();
} }
// group name // group name
@ -251,7 +251,7 @@ class posixGroup extends baseModule implements passwordService {
// group members // group members
if (!$this->isBooleanConfigOptionSet('posixGroup_' . $typeId . '_hidememberUid')) { if (!$this->isBooleanConfigOptionSet('posixGroup_' . $typeId . '_hidememberUid')) {
$return->addElement(new htmlOutputText(_("Group members"))); $return->addElement(new htmlOutputText(_("Group members")));
if (!$this->isBooleanConfigOptionSet('posixGroup_' . $typeId . '_autoSyncGon')) { if (!$this->isBooleanConfigOptionSet('posixGroup_autoSyncGon')) {
$return->addElement(new htmlAccountPageButton(get_class($this), 'user', 'open', _('Edit members'))); $return->addElement(new htmlAccountPageButton(get_class($this), 'user', 'open', _('Edit members')));
} }
else { else {
@ -591,21 +591,24 @@ class posixGroup extends baseModule implements passwordService {
$configContainer->add($magicNumber, 12); $configContainer->add($magicNumber, 12);
$configContainer->add(new htmlResponsiveInputField(_('Suffix for GID/group name check'), 'posixGroup_' . $typeId . '_gidCheckSuffix', '', 'gidCheckSuffix'), 12); $configContainer->add(new htmlResponsiveInputField(_('Suffix for GID/group name check'), 'posixGroup_' . $typeId . '_gidCheckSuffix', '', 'gidCheckSuffix'), 12);
$configContainer->add(new htmlResponsiveInputCheckbox('posixGroup_' . $typeId . '_hidememberUid', false, _('Disable membership management'), 'hidememberUid'), 12); $configContainer->add(new htmlResponsiveInputCheckbox('posixGroup_' . $typeId . '_hidememberUid', false, _('Disable membership management'), 'hidememberUid'), 12);
$gonModules = array('groupOfNames', 'groupOfUniqueNames'); $configContainer->addVerticalSpacer('2rem');
$gonFound = false; }
foreach ($gonModules as $gonModule) { $gonModules = array('groupOfNames', 'groupOfUniqueNames');
if (!empty($allScopes[$gonModule])) { $gonFound = false;
foreach ($allScopes[$gonModule] as $gonTypeId) { foreach ($gonModules as $gonModule) {
if ($gonTypeId === $typeId) { if (!empty($allScopes[$gonModule])) {
$gonFound = true; foreach ($allScopes[$gonModule] as $gonTypeId) {
} if (getScopeFromTypeId($gonTypeId) === 'group') {
$gonFound = true;
} }
} }
} }
if ($gonFound) { }
$configContainer->add(new htmlResponsiveInputCheckbox('posixGroup_' . $typeId . '_autoSyncGon', false, _('Force sync with group of names'), 'autoSyncGon'), 12); if ($gonFound || !isset($allScopes['posixAccount'])) {
} $configContainer->add(new htmlSubTitle(_("Options")), 12);
$configContainer->addVerticalSpacer('2rem'); }
if ($gonFound) {
$configContainer->add(new htmlResponsiveInputCheckbox('posixGroup_autoSyncGon', false, _('Force sync with group of names'), 'autoSyncGon'), 12);
} }
// display password hash option only if posixAccount module is not used // display password hash option only if posixAccount module is not used
if (!isset($allScopes['posixAccount'])) { if (!isset($allScopes['posixAccount'])) {
@ -1048,7 +1051,7 @@ class posixGroup extends baseModule implements passwordService {
} }
// auto sync group members // auto sync group members
$typeId = $this->getAccountContainer()->get_type()->getId(); $typeId = $this->getAccountContainer()->get_type()->getId();
if ($this->isBooleanConfigOptionSet('posixGroup_' . $typeId . '_autoSyncGon')) { if ($this->isBooleanConfigOptionSet('posixGroup_autoSyncGon')) {
$this->syncGon(); $this->syncGon();
} }
$return = $this->getAccountContainer()->save_module_attributes($this->attributes, $this->orig); $return = $this->getAccountContainer()->save_module_attributes($this->attributes, $this->orig);