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

Merge pull request #79 from msimerson/spamassassin

Browse Source 
resolve issue #77 and PR #32
This commit is contained in:
Matt Simerson 2014-09-10 11:01:54 -07:00
commit 6a83020878
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/spamassassin
View File

@ -122,10 +122,6 @@ If the X-Spam-User header is present, the LDA should submit the message to
spamd for re-processing with the recipients address. spamd for re-processing with the recipients address.
=head1 TODO
Make the "subject munge string" configurable
=head1 CHANGES =head1 CHANGES
2012.04.02 - Matt Simerson 2012.04.02 - Matt Simerson
@ -450,10 +446,11 @@ sub munge_subject {
$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 if !defined $sa->{score};
return unless $sa->{score} > $qp_num; return if $required && $sa->{score} <= $required;
return if $sa->{score} <= $qp_num;
my $subject_prefix = $self->qp->config('subject_prefix') || '*** SPAM ***'; my $subject_prefix = $self->{_args}{subject_prefix} || $self->qp->config('subject_prefix') || '*** SPAM ***';
my $subject = $transaction->header->get('Subject') || ''; my $subject = $transaction->header->get('Subject') || '';
$transaction->header->replace('Subject', "$subject_prefix $subject"); $transaction->header->replace('Subject', "$subject_prefix $subject");
} }