/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2002-2004 by the Sylpheed Claws Team and Hiroyuki Yamamoto
+ * Copyright (C) 2002-2004 by the Claws Mail Team and Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
#ifdef HAVE_CONFIG_H
#include "addr_compl.h"
#include "codeconv.h"
#include "quoted-printable.h"
-#include "sylpheed.h"
+#include "claws.h"
#include <ctype.h>
+#include "prefs_common.h"
+#include "log.h"
+#include "tags.h"
/*!
*\brief Keyword lookup element
{MATCHCRITERIA_NOT_COLORLABEL, "~colorlabel"},
{MATCHCRITERIA_IGNORE_THREAD, "ignore_thread"},
{MATCHCRITERIA_NOT_IGNORE_THREAD, "~ignore_thread"},
+ {MATCHCRITERIA_WATCH_THREAD, "watch_thread"},
+ {MATCHCRITERIA_NOT_WATCH_THREAD, "~watch_thread"},
+ {MATCHCRITERIA_SPAM, "spam"},
+ {MATCHCRITERIA_NOT_SPAM, "~spam"},
/* msginfo headers */
{MATCHCRITERIA_SUBJECT, "subject"},
{MATCHCRITERIA_NOT_CC, "~cc"},
{MATCHCRITERIA_TO_OR_CC, "to_or_cc"},
{MATCHCRITERIA_NOT_TO_AND_NOT_CC, "~to_or_cc"},
+ {MATCHCRITERIA_TAG, "tag"},
+ {MATCHCRITERIA_NOT_TAG, "~tag"},
+ {MATCHCRITERIA_TAGGED, "tagged"},
+ {MATCHCRITERIA_NOT_TAGGED, "~tagged"},
{MATCHCRITERIA_AGE_GREATER, "age_greater"},
{MATCHCRITERIA_AGE_LOWER, "age_lower"},
{MATCHCRITERIA_NEWSGROUPS, "newsgroups"},
{MATCHACTION_UNLOCK, "unlock"},
{MATCHACTION_MARK_AS_READ, "mark_as_read"},
{MATCHACTION_MARK_AS_UNREAD, "mark_as_unread"},
+ {MATCHACTION_MARK_AS_SPAM, "mark_as_spam"},
+ {MATCHACTION_MARK_AS_HAM, "mark_as_ham"},
{MATCHACTION_FORWARD, "forward"},
{MATCHACTION_FORWARD_AS_ATTACHMENT, "forward_as_attachment"},
{MATCHACTION_EXECUTE, "execute"},
{MATCHACTION_STOP, "stop"},
{MATCHACTION_HIDE, "hide"},
{MATCHACTION_IGNORE, "ignore"},
+ {MATCHACTION_WATCH, "watch"},
+ {MATCHACTION_ADD_TO_ADDRESSBOOK, "add_to_addressbook"},
+ {MATCHACTION_SET_TAG, "set_tag"},
+ {MATCHACTION_UNSET_TAG, "unset_tag"},
+ {MATCHACTION_CLEAR_TAGS, "clear_tags"},
};
enum {
MATCH_ONE = 2
};
+extern gboolean debug_filtering_session;
+
/*!
*\brief Look up table with keywords defined in \sa matchparser_tab
*/
for (; i < num_addr && !found; i++) {
gchar *addr = get_complete_address(i);
extract_address(addr);
- if (strcasecmp(addr, walk->data) == 0)
+ if (strcasecmp(addr, walk->data) == 0) {
found = TRUE;
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ log_print(LOG_DEBUG_FILTERING,
+ "address [ %s ] matches\n",
+ (gchar *)walk->data);
+ }
+ }
g_free(addr);
}
}
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH
+ && !found) {
+ log_print(LOG_DEBUG_FILTERING,
+ "address [ %s ] doesn't match\n",
+ (gchar *)walk->data);
+ }
g_free(walk->data);
if (match == MATCH_ALL) {
/* if matching all addresses, stop if one doesn't match */
- if (!found)
- break;
+ if (!found) {
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ log_print(LOG_DEBUG_FILTERING,
+ "not all address match (matching all)\n");
+ }
+ break;
+ }
} else if (match == MATCH_ANY) {
/* if matching any address, stop if one does match */
- if (found)
+ if (found) {
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ log_print(LOG_DEBUG_FILTERING,
+ "at least one address matches (matching any)\n");
+ }
break;
- }
+ }
+ }
/* MATCH_ONE: there should be only one loop iteration */
}
*\return gboolean TRUE if str matches the condition in the
* matcher structure
*/
-static gboolean matcherprop_string_match(MatcherProp *prop, const gchar *str)
+static gboolean matcherprop_string_match(MatcherProp *prop, const gchar *str,
+ const gchar *debug_context)
{
gchar *str1;
gchar *str2;
+ gboolean ret = FALSE;
if (str == NULL)
return FALSE;
return FALSE;
if (regexec(prop->preg, str, 0, NULL, 0) == 0)
- return TRUE;
+ ret = TRUE;
else
- return FALSE;
+ ret = FALSE;
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ gchar *stripped = g_strdup(str);
+
+ strretchomp(stripped);
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "%s value [ %s ] matches regular expression [ %s ]\n",
+ debug_context, stripped, prop->expr);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "%s value [ %s ] doesn't matches regular expression [ %s ]\n",
+ debug_context, stripped, prop->expr);
+ }
+ g_free(stripped);
+ }
+ break;
case MATCHTYPE_MATCH:
- return (strstr(str, prop->expr) != NULL);
+ ret = (strstr(str, prop->expr) != NULL);
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ gchar *stripped = g_strdup(str);
+
+ strretchomp(stripped);
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "%s value [ %s ] contains [ %s ] (case sensitive)\n",
+ debug_context, stripped, prop->expr);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "%s value [ %s ] doesn't contains [ %s ] (case sensitive)\n",
+ debug_context, stripped, prop->expr);
+ }
+ g_free(stripped);
+ }
+ break;
/* FIXME: put upper in unesc_str */
case MATCHTYPE_MATCHCASE:
str1 = alloca(strlen(str) + 1);
strcpy(str1, str);
g_strup(str1);
- return (strstr(str1, str2) != NULL);
+ ret = (strstr(str1, str2) != NULL);
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ gchar *stripped = g_strdup(str);
+
+ strretchomp(stripped);
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "%s value [ %s ] contains [ %s ] (case insensitive)\n",
+ debug_context, stripped, prop->expr);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "%s [ %s ] doesn't contains [ %s ] (case insensitive)\n",
+ debug_context, stripped, prop->expr);
+ }
+ g_free(stripped);
+ }
+ break;
default:
+ break;
+ }
+ return ret;
+}
+
+/*!
+ *\brief Find out if a tag matches a condition
+ *
+ *\param prop Matcher structure
+ *\param msginfo message to check
+ *
+ *\return gboolean TRUE if msginfo matches the condition in the
+ * matcher structure
+ */
+static gboolean matcherprop_tag_match(MatcherProp *prop, MsgInfo *msginfo,
+ const gchar *debug_context)
+{
+ gboolean ret = FALSE;
+ GSList *cur;
+
+ if (msginfo == NULL || msginfo->tags == NULL)
return FALSE;
+
+ for (cur = msginfo->tags; cur; cur = cur->next) {
+ const gchar *str = tags_get_tag(GPOINTER_TO_INT(cur->data));
+ if (!str)
+ continue;
+ if (matcherprop_string_match(prop, str, debug_context)) {
+ ret = TRUE;
+ break;
+ }
}
+ return ret;
+}
+
+/*!
+ *\brief Find out if the string-ed list matches a condition
+ *
+ *\param prop Matcher structure
+ *\param list GSList of strings to check
+ *
+ *\return gboolean TRUE if str matches the condition in the
+ * matcher structure
+ */
+static gboolean matcherprop_list_match(MatcherProp *prop, const GSList *list,
+const gchar *debug_context)
+{
+ const GSList *cur;
+
+ for(cur = list; cur != NULL; cur = cur->next) {
+ if (matcherprop_string_match(prop, (gchar *)cur->data, debug_context))
+ return TRUE;
+ }
+ return FALSE;
}
/* FIXME body search is a hack. */
-static gboolean matcherprop_string_decode_match(MatcherProp *prop, const gchar *str)
+static gboolean matcherprop_string_decode_match(MatcherProp *prop, const gchar *str,
+ const gchar *debug_context)
{
gchar *utf = NULL;
gchar tmp[BUFFSIZE];
utf = conv_codeset_strdup
(tmp, conv_get_locale_charset_str_no_utf8(),
CS_INTERNAL);
- res = matcherprop_string_match(prop, utf);
+ res = matcherprop_string_match(prop, utf, debug_context);
g_free(utf);
} else {
- res = matcherprop_string_match(prop, tmp);
+ res = matcherprop_string_match(prop, tmp, debug_context);
}
- if (res == FALSE && (strchr(prop->expr, '=') || strchr(prop->expr, '_')) ) {
+ if (res == FALSE && (strchr(prop->expr, '=') || strchr(prop->expr, '_')
+ || strchr(str, '=') || strchr(str, '_'))) {
/* if searching for something with an equal char, maybe
* we should try to match the non-decoded string.
* In case it was not qp-encoded. */
utf = conv_codeset_strdup
(str, conv_get_locale_charset_str_no_utf8(),
CS_INTERNAL);
- res = matcherprop_string_match(prop, utf);
+ res = matcherprop_string_match(prop, utf, debug_context);
+ g_free(utf);
} else {
- res = matcherprop_string_match(prop, str);
+ res = matcherprop_string_match(prop, str, debug_context);
}
}
#endif
#ifdef USE_PTHREAD
-void *matcher_test_thread(void *data)
+static void *matcher_test_thread(void *data)
{
thread_data *td = (thread_data *)data;
int result = -1;
if (cmd == NULL)
return FALSE;
-#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
+#if (defined USE_PTHREAD && ((defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))) || !defined __GLIBC__))
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ log_print(LOG_DEBUG_FILTERING,
+ "starting threaded command [ %s ]\n",
+ cmd);
+ }
+
td->cmd = cmd;
td->done = FALSE;
if (pthread_create(&pt, PTHREAD_CREATE_JOINABLE,
printf("waiting for test thread\n");
while(!td->done) {
/* don't let the interface freeze while waiting */
- sylpheed_do_idle();
+ claws_do_idle();
if (time(NULL) - start_time > 30) {
pthread_cancel(pt);
td->done = TRUE;
}
g_free(td);
#else
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ log_print(LOG_DEBUG_FILTERING,
+ "starting synchronous command [ %s ]\n",
+ cmd);
+ }
+
retval = system(cmd);
#endif
debug_print("Command exit code: %d\n", retval);
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ log_print(LOG_DEBUG_FILTERING,
+ "command returned [ %d ]\n",
+ retval);
+ }
+
g_free(cmd);
return (retval == 0);
}
switch(prop->criteria) {
case MATCHCRITERIA_ALL:
- return 1;
+ return TRUE;
case MATCHCRITERIA_UNREAD:
return MSG_IS_UNREAD(info->flags);
case MATCHCRITERIA_NOT_UNREAD:
return MSG_IS_LOCKED(info->flags);
case MATCHCRITERIA_NOT_LOCKED:
return !MSG_IS_LOCKED(info->flags);
+ case MATCHCRITERIA_SPAM:
+ return MSG_IS_SPAM(info->flags);
+ case MATCHCRITERIA_NOT_SPAM:
+ return !MSG_IS_SPAM(info->flags);
case MATCHCRITERIA_COLORLABEL:
- return MSG_GET_COLORLABEL_VALUE(info->flags) == prop->value;
+ {
+ gint color = MSG_GET_COLORLABEL_VALUE(info->flags);
+ gboolean ret = (color == prop->value);
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "message color value [ %d ] matches color value [ %d ]\n",
+ color, prop->value);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "message color value [ %d ] doesn't matches color value [ %d ]\n",
+ color, prop->value);
+ }
+ }
+ return ret;
+ }
case MATCHCRITERIA_NOT_COLORLABEL:
- return MSG_GET_COLORLABEL_VALUE(info->flags) != prop->value;
+ {
+ gint color = MSG_GET_COLORLABEL_VALUE(info->flags);
+ gboolean ret = (color != prop->value);
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "message color value [ %d ] matches color value [ %d ]\n",
+ color, prop->value);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "message color value [ %d ] doesn't matches color value [ %d ]\n",
+ color, prop->value);
+ }
+ }
+ return ret;
+ }
case MATCHCRITERIA_IGNORE_THREAD:
return MSG_IS_IGNORE_THREAD(info->flags);
case MATCHCRITERIA_NOT_IGNORE_THREAD:
return !MSG_IS_IGNORE_THREAD(info->flags);
+ case MATCHCRITERIA_WATCH_THREAD:
+ return MSG_IS_WATCH_THREAD(info->flags);
+ case MATCHCRITERIA_NOT_WATCH_THREAD:
+ return !MSG_IS_WATCH_THREAD(info->flags);
case MATCHCRITERIA_SUBJECT:
- return matcherprop_string_match(prop, info->subject);
+ return matcherprop_string_match(prop, info->subject,
+ prefs_common_translated_header_name("Subject:"));
case MATCHCRITERIA_NOT_SUBJECT:
- return !matcherprop_string_match(prop, info->subject);
+ return !matcherprop_string_match(prop, info->subject,
+ prefs_common_translated_header_name("Subject:"));
case MATCHCRITERIA_FROM:
- return matcherprop_string_match(prop, info->from);
case MATCHCRITERIA_NOT_FROM:
- return !matcherprop_string_match(prop, info->from);
+ {
+ gchar *context;
+ gboolean ret;
+
+ context = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("From:"));
+ ret = matcherprop_string_match(prop, info->from, context);
+ g_free(context);
+ return (prop->criteria == MATCHCRITERIA_FROM)? ret : !ret;
+ }
case MATCHCRITERIA_TO:
- return matcherprop_string_match(prop, info->to);
case MATCHCRITERIA_NOT_TO:
- return !matcherprop_string_match(prop, info->to);
+ {
+ gchar *context;
+ gboolean ret;
+
+ context = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("To:"));
+ ret = matcherprop_string_match(prop, info->to, context);
+ g_free(context);
+ return (prop->criteria == MATCHCRITERIA_TO)? ret : !ret;
+ }
case MATCHCRITERIA_CC:
- return matcherprop_string_match(prop, info->cc);
case MATCHCRITERIA_NOT_CC:
- return !matcherprop_string_match(prop, info->cc);
+ {
+ gchar *context;
+ gboolean ret;
+
+ context = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("Cc:"));
+ ret = matcherprop_string_match(prop, info->cc, context);
+ g_free(context);
+ return (prop->criteria == MATCHCRITERIA_CC)? ret : !ret;
+ }
case MATCHCRITERIA_TO_OR_CC:
- return matcherprop_string_match(prop, info->to)
- || matcherprop_string_match(prop, info->cc);
+ {
+ gchar *context1, *context2;
+ gboolean ret;
+
+ context1 = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("To:"));
+ context2 = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("Cc:"));
+ ret = matcherprop_string_match(prop, info->to, context1)
+ || matcherprop_string_match(prop, info->cc, context2);
+ g_free(context1);
+ g_free(context2);
+ return ret;
+ }
case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
- return !(matcherprop_string_match(prop, info->to)
- || matcherprop_string_match(prop, info->cc));
+ {
+ gchar *context1, *context2;
+ gboolean ret;
+
+ context1 = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("To:"));
+ context2 = g_strdup_printf(_("%s header"), prefs_common_translated_header_name("Cc:"));
+ ret = !(matcherprop_string_match(prop, info->to, context1)
+ || matcherprop_string_match(prop, info->cc, context2));
+ g_free(context1);
+ g_free(context2);
+ return ret;
+ }
+ case MATCHCRITERIA_TAG:
+ case MATCHCRITERIA_NOT_TAG:
+ {
+ gboolean ret;
+
+ ret = matcherprop_tag_match(prop, info, _("Tag"));
+ return (prop->criteria == MATCHCRITERIA_TAG)? ret : !ret;
+ }
+ case MATCHCRITERIA_TAGGED:
+ case MATCHCRITERIA_NOT_TAGGED:
+ {
+ gboolean ret;
+
+ ret = (info->tags != NULL);
+ return (prop->criteria == MATCHCRITERIA_TAGGED)? ret : !ret;
+ }
case MATCHCRITERIA_AGE_GREATER:
+ {
+ gboolean ret;
+ gint age;
+
t = time(NULL);
- return ((t - info->date_t) / (60 * 60 * 24)) > prop->value;
+ age = ((t - info->date_t) / (60 * 60 * 24));
+ ret = (age > prop->value);
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "message age [ %d ] is greater than [ %d ]\n",
+ age, prop->value);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "message age [ %d ] is not greater than [ %d ]\n",
+ age, prop->value);
+ }
+ }
+ return ret;
+ }
case MATCHCRITERIA_AGE_LOWER:
+ {
+ gboolean ret;
+ gint age;
+
t = time(NULL);
- return ((t - info->date_t) / (60 * 60 * 24)) < prop->value;
+ age = ((t - info->date_t) / (60 * 60 * 24));
+ ret = (age < prop->value);
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "message age [ %d ] is lower than [ %d ]\n",
+ age, prop->value);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "message age [ %d ] is not lower than [ %d ]\n",
+ age, prop->value);
+ }
+ }
+ return ret;
+ }
case MATCHCRITERIA_SCORE_GREATER:
- return info->score > prop->value;
+ {
+ gboolean ret = (info->score > prop->value);
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "message score [ %d ] is greater than [ %d ]\n",
+ info->score, prop->value);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "message score [ %d ] is not greater than [ %d ]\n",
+ info->score, prop->value);
+ }
+ }
+ return ret;
+ }
case MATCHCRITERIA_SCORE_LOWER:
- return info->score < prop->value;
+ {
+ gboolean ret = (info->score < prop->value);
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "message score [ %d ] is lower than [ %d ]\n",
+ info->score, prop->value);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "message score [ %d ] is not lower than [ %d ]\n",
+ info->score, prop->value);
+ }
+ }
+ return ret;
+ }
case MATCHCRITERIA_SCORE_EQUAL:
- return info->score == prop->value;
+ {
+ gboolean ret = (info->score == prop->value);
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "message score [ %d ] is equal to [ %d ]\n",
+ info->score, prop->value);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "message score [ %d ] is not equal to [ %d ]\n",
+ info->score, prop->value);
+ }
+ }
+ return ret;
+ }
case MATCHCRITERIA_SIZE_GREATER:
+ {
/* FIXME: info->size is an off_t */
- return info->size > (off_t) prop->value;
- case MATCHCRITERIA_SIZE_EQUAL:
- /* FIXME: info->size is an off_t */
- return info->size == (off_t) prop->value;
+ gboolean ret = (info->size > (off_t) prop->value);
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "message size [ %ld ] is greater than [ %d ]\n",
+ info->size, prop->value);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "message size [ %ld ] is not greater than [ %d ]\n",
+ info->size, prop->value);
+ }
+ }
+ return ret;
+ }
case MATCHCRITERIA_SIZE_SMALLER:
+ {
+ /* FIXME: info->size is an off_t */
+ gboolean ret = (info->size < (off_t) prop->value);
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "message size [ %ld ] is smaller than [ %d ]\n",
+ info->size, prop->value);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "message size [ %ld ] is not smaller than [ %d ]\n",
+ info->size, prop->value);
+ }
+ }
+ return ret;
+ }
+ case MATCHCRITERIA_SIZE_EQUAL:
+ {
/* FIXME: info->size is an off_t */
- return info->size < (off_t) prop->value;
+ gboolean ret = (info->size == (off_t) prop->value);
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "message size [ %ld ] is equal to [ %d ]\n",
+ info->size, prop->value);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "message size [ %ld ] is not equal to [ %d ]\n",
+ info->size, prop->value);
+ }
+ }
+ return ret;
+ }
case MATCHCRITERIA_PARTIAL:
+ {
/* FIXME: info->size is an off_t */
- return (info->total_size != 0 && info->size != (off_t)info->total_size);
+ gboolean ret = (info->total_size != 0 && info->size != (off_t)info->total_size);
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "message is partially downloaded, size [ %ld ] is less than total size [ %d ])\n",
+ info->size, info->total_size);
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "message is not partially downloaded\n");
+ }
+ }
+ return ret;
+ }
case MATCHCRITERIA_NOT_PARTIAL:
+ {
/* FIXME: info->size is an off_t */
- return (info->total_size == 0 || info->size == (off_t)info->total_size);
+ gboolean ret = (info->total_size == 0 || info->size == (off_t)info->total_size);
+
+ /* debug output */
+ if (debug_filtering_session
+ && prefs_common.filtering_debug_level >= FILTERING_DEBUG_LEVEL_HIGH) {
+ if (ret) {
+ log_print(LOG_DEBUG_FILTERING,
+ "message is not partially downloaded\n");
+ } else {
+ log_print(LOG_DEBUG_FILTERING,
+ "message is partially downloaded, size [ %ld ] is less than total size [ %d ])\n",
+ info->size, info->total_size);
+ }
+ }
+ return ret;
+ }
case MATCHCRITERIA_NEWSGROUPS:
- return matcherprop_string_match(prop, info->newsgroups);
case MATCHCRITERIA_NOT_NEWSGROUPS:
- return !matcherprop_string_match(prop, info->newsgroups);
+ {
+ gchar *context;
+ gboolean ret;
+
+ context = g_strdup_printf(_("%s header"),
+ prefs_common_translated_header_name("Newsgroups:"));
+ ret = matcherprop_string_match(prop, info->newsgroups, context);
+ g_free(context);
+ return (prop->criteria == MATCHCRITERIA_NEWSGROUPS)? ret : !ret;
+ }
case MATCHCRITERIA_INREPLYTO:
- return matcherprop_string_match(prop, info->inreplyto);
case MATCHCRITERIA_NOT_INREPLYTO:
- return !matcherprop_string_match(prop, info->inreplyto);
- /* FIXME: Using inreplyto, but matching the (newly implemented)
- * list of references is better */
- case MATCHCRITERIA_REFERENCES:
- return matcherprop_string_match(prop, info->inreplyto);
+ {
+ gchar *context;
+ gboolean ret;
+
+ context = g_strdup_printf(_("%s header"),
+ prefs_common_translated_header_name("In-Reply-To:"));
+ ret = matcherprop_string_match(prop, info->inreplyto, context);
+ g_free(context);
+ return (prop->criteria == MATCHCRITERIA_INREPLYTO)? ret : !ret;
+ }
+ case MATCHCRITERIA_REFERENCES:
case MATCHCRITERIA_NOT_REFERENCES:
- return !matcherprop_string_match(prop, info->inreplyto);
+ {
+ gchar *context;
+ gboolean ret;
+
+ context = g_strdup_printf(_("%s header"),
+ prefs_common_translated_header_name("References:"));
+ ret = matcherprop_list_match(prop, info->references, context);
+ g_free(context);
+ return (prop->criteria == MATCHCRITERIA_REFERENCES)? ret : !ret;
+ }
case MATCHCRITERIA_TEST:
return matcherprop_match_test(prop, info);
case MATCHCRITERIA_NOT_TEST:
if (procheader_headername_equal(header->name,
matcher->header)) {
if (matcher->criteria == MATCHCRITERIA_HEADER)
- result = matcherprop_string_match(matcher, header->body);
+ result = matcherprop_string_match(matcher, header->body, _("header"));
else
- result = !matcherprop_string_match(matcher, header->body);
+ result = !matcherprop_string_match(matcher, header->body, _("header"));
procheader_header_free(header);
return result;
}
}
break;
case MATCHCRITERIA_HEADERS_PART:
- return matcherprop_string_match(matcher, buf);
+ return matcherprop_string_match(matcher, buf, _("header line"));
+ case MATCHCRITERIA_NOT_HEADERS_PART:
+ return !matcherprop_string_match(matcher, buf, _("headers line"));
case MATCHCRITERIA_MESSAGE:
- return matcherprop_string_decode_match(matcher, buf);
+ return matcherprop_string_decode_match(matcher, buf, _("message line"));
case MATCHCRITERIA_NOT_MESSAGE:
- return !matcherprop_string_decode_match(matcher, buf);
- case MATCHCRITERIA_NOT_HEADERS_PART:
- return !matcherprop_string_match(matcher, buf);
+ return !matcherprop_string_decode_match(matcher, buf, _("message line"));
case MATCHCRITERIA_FOUND_IN_ADDRESSBOOK:
case MATCHCRITERIA_NOT_FOUND_IN_ADDRESSBOOK:
{
/* how many address headers are me trying to mach? */
if (strcasecmp(matcher->header, _("Any")) == 0)
match = MATCH_ANY;
- else if (strcasecmp(matcher->header, _("All")) == 0)
+ else if (strcasecmp(matcher->header, Q_("Filtering Matcher Menu|All")) == 0)
match = MATCH_ALL;
if (match == MATCH_ONE) {
if (strcasecmp(matcher->header, _("Any")) == 0)
match = MATCH_ANY;
- else if (strcasecmp(matcher->header, _("All")) == 0)
+ else if (strcasecmp(matcher->header, Q_("Filtering Matcher Menu|All")) == 0)
match = MATCH_ALL;
else
match = MATCH_ONE;
switch (matcher->criteria) {
case MATCHCRITERIA_BODY_PART:
case MATCHCRITERIA_MESSAGE:
- return matcherprop_string_decode_match(matcher, line);
+ return matcherprop_string_decode_match(matcher, line, _("body line"));
case MATCHCRITERIA_NOT_BODY_PART:
case MATCHCRITERIA_NOT_MESSAGE:
- return !matcherprop_string_decode_match(matcher, line);
+ return !matcherprop_string_decode_match(matcher, line, _("body line"));
}
return FALSE;
}
*
*\return gboolean TRUE if matched
*/
-gboolean matcherlist_match_file(MatcherList *matchers, MsgInfo *info,
+static gboolean matcherlist_match_file(MatcherList *matchers, MsgInfo *info,
gboolean result)
{
gboolean read_headers;
for (l = matchers->matchers; l != NULL ;l = g_slist_next(l)) {
MatcherProp *matcher = (MatcherProp *) l->data;
+ if (debug_filtering_session) {
+ gchar *buf = matcherprop_to_string(matcher);
+ log_print(LOG_DEBUG_FILTERING, _("checking if message matches [ %s ]\n"), buf);
+ g_free(buf);
+ }
+
switch(matcher->criteria) {
case MATCHCRITERIA_ALL:
case MATCHCRITERIA_UNREAD:
case MATCHCRITERIA_NOT_FORWARDED:
case MATCHCRITERIA_LOCKED:
case MATCHCRITERIA_NOT_LOCKED:
+ case MATCHCRITERIA_SPAM:
+ case MATCHCRITERIA_NOT_SPAM:
case MATCHCRITERIA_COLORLABEL:
case MATCHCRITERIA_NOT_COLORLABEL:
case MATCHCRITERIA_IGNORE_THREAD:
case MATCHCRITERIA_NOT_IGNORE_THREAD:
+ case MATCHCRITERIA_WATCH_THREAD:
+ case MATCHCRITERIA_NOT_WATCH_THREAD:
case MATCHCRITERIA_SUBJECT:
case MATCHCRITERIA_NOT_SUBJECT:
case MATCHCRITERIA_FROM:
case MATCHCRITERIA_NOT_CC:
case MATCHCRITERIA_TO_OR_CC:
case MATCHCRITERIA_NOT_TO_AND_NOT_CC:
+ case MATCHCRITERIA_TAG:
+ case MATCHCRITERIA_NOT_TAG:
+ case MATCHCRITERIA_TAGGED:
+ case MATCHCRITERIA_NOT_TAGGED:
case MATCHCRITERIA_AGE_GREATER:
case MATCHCRITERIA_AGE_LOWER:
case MATCHCRITERIA_NEWSGROUPS:
case MATCHCRITERIA_NOT_PARTIAL:
if (matcherprop_match(matcher, info)) {
if (!matchers->bool_and) {
+ if (debug_filtering_session)
+ log_status_ok(LOG_DEBUG_FILTERING, _("message matches\n"));
return TRUE;
}
}
else {
if (matchers->bool_and) {
+ if (debug_filtering_session)
+ log_status_nok(LOG_DEBUG_FILTERING, _("message does not match\n"));
return FALSE;
}
}
/* test the condition on the file */
if (matcherlist_match_file(matchers, info, result)) {
- if (!matchers->bool_and)
+ if (!matchers->bool_and) {
+ if (debug_filtering_session)
+ log_status_ok(LOG_DEBUG_FILTERING, _("message matches\n"));
return TRUE;
- }
- else {
- if (matchers->bool_and)
+ }
+ } else {
+ if (matchers->bool_and) {
+ if (debug_filtering_session)
+ log_status_nok(LOG_DEBUG_FILTERING, _("message does not match\n"));
return FALSE;
+ }
}
+ if (debug_filtering_session) {
+ if (result)
+ log_status_ok(LOG_DEBUG_FILTERING, _("message matches\n"));
+ else
+ log_status_nok(LOG_DEBUG_FILTERING, _("message does not match\n"));
+ }
return result;
}
case MATCHCRITERIA_NOT_FORWARDED:
case MATCHCRITERIA_LOCKED:
case MATCHCRITERIA_NOT_LOCKED:
+ case MATCHCRITERIA_SPAM:
+ case MATCHCRITERIA_NOT_SPAM:
case MATCHCRITERIA_PARTIAL:
case MATCHCRITERIA_NOT_PARTIAL:
case MATCHCRITERIA_IGNORE_THREAD:
case MATCHCRITERIA_NOT_IGNORE_THREAD:
+ case MATCHCRITERIA_WATCH_THREAD:
+ case MATCHCRITERIA_NOT_WATCH_THREAD:
+ case MATCHCRITERIA_TAGGED:
+ case MATCHCRITERIA_NOT_TAGGED:
return g_strdup(criteria_str);
case MATCHCRITERIA_TEST:
case MATCHCRITERIA_NOT_TEST:
/* ******************************************************************* */
-void matcher_add_rulenames(const gchar *rcpath)
+static void matcher_add_rulenames(const gchar *rcpath)
{
gchar *newpath = g_strconcat(rcpath, ".new", NULL);
FILE *src = g_fopen(rcpath, "rb");
while (fgets (buf, sizeof(buf), src) != NULL) {
if (strlen(buf) > 2 && buf[0] != '['
- && strncmp(buf, "rulename \"", 10)) {
- fwrite("rulename \"\" ",
- strlen("rulename \"\" "), 1, dst);
+ && strncmp(buf, "rulename \"", 10)
+ && strncmp(buf, "enabled rulename \"", 18)
+ && strncmp(buf, "disabled rulename \"", 18)) {
+ fwrite("enabled rulename \"\" ",
+ strlen("enabled rulename \"\" "), 1, dst);
}
fwrite(buf, strlen(buf), 1, dst);
}
projects / claws.git / blobdiff