* tweak the diploma rules

[spamassassin_config.git] / common / phrase_spam

diff --git a/common/phrase_spam b/common/phrase_spam
index 4dd9580e8f7c5826e061348c985b50f7a0f5e956..76cf98eb1eec82f062c78c91c1feb26f313bbc82 100644 (file)
--- a/common/phrase_spam
+++ b/common/phrase_spam
@@ -39,7 +39,7 @@ score MDO_AUTORESP7   0.1
 meta   MDO_AUTORESP_META1      (MDO_AUTORESP1 + MDO_AUTORESP2 + MDO_AUTORESP3 + MDO_AUTORESP4 + MDO_AUTORESP5 + MDO_AUTORESP6 + MDO_AUTORESP7) > 1
 score  MDO_AUTORESP_META1      2.0
 
-body MURPHY_DIPLOMA    /Diploma/
+body MURPHY_DIPLOMA    /dip[l1]omas?/i
 describe MURPHY_DIPLOMA        No Diploma
 score MURPHY_DIPLOMA   1
 
@@ -164,7 +164,7 @@ score TEDIOUS_WITTER        2
 
 # cjwatson, 2004-03-12
 # blarson 2004-06-09
-header UNI_DIPLOMA     Subject =~ /\b(university|college)\s+(diploma|cert|degree)/i
+header UNI_DIPLOMA     Subject =~ /\b(university|college|doctora+te|bache+lor)\s+(dip[l1][o0]ma|cert|degree)/i
 describe UNI_DIPLOMA   Got one, thanks
 score UNI_DIPLOMA      4
 
@@ -174,7 +174,7 @@ describe UNI2       Got one, thanks
 score UNI2     4
 
 # don 2007-11-03
-body UNI3              /(?:(?:masters|batchelor|m\s*b\s*a\s*|ph\.?\s*d)\s*[,.]?\s*){2,}/i
+body UNI3              /(?:(?:maste+rs|batche+lor|m\s*b\s*a\s*|ph\.?\s*d|doctora+te)\s*[,.]?\s*){2,}/i
 describe UNI3          multiple types of degrees
 score UNI3             2
 
@@ -447,8 +447,8 @@ describe HASSENT    sent a message
 score HASSENT          4
 
 # don 2008-04-19
-header WANTTOCHAT      subject =~ /\b(?:(?:would like|wants|feels?) (?:to chat|like chatting))\b/i
-describe WANTTOCHAT    I want to chat with spam
+header WANTTOCHAT      subject =~ /\b(?:(?:would like|wants|feels?) (?:to chat|like chatting|to keep up with you))\b/i
+describe WANTTOCHAT    I want to chat/keep up with spam
 score WANTTOCHAT       4
 
 # blarson 2007-09-20
@@ -868,3 +868,12 @@ header INVITATIONFROM      subject =~ /^\s*Invitation\s*from\s*\w+\s*$/i
 describe INVITATIONFROM        Invitation from Spammer
 score INVITATIONFROM   5
 
+# blarson 2008-04-28
+header RERE            subject =~ /^Re\:\s+Re\:\s+/i
+describe RERE          Re: Re:
+score RERE                     1
+
+# don 2008-04-30
+header CLAIMTICKETS    subject =~ /claim.+ticket/i
+describe CLAIMTICKETS  Blah blah claim ticket
+score CLAIMTICKETS     4