X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fmoney_spam;h=ddf97d4c1e35c00aa4cf66b6e9225f4096f7e269;hp=ebee2f527adeec38a732d1fff057b0dbcea818c0;hb=e96b6ecd64a7771071a27d256f685232010823ce;hpb=1673f60a245954709d7066325128b570cae810e7

diff --git a/common/money_spam b/common/money_spam
index ebee2f5..ddf97d4 100644
--- a/common/money_spam
+++ b/common/money_spam
@@ -222,8 +222,8 @@ body ANALLE		/\bAN ALLE FINANZINVESTOREN\b/
 describe ANALLE		stock spam in german
 score ANALLE		3
 
-# blarson 2007-06-17 2007-09-21
-body REPWATCH2		/\breplica (?:watch|timepiece)/i
+# blarson 2007-06-17 2007-09-21 2007-10-20 2007-11-06
+body REPWATCH2		/\brepl[i1]c+a\s*(?:w[a4]tch|timepiece)/i
 describe REPWATCH2	still pushing fake watches
 score REPWATCH2		3.5
 
@@ -257,10 +257,47 @@ body DMXC               /Look at D-M-X-C!/
 describe DMXC           stock spam
 score DMXC              4
 
-body MONEY		/(\$\s*[\d\.]+|[\d\.]+\s*(usd|yen|euro|dollar))/
-describe MONEY		Some amount of money
-score MONEY		1.5
+body MONEY		/((usd|yen|eur?o?|dollar|\$)\s*\d[\d\.\,]+|\d[\d\.\,]+\s*(usd|yen|eur?o?|dollar|\$))/i
+describe MONEY		Some amount of money in body
+score MONEY		0.5
+
+header SUBJMONEY	subject =~ /((usd|yen|eur?o?|dollar|\$)\s*[\d\.\, ]+|[\d\.\, ]+\s*(usd|yen|eur?o?|dollar|\$))/i
+describe SUBJMONEY	Some amount of money in subject
+score SUBJMONEY		3
+
 
 body HIDDENCOSTS	/hidden\s*(costs|fees)/i
 describe HIDDENCOSTS	Hidden costs or fees?
 score HIDDENCOSTS	1.5
+
+header EXCHANGEFIN	subject =~ /\bE-exchange Finland\b/
+describe EXCHANGEFIN	EXCHANGEFIN E-money
+score EXCHANGEFIN	4.0
+
+body STOCKFRLE		/\bFRLE\b/i
+describe STOCKFRLE	FRLE Stock Spam
+score STOCKFRLE		3.4
+
+# blarson 2007-10-16
+body OPORTUNI		/\bOportunidade de Emprego\b/i
+describe OPORTUNI	Oportunidade de Emprego
+score OPORTUNI		3.5
+
+# blarson 2007-12-10
+header WATCHES		subject =~ /\b(?:watches|time\s*piece|Replica|aRolex|Cartier|Omega)\b/i
+describe WATCHES	watches
+score WATCHES		2
+
+# blarson 2007-12-29
+body COUP0N		/\bCoup0n\b/i
+describe COUP0N		Coup0n
+score COUP0N		3
+
+header SOFTWARERETAIL	subject =~ /\bretail/i
+describe SOFTWARERETAIL Adobe RETAIL products
+score SOFTWARERETAIL	3.2
+
+# cord 2008-01-23
+full DEPOSIT		/deposit/i
+describe DEPOSIT	Deposit
+score DEPOSIT		3