switch ifplugin rule to inside image_spam; fix image_size rule
authorDon Armstrong <don@debian.org>
Wed, 6 May 2009 02:06:30 +0000 (02:06 +0000)
committerDon Armstrong <don@debian.org>
Wed, 6 May 2009 02:06:30 +0000 (02:06 +0000)
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-listmaster/trunk/spamassassin_config@308 0b7a5b0c-1f2c-0410-bd74-c376f8064c91

common/common_spam
common/image_spam

index 0bb0038..4801f12 100644 (file)
@@ -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
index c8f13d8..e2c6f19 100644 (file)
@@ -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