Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
MaarchCapture
Commits
70766aa7
Commit
70766aa7
authored
Oct 18, 2017
by
Giovannoni Laurent
Browse files
Merge branch 'develop' into 'master'
WS REST See merge request !7
parents
4c6c1324
3894bd15
Changes
1
Hide whitespace changes
Inline
Side-by-side
modules/MailCapture/MailCapture.php
View file @
70766aa7
...
...
@@ -81,7 +81,7 @@ class MailCapture
if
(
$error
)
{
if
(
1
===
preg_match
(
'/Unexpected characters at end of address
: <(.*)>
/'
,
'/Unexpected characters at end of address/'
,
$error
,
$matches
)
...
...
@@ -93,7 +93,7 @@ class MailCapture
}
if
(
1
===
preg_match
(
'/Must use comma to separate addresses
: <(.*)>
/'
,
'/Must use comma to separate addresses/'
,
$error
,
$matches
)
...
...
@@ -103,6 +103,30 @@ class MailCapture
'clear error because we found pattern : Must use comma to separate addresses'
);
}
if
(
1
===
preg_match
(
'/Unexpected characters after address in group/'
,
$error
,
$matches
)
)
{
$clearError
=
true
;
$_SESSION
[
'capture'
]
->
logEvent
(
'clear error because we found pattern : Unexpected characters after address in group'
);
}
if
(
1
===
preg_match
(
'/Invalid mailbox list/'
,
$error
,
$matches
)
)
{
$clearError
=
true
;
$_SESSION
[
'capture'
]
->
logEvent
(
'clear error because we found pattern : Invalid mailbox list'
);
}
$actual_errors
++
;
$_SESSION
[
'capture'
]
->
logEvent
(
$error
,
...
...
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!
Cancel
Please
register
or
sign in
to comment