From d829280096930c81cc0f674cb8fa6f53157b4875 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Sun, 26 Jan 2014 21:23:18 +0000
Subject: [PATCH] Centralize how we check for auto replies. Disable
auto-response on a bounce.
---
include/class.mailfetch.php | 6 ------
include/class.ticket.php | 11 ++---------
2 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/include/class.mailfetch.php b/include/class.mailfetch.php
index e7b039211..a0de79768 100644
--- a/include/class.mailfetch.php
+++ b/include/class.mailfetch.php
@@ -609,12 +609,6 @@ class MailFetcher {
return true;
}
- # check if it's a bounce!
- if($vars['header'] && TicketFilter::isAutoBounce($vars['header'])) {
- $ost->logWarning('Bounced email', $vars['message'], false);
- return true;
- }
-
//TODO: Log error..
return null;
}
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 7b2f92784..08e2e29d0 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -1371,7 +1371,7 @@ class Ticket {
if(!$alerts) return $message; //Our work is done...
$autorespond = true;
- if ($autorespond && $message->isAutoResponse())
+ if ($autorespond && $message->isAutoReply())
$autorespond=false;
$this->onMessage($autorespond, $message); //must be called b4 sending alerts to staff.
@@ -2151,16 +2151,9 @@ class Ticket {
# Messages that are clearly auto-responses from email systems should
# not have a return 'ping' message
- if ($autorespond && $message && $message->isAutoResponse())
+ if ($autorespond && $message && $message->isAutoReply())
$autorespond=false;
- //Don't auto respond to mailer daemons.
- if( $autorespond &&
- (strpos(strtolower($vars['email']),'mailer-daemon@')!==false
- || strpos(strtolower($vars['email']),'postmaster@')!==false)) {
- $autorespond=false;
- }
-
//post canned auto-response IF any (disables new ticket auto-response).
if ($vars['cannedResponseId']
&& $ticket->postCannedReply($vars['cannedResponseId'], $message->getId(), $autorespond)) {
--
GitLab