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

Merge branch 'master' of github.com:msimerson/qpsmtpd-dev

Browse Source
This commit is contained in:
Matt Simerson 2013-03-23 01:13:34 -04:00
commit 1a7f2c26a5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/dspam
View File

@ -200,6 +200,8 @@ ie, (Trust smtpd).
use strict; use strict;
use warnings; use warnings;
use lib 'lib';
use Qpsmtpd::Constants; use Qpsmtpd::Constants;
use Qpsmtpd::DSN; use Qpsmtpd::DSN;
use IO::Handle; use IO::Handle;
@ -279,7 +281,7 @@ sub assemble_message {
$transaction->body_resetpos; $transaction->body_resetpos;
while (my $line = $transaction->body_getline) { $message .= $line; }; while (my $line = $transaction->body_getline) { $message .= $line; };
$message = join(CRLF, split/\n/, $message); $message = join(CRLF, split /\n/, $message);
return $message . CRLF; return $message . CRLF;
}; };
@ -517,11 +519,11 @@ sub get_dspam_results {
return; return;
}; };
my @bits = split(/,\s+/, $string); chomp @bits; my @bits = split /,\s+/, $string; chomp @bits;
my $class = shift @bits; my $class = shift @bits;
my %d; my %d;
foreach (@bits) { foreach (@bits) {
my ($key,$val) = split(/=/, $_); my ($key,$val) = split /=/, $_;
$d{$key} = $val; $d{$key} = $val;
}; };
$d{class} = $class; $d{class} = $class;