diff options
| author | ivan <ivan> | 2008-03-02 04:06:06 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2008-03-02 04:06:06 +0000 |
| commit | 5e05724a635a22776f1b973f5d7e77989da4e048 (patch) | |
| tree | 8c9155a06d82fd0fac65300ce8ca8f51e73d6afc /rt/lib/RT/Action/AutoOpen.pm | |
| parent | 807bc6bf91e6208fd40bcdf99ce4c0149c2598d2 (diff) | |
| parent | 9c68254528b6f2c7d8c1921b452fa56064783782 (diff) | |
This commit was generated by cvs2svn to compensate for changes in r6252,
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, 12 insertions, 11 deletions
diff --git a/rt/lib/RT/Action/AutoOpen.pm b/rt/lib/RT/Action/AutoOpen.pm index 54b5ab4..3423db9 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-2007 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC # <jesse@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -22,9 +22,7 @@ # # 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., 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. +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # # # CONTRIBUTION SUBMISSION POLICY: @@ -73,15 +71,18 @@ 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. - my $status = $self->TicketObj->Status; - return undef if $status eq 'open'; - return undef if $status eq 'new' && $self->TransactionObj->IsInbound; + 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 ) + ) { - if ( my $msg = $self->TransactionObj->Message->First ) { - return undef if ($msg->GetHeader('RT-Control') || '') =~ /\bno-autoopen\b/i; + return undef; + } + else { + return (1); } - - return 1; } # }}} |