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

:sparkles: Feat(tasks) MembersOnly tasks 1 

First step towards member only taks 1
parent 8f2a33d0
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 69 additions and 49 deletions
+69 -49
plugins/configuration/tasks/class_tasksMail.inc
+ 67
− 46
View file @ 64ba3042
......@@ -26,18 +26,18 @@ class tasksMail extends simplePlugin
static function plInfo (): array
{
return [
'plShortName' => _('Tasks Mail'),
'plShortName' => _('Tasks Mail'),
'plDescription' => _('Tasks Mail Object'),
'plIcon' => 'geticon.php?context=applications&icon=tasks&size=16',
'plPriority' => 42,
'plIcon' => 'geticon.php?context=applications&icon=tasks&size=16',
'plPriority' => 42,
'plObjectClass' => ['fdTasksMail'],
'plFilter' => '(objectClass=fdTasksMail)',
'plObjectType' => ['tasks'],
'plConflicts' => [''],
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo()),
'plForeignKeys' => [
'plFilter' => '(objectClass=fdTasksMail)',
'plObjectType' => ['tasks'],
'plConflicts' => [''],
'plProvidedAcls' => parent::generatePlProvidedAcls(static::getAttributesInfo()),
'plForeignKeys' => [
'fdTasksMailUsers' => [
['user','dn','fdTasksMailUsers=%oldvalue%','*']
['user', 'dn', 'fdTasksMailUsers=%oldvalue%', '*']
]
],
];
......@@ -48,7 +48,7 @@ class tasksMail extends simplePlugin
return [
// Attributes are grouped by section
'taskMail' => [
'name' => _('Task Mail Object'),
'name' => _('Task Mail Object'),
'attrs' => [
new SelectAttribute(
_('Mail Template'), _('Mail Template Object Selection'),
......@@ -58,15 +58,15 @@ class tasksMail extends simplePlugin
]
],
'From Component' => [
'name' => _('Sender email address'),
'name' => _('Sender email address'),
'attrs' => [
new MailAttribute(
_('Sender email address'),
_('Email address from which mails will be sent'), 'fdTasksEmailSender', TRUE, 'to.be@chang.ed'),
new MailAttribute(
_('Sender email address'),
_('Email address from which mails will be sent'), 'fdTasksEmailSender', TRUE, 'to.be@chang.ed'),
]
],
'UserGroupSelection' => [
'name' => _('Recipients Users and/or Groups'),
'name' => _('Recipients Users and/or Groups'),
'attrs' => [
new UsersGroupsRolesAttribute(
_('Members'), _('Users or groups to assign to this task.'),
......@@ -75,7 +75,7 @@ class tasksMail extends simplePlugin
],
],
'tasksMailType' => [
'name' => _('Type of e-mail address desired'),
'name' => _('Type of e-mail address desired'),
'attrs' => [
new SelectAttribute(
_('Mail Type - If not found, priority will apply'), _('Mail Type Object Selection'),
......@@ -103,12 +103,12 @@ class tasksMail extends simplePlugin
$this->attributesAccess['fdTasksMailObject']->setChoices(array_keys($tmpSearch), array_values($tmpSearch));
$mailAttrTypes = [
'mail' => 'mail - [gosaMailAccount primary]',
'gosaMailAlternateAddress' => 'gosaMailAlternateAddress',
'mail' => 'mail - [gosaMailAccount primary]',
'gosaMailAlternateAddress' => 'gosaMailAlternateAddress',
'gosaMailForwardingAddress' => 'gosaMailForwardingAddress',
'supannAutreMail' => 'supannAutreMail',
'supannMailPerso' => 'supannMailPerso',
'supannMailPrive' => 'supannMailPrive'
'supannAutreMail' => 'supannAutreMail',
'supannMailPerso' => 'supannMailPerso',
'supannMailPrive' => 'supannMailPrive'
];
$this->attributesAccess['fdTasksMailType']->setChoices(array_keys($mailAttrTypes), array_values($mailAttrTypes));
......@@ -124,7 +124,7 @@ class tasksMail extends simplePlugin
parent::update();
// get the value of type mail desired and if null set default
$mailAttr = $this->attributesAccess['fdTasksMailType']->getValue();
$mailAttr = $this->attributesAccess['fdTasksMailType']->getValue();
if (empty($mailAttr)) {
$mailAttr = 'mail';
}
......@@ -141,7 +141,7 @@ class tasksMail extends simplePlugin
/*
* Return the objectype searched for by setEmailFromSelectedDN
*/
public function getMailObject (string $mailAttr) : string
public function getMailObject (string $mailAttr): string
{
switch ($mailAttr) {
case 'mail' :
......@@ -159,10 +159,10 @@ class tasksMail extends simplePlugin
}
}
/*
* Populate the fdTasksEmailsFromDN attribute with related mails addresses.
*/
public function setEmailsFromSelectedDN ($mailObject, $mailAttr) : void
/*
* Populate the fdTasksEmailsFromDN attribute with related mails addresses.
*/
public function setEmailsFromSelectedDN ($mailObject, $mailAttr): void
{
global $config;
......@@ -241,50 +241,71 @@ class tasksMail extends simplePlugin
*/
public function generateSlaveTasks ()
{
global $config;
$ldap = $config->get_ldap_link();
$emails = $this->attributesAccess['fdTasksEmailsFromDN']->getValue();
// Ref is supposed to be the mail object CN in this class
$ref = $this->attributesAccess['fdTasksMailObject']->getValue();
$ref = $this->attributesAccess['fdTasksMailObject']->getValue();
$from = $this->attributesAccess['fdTasksEmailSender']->getValue();
// Incremental id allowing creation of different CN for sub-tasks
$id = 0;
// Take the attribute from the other tabs - attribute cannot be null or unset by default
$schedule = $this->parent->getBaseObject()->fdTasksScheduleDate ?? NULL;
// Verify if members can have multiple sub-tasks for that main task.
$newMemberOnly = $this->parent->getBaseObject()->fdTasksUpdatable;
// remove 'dn' keeping only 'cn'
$rmDn = preg_replace('/(?=,).*/', '', $this->dn);
// only take the cn without dc
preg_match('/cn=(.*)/', $rmDn, $matches);
if (!empty($emails)) {
// Condition allowing the creation of subtasks for existing members
if ($newMemberOnly === TRUE) {
$ldap->cd($config->current['BASE']);
$filter = '(&(objectClass=fdTasksGranular)(fdTasksGranularMaster='.$this->dn.'))';
$attrs = ['fdTasksGranularMail'];
$ldap->search($filter, $attrs);
while ($info = $ldap->fetch()) {
$subTasks[] = $info;
}
foreach ($subTasks as $subTask) {
$membersEmailslist[] = $subTask['fdTasksGranularMail'][0];
}
// Correct list of emails in below variable.
print_r($membersEmailslist);
}
foreach ($emails as $email) {
// Using ID incrementation in order to have sub-tasks CN with different name.
// Enhancement possible is to use dateTime instead.
$id ++;
// Here we create the object taskGranular
$tabObject = objects::create('TasksGranular');
// remove 'dn' keeping only 'cn'
$rmDn = preg_replace('/(?=,).*/', '', $this->dn);
// only take the cn without dc
preg_match('/cn=(.*)/', $rmDn, $matches);
// Create a unique ID based on timestamp (Allowing duplicate subtasks for same members in case of repeat).
$timestamp = microtime(true); // Get the current timestamp with microseconds
$uniqueID = str_replace(".", "_", $timestamp); // Remove . with _ for correct CN
$subTaskName = $matches[1].'-SubTask-'.$id;
// Array matches come from preg_match function above with rmDn
$subTaskName = $matches[1] . '-SubTask-' . $uniqueID;
$values['tasksGranular'] = [
"cn" => $subTaskName,
"fdTasksGranularType" => 'Mail Object',
"fdTasksGranularMaster" => $this->dn,
"fdTasksGranularMail" => $email,
"cn" => $subTaskName,
"fdTasksGranularType" => 'Mail Object',
"fdTasksGranularMaster" => $this->dn,
"fdTasksGranularMail" => $email,
"fdTasksGranularSchedule" => $schedule,
"fdTasksGranularRef" => $ref,
"fdTasksGranularRef" => $ref,
"fdTasksGranularMailFrom" => $from
];
foreach ($values as $tab => $tabvalues) {
if (!isset($tabObject->by_object[$tab])) {
echo "Error tab does not contains attributes values" .PHP_EOL;
echo "Error tab does not contains attributes values" . PHP_EOL;
}
$error = $tabObject->by_object[$tab]->deserializeValues($tabvalues);
if ($error !== TRUE) {
echo 'Error during deserializing' .$error .PHP_EOL;
echo 'Error during deserializing' . $error . PHP_EOL;
}
$tabObject->current = $tab;
......
plugins/configuration/tasks/class_tasksManagement.inc
+ 2
− 3
View file @ 64ba3042
......@@ -24,11 +24,10 @@ class tasksManagement extends management
protected $skipCpHandler = TRUE;
/*
* LinkColumn exists by class collumn
* TasksColumn is a new class for Tasks bassed on argonaut column definition
* LinkColumn exists by class column
* TasksColumn is a new class for Tasks based on argonaut column definition
*/
public static $columns = [
['LinkColumn', ['attributes' => 'cn', 'label' => 'Tasks']],
//below fdTasksMailObject must be change to have a type defined within task creation (new ldap attributes ?hidden)
['TasksColumn', ['attributes' => 'fdTasksMailObject', 'label' => 'Types']],
['Column', ['attributes' => 'fdTasksCreationDate', 'label' => 'Creation Date']],
......
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