You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/07/07 09:44:35 UTC
svn commit: r1862683 - in /spamassassin: branches/3.4/lib/Mail/SpamAssassin/
branches/3.4/lib/Mail/SpamAssassin/Plugin/ trunk/lib/Mail/SpamAssassin/
trunk/lib/Mail/SpamAssassin/Plugin/
Author: hege
Date: Sun Jul 7 09:44:35 2019
New Revision: 1862683
URL: http://svn.apache.org/viewvc?rev=1862683&view=rev
Log:
Few more parameter whitespace fixes
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/DBBasedAddrList.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TextCat.pm
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TextCat.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/DBBasedAddrList.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/DBBasedAddrList.pm?rev=1862683&r1=1862682&r2=1862683&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/DBBasedAddrList.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/DBBasedAddrList.pm Sun Jul 7 09:44:35 2019
@@ -53,7 +53,7 @@ sub new_checker {
'locked_file' => ''
};
- my @order = split (' ', $main->{conf}->{auto_whitelist_db_modules});
+ my @order = split(/\s+/, $main->{conf}->{auto_whitelist_db_modules});
untaint_var(\@order);
my $dbm_module = Mail::SpamAssassin::Util::first_available_module (@order);
if (!$dbm_module) {
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TextCat.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TextCat.pm?rev=1862683&r1=1862682&r2=1862683&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TextCat.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TextCat.pm Sun Jul 7 09:44:35 2019
@@ -542,8 +542,8 @@ sub extract_metadata {
if ($len >= 256) {
# generate list of languages to skip
my %skip;
- $skip{$_} = 1 for split(' ', $opts->{conf}->{inactive_languages});
- delete $skip{$_} for split(' ', $opts->{conf}->{ok_languages});
+ $skip{$_} = 1 for split(/\s+/, $opts->{conf}->{inactive_languages});
+ delete $skip{$_} for split(/\s+/, $opts->{conf}->{ok_languages});
dbg("textcat: classifying, skipping: " . join(" ", keys %skip));
@matches = classify(\$body, $opts, %skip);
}
@@ -565,7 +565,7 @@ sub check_language {
my $msg = $scan->{msg};
- my @languages = split(' ', $scan->{conf}->{ok_languages});
+ my @languages = split(/\s+/, $scan->{conf}->{ok_languages});
if (grep { $_ eq "all" } @languages) {
return 0;
@@ -603,7 +603,7 @@ sub check_language {
sub check_body_8bits {
my ($self, $scan, $body) = @_;
- my @languages = split(' ', $scan->{conf}->{ok_languages});
+ my @languages = split(/\s+/, $scan->{conf}->{ok_languages});
for (@languages) {
return 0 if $_ eq "all";
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm?rev=1862683&r1=1862682&r2=1862683&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Util.pm Sun Jul 7 09:44:35 2019
@@ -1962,7 +1962,7 @@ sub make_qr {
sub get_my_locales {
my ($ok_locales) = @_;
- my @locales = split(' ', $ok_locales);
+ my @locales = split(/\s+/, $ok_locales);
my $lang = $ENV{'LC_ALL'};
$lang ||= $ENV{'LANGUAGE'};
$lang ||= $ENV{'LC_MESSAGES'};
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm?rev=1862683&r1=1862682&r2=1862683&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/DBBasedAddrList.pm Sun Jul 7 09:44:35 2019
@@ -53,7 +53,7 @@ sub new_checker {
'locked_file' => ''
};
- my @order = split (' ', $main->{conf}->{auto_whitelist_db_modules});
+ my @order = split(/\s+/, $main->{conf}->{auto_whitelist_db_modules});
untaint_var(\@order);
my $dbm_module = Mail::SpamAssassin::Util::first_available_module (@order);
if (!$dbm_module) {
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TextCat.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TextCat.pm?rev=1862683&r1=1862682&r2=1862683&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TextCat.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TextCat.pm Sun Jul 7 09:44:35 2019
@@ -550,8 +550,8 @@ sub extract_metadata {
if ($len >= 256) {
# generate list of languages to skip
my %skip;
- $skip{$_} = 1 for split(' ', $opts->{conf}->{inactive_languages});
- delete $skip{$_} for split(' ', $opts->{conf}->{ok_languages});
+ $skip{$_} = 1 for split(/\s+/, $opts->{conf}->{inactive_languages});
+ delete $skip{$_} for split(/\s+/, $opts->{conf}->{ok_languages});
dbg("textcat: classifying, skipping: " . join(" ", keys %skip));
@matches = classify(\$body, $opts, %skip);
}
@@ -575,7 +575,7 @@ sub check_language {
my $msg = $scan->{msg};
- my @languages = split(' ', $scan->{conf}->{ok_languages});
+ my @languages = split(/\s+/, $scan->{conf}->{ok_languages});
if (grep { $_ eq "all" } @languages) {
return 0;
@@ -615,7 +615,7 @@ sub check_body_8bits {
return 0 if $self->{textcat_disabled};
- my @languages = split(' ', $scan->{conf}->{ok_languages});
+ my @languages = split(/\s+/, $scan->{conf}->{ok_languages});
for (@languages) {
return 0 if $_ eq "all";
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=1862683&r1=1862682&r2=1862683&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Sun Jul 7 09:44:35 2019
@@ -2086,7 +2086,7 @@ sub make_qr {
sub get_my_locales {
my ($ok_locales) = @_;
- my @locales = split(' ', $ok_locales);
+ my @locales = split(/\s+/, $ok_locales);
my $lang = $ENV{'LC_ALL'};
$lang ||= $ENV{'LANGUAGE'};
$lang ||= $ENV{'LC_MESSAGES'};