yetangitu/lam
1
0
Fork 0
mirror of https://github.com/LDAPAccountManager/lam.git synced 2025-10-06 03:49:56 +02:00
Code Issues Releases Wiki Activity

refactoring

Browse source
This commit is contained in:
Roland Gruber 2024-12-29 10:55:08 +01:00
parent 6a17b54e9d
commit 61036d8f2c
1 changed files with 43 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

88
lam/lib/modules/windowsGroup.inc
View file

@ -88,7 +88,7 @@ class windowsGroup extends baseModule {
* @return boolean true if module fits * @return boolean true if module fits
*/ */
public function can_manage() { public function can_manage() {
return in_array($this->get_scope(), ['group']); return $this->get_scope() === 'group';
} }
/** /**
@ -323,16 +323,16 @@ class windowsGroup extends baseModule {
$groupType = windowsGroup::TYPE_SECURITY; $groupType = windowsGroup::TYPE_SECURITY;
$groupScope = windowsGroup::SCOPE_GLOBAL; $groupScope = windowsGroup::SCOPE_GLOBAL;
if (isset($this->attributes['groupType'][0])) { if (isset($this->attributes['groupType'][0])) {
if ($this->attributes['groupType'][0] & 2) { if (($this->attributes['groupType'][0] & 2) !== 0) {
$groupScope = windowsGroup::SCOPE_GLOBAL; $groupScope = windowsGroup::SCOPE_GLOBAL;
} }
elseif ($this->attributes['groupType'][0] & 4) { elseif (($this->attributes['groupType'][0] & 4) !== 0) {
$groupScope = windowsGroup::SCOPE_DOMAIN_LOCAL; $groupScope = windowsGroup::SCOPE_DOMAIN_LOCAL;
} }
elseif ($this->attributes['groupType'][0] & 8) { elseif (($this->attributes['groupType'][0] & 8) !== 0) {
$groupScope = windowsGroup::SCOPE_UNIVERSAL; $groupScope = windowsGroup::SCOPE_UNIVERSAL;
} }
if ($this->attributes['groupType'][0] & 0x80000000) { if (($this->attributes['groupType'][0] & 0x80000000) !== 0) {
$groupType = windowsGroup::TYPE_SECURITY; $groupType = windowsGroup::TYPE_SECURITY;
} }
else { else {
@ -343,11 +343,11 @@ class windowsGroup extends baseModule {
// do not allow invalid conversions // do not allow invalid conversions
if (isset($this->orig['groupType'][0])) { if (isset($this->orig['groupType'][0])) {
$flippedScopes = array_flip($this->groupScopes); $flippedScopes = array_flip($this->groupScopes);
if ($this->orig['groupType'][0] & 2) { if (($this->orig['groupType'][0] & 2) !== 0) {
// no change from global to domain local // no change from global to domain local
unset($scopeList[$flippedScopes[windowsGroup::SCOPE_DOMAIN_LOCAL]]); unset($scopeList[$flippedScopes[windowsGroup::SCOPE_DOMAIN_LOCAL]]);
} }
elseif ($this->orig['groupType'][0] & 4) { elseif (($this->orig['groupType'][0] & 4) !== 0) {
// no change from domain local to global // no change from domain local to global
unset($scopeList[$flippedScopes[windowsGroup::SCOPE_GLOBAL]]); unset($scopeList[$flippedScopes[windowsGroup::SCOPE_GLOBAL]]);
} }
@ -406,7 +406,7 @@ class windowsGroup extends baseModule {
$container->addField($memberButtons); $container->addField($memberButtons);
$memberList = []; $memberList = [];
if (isset($this->attributes['member'])) { if (isset($this->attributes['member'])) {
for ($i = 0; $i < sizeof($this->attributes['member']); $i++) { for ($i = 0; $i < count($this->attributes['member']); $i++) {
$memberList[] = $this->attributes['member'][$i]; $memberList[] = $this->attributes['member'][$i];
} }
usort($memberList, 'compareDN'); usort($memberList, 'compareDN');
@ -414,7 +414,7 @@ class windowsGroup extends baseModule {
$members = new htmlTable(); $members = new htmlTable();
$members->alignment = htmlElement::ALIGN_RIGHT; $members->alignment = htmlElement::ALIGN_RIGHT;
$members->setCSSClasses(['fullwidth']); $members->setCSSClasses(['fullwidth']);
for ($i = 0; $i < sizeof($memberList); $i++) { for ($i = 0; $i < count($memberList); $i++) {
$member = new htmlOutputText(getAbstractDN($memberList[$i])); $member = new htmlOutputText(getAbstractDN($memberList[$i]));
$member->alignment = htmlElement::ALIGN_RIGHT; $member->alignment = htmlElement::ALIGN_RIGHT;
$members->addElement($member, true); $members->addElement($member, true);
@ -431,7 +431,7 @@ class windowsGroup extends baseModule {
$container->addField($memberOfGroup); $container->addField($memberOfGroup);
$memberList = []; $memberList = [];
if (isset($this->attributes['memberOf'])) { if (isset($this->attributes['memberOf'])) {
for ($i = 0; $i < sizeof($this->attributes['memberOf']); $i++) { for ($i = 0; $i < count($this->attributes['memberOf']); $i++) {
$memberList[] = $this->attributes['memberOf'][$i]; $memberList[] = $this->attributes['memberOf'][$i];
} }
usort($memberList, 'compareDN'); usort($memberList, 'compareDN');
@ -439,7 +439,7 @@ class windowsGroup extends baseModule {
$memberOf = new htmlTable(); $memberOf = new htmlTable();
$memberOf->setCSSClasses(['fullwidth']); $memberOf->setCSSClasses(['fullwidth']);
$memberOf->alignment = htmlElement::ALIGN_RIGHT; $memberOf->alignment = htmlElement::ALIGN_RIGHT;
for ($i = 0; $i < sizeof($memberList); $i++) { for ($i = 0; $i < count($memberList); $i++) {
$member = new htmlOutputText(getAbstractDN($memberList[$i])); $member = new htmlOutputText(getAbstractDN($memberList[$i]));
$member->alignment = htmlElement::ALIGN_RIGHT; $member->alignment = htmlElement::ALIGN_RIGHT;
$memberOf->addElement($member, true); $memberOf->addElement($member, true);
@ -487,15 +487,13 @@ class windowsGroup extends baseModule {
} }
// group type // group type
if ($_POST['groupType'] == windowsGroup::TYPE_SECURITY) { if ($_POST['groupType'] == windowsGroup::TYPE_SECURITY) {
$this->attributes['groupType'][0] = $this->attributes['groupType'][0] - 2147483648; $this->attributes['groupType'][0] -= 2147483648;
} }
// notes // notes
$this->attributes['info'][0] = $_POST['info']; $this->attributes['info'][0] = $_POST['info'];
// managed by // managed by
if (!$this->isBooleanConfigOptionSet('windowsGroup_hidemanagedBy')) { if (!$this->isBooleanConfigOptionSet('windowsGroup_hidemanagedBy') && isset($_POST['form_subpage_' . static::class . '_attributes_removeManagedBy'])) {
if (isset($_POST['form_subpage_' . static::class . '_attributes_removeManagedBy'])) { unset($this->attributes['managedBy']);
unset($this->attributes['managedBy']);
}
} }
// NIS name // NIS name
if (!$this->isBooleanConfigOptionSet('windowsGroup_hidemsSFU30Name', true)) { if (!$this->isBooleanConfigOptionSet('windowsGroup_hidemsSFU30Name', true)) {
@ -534,7 +532,7 @@ class windowsGroup extends baseModule {
} }
// sort by DN // sort by DN
usort($this->attributes['memberOf'], 'compareDN'); usort($this->attributes['memberOf'], 'compareDN');
for ($i = 0; $i < sizeof($this->attributes['memberOf']); $i++) { for ($i = 0; $i < count($this->attributes['memberOf']); $i++) {
if (in_array($this->attributes['memberOf'][$i], $groups)) { if (in_array($this->attributes['memberOf'][$i], $groups)) {
$selectedGroups[getAbstractDN($this->attributes['memberOf'][$i])] = $this->attributes['memberOf'][$i]; $selectedGroups[getAbstractDN($this->attributes['memberOf'][$i])] = $this->attributes['memberOf'][$i];
} }
@ -584,12 +582,12 @@ class windowsGroup extends baseModule {
$options = []; $options = [];
$filter = get_ldap_filter('user'); $filter = get_ldap_filter('user');
$entries = searchLDAPByFilter($filter, ['dn'], ['user']); $entries = searchLDAPByFilter($filter, ['dn'], ['user']);
for ($i = 0; $i < sizeof($entries); $i++) { for ($i = 0; $i < count($entries); $i++) {
$entries[$i] = $entries[$i]['dn']; $entries[$i] = $entries[$i]['dn'];
} }
// sort by DN // sort by DN
usort($entries, 'compareDN'); usort($entries, 'compareDN');
for ($i = 0; $i < sizeof($entries); $i++) { for ($i = 0; $i < count($entries); $i++) {
$options[getAbstractDN($entries[$i])] = $entries[$i]; $options[getAbstractDN($entries[$i])] = $entries[$i];
} }
$selected = []; $selected = [];
@ -659,19 +657,19 @@ class windowsGroup extends baseModule {
$options = []; $options = [];
$filter = get_ldap_filter($type->getId()); $filter = get_ldap_filter($type->getId());
$entries = searchLDAP($type->getSuffix(), $filter, ['dn']); $entries = searchLDAP($type->getSuffix(), $filter, ['dn']);
for ($i = 0; $i < sizeof($entries); $i++) { for ($i = 0; $i < count($entries); $i++) {
$entries[$i] = $entries[$i]['dn']; $entries[$i] = $entries[$i]['dn'];
} }
// sort by DN // sort by DN
usort($entries, 'compareDN'); usort($entries, 'compareDN');
for ($i = 0; $i < sizeof($entries); $i++) { for ($i = 0; $i < count($entries); $i++) {
if (!isset($this->attributes['member']) || !in_array($entries[$i], $this->attributes['member'])) { if (!isset($this->attributes['member']) || !in_array($entries[$i], $this->attributes['member'])) {
$options[getAbstractDN($entries[$i])] = $entries[$i]; $options[getAbstractDN($entries[$i])] = $entries[$i];
} }
} }
$size = 20; $size = 20;
if (sizeof($options) < 20) { if (count($options) < 20) {
$size = sizeof($options); $size = count($options);
} }
$membersSelect = new htmlSelect('members', $options, [], $size); $membersSelect = new htmlSelect('members', $options, [], $size);
$membersSelect->setHasDescriptiveElements(true); $membersSelect->setHasDescriptiveElements(true);
@ -695,14 +693,14 @@ class windowsGroup extends baseModule {
// sort by DN // sort by DN
usort($membersTemp, 'compareDN'); usort($membersTemp, 'compareDN');
$members = []; $members = [];
for ($i = 0; $i < sizeof($membersTemp); $i++) { for ($i = 0; $i < count($membersTemp); $i++) {
$members[getAbstractDN($membersTemp[$i])] = $membersTemp[$i]; $members[getAbstractDN($membersTemp[$i])] = $membersTemp[$i];
} }
$size = 20; $size = 20;
if (isset($this->attributes['member']) && (sizeof($this->attributes['member']) < 20)) { if (isset($this->attributes['member']) && (count($this->attributes['member']) < 20)) {
$size = sizeof($this->attributes['member']); $size = count($this->attributes['member']);
} }
if (sizeof($members) > 0) { if ($members !== []) {
$membersSelect = new htmlSelect('members', $members, [], $size); $membersSelect = new htmlSelect('members', $members, [], $size);
$membersSelect->setHasDescriptiveElements(true); $membersSelect->setHasDescriptiveElements(true);
$membersSelect->setMultiSelect(true); $membersSelect->setMultiSelect(true);
@ -747,7 +745,7 @@ class windowsGroup extends baseModule {
$return = []; $return = [];
if (isset($_POST['form_subpage_' . static::class . '_user_remove']) && isset($_POST['members'])) { if (isset($_POST['form_subpage_' . static::class . '_user_remove']) && isset($_POST['members'])) {
$members = array_flip($this->attributes['member']); $members = array_flip($this->attributes['member']);
for ($i = 0; $i < sizeof($_POST['members']); $i++) { for ($i = 0; $i < count($_POST['members']); $i++) {
if (isset($members[$_POST['members'][$i]])) { if (isset($members[$_POST['members'][$i]])) {
unset($members[$_POST['members'][$i]]); unset($members[$_POST['members'][$i]]);
} }
@ -755,7 +753,7 @@ class windowsGroup extends baseModule {
$this->attributes['member'] = array_values(array_flip($members)); $this->attributes['member'] = array_values(array_flip($members));
} }
elseif (isset($_POST['form_subpage_' . static::class . '_user_addMembers']) && isset($_POST['members'])) { elseif (isset($_POST['form_subpage_' . static::class . '_user_addMembers']) && isset($_POST['members'])) {
for ($i = 0; $i < sizeof($_POST['members']); $i++) { for ($i = 0; $i < count($_POST['members']); $i++) {
$this->attributes['member'][] = $_POST['members'][$i]; $this->attributes['member'][] = $_POST['members'][$i];
$this->attributes['member'] = array_unique($this->attributes['member']); $this->attributes['member'] = array_unique($this->attributes['member']);
} }
@ -802,7 +800,7 @@ class windowsGroup extends baseModule {
*/ */
public function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) { public function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$errors = []; $errors = [];
for ($i = 0; $i < sizeof($rawAccounts); $i++) { for ($i = 0; $i < count($rawAccounts); $i++) {
// add object class // add object class
if (!in_array('group', $partialAccounts[$i]['objectClass'])) { if (!in_array('group', $partialAccounts[$i]['objectClass'])) {
$partialAccounts[$i]['objectClass'][] = 'group'; $partialAccounts[$i]['objectClass'][] = 'group';
@ -815,7 +813,7 @@ class windowsGroup extends baseModule {
} }
else { else {
$errMsg = $this->messages['cn'][1]; $errMsg = $this->messages['cn'][1];
array_push($errMsg, [$i]); $errMsg[] = [$i];
$errors[] = $errMsg; $errors[] = $errMsg;
} }
} }
@ -853,7 +851,7 @@ class windowsGroup extends baseModule {
} }
else { else {
$errMsg = $this->messages['groupScope'][0]; $errMsg = $this->messages['groupScope'][0];
array_push($errMsg, [$i]); $errMsg[] = [$i];
$errors[] = $errMsg; $errors[] = $errMsg;
} }
} }
@ -864,17 +862,17 @@ class windowsGroup extends baseModule {
if ($rawAccounts[$i][$ids['windowsGroup_type']] != "") { if ($rawAccounts[$i][$ids['windowsGroup_type']] != "") {
if (in_array($rawAccounts[$i][$ids['windowsGroup_type']], $this->groupTypes)) { if (in_array($rawAccounts[$i][$ids['windowsGroup_type']], $this->groupTypes)) {
if ($rawAccounts[$i][$ids['windowsGroup_type']] == windowsGroup::TYPE_SECURITY) { if ($rawAccounts[$i][$ids['windowsGroup_type']] == windowsGroup::TYPE_SECURITY) {
$partialAccounts[$i]['groupType'] = $partialAccounts[$i]['groupType'] - 2147483648; $partialAccounts[$i]['groupType'] -= 2147483648;
} }
} }
else { else {
$errMsg = $this->messages['groupType'][0]; $errMsg = $this->messages['groupType'][0];
array_push($errMsg, [$i]); $errMsg[] = [$i];
$errors[] = $errMsg; $errors[] = $errMsg;
} }
} }
else { else {
$partialAccounts[$i]['groupType'] = $partialAccounts[$i]['groupType'] - 2147483648; $partialAccounts[$i]['groupType'] -= 2147483648;
} }
// NIS name // NIS name
if (!$this->isBooleanConfigOptionSet('windowsGroup_hidemsSFU30Name', true)) { if (!$this->isBooleanConfigOptionSet('windowsGroup_hidemsSFU30Name', true)) {
@ -905,16 +903,16 @@ class windowsGroup extends baseModule {
$groupType = windowsGroup::TYPE_SECURITY; $groupType = windowsGroup::TYPE_SECURITY;
$groupScope = windowsGroup::SCOPE_GLOBAL; $groupScope = windowsGroup::SCOPE_GLOBAL;
if (isset($this->attributes['groupType'][0])) { if (isset($this->attributes['groupType'][0])) {
if ($this->attributes['groupType'][0] & 2) { if (($this->attributes['groupType'][0] & 2) !== 0) {
$groupScope = windowsGroup::SCOPE_GLOBAL; $groupScope = windowsGroup::SCOPE_GLOBAL;
} }
elseif ($this->attributes['groupType'][0] & 4) { elseif (($this->attributes['groupType'][0] & 4) !== 0) {
$groupScope = windowsGroup::SCOPE_DOMAIN_LOCAL; $groupScope = windowsGroup::SCOPE_DOMAIN_LOCAL;
} }
elseif ($this->attributes['groupType'][0] & 8) { elseif (($this->attributes['groupType'][0] & 8) !== 0) {
$groupScope = windowsGroup::SCOPE_UNIVERSAL; $groupScope = windowsGroup::SCOPE_UNIVERSAL;
} }
if ($this->attributes['groupType'][0] & 0x80000000) { if (($this->attributes['groupType'][0] & 0x80000000) !== 0) {
$groupType = windowsGroup::TYPE_SECURITY; $groupType = windowsGroup::TYPE_SECURITY;
} }
else { else {
@ -941,7 +939,7 @@ class windowsGroup extends baseModule {
} }
usort($memberList, 'compareDN'); usort($memberList, 'compareDN');
$pdfTable = new PDFTable(_('Members')); $pdfTable = new PDFTable(_('Members'));
for ($i = 0; $i < sizeof($memberList); $i++) { for ($i = 0; $i < count($memberList); $i++) {
$pdfRow = new PDFTableRow(); $pdfRow = new PDFTableRow();
$pdfRow->cells[] = new PDFTableCell($memberList[$i]); $pdfRow->cells[] = new PDFTableCell($memberList[$i]);
$pdfTable->rows[] = $pdfRow; $pdfTable->rows[] = $pdfRow;
@ -956,7 +954,7 @@ class windowsGroup extends baseModule {
} }
usort($memberOfList, 'compareDN'); usort($memberOfList, 'compareDN');
$pdfTable = new PDFTable(_('Member of')); $pdfTable = new PDFTable(_('Member of'));
for ($i = 0; $i < sizeof($memberOfList); $i++) { for ($i = 0; $i < count($memberOfList); $i++) {
$pdfRow = new PDFTableRow(); $pdfRow = new PDFTableRow();
$pdfRow->cells[] = new PDFTableCell($memberOfList[$i]); $pdfRow->cells[] = new PDFTableCell($memberOfList[$i]);
$pdfTable->rows[] = $pdfRow; $pdfTable->rows[] = $pdfRow;
@ -978,7 +976,7 @@ class windowsGroup extends baseModule {
$return = []; $return = [];
$types = ['group']; $types = ['group'];
$results = searchLDAPByFilter('(objectClass=group)', ['dn'], $types); $results = searchLDAPByFilter('(objectClass=group)', ['dn'], $types);
$count = sizeof($results); $count = count($results);
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $count; $i++) {
if (isset($results[$i]['dn'])) { if (isset($results[$i]['dn'])) {
$return[] = $results[$i]['dn']; $return[] = $results[$i]['dn'];
@ -1038,7 +1036,7 @@ class windowsGroup extends baseModule {
$toAdd = array_values(array_diff($this->attributes['memberOf'], $this->orig['memberOf'])); $toAdd = array_values(array_diff($this->attributes['memberOf'], $this->orig['memberOf']));
$toRem = array_values(array_diff($this->orig['memberOf'], $this->attributes['memberOf'])); $toRem = array_values(array_diff($this->orig['memberOf'], $this->attributes['memberOf']));
// add groups // add groups
for ($i = 0; $i < sizeof($toAdd); $i++) { for ($i = 0; $i < count($toAdd); $i++) {
if (in_array($toAdd[$i], $groups)) { if (in_array($toAdd[$i], $groups)) {
$success = @ldap_mod_add($_SESSION['ldap']->server(), $toAdd[$i], ['member' => [$this->getAccountContainer()->finalDN]]); $success = @ldap_mod_add($_SESSION['ldap']->server(), $toAdd[$i], ['member' => [$this->getAccountContainer()->finalDN]]);
if (!$success) { if (!$success) {
@ -1051,7 +1049,7 @@ class windowsGroup extends baseModule {
} }
} }
// remove groups // remove groups
for ($i = 0; $i < sizeof($toRem); $i++) { for ($i = 0; $i < count($toRem); $i++) {
if (in_array($toRem[$i], $groups)) { if (in_array($toRem[$i], $groups)) {
$success = @ldap_mod_del($_SESSION['ldap']->server(), $toRem[$i], ['member' => [$this->getAccountContainer()->dn_orig]]); $success = @ldap_mod_del($_SESSION['ldap']->server(), $toRem[$i], ['member' => [$this->getAccountContainer()->dn_orig]]);
if (!$success) { if (!$success) {
@ -1148,7 +1146,7 @@ class windowsGroup extends baseModule {
if (!empty($values)) { if (!empty($values)) {
usort($values, 'compareDN'); usort($values, 'compareDN');
} }
$count = sizeof($values); $count = count($values);
for ($i = 0; $i < $count; $i++) { for ($i = 0; $i < $count; $i++) {
$replaced = false; $replaced = false;
foreach ($typeManager->getConfiguredTypes() as $type) { foreach ($typeManager->getConfiguredTypes() as $type) {