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/03 20:17:01 UTC
svn commit: r1872299 - in /spamassassin/trunk/rulesrc/sandbox/pds:
20_html.cf 20_urlshort.cf
Author: pds
Date: Fri Jan 3 20:17:00 2020
New Revision: 1872299
URL: http://svn.apache.org/viewvc?rev=1872299&view=rev
Log:
Adjust to meta
Modified:
spamassassin/trunk/rulesrc/sandbox/pds/20_html.cf
spamassassin/trunk/rulesrc/sandbox/pds/20_urlshort.cf
Modified: spamassassin/trunk/rulesrc/sandbox/pds/20_html.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/pds/20_html.cf?rev=1872299&r1=1872298&r2=1872299&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/pds/20_html.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/pds/20_html.cf Fri Jan 3 20:17:00 2020
@@ -1,6 +1,6 @@
ifplugin Mail::SpamAssassin::Plugin::HTMLEval
-body __PDS_HTML_LENGTH_LT_1024 eval:html_eval('length', '< 1024')
-body __PDS_HTML_LENGTH_LT_2048 eval:html_eval('length', '< 2048')
+meta __PDS_HTML_LENGTH_1024 __HTML_LENGTH_0000_1024
+meta __PDS_HTML_LENGTH_2048 __HTML_LENGTH_0000_1024 || __HTML_LENGTH_1024_1536 || __HTML_LENGTH_1536_2048
endif
Modified: spamassassin/trunk/rulesrc/sandbox/pds/20_urlshort.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/pds/20_urlshort.cf?rev=1872299&r1=1872298&r2=1872299&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/pds/20_urlshort.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/pds/20_urlshort.cf Fri Jan 3 20:17:00 2020
@@ -727,7 +727,7 @@ header __PDS_URISHORTENER eval:check_u
meta __PDS_SHORT_URL __SHORT_URL && !(__URL_SHORTENER || __PDS_URISHORTENER) && !ALL_TRUSTED
-meta DRUGS_ERECTILE_SHORT_SHORTNER __PDS_HTML_LENGTH_LT_1024 && (__PDS_URISHORTENER || __URL_SHORTENER) && DRUGS_ERECTILE
+meta DRUGS_ERECTILE_SHORT_SHORTNER __PDS_HTML_LENGTH_1024 && (__PDS_URISHORTENER || __URL_SHORTENER) && DRUGS_ERECTILE
describe DRUGS_ERECTILE_SHORT_SHORTNER Short erectile drugs advert with URL_SHORTENER
score DRUGS_ERECTILE_SHORT_SHORTNER 1.5 # limit
reuse DRUGS_ERECTILE_SHORT_SHORTNER
@@ -742,27 +742,27 @@ describe SHORT_SHORTNER Short body with
score SHORT_SHORTNER 2.0 # limit
reuse SHORT_SHORTNER
-meta PDS_TINYSUBJ_URISHRT (__PDS_URISHORTENER || __URL_SHORTENER) && __SUBJ_SHORT && __PDS_HTML_LENGTH_LT_1024
+meta PDS_TINYSUBJ_URISHRT (__PDS_URISHORTENER || __URL_SHORTENER) && __SUBJ_SHORT && __PDS_HTML_LENGTH_1024
describe PDS_TINYSUBJ_URISHRT Short subject with URL shortener
score PDS_TINYSUBJ_URISHRT 1.5 # limit
reuse PDS_TINYSUBJ_URISHRT
-meta PDS_EMPTYSUBJ_URISHRT (__PDS_URISHORTENER || __URL_SHORTENER) && __SUBJECT_EMPTY && __PDS_HTML_LENGTH_LT_1024
+meta PDS_EMPTYSUBJ_URISHRT (__PDS_URISHORTENER || __URL_SHORTENER) && __SUBJECT_EMPTY && __PDS_HTML_LENGTH_1024
describe PDS_EMPTYSUBJ_URISHRT Empty subject with little more than URI shortener
score PDS_EMPTYSUBJ_URISHRT 1.5 # limit
reuse PDS_EMPTYSUBJ_URISHRT
-meta PDS_SHORTFWD_URISHRT (__PDS_URISHORTENER || __URL_SHORTENER) && (__THREADED || __URI_MAILTO) && __SUBJ_SHORT && __PDS_HTML_LENGTH_LT_2048
+meta PDS_SHORTFWD_URISHRT (__PDS_URISHORTENER || __URL_SHORTENER) && (__THREADED || __URI_MAILTO) && __SUBJ_SHORT && __PDS_HTML_LENGTH_2048
describe PDS_SHORTFWD_URISHRT Threaded email with URI shortener
score PDS_SHORTFWD_URISHRT 1.5 # limit
reuse PDS_SHORTFWD_URISHRT
-meta PDS_FREEMAIL_REPLYTO_URISHRT (__PDS_URISHORTENER || __URL_SHORTENER) && __freemail_hdr_replyto && __SUBJ_SHORT && __PDS_HTML_LENGTH_LT_2048
+meta PDS_FREEMAIL_REPLYTO_URISHRT (__PDS_URISHORTENER || __URL_SHORTENER) && __freemail_hdr_replyto && __SUBJ_SHORT && __PDS_HTML_LENGTH_2048
describe PDS_FREEMAIL_REPLYTO_URISHRT Freemail replyto with URI shortener
score PDS_FREEMAIL_REPLYTO_URISHRT 1.5 # limit
reuse PDS_FREEMAIL_REPLYTO_URISHRT
-meta TONOM_EQ_TOLOC_SHRT_SHRTNER __PDS_URISHORTENER && __PDS_TONAME_EQ_TOLOCAL && __PDS_HTML_LENGTH_LT_1024
+meta TONOM_EQ_TOLOC_SHRT_SHRTNER __PDS_URISHORTENER && __PDS_TONAME_EQ_TOLOCAL && __PDS_HTML_LENGTH_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
reuse TONOM_EQ_TOLOC_SHRT_SHRTNER