diff options
| author | ivan <ivan> | 2008-03-02 04:11:51 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2008-03-02 04:11:51 +0000 |
| commit | c648976f0b7975f2328ebd7ba8c711fad0ca4195 (patch) | |
| tree | f3d176ec300a46c253ba25a988b897bce02fe174 /rt/lib/RT/Action/AutoOpen.pm | |
| parent | 5e05724a635a22776f1b973f5d7e77989da4e048 (diff) | |
| parent | 8103c1fc1b2c27a6855feadf26f91b980a54bc52 (diff) | |
This commit was generated by cvs2svn to compensate for changes in r6255,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'rt/lib/RT/Action/AutoOpen.pm')
| -rw-r--r-- | rt/lib/RT/Action/AutoOpen.pm | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/rt/lib/RT/Action/AutoOpen.pm b/rt/lib/RT/Action/AutoOpen.pm index 3423db93e..54b5ab4e2 100644 --- a/rt/lib/RT/Action/AutoOpen.pm +++ b/rt/lib/RT/Action/AutoOpen.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC # <jesse@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 or visit their web page on the internet at +# http://www.gnu.org/copyleft/gpl.html. # # # CONTRIBUTION SUBMISSION POLICY: @@ -71,18 +73,15 @@ sub Prepare { # if the ticket is already open or the ticket is new and the message is more mail from the # requestor, don't reopen it. - if ( ( $self->TicketObj->Status eq 'open' ) - || ( ( $self->TicketObj->Status eq 'new' ) - && $self->TransactionObj->IsInbound ) - || ( defined $self->TransactionObj->Message->First - && $self->TransactionObj->Message->First->GetHeader('RT-Control') =~ /\bno-autoopen\b/i ) - ) { + my $status = $self->TicketObj->Status; + return undef if $status eq 'open'; + return undef if $status eq 'new' && $self->TransactionObj->IsInbound; - return undef; - } - else { - return (1); + if ( my $msg = $self->TransactionObj->Message->First ) { + return undef if ($msg->GetHeader('RT-Control') || '') =~ /\bno-autoopen\b/i; } + + return 1; } # }}} |