From: Don Armstrong <don@debian.org>
Date: Fri, 13 Jun 2008 16:37:14 +0000 (+0000)
Subject: update the university degrees; add a fashion matcher
X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=commitdiff_plain;h=e7ca7aa63e3ba01bdc4b0465acda50e482b1ab65

update the university degrees; add a fashion matcher

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

diff --git a/common/phrase_spam b/common/phrase_spam
index 8071396..fd162eb 100644
--- 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
+