switch ifplugin rule to inside image_spam; fix image_size rule

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-listmaster/trunk/spamassassin_config@308 0b7a5b0c-1f2c-0410-bd74-c376f8064c91

diff --git a/common/common_spam b/common/common_spam
index 0bb003816b50db9e0993a14df66b915ca8d2aa61..4801f1236351d14619bb4aeff0b8e83256097590 100644 (file)
--- a/common/common_spam
+++ b/common/common_spam
@@ -21,9 +21,8 @@ include auto_response_spam
 
 # this is a set of image-specific spam rules
 tryplugin Mail::SpamAssassin::Plugin::ImageInfo
-if plugin(Mail::SpamAssassin::Plugin::ImageInfo)
-   include image_spam
-endif
+include image_spam
+
 
 meta DIGEST_MULTIPLE            RAZOR2_CHECK + PYZOR_CHECK > 1
 describe DIGEST_MULTIPLE        Message hits more than one network digest check

diff --git a/common/image_spam b/common/image_spam
index c8f13d857f53695874812bdd3b63528eb3976c3c..e2c6f198e4a9378d7c372bcd6b45be52d4ee9954 100644 (file)
--- a/common/image_spam
+++ b/common/image_spam
@@ -1,5 +1,7 @@
 # -*- mode: spamassassin -*-
 
+ifplugin Mail::SpamAssassin::Plugin::ImageInfo
+
 body    ONE_PNG eval:image_count('png',1,1)
 describe ONE_PNG Contains exactly one png attachment
 score   ONE_PNG 0.5
@@ -8,6 +10,8 @@ body    MOSTLY_PNG_IMAGE eval:image_to_text_ratio('png',0,0.2)
 describe MOSTLY_PNG_IMAGE Contains mostly png image, with little text
 score   MOSTLY_PNG_IMAGE 2
 
-body    VIAGRA_IMG_SIZE  eval:image_size('png',370,390,405,425)
+body    VIAGRA_IMG_SIZE  eval:image_size_range('png',370,390,405,425)
 describe VIAGRA_IMG_SIZE  Matches the size of viagra images
 score   VIAGRA_IMG_SIZE  2
+
+endif
\ No newline at end of file