X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fphrase_spam;h=47124acca89ef8cb274a15a7b4658f9966a4ae0b;hp=630bced868df6d3b8f4db9baa70248d4d4f70252;hb=f48a441b7bbd473e2cd70e6ad39604164f04d729;hpb=151752a7a3837dd98178d3854e454e689f7380a8

diff --git a/common/phrase_spam b/common/phrase_spam
index 630bced..47124ac 100644
--- a/common/phrase_spam
+++ b/common/phrase_spam
@@ -90,6 +90,14 @@ header ONEWORD		subject =~ /^(?:Fw:|re:)?\s*\S+\s*$/i
 describe ONEWORD	one word subject
 score ONEWORD		2
 
+rawbody ONEWORDBODY	/^\s*\S+\s*$/s
+describe ONEWORDBODY 	One word body
+score ONEWORDBODY	2
+
+meta  ONEWORDALL	(ONEWORD && ONEWORDBODY)
+describe ONEWORDALL	Both subject and body contain one word
+score ONEWORDALL	4
+
 # robot101, 2003-09-22
 header CROSSWALK	X-UnityUser =~ /^Crosswalk.com, Inc/
 describe CROSSWALK	Crosswalk bible mailing list
@@ -870,12 +878,12 @@ describe SUMHERE	summer is here
 score SUMHERE		3
 
 # don 2008-04-24
-header INVITATIONFROM	subject =~ /^\s*Invitation\s*from\s*\w+\s*$/i
+header INVITATIONFROM	subject =~ /^\s*(Invitation|Invitaci.n)\s*(from|curso)\s*\w+\s*$/i
 describe INVITATIONFROM	Invitation from Spammer
 score INVITATIONFROM	5
 
-header INVITESYOU	subject =~ /^[\w\s]+invites\s+you\s+to[\w\s]+$/i
-describe INVITESYOU	Invites me with spam
+header INVITESYOU	subject =~ /^[\w\s]+(invites|communicates\s+with)\s+you\s+(to|about)[\w\s]+$/i
+describe INVITESYOU	Invites or communicates me with spam
 score INVITESYOU	5
 
 # blarson 2008-04-28
@@ -999,3 +1007,30 @@ score	NYPOSTCARD 	4
 header   BIZZBOOSTER	from =~ /bizzbooster/i
 describe BIZZBOOSTER	From bizzbooster
 score	 BIZZBOOSTER	5
+
+# don 2011-09-22
+header QUOTAEXP		subject =~ /mail\s+account(.+)quot[ae]\s+limit/
+describe QUOTAEXP	Exceeded quota limit
+score QUOTAEXP		4
+
+# don 2011-09-22
+body SEOBODY		/search\s+engine\s+traffic/
+describe SEOBODY	Body contains SEO terms
+score SEOBODY		1
+
+header SEOSUBJECT	subject =~ /\bseo\b/i
+describe SEOSUBJECT	Subject contains SEO terms
+score SEOSUBJECT	1
+
+meta SEOMETA		(SEOBODY && SEOSUBJECT)
+describe SEOMETA	Matches both SEOBODY and SEOSUBJECT
+score SEOMETA		3
+
+body WEBINAR		/webinar/i
+describe WEBINAR	Contains webinar
+score WEBINAR		2
+
+
+header TRIALVERSION	subject =~ /trial\s*version/i
+describe TRIALVERSION	Trial version in subject
+score TRIALVERSION	3
\ No newline at end of file