Skip to content

Commit

Permalink
changed spamassassing plugin note to plugin name
Browse files Browse the repository at this point in the history
  • Loading branch information
msimerson committed Apr 29, 2012
1 parent 24ed765 commit e9498b1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions plugins/dspam
Expand Up @@ -320,8 +320,8 @@ sub get_dspam_results {
sub get_spamassassin_results {
my ($self, $transaction) = @_;

if ( $transaction->notes('spamass' ) ) {
return split(':', $transaction->notes('spamass' ) );
if ( $transaction->notes('spamassassin' ) ) {
return split(':', $transaction->notes('spamassassin' ) );
};

my $sa_status = $transaction->header->get('X-Spam-Status') or do {
Expand All @@ -335,7 +335,7 @@ sub get_spamassassin_results {

$self->log(LOGINFO, "SA: $is_spam; $score; $autolearn");

$transaction->notes('spamass', "$is_spam:$score:$autolearn");
$transaction->notes('spamassassin', "$is_spam:$score:$autolearn");

return ($is_spam, $score, $autolearn);
};
Expand Down
2 changes: 1 addition & 1 deletion plugins/spamassassin
Expand Up @@ -250,7 +250,7 @@ sub insert_spam_headers {
my ( $is_spam,undef,$score,$autolearn ) = $new_headers->{$name}
=~ /^(yes|no), (score|hits)=([\d\.\-]+)\s.*?autolearn=([\w]+)/i;
$self->log(LOGINFO, "SA: $is_spam; $score; $autolearn");
$transaction->notes('spamass', "$is_spam:$score:$autolearn");
$transaction->notes('spamassassin', "$is_spam:$score:$autolearn");
};
$new_headers->{$name} =~ s/\015//; # hack for outlook (still necessary?)
$self->_cleanup_spam_header($transaction, $name);
Expand Down

0 comments on commit e9498b1

Please sign in to comment.