From: Don Armstrong <don@debian.org>
Date: Mon, 29 Oct 2007 07:31:45 +0000 (+0000)
Subject:  * Make the money rules more powerful
X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=commitdiff_plain;h=1a58e10c4c2cf88bb10f3374f65d57f7abc3b6ac;ds=sidebyside

 * Make the money rules more powerful


git-svn-id: svn+ssh://svn.debian.org/svn/pkg-listmaster/trunk/spamassassin_config@88 0b7a5b0c-1f2c-0410-bd74-c376f8064c91
---

diff --git a/common/money_spam b/common/money_spam
index 04b8599..2f08e10 100644
--- 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