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
389377f7
Verified
Commit
389377f7
authored
3 years ago
by
dockx thibault
Browse files
Options
Download
Patches
Plain Diff
Feat(MailTemplate) - Removes mail list
Mail list will be implemented within Task object
parent
3553abe2
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
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
+1
-7
contrib/openldap/core-fd.schema
plugins/addons/mailtemplate/class_mailTemplateInvitations.inc
+3
-33
...ins/addons/mailtemplate/class_mailTemplateInvitations.inc
with
4 additions
and
40 deletions
+4
-40
contrib/openldap/core-fd.schema
+
1
−
7
View file @
389377f7
...
...
@@ -251,12 +251,6 @@ attributetype ( 1.3.6.1.4.1.38414.88.1.26 NAME 'fdMTInvitationReplyTo'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.88.1.27 NAME 'fdMTInvitationEmailList'
DESC 'FusionDirectory - Lists of emails registered - received'
EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
# Classes
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY
...
...
@@ -329,4 +323,4 @@ objectclass ( 1.3.6.1.4.1.38414.88.2.5 NAME 'fdMailTemplateInvitations'
DESC 'FusionDirectory mail template Invitations'
SUP top AUXILIARY
MUST ( cn $ fdMTInvitationEmailSubject $ fdMTInvitationEmailContent)
MAY ( fdMTInvitationReplyTo
$ fdMTInvitationEmailList
) )
MAY ( fdMTInvitationReplyTo ) )
This diff is collapsed.
Click to expand it.
plugins/addons/mailtemplate/class_mailTemplateInvitations.inc
+
3
−
33
View file @
389377f7
...
...
@@ -52,24 +52,14 @@ class mailTemplateInvitations extends simplePlugin
new
TextAreaAttribute
(
_
(
'Email content'
),
_
(
'Content of the email sent for this invitation'
),
'fdMTInvitationEmailContent'
,
TRUE
,
'A default Email here - was previously fetched by default configuration'
'A default Email here - was previously fetched by default configuration
- %token%
'
),
]
],
'emails'
=>
[
'name'
=>
_
(
'Emails'
),
'attrs'
=>
[
new
StringAttribute
(
new
StringAttribute
(
_
(
'Reply to'
),
_
(
'Email address set as "Reply to" in the sent emails'
),
'fdMTInvitationReplyTo'
,
FALSE
),
new
FileTextAreaAttribute
(
_
(
'Emails'
),
_
(
'List of email adresses of people to invite - one per line'
),
'fdMTInvitationEmailList'
,
FALSE
,
'.txt'
,
TRUE
,
FALSE
),
]
]
]
,
];
}
...
...
@@ -79,24 +69,4 @@ class mailTemplateInvitations extends simplePlugin
parent
::
__construct
(
$dn
,
$object
,
$parent
,
$mainTab
);
}
/*
* Used to verify if the list of emails imported by the mails_file are correct emails format.
*
*/
function
check
():
array
{
$errors
=
parent
::
check
();
$emails
=
explode
(
"
\n
"
,
$this
->
fdMTInvitationEmailList
);
foreach
(
$emails
as
$email
)
{
if
(
!
tests
::
is_email
(
$email
))
{
$errors
[]
=
new
SimplePluginCheckError
(
$this
->
attributesAccess
[
'fdMTInvitationEmailList'
],
htmlescape
(
sprintf
(
_
(
'"%s" is not a valid email address'
),
$email
))
);
}
}
return
$errors
;
}
}
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