svn commit: rev 55654 - spamassassin/trunk/rules

[qu...@apache.org]

Author: quinlan
Date: Tue Oct 26 18:00:41 2004
New Revision: 55654

Modified:
   spamassassin/trunk/rules/20_head_tests.cf
Log:
bug 2926: allow leading 1 for US/Canada phone numbers (also simplifies
FROM_ALL_NUMS into single cheap rule)


Modified: spamassassin/trunk/rules/20_head_tests.cf
==============================================================================
--- spamassassin/trunk/rules/20_head_tests.cf	(original)
+++ spamassassin/trunk/rules/20_head_tests.cf	Tue Oct 26 18:00:41 2004
@@ -53,10 +53,9 @@
 header ADDR_NUMS_AT_BIGSITE	ALL =~ /^(To|From|Cc|Reply-To):\s*<?\S+\d{5,}\@(?:aol|bigfoot|compuserve|excite|hotmail|juno|prodigy|yahoo)\.(?:com|net|org)/mi
 describe ADDR_NUMS_AT_BIGSITE	Uses an address with lots of numbers, at a big ISP
 
-header __FROM_JUST_NUMBER       From:addr =~ /^\d+\@/
-header __FROM_PHONE             From:addr =~ /^\d{3}(?:[-.]?\d{3}[-.]?\d{4}|\d{7})\@/
-meta FROM_ALL_NUMS              (__FROM_JUST_NUMBER && !__FROM_PHONE)
-describe FROM_ALL_NUMS          From an address that is all numbers (non-phone)
+# don't match US/Canada phone numbers: 10 digits optionally preceded by a "1"
+header FROM_ALL_NUMS		From:addr =~ /^(?:\d{1,9}|[02-9]\d{10}|\d{12,})@/
+describe FROM_ALL_NUMS		From numeric address (except US/Canada phones)
 
 header FROM_OFFERS		From:addr =~ /\@\S*offers(?![eo]n\b)/i
 describe FROM_OFFERS		From address is "at something-offers"