update the university degrees; add a fashion matcher

[spamassassin_config.git] / common / phrase_spam

diff --git a/common/phrase_spam b/common/phrase_spam
index 80713968aeb9c3dba1cb2bcb2cc7dca98b978434..fd162eb7ffc924e4436dc40fe67d2ffef73b8537 100644 (file)
--- a/common/phrase_spam
+++ b/common/phrase_spam
@@ -164,8 +164,8 @@ score TEDIOUS_WITTER        2
 
 # cjwatson, 2004-03-12
 # blarson 2004-06-09
-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
+header UNI_DIPLOMA     subject =~ /\b(?:(?:university|college|doctora+te|bache+lor|maste+rs?)[\/\s]+(?:(dip[l1][o0]ma|cert|degree)|(?:university|college|doctora+te|bache+lor|maste+rs?))/i
+describe UNI_DIPLOMA   Got a diploma, thanks
 score UNI_DIPLOMA      4
 
 # blarson 2004-04-27
@@ -174,7 +174,7 @@ describe UNI2       Got one, thanks
 score UNI2     4
 
 # don 2007-11-03
-body UNI3              /(?:(?:maste+rs|batche+lor|m\s*b\s*a\s*|ph\.?\s*d|doctora+te)\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
 
@@ -887,3 +887,9 @@ score WAITINGREPLY  4
 body CONTACTUS         /contact us by email:/
 score CONTACTUS                3
 describe CONTACTUS     Don't contact us, we'll spam you
+
+# don 2008-06-18
+header FASHION         subject =~ /(?:(?:armani|chanel|boss|versache|ugg|dsquared)(?:\,\s*|$)){2,}/i
+describe FASHION       Fashion designers in subject
+score FASHION          2
+