svn commit: r359005 - in /spamassassin/rules/trunk/sandbox/hstern: 20_uri_tests.cf 70_syndicate.cf

[hs...@apache.org]

Author: hstern
Date: Sun Dec 25 13:38:07 2005
New Revision: 359005

URL: http://svn.apache.org/viewcvs?rev=359005&view=rev
Log:
 * 70_syndicate.cf: Replaced duplicated content-type rule.
 * 20_uri_tests.cf: members.aol.com and hometown.aol.com are equivalent.


Modified:
    spamassassin/rules/trunk/sandbox/hstern/20_uri_tests.cf
    spamassassin/rules/trunk/sandbox/hstern/70_syndicate.cf

Modified: spamassassin/rules/trunk/sandbox/hstern/20_uri_tests.cf
URL: http://svn.apache.org/viewcvs/spamassassin/rules/trunk/sandbox/hstern/20_uri_tests.cf?rev=359005&r1=359004&r2=359005&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/hstern/20_uri_tests.cf (original)
+++ spamassassin/rules/trunk/sandbox/hstern/20_uri_tests.cf Sun Dec 25 13:38:07 2005
@@ -29,5 +29,5 @@
 uri __HS_GEOCITIES_URI m'^https?:/*(?:[a-z]+\.)*geocities\.(?:com|yahoo\.com)(?:\.[a-z]{2})?(?:$|[/\#?])'i
 uri __HS_TRIPOD_URI m'^https?:/*(?:[a-z]+\.)*tripod\.com(?:$|[/\#?])'i
 uri __HS_MSNSPACES_URI m'^https?:/*spaces.msn.com/[a-z0-9_\-](?:$|[/\#?])'i
-uri __HS_AOL_HT_URI m'^https?:/*hometown.aol.com/[a-z0-9_\-](?:$|[/\#?])'i
-meta __HS_FREEHOST_URI __HS_GEOCITIES_URI || __HS_TRIPOD_URI || __HS_MSNSPACES_URI || __HS_AOL_HT_URI
+uri __HS_AOL_URI m'^https?:/*(?:members|hometown).aol.com/[a-z0-9_\-](?:$|[/\#?])'i
+meta __HS_FREEHOST_URI __HS_GEOCITIES_URI || __HS_TRIPOD_URI || __HS_MSNSPACES_URI || __HS_AOL_URI

Modified: spamassassin/rules/trunk/sandbox/hstern/70_syndicate.cf
URL: http://svn.apache.org/viewcvs/spamassassin/rules/trunk/sandbox/hstern/70_syndicate.cf?rev=359005&r1=359004&r2=359005&view=diff
==============================================================================
--- spamassassin/rules/trunk/sandbox/hstern/70_syndicate.cf (original)
+++ spamassassin/rules/trunk/sandbox/hstern/70_syndicate.cf Sun Dec 25 13:38:07 2005
@@ -21,10 +21,9 @@
 describe HS_FORGED_OE_FW Outlook does not prefix forwards with "FW:"
 score HS_FORGED_OE_FW 1.5
 
-header __HS_CTYPE_PLAIN             Content-Type =~ m'text/plain'i
 header __HS_SUBJ_RE_FW Subject =~ /^(?i:re|fw):/
 rawbody __HS_QUOTE /^> /
-meta HS_NONDEFAULT_OE_QUOTE __HS_CTYPE_PLAIN && __HS_SUBJ_RE_FW && __OE_MUA && ! __HS_QUOTE
+meta HS_NONDEFAULT_OE_QUOTE __CT_TEXT_PLAIN && __HS_SUBJ_RE_FW && __OE_MUA && ! __HS_QUOTE
 describe HS_NONDEFAULT_OE_QUOTE Outlook Express user has changed their quote pattern.
 score HS_NONDEFAULT_OE_QUOTE 0.5