You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2006/08/04 03:33:49 UTC
svn commit: r428587 - in /spamassassin/rules/trunk/sandbox/felicity:
70_imageinfo.cf ImageInfo.pm
Author: felicity
Date: Thu Aug 3 18:33:48 2006
New Revision: 428587
URL: http://svn.apache.org/viewvc?rev=428587&view=rev
Log:
fix typo and potential undef issue with imageinfo test plugin, also trim unneeded parens around metas
Modified:
spamassassin/rules/trunk/sandbox/felicity/70_imageinfo.cf
spamassassin/rules/trunk/sandbox/felicity/ImageInfo.pm
Modified: spamassassin/rules/trunk/sandbox/felicity/70_imageinfo.cf
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/felicity/70_imageinfo.cf?rev=428587&r1=428586&r2=428587&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/felicity/70_imageinfo.cf (original)
+++ spamassassin/rules/trunk/sandbox/felicity/70_imageinfo.cf Thu Aug 3 18:33:48 2006
@@ -26,7 +26,7 @@
ifplugin Mail::SpamAssassin::Plugin::ImageInfo
-meta __HTML_IMG_ONLY ( HTML_IMAGE_ONLY_04 || HTML_IMAGE_ONLY_08 || HTML_IMAGE_ONLY_12 || HTML_IMAGE_ONLY_16 || HTML_IMAGE_ONLY_20 || HTML_IMAGE_ONLY_24 || HTML_IMAGE_ONLY_28 )
+meta __HTML_IMG_ONLY HTML_IMAGE_ONLY_04 || HTML_IMAGE_ONLY_08 || HTML_IMAGE_ONLY_12 || HTML_IMAGE_ONLY_16 || HTML_IMAGE_ONLY_20 || HTML_IMAGE_ONLY_24 || HTML_IMAGE_ONLY_28
body __GIF_ATTACH_1 eval:image_count('gif','1','1')
body __GIF_ATTACH_4P eval:image_count('gif','4')
@@ -36,23 +36,23 @@
body __PNG_ATTACH_4P eval:image_count('png','4')
body __PNG_AREA_180K eval:pixel_coverage('png','180000','400000')
-meta DC_GIF_UNO_LARGO ( __GIF_ATTACH_1 && __GIF_AREA_180K )
+meta DC_GIF_UNO_LARGO __GIF_ATTACH_1 && __GIF_AREA_180K
describe DC_GIF_UNO_LARGO Message contains a single large inline gif
score DC_GIF_UNO_LARGO 3.00
-meta DC_GIF_MULTI_LARGO ( GIF_ATTACH_4P && __GIF_AREA_180K )
+meta DC_GIF_MULTI_LARGO __GIF_ATTACH_4P && __GIF_AREA_180K
describe DC_GIF_MULTI_LARGO Message contains 4 or more inline gif that cover alot of area
score DC_GIF_MULTI_LARGO 4.00
-meta DC_PNG_UNO_LARGO ( __PNG_ATTACH_1 && __PNG_AREA_180K )
+meta DC_PNG_UNO_LARGO __PNG_ATTACH_1 && __PNG_AREA_180K
describe DC_PNG_UNO_LARGO Message contains a single large inline gif
score DC_PNG_UNO_LARGO 3.00
-meta DC_PNG_MULTI_LARGO ( __PNG_ATTACH_4P && __PNG_AREA_180K )
+meta DC_PNG_MULTI_LARGO __PNG_ATTACH_4P && __PNG_AREA_180K
describe DC_PNG_MULTI_LARGO Message contains 4 or more inline png that cover alot of area
score DC_PNG_MULTI_LARGO 4.00
-meta DC_IMAGE_SPAM ( __HTML_IMG_ONLY && ( DC_GIF_UNO_LARGO || DC_PNG_UNO_LARGO || DC_GIF_MULTI_LARGO || DC_PNG_MULTI_LARGO ))
+meta DC_IMAGE_SPAM __HTML_IMG_ONLY && ( DC_GIF_UNO_LARGO || DC_PNG_UNO_LARGO || DC_GIF_MULTI_LARGO || DC_PNG_MULTI_LARGO )
describe DC_IMAGE_SPAM Possible Image-only spam
score DC_IMAGE_SPAM 3.00
Modified: spamassassin/rules/trunk/sandbox/felicity/ImageInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/rules/trunk/sandbox/felicity/ImageInfo.pm?rev=428587&r1=428586&r2=428587&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/felicity/ImageInfo.pm (original)
+++ spamassassin/rules/trunk/sandbox/felicity/ImageInfo.pm Thu Aug 3 18:33:48 2006
@@ -140,6 +140,7 @@
$self->_get_images($pms);
}
+ #dbg("count: $min, ".($max ? $max:'').", $type, ".$pms->{'imageinfo'}->{"count_$type"});
return result_check($min, $max, $pms->{'imageinfo'}->{"count_$type"});
}
@@ -155,6 +156,7 @@
$self->_get_images($pms);
}
+ #dbg("pc: $min, ".($max ? $max:'').", $type, ".$pms->{'imageinfo'}->{"pc_$type"});
return result_check($min, $max, $pms->{'imageinfo'}->{"pc_$type"});
}
@@ -162,6 +164,7 @@
sub result_check {
my ($min, $max, $value) = @_;
+ return 0 unless defined $value;
return 0 if ($value < $min);
return 0 if (defined $max && $value > $max);
return 1;