Skip to content
GitLab
Verified Commit 02864376 authored by dockx thibault's avatar dockx thibault
Browse files

:sparkles: Feat(Orchestrator) - removal of ppolicy 

Removal of ppolicy
parent 80e1a082
dev 63-orchestrator-mail-controller-format-of-mail-text-and-signature-are-not-utf8-usage-of-accents-is 70-create-unitests-for-orchestrator 73-orchestrator-create-a-librabry-in-core-orchestrator 78-redesign-audit-class 79-redesign-mail 80-redesign-notifications-class 81-redesign-reminders-class 82-redesign-lifecycle-class 92-improve-config-file-to-be-better-align-with-standard-and-remov-some-ambiguities main revert-55863b23 1.1
2 merge requests!72Releasing Fusiondirectory Orchestrator 1.1,!61Resolve "[Orchestrator] - New endpoint for userReminder allowing to send notification to use with token to extend their account longevity"
Pipeline #30515 passed with stages
in 2 minutes
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 13 deletions
+4 -13
plugins/tasks/Reminder.php
+ 4
− 13
View file @ 02864376
...@@ -127,10 +127,9 @@ class Reminder implements EndpointInterface ...@@ -127,10 +127,9 @@ class Reminder implements EndpointInterface
} }
} }
// Case where prolongation is set without supann. Case of posix and PPolicy // Case where prolongation is set without supann.
if ($monitoredResources['resource'][0] === 'NONE' && $monitoredResources['prolongation'] === 'TRUE') { if ($monitoredResources['resource'][0] === 'NONE' && $monitoredResources['prolongation'] === 'TRUE') {
if ($this->posixAboutToExpire($task['fdtasksgranulardn'][0], $task['fdtasksgranularhelper'][0]) || if ($this->posixAboutToExpire($task['fdtasksgranulardn'][0], $task['fdtasksgranularhelper'][0])) {
$this->pPolicyAboutToExpire($task['fdtasksgranulardn'][0], $task['fdtasksgranularhelper'][0])) {
// Require to be set for updating the status of the task later on and sent the email. // Require to be set for updating the status of the task later on and sent the email.
$reminders[$remindersMainTaskName]['subTask'][$task['cn'][0]]['dn'] = $task['dn']; $reminders[$remindersMainTaskName]['subTask'][$task['cn'][0]]['dn'] = $task['dn'];
...@@ -218,13 +217,6 @@ class Reminder implements EndpointInterface ...@@ -218,13 +217,6 @@ class Reminder implements EndpointInterface
return $result; return $result;
} }
private function pPolicyAboutToExpire ($dn, $days) : bool
{
$result = FALSE;
return $result;
}
/** /**
* @param string $token * @param string $token
* @param array $mailTemplateForm * @param array $mailTemplateForm
...@@ -522,9 +514,8 @@ class Reminder implements EndpointInterface ...@@ -522,9 +514,8 @@ class Reminder implements EndpointInterface
$monitoredResourcesArray['nextState'] = $remindersMainTask['fdtasksremindernextstate']; $monitoredResourcesArray['nextState'] = $remindersMainTask['fdtasksremindernextstate'];
$monitoredResourcesArray['nextSubState'] = $remindersMainTask['fdtasksremindernextsubstate'] ?? NULL; $monitoredResourcesArray['nextSubState'] = $remindersMainTask['fdtasksremindernextsubstate'] ?? NULL;
} }
// Posix attributes
$monitoredResourcesArray['fdTasksReminderPosix'] = $remindersMainTask['fdtasksreminderposix'] ?? FALSE; $monitoredResourcesArray['fdTasksReminderPosix'] = $remindersMainTask['fdtasksreminderposix'] ?? FALSE;
$monitoredResourcesArray['fdTasksReminderPPolicy'] = $remindersMainTask['fdtasksreminderppolicy'] ?? FALSE;
} }
...@@ -613,7 +604,7 @@ class Reminder implements EndpointInterface ...@@ -613,7 +604,7 @@ class Reminder implements EndpointInterface
// Retrieve data from the main Reminder task // Retrieve data from the main Reminder task
return $this->gateway->getLdapTasks( '(objectClass=fdTasksReminder)', ['fdTasksReminderListOfRecipientsMails', return $this->gateway->getLdapTasks( '(objectClass=fdTasksReminder)', ['fdTasksReminderListOfRecipientsMails',
'fdTasksReminderResource', 'fdTasksReminderState', 'fdTasksReminderPosix', 'fdTasksReminderMailTemplate', 'fdTasksReminderResource', 'fdTasksReminderState', 'fdTasksReminderPosix', 'fdTasksReminderMailTemplate',
'fdTasksReminderPPolicy', 'fdTasksReminderSupannNewEndDate', 'fdTasksReminderRecipientsMembers', 'fdTasksReminderEmailSender', 'fdTasksReminderSupannNewEndDate', 'fdTasksReminderRecipientsMembers', 'fdTasksReminderEmailSender',
'fdTasksReminderManager', 'fdTasksReminderAccountProlongation', 'fdTasksReminderMembers', 'fdTasksReminderNextResource', 'fdTasksReminderManager', 'fdTasksReminderAccountProlongation', 'fdTasksReminderMembers', 'fdTasksReminderNextResource',
'fdTasksReminderNextState', 'fdTasksReminderNextSubState', 'fdTasksReminderSubState', 'fdTasksReminderFirstCall', 'fdTasksReminderSecondCall'], '', $mainTaskDn); 'fdTasksReminderNextState', 'fdTasksReminderNextSubState', 'fdTasksReminderSubState', 'fdTasksReminderFirstCall', 'fdTasksReminderSecondCall'], '', $mainTaskDn);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment