svn commit: r1583680 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm

[jq...@apache.org]

Author: jquinn
Date: Tue Apr  1 14:14:04 2014
New Revision: 1583680

URL: http://svn.apache.org/r1583680
Log:
latest version of TxRep plugin

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm?rev=1583680&r1=1583679&r2=1583680&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm Tue Apr  1 14:14:04 2014
@@ -1195,7 +1195,7 @@ sub check_senders_reputation {
   my $delta    = 0;
   my $timer    = $self->{main}->time_method("total_txrep");
   my $msgscore = (defined $self->{learning})? $self->{learning} : $pms->get_autolearn_points();
-  my $date     = $pms->{date_header_time};
+  my $date     = $pms->{msg}->receive_date() || $pms->{date_header_time};
   my $msg_id   = $self->{msgid} ||
                  Mail::SpamAssassin::Plugin::Bayes->get_msgid($pms->{msg}) ||
                  $pms->get('Message-Id') || $pms->get('Message-ID') || $pms->get('MESSAGE-ID') || $pms->get('MESSAGEID');
@@ -1397,7 +1397,7 @@ sub check_reputation {
                 $self->{checker}->remove_entry($self->{entry});
             }
         } else {
-            $self->add_score($msgscore);        # add the score and increment the cont
+            $self->add_score($msgscore);        # add the score and increment the count
             if ($self->{learning} && $key eq 'MSG_ID' && $self->count() eq 1) {
                 $self->add_score($msgscore);    # increasing the count by 1 at a learned score (count=2)
             }                                   # it can be distinguished from a scanned score (count=1)
@@ -1726,13 +1726,13 @@ sub learn_message {
 ###########################################################################
   my ($self, $params) = @_;
   return 0 unless (defined $params->{isspam});
+  dbg("TxRep: learning a message");
   my $pms = ($self->{last_pms})? $self->{last_pms} : Mail::SpamAssassin::PerMsgStatus->new($self->{main}, $params->{msg});
 
   if (!defined $pms->{relays_internal} && !defined $pms->{relays_external}) {
     $pms->extract_message_metadata();
   }
 
-  dbg("TxRep: learning a message");
   if ($params->{isspam})
         {$self->{learning} =      $self->{conf}->{txrep_learn_penalty};}
   else  {$self->{learning} = -1 * $self->{conf}->{txrep_learn_bonus};}