* Make the money rules more powerful

[spamassassin_config.git] / common / money_spam

diff --git a/common/money_spam b/common/money_spam
index 90a9526f3ba7b791f322b3331d47870808effe64..2f08e10ce2611900826383a4957b5ebc9104c8e6 100644 (file)
--- 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
+body REPWATCH2         /\breplic+a\s*(?:watch|timepiece)/i
 describe REPWATCH2     still pushing fake watches
 score REPWATCH2                3.5
 
@@ -257,10 +257,28 @@ 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
+body MONEY             /((usd|yen|eur?o?|dollar|\$)\s*[\d\.\, ]+|[\d\.\, ]+\s*(usd|yen|eur?o?|dollar|\$))/i
+describe MONEY         Some amount of money in body
 score MONEY            1.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