Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
f85f4dd4
Verified
Commit
f85f4dd4
authored
2 years ago
by
dockx thibault
Browse files
Options
Download
Patches
Plain Diff
Feat(Tasks) - Adds sender email
Add sender emails and fixes typo in ldap schema.
parent
3021466f
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
6379-core-ogroups-creation-with-backend-default-user-available-for-selection
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/openldap/core-fd.schema
+8
-3
contrib/openldap/core-fd.schema
plugins/addons/tasks/class_tasksMail.inc
+11
-3
plugins/addons/tasks/class_tasksMail.inc
with
19 additions
and
6 deletions
+19
-6
contrib/openldap/core-fd.schema
+
8
−
3
View file @
f85f4dd4
...
...
@@ -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 $ fdTasksEmailsFrom
d
DN ) )
MUST ( fdTasksMailObject
$ fdTasksEmailSender
)
MAY ( fdTasksMailUsers $ fdTasksEmailsFromDN ) )
This diff is collapsed.
Click to expand it.
plugins/addons/tasks/class_tasksMail.inc
+
11
−
3
View file @
f85f4dd4
...
...
@@ -55,11 +55,19 @@ class tasksMail extends simplePlugin
_
(
'Mail Template'
),
_
(
'Mail Template Object Selection'
),
'fdTasksMailObject'
,
FALSE
),
new
HiddenArrayAttribute
(
'fdTasksEmailsFrom
d
DN'
,
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
[
'fdTasksEmailsFrom
d
DN'
]
->
setValue
(
array_values
(
$mailList
));
$this
->
attributesAccess
[
'fdTasksEmailsFromDN'
]
->
setValue
(
array_values
(
$mailList
));
print_r
(
$mailList
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets