Alex/freescout
1
0
Fork 0
mirror of https://github.com/freescout-helpdesk/freescout.git synced 2024-11-25 03:43:33 +01:00
Code Issues Releases Wiki Activity

Small improvement to bounce detection

Browse Source
This commit is contained in:
Alessandro Corbelli 2018-12-14 09:48:36 +01:00
parent 503bd57d5e
commit 9b2495edce
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Console/Commands/FetchEmails.php
View File

@ -242,7 +242,7 @@ class FetchEmails extends Command
if ($message->hasAttachments()) {
foreach ($attachments as $attachment) {
if (!empty(Attachment::$types[$attachment->getType()]) && Attachment::$types[$attachment->getType()] == Attachment::TYPE_MESSAGE) {
if (in_array($attachment->getName(), ['RFC822', 'DELIVERY-STATUS'])) {
if (in_array(strtoupper($attachment->getName()), ['RFC822', 'DELIVERY-STATUS', 'DELIVERY-STATUS-NOTIFICATION', 'UNDELIVERED-MESSAGE'])) {
$is_bounce = true;
$bounce_attachment = $attachment;
break;
@ -251,6 +251,12 @@ class FetchEmails extends Command
}
}
// If a bounce was not detected by the attachment check, try to determine a bounce by looking at subject or at From
if (!$is_bounce) {
$is_bounce = preg_match('/Delivery Status Notification/i', $message->getSubject() )
|| preg_match('/mailer-daemon/i', $from );
}
// Is it a message from Customer or User replied to the notification
preg_match('/^'.\MailHelper::MESSAGE_ID_PREFIX_NOTIFICATION."\-(\d+)\-(\d+)\-/", $prev_message_id, $m);