Verified Commit f85f4dd4 authored by dockx thibault's avatar dockx thibault
Browse files

:sparkles: Feat(Tasks) - Adds sender email

Add sender emails and fixes typo in ldap schema.
Showing with 19 additions and 6 deletions
+19 -6
......@@ -320,7 +320,12 @@ attributetype ( 1.3.6.1.4.1.38414.89.1.6 NAME 'fdTasksCreationDate'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
attributetype ( 1.3.6.1.4.1.38414.89.1.7 NAME 'fdTasksEmailsFromdDN'
attributetype ( 1.3.6.1.4.1.38414.89.1.7 NAME 'fdTasksEmailsFromDN'
DESC 'Fusion Directory - Emails derived from DN'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
attributetype ( 1.3.6.1.4.1.38414.89.1.8 NAME 'fdTasksEmailSender'
DESC 'Fusion Directory - Emails derived from DN'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
......@@ -417,5 +422,5 @@ objectclass (1.3.6.1.4.1.38414.89.2.1 NAME 'fdTasks'
objectclass (1.3.6.1.4.1.38414.89.2.2 NAME 'fdTasksMail'
DESC 'FusionDirectory - Tasks objects Mail'
SUP top AUXILIARY
MUST ( fdTasksMailObject )
MAY ( fdTasksMailUsers $ fdTasksEmailsFromdDN ) )
MUST ( fdTasksMailObject $ fdTasksEmailSender )
MAY ( fdTasksMailUsers $ fdTasksEmailsFromDN ) )
......@@ -55,11 +55,19 @@ class tasksMail extends simplePlugin
_('Mail Template'), _('Mail Template Object Selection'),
'fdTasksMailObject', FALSE
),
new HiddenArrayAttribute('fdTasksEmailsFromdDN', FALSE, ''),
new HiddenArrayAttribute('fdTasksEmailsFromDN', FALSE, ''),
]
],
'From Component' => [
'name' => _('Sender Address'),
'attrs' => [
new MailAttribute(
_('Sender email address'),
_('Email address from which mails will be sent'), 'fdTasksEmailSender', TRUE, 'to.be@chang.ed'),
]
],
'UserGroupSelection' => [
'name' => _('Users and/or Groups'),
'name' => _('Recipients Users and/or Groups'),
'attrs' => [
new GroupMembersAttribute(
'', _('Select Users/Groups'),
......@@ -129,7 +137,7 @@ class tasksMail extends simplePlugin
$mailList[] = $info["mail"][0];
}
}
$this->attributesAccess['fdTasksEmailsFromdDN']->setValue(array_values($mailList));
$this->attributesAccess['fdTasksEmailsFromDN']->setValue(array_values($mailList));
print_r($mailList);
}
}
......
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