[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-482-gac0ae54

[? sunnavy]

The branch, 3.9-trunk has been updated
       via  ac0ae54b2f1cb2b012db802435189b2c458a659f (commit)
       via  60bc2b12459b454f4e5ea79330f9c7fa8ba0fd18 (commit)
      from  f8fffdddbc52bd849afdea57605522a6d4885ccb (commit)

Summary of changes:
 lib/RT/Interface/Email.pm                     |    2 +-
 lib/RT/Interface/Email/Filter/SpamAssassin.pm |   95 -------------------------
 2 files changed, 1 insertions(+), 96 deletions(-)
 delete mode 100755 lib/RT/Interface/Email/Filter/SpamAssassin.pm

- Log -----------------------------------------------------------------
commit 60bc2b12459b454f4e5ea79330f9c7fa8ba0fd18
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sat Aug 21 17:54:59 2010 +0800

    remove SpamAssassin

diff --git a/lib/RT/Interface/Email/Filter/SpamAssassin.pm b/lib/RT/Interface/Email/Filter/SpamAssassin.pm
deleted file mode 100755
index c6200b2..0000000
--- a/lib/RT/Interface/Email/Filter/SpamAssassin.pm
+++ /dev/null
@@ -1,95 +0,0 @@
-# BEGIN BPS TAGGED BLOCK {{{
-# 
-# COPYRIGHT:
-# 
-# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
-#                                          <jesse at bestpractical.com>
-# 
-# (Except where explicitly superseded by other copyright notices)
-# 
-# 
-# LICENSE:
-# 
-# This work is made available to you under the terms of Version 2 of
-# the GNU General Public License. A copy of that license should have
-# been provided with this software, but in any event can be snarfed
-# from www.gnu.org.
-# 
-# This work is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-# 
-# 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/licenses/old-licenses/gpl-2.0.html.
-# 
-# 
-# CONTRIBUTION SUBMISSION POLICY:
-# 
-# (The following paragraph is not intended to limit the rights granted
-# to you to modify and distribute this software under the terms of
-# the GNU General Public License and is only of importance to you if
-# you choose to contribute your changes and enhancements to the
-# community by submitting them to Best Practical Solutions, LLC.)
-# 
-# By intentionally submitting any modifications, corrections or
-# derivatives to this work, or any other work intended for use with
-# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-# you are the copyright holder for those contributions and you grant
-# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
-# royalty-free, perpetual, license to use, copy, create derivative
-# works based on those contributions, and sublicense and distribute
-# those contributions and any derivatives thereof.
-# 
-# END BPS TAGGED BLOCK }}}
-
-package RT::Interface::Email::Filter::SpamAssassin;
-
-use Mail::SpamAssassin;
-my $spamtest = Mail::SpamAssassin->new();
-
-sub GetCurrentUser {
-    my %args = (
-        Message     => undef,
-        CurrentUser => undef,
-        AuthLevel   => undef,
-        @_
-    );
-    my $status = $spamtest->check( $args{'Message'} );
-    return ( $args{'CurrentUser'}, $args{'AuthLevel'} )
-      unless $status->is_spam();
-
-    eval { $status->rewrite_mail() };
-    if ( $status->get_hits > $status->get_required_hits() * 1.5 ) {
-
-        # Spammy indeed
-        return ( $args{'CurrentUser'}, -1 );
-    }
-    return ( $args{'CurrentUser'}, $args{'AuthLevel'} );
-
-}
-
-=head1 NAME
-
-RT::Interface::Email::Filter::SpamAssassin - Spam filter for RT
-
-=head1 SYNOPSIS
-
-    # in RT config
-    Set(@MailPlugins, 'Filter::SpamAssassin', ...other filters...);
-
-=head1 DESCRIPTION
-
-This plugin checks to see if an incoming mail is spam (using
-C<spamassassin>) and if so, rewrites its headers. If the mail is very
-definitely spam - 1.5x more hits than required - then it is dropped on
-the floor; otherwise, it is passed on as normal.
-
-=cut
-
-RT::Base->_ImportOverlays();
-
-1;

commit ac0ae54b2f1cb2b012db802435189b2c458a659f
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Sat Aug 21 17:55:56 2010 +0800

    loose the regex a bit so we can use RT::Extension::SpamAssassin as a mail plugin

diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm
index e8052b1..b2e27ab 100755
--- a/lib/RT/Interface/Email.pm
+++ b/lib/RT/Interface/Email.pm
@@ -1247,7 +1247,7 @@ sub _LoadPlugins {
         } elsif ( !ref $plugin ) {
             my $Class = $plugin;
             $Class = "RT::Interface::Email::" . $Class
-                unless $Class =~ /^RT::Interface::Email::/;
+                unless $Class =~ /^RT::/;
             $Class->require or
                 do { $RT::Logger->error("Couldn't load $Class: $@"); next };
 

-----------------------------------------------------------------------