Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv2546/src/gui
Modified Files:
wxFiltersDialog.cpp
Log Message:
fixed X-Auth-Warning test and added an HTML spam test
Index: wxFiltersDialog.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxFiltersDialog.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -b -u -2 -r1.87 -r1.88
--- wxFiltersDialog.cpp 20 Jun 2002 18:12:12 -0000 1.87
+++ wxFiltersDialog.cpp 27 Jun 2002 11:17:29 -0000 1.88
@@ -393,4 +393,5 @@
bool m_checkKorean:1;
bool m_checkXAuthWarn:1;
+ bool m_checkHtml:1;
#ifdef USE_RBL
bool m_checkRBL:1;
@@ -615,4 +616,7 @@
#define MP_SPAM_X_AUTH_WARN_D 0l
+#define MP_SPAM_HTML "SpamHtml"
+#define MP_SPAM_HTML_D 0l
+
#ifdef USE_RBL
#define MP_SPAM_RBL "SpamIsInRBL"
@@ -629,4 +633,5 @@
CONFIG_ENTRY(MP_SPAM_KOREAN_CSET),
CONFIG_ENTRY(MP_SPAM_X_AUTH_WARN),
+ CONFIG_ENTRY(MP_SPAM_HTML),
#ifdef USE_RBL
CONFIG_ENTRY(MP_SPAM_RBL),
@@ -645,7 +650,8 @@
"So the message is considered to be spam if it has..."),
wxOptionsPage::Field_Message, -1 },
- { gettext_noop("Too many &8 bit characters in subject"),
wxOptionsPage::Field_Bool, -1},
- { gettext_noop("&Korean charset"), wxOptionsPage::Field_Bool, -1},
- { gettext_noop("X-Authentification-&Warning header"), wxOptionsPage::Field_Bool,
-1},
+ { gettext_noop("Too many &8 bit characters in subject"),
+wxOptionsPage::Field_Bool, -1 },
+ { gettext_noop("&Korean charset"), wxOptionsPage::Field_Bool, -1 },
+ { gettext_noop("X-Authentification-&Warning header"), wxOptionsPage::Field_Bool,
+-1 },
+ { gettext_noop("HTML content"), wxOptionsPage::Field_Bool, -1 },
#ifdef USE_RBL
{ gettext_noop("been &blacklisted by RBL"), wxOptionsPage::Field_Bool, -1},
@@ -676,4 +682,5 @@
m_checkXAuthWarn = MP_SPAM_X_AUTH_WARN_D;
+ m_checkHtml = MP_SPAM_HTML_D;
#ifdef USE_RBL
@@ -693,4 +700,5 @@
profile->writeEntry(MP_SPAM_KOREAN_CSET, m_checkKorean);
profile->writeEntry(MP_SPAM_X_AUTH_WARN, m_checkXAuthWarn);
+ profile->writeEntry(MP_SPAM_HTML, m_checkHtml);
#ifdef USE_RBL
profile->writeEntry(MP_SPAM_RBL, m_checkRBL);
@@ -702,4 +710,5 @@
m_checkKorean = profile->readEntry(MP_SPAM_KOREAN_CSET, 0l) != 0;
m_checkXAuthWarn = profile->readEntry(MP_SPAM_X_AUTH_WARN, 0l) != 0;
+ m_checkHtml = profile->readEntry(MP_SPAM_HTML, 0l) != 0;
#ifdef USE_RBL
m_checkRBL = profile->readEntry(MP_SPAM_RBL, 0l) != 0;
@@ -717,4 +726,5 @@
profile->DeleteEntry(MP_SPAM_KOREAN_CSET);
profile->DeleteEntry(MP_SPAM_X_AUTH_WARN);
+ profile->DeleteEntry(MP_SPAM_HTML);
#ifdef USE_RBL
profile->DeleteEntry(MP_SPAM_RBL);
@@ -737,4 +747,7 @@
CHECK( m_btnSpam, s, "shouldn't be called if spam button not used" );
+ // these strings are the same as in Filters.cpp (of course we should have a
+ // common header for them... TODO!)
+
if ( m_check8bit )
AddToSpamArgument(s, "subj8bit");
@@ -743,4 +756,6 @@
if ( m_checkXAuthWarn )
AddToSpamArgument(s, "xauthwarn");
+ if ( m_checkHtml )
+ AddToSpamArgument(s, "html");
#ifdef USE_RBL
if ( m_checkRBL )
-------------------------------------------------------
Sponsored by:
ThinkGeek at http://www.ThinkGeek.com/
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
