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

munge_subject_threshold did not previously work

Browse Source
This commit is contained in:
Priyadi Iman Nurcahyo 2014-05-15 12:21:09 +00:00
parent d60882c857
commit bb03a785ef
1 changed files with 3 additions and 1 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') || '';