X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fphrase_spam;h=236c9e2fbc756d086b9a1834cfec1a68d549dbbd;hp=d83bc6f678f733c98d5864fca77b098ee07c5896;hb=c5509c855221dc1f5aa057cdb0aa7901158e8ebc;hpb=15410c692815e1936f375b847ec356587c287b70

diff --git a/common/phrase_spam b/common/phrase_spam
index d83bc6f..236c9e2 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
@@ -1014,7 +1022,39 @@ header SEOSUBJECT	subject =~ /\bseo\b/i
 describe SEOSUBJECT	Subject contains SEO terms
 score SEOSUBJECT	1
 
-meta SEOMETA		SEOBODY & SEOSUBJECT
+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
+
+header SHARESPAM	subject =~ /shared photos with you/i
+describe SHARESPAM 	shares photos
+score SHARESPAM		3
+
+header MYNAMEIS		subject =~ /hello(.*)my name is/i
+describe MYNAMEIS	Name spam
+score	MYNAMEIS	2.5
+
+# formorer 2012-02-28
+header VOTREANN     Subject =~ /(votre|Petites) annonce/i
+describe VOTREANN   Votre annonce
+score VOTREANN      4
+
+# formorer 2010-01-23
+header LEXCHANGE 	subject =~ /(?:for|4)\s+L[i1]nks?\s+E?xcha?nge/i
+describe LEXCHANGE	ask for link exchange
+score LEXCHANGE		4
+
+# formorer 2013-11-08
+header IMARKETING   subject =~ /integrated marketing/i
+describe IMARKETING integrated marketing
+score IMARKETING    4
+