tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Conform to coding guidelines

Browse Source 
refs #12598
This commit is contained in:
Alexander A. Klimov 2016-12-07 17:45:50 +01:00
parent 59f1a70d5e
commit 648f088564
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/forms/Config/UserGroup/LdapUserGroupBackendForm.php
View File

@ -92,7 +92,7 @@ class LdapUserGroupBackendForm extends Form
if ($formData['type'] === 'msldap') { if ($formData['type'] === 'msldap') {
$this->addElement( $this->addElement(
'checkbox', 'checkbox',
'nested_group_search_in_ad', 'nested_group_search',
array( array(
'description' => $this->translate( 'description' => $this->translate(
'Check this box for nested group search in Active Directory based on the user' 'Check this box for nested group search in Active Directory based on the user'
@ -100,6 +100,9 @@ class LdapUserGroupBackendForm extends Form
'label' => $this->translate('Nested Group Search') 'label' => $this->translate('Nested Group Search')
) )
); );
} else {
// This is required to purge already present options
$this->addElement('hidden', 'nested_group_search', array('disabled' => true));
} }
$this->createGroupConfigElements($defaults, $groupConfigDisabled); $this->createGroupConfigElements($defaults, $groupConfigDisabled);

34
library/Icinga/Authentication/UserGroup/LdapUserGroupBackend.php
View File

@ -98,7 +98,7 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
* *
* @var bool * @var bool
*/ */
protected $nestedGroupSearchInAD; protected $nestedGroupSearch;
/** /**
* The columns which are not permitted to be queried * The columns which are not permitted to be queried
@ -372,30 +372,26 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
} }
/** /**
* Set nestedGroupSearchInAD for the group query * Set nestedGroupSearch for the group query
* *
* @param string $enable * @param bool $enable
* *
* @return bool * @return $this
*/ */
public function setNestedGroupSearchInAD($enable) public function setNestedGroupSearch($enable = true)
{ {
if ($enable == "1") { $this->nestedGroupSearch = $enable;
$this->nestedGroupSearchInAD = true;
} else {
$this->nestedGroupSearchInAD = false;
}
return $this; return $this;
} }
/** /**
* Get nestedGroupSearchInAD for the group query * Get nestedGroupSearch for the group query
* *
* @return bool * @return bool
*/ */
public function getNestedGroupSearchInAD() public function getNestedGroupSearch()
{ {
return $this->nestedGroupSearchInAD; return $this->nestedGroupSearch;
} }
/** /**
@ -654,10 +650,10 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
} }
} }
if ($this->nestedGroupSearchInAD) { if ($this->nestedGroupSearch) {
$groupMemberAttribute = $this->groupMemberAttribute . ':1.2.840.113556.1.4.1941:'; $groupMemberAttribute = $this->groupMemberAttribute . ':1.2.840.113556.1.4.1941:';
} else { } else {
$groupMemberAttribute = $this->groupMemberAttribute; $groupMemberAttribute = $this->groupMemberAttribute;
} }
$groupQuery = $this->ds $groupQuery = $this->ds
@ -747,7 +743,7 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
->setGroupMemberAttribute($config->get('group_member_attribute', $defaults->group_member_attribute)) ->setGroupMemberAttribute($config->get('group_member_attribute', $defaults->group_member_attribute))
->setGroupFilter($config->group_filter) ->setGroupFilter($config->group_filter)
->setUserFilter($config->user_filter) ->setUserFilter($config->user_filter)
->setNestedGroupSearchInAD($config->get('nested_group_search_in_ad', $defaults->nested_group_search_in_ad)); ->setNestedGroupSearch((bool) $config->get('nested_group_search', $defaults->nested_group_search));
} }
/** /**
@ -763,7 +759,7 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
'group_name_attribute' => 'gid', 'group_name_attribute' => 'gid',
'user_name_attribute' => 'uid', 'user_name_attribute' => 'uid',
'group_member_attribute' => 'member', 'group_member_attribute' => 'member',
'nested_group_search_in_ad' => '0' 'nested_group_search' => '0'
)); ));
} }
@ -780,7 +776,7 @@ class LdapUserGroupBackend extends LdapRepository implements UserGroupBackendInt
'group_name_attribute' => 'sAMAccountName', 'group_name_attribute' => 'sAMAccountName',
'user_name_attribute' => 'sAMAccountName', 'user_name_attribute' => 'sAMAccountName',
'group_member_attribute' => 'member', 'group_member_attribute' => 'member',
'nested_group_search_in_ad' => '0' 'nested_group_search' => '0'
)); ));
} }
} }