byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44 from priyadi/master

Browse Source 
munge_subject_threshold did not previously work
This commit is contained in:
Matt Simerson 2014-06-03 22:12:00 -07:00
commit c74564b4c8
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/spamassassin
View File

@ -444,12 +444,14 @@ sub munge_subject {
my $sa = $self->get_spam_results($transaction) or return; my $sa = $self->get_spam_results($transaction) or return;
my $qp_num = $self->{_args}{munge_subject_threshold}; my $qp_num = $self->{_args}{munge_subject_threshold};
my $required = $sa->{required};
my $required = $sa->{required} || $qp_num or do { if (!$qp_num) {
$self->log(LOGDEBUG, "skipping munge, no user or qpsmtpd pref set"); $self->log(LOGDEBUG, "skipping munge, no user or qpsmtpd pref set");
return; return;
}; };
return unless $sa->{score} > $required; return unless $sa->{score} > $required;
return unless $sa->{score} > $qp_num;
my $subject_prefix = $self->qp->config('subject_prefix') || '*** SPAM ***'; my $subject_prefix = $self->qp->config('subject_prefix') || '*** SPAM ***';
my $subject = $transaction->header->get('Subject') || ''; my $subject = $transaction->header->get('Subject') || '';

2
t/plugin_tests/spamassassin
View File

@ -127,7 +127,7 @@ sub test_munge_subject {
$transaction->header->add('Subject', $subject); $transaction->header->add('Subject', $subject);
$self->munge_subject($transaction); $self->munge_subject($transaction);
$r = $transaction->header->get('Subject'); chomp $r; $r = $transaction->header->get('Subject'); chomp $r;
cmp_ok($r, 'eq', "*** SPAM *** $subject", "+"); cmp_ok($r, 'eq', "$subject", "+");
}; };
sub test_get_spam_results { sub test_get_spam_results {