Cadoles/nineskeletor
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix(activeuser): user isactive & adress niveau & route all
Some checks reported warnings
Cadoles/nineskeletor/pipeline/head This commit is unstable
Details
Cadoles/nineskeletor/pipeline/pr-master This commit is unstable
Details

Browse Source
This commit is contained in:
Arnaud Fornerot
2022-10-02 14:50:48 +02:00
parent 2cad98ca86
commit 84230eb347
35 changed files with 749 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Service/LdapService.php
View File

@ -431,6 +431,10 @@ class LdapService
$connection = $this->connect();
$result = null;
if (!$user->isIsactive()) {
$todel = true;
}
// NIVEAU01
// On recherche le Niveau01 actuellement asscocié à l'utilisateur
$criteria = '(&(cn=*)(memberUid='.$user->getUsername().'))';
@ -765,7 +769,9 @@ class LdapService
$attrs['memberuid'] = [];
foreach ($niveau01->getUsers() as $user) {
array_push($attrs['memberuid'], $user->getUsername());
if ($user->isIsactive()) {
array_push($attrs['memberuid'], $user->getUsername());
}
}
sort($attrs['memberuid']);
@ -893,7 +899,9 @@ class LdapService
$attrs['memberuid'] = [];
foreach ($niveau02->getUsers() as $user) {
array_push($attrs['memberuid'], $user->getUsername());
if ($user->isIsactive()) {
array_push($attrs['memberuid'], $user->getUsername());
}
}
sort($attrs['memberuid']);
@ -1021,7 +1029,9 @@ class LdapService
$attrs['memberuid'] = [];
foreach ($niveau03->getUsers() as $user) {
array_push($attrs['memberuid'], $user->getUsername());
if ($user->isIsactive()) {
array_push($attrs['memberuid'], $user->getUsername());
}
}
sort($attrs['memberuid']);
@ -1149,7 +1159,9 @@ class LdapService
$attrs['memberuid'] = [];
foreach ($niveau04->getUsers() as $user) {
array_push($attrs['memberuid'], $user->getUsername());
if ($user->isIsactive()) {
array_push($attrs['memberuid'], $user->getUsername());
}
}
sort($attrs['memberuid']);
@ -1277,7 +1289,9 @@ class LdapService
$attrs['memberuid'] = [];
foreach ($group->getUsers() as $usergroup) {
array_push($attrs['memberuid'], $usergroup->getUser()->getUsername());
if ($usergroup->getUser()->isIsactive()) {
array_push($attrs['memberuid'], $usergroup->getUser()->getUsername());
}
}
sort($attrs['memberuid']);
@ -1306,11 +1320,13 @@ class LdapService
$result = $this->search($criteria, ['memberuid'], $subbranch);
if (!$this->in_array_r($usergroup->getUser()->getUsername(), $result[0])) {
$dn = $this->getGroupDN($usergroup->getGroup()->getLabel());
$entry['memberuid'] = $usergroup->getUser()->getUsername();
$result = ldap_mod_add($connection, $dn, $entry);
if (!$result) {
$this->ldapError();
if ($usergroup->getUser()->isIsactive()) {
$dn = $this->getGroupDN($usergroup->getGroup()->getLabel());
$entry['memberuid'] = $usergroup->getUser()->getUsername();
$result = ldap_mod_add($connection, $dn, $entry);
if (!$result) {
$this->ldapError();
}
}
}