You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by pd...@apache.org on 2020/01/25 12:14:43 UTC
svn commit: r1873148 - /spamassassin/trunk/rulesrc/sandbox/pds/20_urlshort.cf
Author: pds
Date: Sat Jan 25 12:14:43 2020
New Revision: 1873148
URL: http://svn.apache.org/viewvc?rev=1873148&view=rev
Log:
Meta together HTML and body for show viewable email
Modified:
spamassassin/trunk/rulesrc/sandbox/pds/20_urlshort.cf
Modified: spamassassin/trunk/rulesrc/sandbox/pds/20_urlshort.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/pds/20_urlshort.cf?rev=1873148&r1=1873147&r2=1873148&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/pds/20_urlshort.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/pds/20_urlshort.cf Sat Jan 25 12:14:43 2020
@@ -796,15 +796,18 @@ meta XPRIO_URL_SHORTNER __XPRIO_MINF
describe XPRIO_URL_SHORTNER X-Priority header and short URL
score XPRIO_URL_SHORTNER 1.0 # limit
-meta SHORT_SHORTNER __HTML_LENGTH_512 && (__PDS_URISHORTENER || __URL_SHORTENER) && !DRUGS_ERECTILE
+meta __PDS_MSG_512 (__KAM_BODY_LENGTH_LT_512 || __HTML_LENGTH_512)
+meta __PDS_MSG_1024 (__KAM_BODY_LENGTH_LT_1024 || __PDS_HTML_LENGTH_1024)
+
+meta SHORT_SHORTNER __PDS_MSG_512 && (__PDS_URISHORTENER || __URL_SHORTENER) && !DRUGS_ERECTILE
describe SHORT_SHORTNER Short body with little more than a link to a shortener
score SHORT_SHORTNER 2.0 # limit
-meta PDS_TINYSUBJ_URISHRT (__PDS_URISHORTENER || __URL_SHORTENER) && __SUBJ_SHORT && __PDS_HTML_LENGTH_1024
+meta PDS_TINYSUBJ_URISHRT (__PDS_URISHORTENER || __URL_SHORTENER) && __SUBJ_SHORT && __PDS_MSG_1024
describe PDS_TINYSUBJ_URISHRT Short subject with URL shortener
score PDS_TINYSUBJ_URISHRT 1.5 # limit
-meta PDS_EMPTYSUBJ_URISHRT (__PDS_URISHORTENER || __URL_SHORTENER) && __SUBJECT_EMPTY && __PDS_HTML_LENGTH_1024
+meta PDS_EMPTYSUBJ_URISHRT (__PDS_URISHORTENER || __URL_SHORTENER) && __SUBJECT_EMPTY && __PDS_MSG_1024
describe PDS_EMPTYSUBJ_URISHRT Empty subject with little more than URI shortener
score PDS_EMPTYSUBJ_URISHRT 1.5 # limit
@@ -817,7 +820,7 @@ meta PDS_FREEMAIL_REPLYTO_URISHRT (_
describe PDS_FREEMAIL_REPLYTO_URISHRT Freemail replyto with URI shortener
score PDS_FREEMAIL_REPLYTO_URISHRT 1.5 # limit
-meta TONOM_EQ_TOLOC_SHRT_SHRTNER __PDS_URISHORTENER && __PDS_TONAME_EQ_TOLOCAL && __PDS_HTML_LENGTH_1024
+meta TONOM_EQ_TOLOC_SHRT_SHRTNER __PDS_URISHORTENER && __PDS_TONAME_EQ_TOLOCAL && __PDS_MSG_1024
describe TONOM_EQ_TOLOC_SHRT_SHRTNER Short email with shortener and To:name eq To:local
score TONOM_EQ_TOLOC_SHRT_SHRTNER 1.5 # limit