* Make the money rules more powerful

[spamassassin_config.git] / common / money_spam

diff --git a/common/money_spam b/common/money_spam
index 04b8599a7bb217eccd4e9f9f7a7130a144712a55..2f08e10ce2611900826383a4957b5ebc9104c8e6 100644 (file)
--- a/common/money_spam
+++ b/common/money_spam
@@ -257,11 +257,11 @@ 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|\$))/i
-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 =~ /(\$\s*[\d\.]+|[\d\.]+\s*(usd|yen|euro|dollar|\$))/i
+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