/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and
+ * the Claws Mail team
*
* 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 <locale.h>
#endif
-#include "common/sylpheed.h"
+#include "common/claws.h"
#include "common/version.h"
#include "plugin.h"
#include "common/utils.h"
#include "log.h"
#include "prefs_common.h"
#include "alertpanel.h"
+#include "addr_compl.h"
#ifdef HAVE_SYSEXITS_H
#include <sysexits.h>
#include <pwd.h>
#endif
-#define MAILS_PER_BATCH 20
+#define PLUGIN_NAME (_("Bogofilter"))
static guint hook_id = -1;
static MessageCallback message_callback;
NULL, NULL, NULL},
{"save_folder", NULL, &config.save_folder, P_STRING,
NULL, NULL, NULL},
+ {"save_unsure", "FALSE", &config.save_unsure, P_BOOL,
+ NULL, NULL, NULL},
+ {"save_unsure_folder", NULL, &config.save_unsure_folder, P_STRING,
+ NULL, NULL, NULL},
{"max_size", "250", &config.max_size, P_INT,
NULL, NULL, NULL},
{"bogopath", "bogofilter", &config.bogopath, P_STRING,
NULL, NULL, NULL},
+ {"insert_header", "FALSE", &config.insert_header, P_BOOL,
+ NULL, NULL, NULL},
+ {"whitelist_ab", "FALSE", &config.whitelist_ab, P_BOOL,
+ NULL, NULL, NULL},
+ {"whitelist_ab_folder", N_("Any"), &config.whitelist_ab_folder, P_STRING,
+ NULL, NULL, NULL},
+ {"learn_from_whitelist", "FALSE", &config.learn_from_whitelist, P_BOOL,
+ NULL, NULL, NULL},
+ {"mark_as_read", "TRUE", &config.mark_as_read, P_BOOL,
+ NULL, NULL, NULL},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
return TRUE;
}
-static gboolean mail_filtering_hook(gpointer source, gpointer data)
+typedef struct _BogoFilterData {
+ MailFilteringData *mail_filtering_data;
+ gchar **bogo_args;
+ GSList *msglist;
+ GSList *new_hams;
+ GSList *new_unsure;
+ GSList *new_spams;
+ GSList *whitelisted_new_spams;
+ gboolean done;
+ int status;
+ gboolean in_thread;
+} BogoFilterData;
+
+static BogoFilterData *to_filter_data = NULL;
+#ifdef USE_PTHREAD
+static gboolean filter_th_done = FALSE;
+static pthread_mutex_t list_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t wait_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t wait_cond = PTHREAD_COND_INITIALIZER;
+#endif
+
+static gboolean found_in_addressbook(const gchar *address)
{
- MailFilteringData *mail_filtering_data = (MailFilteringData *) source;
- MsgInfo *msginfo = mail_filtering_data->msginfo;
- GSList *msglist = mail_filtering_data->msglist;
- GSList *cur = NULL;
- static gboolean warned_error = FALSE;
- gchar *file = NULL;
- int status = 0;
- gchar *bogo_exec = (config.bogopath && *config.bogopath) ? config.bogopath:"bogofilter";
- int total = 0, curnum = 0;
- GSList *spams = NULL;
- gchar buf[BUFSIZ];
+ gchar *addr = NULL;
+ gboolean found = FALSE;
+ gint num_addr = 0;
+
+ if (!address)
+ return FALSE;
+
+ addr = g_strdup(address);
+ extract_address(addr);
+ num_addr = complete_address(addr);
+ if (num_addr > 1) {
+ /* skip first item (this is the search string itself) */
+ int i = 1;
+ for (; i < num_addr && !found; i++) {
+ gchar *caddr = get_complete_address(i);
+ extract_address(caddr);
+ if (strcasecmp(caddr, addr) == 0)
+ found = TRUE;
+ g_free(caddr);
+ }
+ }
+ g_free(addr);
+ return found;
+}
- gchar *bogo_args[4];
+static void bogofilter_do_filter(BogoFilterData *data)
+{
GPid bogo_pid;
gint bogo_stdin, bogo_stdout;
GError *error = NULL;
gboolean bogo_forked;
+ int status = 0;
+ MsgInfo *msginfo;
+ GSList *cur = NULL;
+ int total = 0, curnum = 0;
+ gchar *file = NULL;
+ gchar buf[BUFSIZ];
- if (!config.process_emails) {
- return FALSE;
- }
-
- if (msglist == NULL && msginfo != NULL) {
- g_warning("wrong call to bogofilter mail_filtering_hook");
- return FALSE;
- }
-
- total = g_slist_length(msglist);
- if (message_callback != NULL)
- message_callback(_("Bogofilter: filtering messages..."), total, 0);
-
- bogo_args[0] = bogo_exec;
- bogo_args[1] = "-T";
- bogo_args[2] = "-b";
- bogo_args[3] = NULL;
+ total = g_slist_length(data->msglist);
bogo_forked = g_spawn_async_with_pipes(
- NULL, bogo_args,NULL, G_SPAWN_SEARCH_PATH|G_SPAWN_DO_NOT_REAP_CHILD,
+ NULL, data->bogo_args,NULL, G_SPAWN_SEARCH_PATH|G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, &bogo_pid, &bogo_stdin,
&bogo_stdout, NULL, &error);
error = NULL;
status = -1;
} else {
- for (cur = msglist; cur; cur = cur->next) {
+
+ if (config.whitelist_ab) {
+ gchar *ab_folderpath;
+
+ if (*config.whitelist_ab_folder == '\0' ||
+ strcasecmp(config.whitelist_ab_folder, "Any") == 0) {
+ /* match the whole addressbook */
+ ab_folderpath = NULL;
+ } else {
+ /* match the specific book/folder of the addressbook */
+ ab_folderpath = config.whitelist_ab_folder;
+ }
+
+ start_address_completion(ab_folderpath);
+ }
+
+ for (cur = data->msglist; cur; cur = cur->next) {
+ gboolean whitelisted = FALSE;
msginfo = (MsgInfo *)cur->data;
debug_print("Filtering message %d (%d/%d)\n", msginfo->msgnum, curnum, total);
if (message_callback != NULL)
- message_callback(NULL, total, curnum++);
+ message_callback(NULL, total, curnum++, data->in_thread);
+
+ if (config.whitelist_ab && msginfo->from &&
+ found_in_addressbook(msginfo->from))
+ whitelisted = TRUE;
+
+ /* can set flags (SCANNED, ATTACHMENT) but that's ok
+ * as GUI updates are hooked not direct */
file = procmsg_get_message_file(msginfo);
if (file) {
gchar *tmp = g_strdup_printf("%s\n",file);
+ /* send filename to bogofilter */
write_all(bogo_stdin, tmp, strlen(tmp));
g_free(tmp);
memset(buf, 0, sizeof(buf));
+ /* get the result */
if (read(bogo_stdout, buf, sizeof(buf)-1) < 0) {
g_warning("bogofilter short read\n");
debug_print("message %d is ham\n", msginfo->msgnum);
- procmsg_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
- mail_filtering_data->unfiltered = g_slist_prepend(
- mail_filtering_data->unfiltered, msginfo);
+ data->mail_filtering_data->unfiltered = g_slist_prepend(
+ data->mail_filtering_data->unfiltered, msginfo);
+ data->new_hams = g_slist_prepend(data->new_hams, msginfo);
} else {
gchar **parts = NULL;
if (strchr(buf, '/')) {
}
parts = g_strsplit(tmp, " ", 0);
debug_print("read %s\n", buf);
- if (parts && parts[0] && parts[1] && *parts[1] == 'S') {
+
+ /* note the result if the header if needed */
+ if (parts && parts[0] && parts[1] && parts[2] &&
+ FOLDER_TYPE(msginfo->folder->folder) == F_MH &&
+ config.insert_header) {
+ gchar *tmpfile = get_tmp_file();
+ FILE *input = fopen(file, "r");
+ FILE *output = fopen(tmpfile, "w");
+ if (strstr(parts[2], "\n"))
+ *(strstr(parts[2], "\n")) = '\0';
+ if (input && !output)
+ fclose (input);
+ else if (!input && output)
+ fclose (output);
+ else {
+ gchar tmpbuf[BUFFSIZE];
+ gboolean err = FALSE;
+ const gchar *bogosity = *parts[1] == 'S' ? "Spam":
+ (*parts[1] == 'H' ? "Ham":"Unsure");
+ gchar *tmpstr = g_strdup_printf(
+ "X-Claws-Bogosity: %s, spamicity=%s%s\n",
+ bogosity, parts[2],
+ whitelisted?" [whitelisted]":"");
+ if (fwrite(tmpstr, 1, strlen(tmpstr), output) < strlen(tmpstr)) {
+ err = TRUE;
+ } else {
+ while (fgets(tmpbuf, sizeof(buf), input)) {
+ if (fputs(tmpbuf, output) == EOF) {
+ err = TRUE;
+ break;
+ }
+ }
+ }
+ fclose(input);
+ if (fclose(output) == EOF)
+ err = TRUE;
+ if (!err)
+ move_file(tmpfile, file, TRUE);
+ g_free(tmpstr);
+ }
+ g_free(tmpfile);
+ }
+
+ /* file the mail */
+ if (!whitelisted && parts && parts[0] && parts[1] && *parts[1] == 'S') {
+
debug_print("message %d is spam\n", msginfo->msgnum);
- procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);
+ /* Spam will be filtered away */
+ data->mail_filtering_data->filtered = g_slist_prepend(
+ data->mail_filtering_data->filtered, msginfo);
+ data->new_spams = g_slist_prepend(data->new_spams, msginfo);
+
+ } else if (whitelisted && parts && parts[0] && parts[1] &&
+ (*parts[1] == 'S' || *parts[1] == 'U')) {
+
+ debug_print("message %d is whitelisted %s\n", msginfo->msgnum,
+ *parts[1] == 'S' ? "spam":"unsure");
+ /* Whitelisted spam will *not* be filtered away, but continue
+ * their trip through filtering as if it was ham. */
+ data->mail_filtering_data->unfiltered = g_slist_prepend(
+ data->mail_filtering_data->unfiltered, msginfo);
+ /* But it gets put in a different list, so that we
+ * can still flag it and inform the user that it is
+ * considered a spam (so that he can teach bogo that
+ * it was not). */
+ data->whitelisted_new_spams = g_slist_prepend(data->whitelisted_new_spams, msginfo);
+
+ } else if (config.save_unsure && parts && parts[0] && parts[1] && *parts[1] == 'U') {
- if (config.receive_spam) {
- procmsg_msginfo_unset_flags(msginfo, ~0, 0);
- procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);
- spams = g_slist_prepend(spams, msginfo);
- } else {
- folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
- }
+ debug_print("message %d is unsure\n", msginfo->msgnum);
+ /* Spam will be filtered away */
+ data->mail_filtering_data->filtered = g_slist_prepend(
+ data->mail_filtering_data->filtered, msginfo);
+ data->new_unsure = g_slist_prepend(data->new_unsure, msginfo);
- mail_filtering_data->filtered = g_slist_prepend(
- mail_filtering_data->filtered, msginfo);
} else {
+
debug_print("message %d is ham\n", msginfo->msgnum);
- procmsg_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
- mail_filtering_data->unfiltered = g_slist_prepend(
- mail_filtering_data->unfiltered, msginfo);
+ data->mail_filtering_data->unfiltered = g_slist_prepend(
+ data->mail_filtering_data->unfiltered, msginfo);
+ data->new_hams = g_slist_prepend(data->new_hams, msginfo);
+
}
g_strfreev(parts);
}
g_free(file);
} else {
- procmsg_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
- mail_filtering_data->unfiltered = g_slist_prepend(
- mail_filtering_data->unfiltered, msginfo);
+ data->mail_filtering_data->unfiltered = g_slist_prepend(
+ data->mail_filtering_data->unfiltered, msginfo);
+ data->new_hams = g_slist_prepend(data->new_hams, msginfo);
}
}
+ if (config.whitelist_ab)
+ end_address_completion();
}
-
if (status != -1) {
close(bogo_stdout);
close(bogo_stdin);
status = -1;
else
status = WEXITSTATUS(status);
- }
+ }
+
+ to_filter_data->status = status;
+}
+
+#ifdef USE_PTHREAD
+static void *bogofilter_filtering_thread(void *data)
+{
+ while (!filter_th_done) {
+ pthread_mutex_lock(&list_mutex);
+ if (to_filter_data == NULL || to_filter_data->done == TRUE) {
+ pthread_mutex_unlock(&list_mutex);
+ debug_print("thread is waiting for something to filter\n");
+ pthread_mutex_lock(&wait_mutex);
+ pthread_cond_wait(&wait_cond, &wait_mutex);
+ pthread_mutex_unlock(&wait_mutex);
+ } else {
+ debug_print("thread awaken with something to filter\n");
+ to_filter_data->done = FALSE;
+ bogofilter_do_filter(to_filter_data);
+ pthread_mutex_unlock(&list_mutex);
+ to_filter_data->done = TRUE;
+ usleep(100);
+ }
+ }
+ return NULL;
+}
+
+static pthread_t filter_th = 0;
+
+static void bogofilter_start_thread(void)
+{
+ filter_th_done = FALSE;
+ if (filter_th != 0 || 1)
+ return;
+ if (pthread_create(&filter_th, 0,
+ bogofilter_filtering_thread,
+ NULL) != 0) {
+ filter_th = 0;
+ return;
+ }
+ debug_print("thread created\n");
+}
+
+static void bogofilter_stop_thread(void)
+{
+ void *res;
+ while (pthread_mutex_trylock(&list_mutex) != 0) {
+ GTK_EVENTS_FLUSH();
+ usleep(100);
+ }
+ if (filter_th != 0) {
+ filter_th_done = TRUE;
+ debug_print("waking thread up\n");
+ pthread_mutex_lock(&wait_mutex);
+ pthread_cond_broadcast(&wait_cond);
+ pthread_mutex_unlock(&wait_mutex);
+ pthread_join(filter_th, &res);
+ filter_th = 0;
+ }
+ pthread_mutex_unlock(&list_mutex);
+ debug_print("thread done\n");
+}
+#endif
+
+static gboolean mail_filtering_hook(gpointer source, gpointer data)
+{
+ MailFilteringData *mail_filtering_data = (MailFilteringData *) source;
+ MsgInfo *msginfo = mail_filtering_data->msginfo;
+ GSList *msglist = mail_filtering_data->msglist;
+ GSList *cur = NULL;
+ static gboolean warned_error = FALSE;
+ int status = 0;
+ int total = 0, curnum = 0;
+ GSList *new_hams = NULL, *new_spams = NULL;
+ GSList *new_unsure, *whitelisted_new_spams = NULL;
+ gchar *bogo_exec = (config.bogopath && *config.bogopath) ? config.bogopath:"bogofilter";
+ gchar *bogo_args[4];
+ gboolean ok_to_thread = TRUE;
+
+ bogo_args[0] = bogo_exec;
+ bogo_args[1] = "-T";
+ bogo_args[2] = "-b";
+ bogo_args[3] = NULL;
+
+ if (!config.process_emails) {
+ return FALSE;
+ }
+
+ if (msglist == NULL && msginfo != NULL) {
+ g_warning("wrong call to bogofilter mail_filtering_hook");
+ return FALSE;
+ }
+
+ total = g_slist_length(msglist);
+
+ /* we have to make sure the mails are cached - or it'll break on IMAP */
+ if (message_callback != NULL)
+ message_callback(_("Bogofilter: fetching bodies..."), total, 0, FALSE);
+ for (cur = msglist; cur; cur = cur->next) {
+ gchar *file = procmsg_get_message_file((MsgInfo *)cur->data);
+ if (file == NULL)
+ ok_to_thread = FALSE;
+ if (message_callback != NULL)
+ message_callback(NULL, total, curnum++, FALSE);
+ g_free(file);
+ }
+ if (message_callback != NULL)
+ message_callback(NULL, 0, 0, FALSE);
+
+ if (message_callback != NULL)
+ message_callback(_("Bogofilter: filtering messages..."), total, 0, FALSE);
+
+#ifdef USE_PTHREAD
+ while (pthread_mutex_trylock(&list_mutex) != 0) {
+ GTK_EVENTS_FLUSH();
+ usleep(100);
+ }
+#endif
+ to_filter_data = g_new0(BogoFilterData, 1);
+ to_filter_data->msglist = msglist;
+ to_filter_data->mail_filtering_data = mail_filtering_data;
+ to_filter_data->new_hams = NULL;
+ to_filter_data->new_unsure = NULL;
+ to_filter_data->new_spams = NULL;
+ to_filter_data->whitelisted_new_spams = NULL;
+ to_filter_data->done = FALSE;
+ to_filter_data->status = -1;
+ to_filter_data->bogo_args = bogo_args;
+#ifdef USE_PTHREAD
+ to_filter_data->in_thread = (filter_th != 0 && ok_to_thread);
+#else
+ to_filter_data->in_thread = FALSE;
+#endif
+
+#ifdef USE_PTHREAD
+ pthread_mutex_unlock(&list_mutex);
+
+ if (filter_th != 0 && ok_to_thread) {
+ debug_print("waking thread to let it filter things\n");
+ pthread_mutex_lock(&wait_mutex);
+ pthread_cond_broadcast(&wait_cond);
+ pthread_mutex_unlock(&wait_mutex);
+
+ while (!to_filter_data->done) {
+ GTK_EVENTS_FLUSH();
+ usleep(100);
+ }
+ }
+ while (pthread_mutex_trylock(&list_mutex) != 0) {
+ GTK_EVENTS_FLUSH();
+ usleep(100);
+
+ }
+ if (filter_th == 0 || !ok_to_thread)
+ bogofilter_do_filter(to_filter_data);
+#else
+ bogofilter_do_filter(to_filter_data);
+#endif
+
+ new_hams = to_filter_data->new_hams;
+ new_unsure = to_filter_data->new_unsure;
+ new_spams = to_filter_data->new_spams;
+ whitelisted_new_spams = to_filter_data->whitelisted_new_spams;
+ status = to_filter_data->status;
+ g_free(to_filter_data);
+ to_filter_data = NULL;
+#ifdef USE_PTHREAD
+ pthread_mutex_unlock(&list_mutex);
+#endif
+
+
+ /* unflag hams */
+ for (cur = new_hams; cur; cur = cur->next) {
+ MsgInfo *msginfo = (MsgInfo *)cur->data;
+ procmsg_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
+ debug_print("unflagging ham: %d\n", msginfo->msgnum);
+ }
+ /* unflag unsure */
+ for (cur = new_unsure; cur; cur = cur->next) {
+ MsgInfo *msginfo = (MsgInfo *)cur->data;
+ procmsg_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
+ debug_print("unflagging unsure: %d\n", msginfo->msgnum);
+ }
+ if (config.learn_from_whitelist && whitelisted_new_spams) {
+ /* flag whitelisted spams */
+ for (cur = whitelisted_new_spams; cur; cur = cur->next) {
+ MsgInfo *msginfo = (MsgInfo *)cur->data;
+ procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);
+ debug_print("flagging whitelisted non-ham: %d\n", msginfo->msgnum);
+ }
+ /* correct bogo */
+ bogofilter_learn(NULL, whitelisted_new_spams, FALSE);
+
+ /* unflag them */
+ for (cur = whitelisted_new_spams; cur; cur = cur->next) {
+ MsgInfo *msginfo = (MsgInfo *)cur->data;
+ procmsg_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
+ debug_print("unflagging whitelisted non-ham: %d\n", msginfo->msgnum);
+ }
+ } else {
+ for (cur = whitelisted_new_spams; cur; cur = cur->next) {
+ MsgInfo *msginfo = (MsgInfo *)cur->data;
+ procmsg_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
+ debug_print("not flagging whitelisted non-ham: %d\n", msginfo->msgnum);
+ }
+ }
+
+ /* flag spams and delete them if !config.receive_spam
+ * (if config.receive_spam is set, we'll move them later) */
+ for (cur = new_spams; cur; cur = cur->next) {
+ MsgInfo *msginfo = (MsgInfo *)cur->data;
+ if (config.receive_spam) {
+ if (config.mark_as_read)
+ procmsg_msginfo_unset_flags(msginfo, ~0, 0);
+ procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);
+ } else {
+ folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
+ }
+ }
+
if (status < 0 || status > 2) { /* I/O or other errors */
gchar *msg = NULL;
"spam and ham messages."));
else
msg = g_strdup_printf(_("The Bogofilter plugin couldn't filter "
- "a message. the command `%s %s %s` couldn't be run."),
+ "a message. The command `%s %s %s` couldn't be run."),
bogo_args[0], bogo_args[1], bogo_args[2]);
if (!prefs_common.no_recv_err_panel) {
if (!warned_error) {
- alertpanel_error(msg);
+ alertpanel_error("%s", msg);
}
warned_error = TRUE;
} else {
- gchar *tmp = g_strdup_printf("%s\n", msg);
- log_error(tmp);
- g_free(tmp);
+ log_error(LOG_PROTOCOL, "%s\n", msg);
}
g_free(msg);
}
if (status < 0 || status > 2) {
g_slist_free(mail_filtering_data->filtered);
g_slist_free(mail_filtering_data->unfiltered);
- g_slist_free(spams);
mail_filtering_data->filtered = NULL;
mail_filtering_data->unfiltered = NULL;
- } else if (config.receive_spam && spams) {
- FolderItem *save_folder;
-
- if ((!config.save_folder) ||
- (config.save_folder[0] == '\0') ||
- ((save_folder = folder_find_item_from_identifier(config.save_folder)) == NULL))
- save_folder = folder_get_default_trash();
- if (save_folder) {
- for (cur = spams; cur; cur = cur->next) {
- msginfo = (MsgInfo *)cur->data;
- msginfo->is_move = TRUE;
- msginfo->to_filter_folder = save_folder;
+ } else {
+ if (config.receive_spam && new_spams) {
+ FolderItem *save_folder = NULL;
+
+ if ((!config.save_folder) ||
+ (config.save_folder[0] == '\0') ||
+ ((save_folder = folder_find_item_from_identifier(config.save_folder)) == NULL)) {
+ if (mail_filtering_data->account && mail_filtering_data->account->set_trash_folder) {
+ save_folder = folder_find_item_from_identifier(
+ mail_filtering_data->account->trash_folder);
+ if (save_folder)
+ debug_print("found trash folder from account's advanced settings\n");
+ }
+ if (save_folder == NULL && mail_filtering_data->account &&
+ mail_filtering_data->account->folder) {
+ save_folder = mail_filtering_data->account->folder->trash;
+ if (save_folder)
+ debug_print("found trash folder from account's trash\n");
+ }
+ if (save_folder == NULL && mail_filtering_data->account &&
+ !mail_filtering_data->account->folder) {
+ if (mail_filtering_data->account->inbox) {
+ FolderItem *item = folder_find_item_from_identifier(
+ mail_filtering_data->account->inbox);
+ if (item && item->folder->trash) {
+ save_folder = item->folder->trash;
+ debug_print("found trash folder from account's inbox\n");
+ }
+ }
+ if (!save_folder && mail_filtering_data->account->local_inbox) {
+ FolderItem *item = folder_find_item_from_identifier(
+ mail_filtering_data->account->local_inbox);
+ if (item && item->folder->trash) {
+ save_folder = item->folder->trash;
+ debug_print("found trash folder from account's local_inbox\n");
+ }
+ }
+ }
+ if (save_folder == NULL) {
+ debug_print("using default trash folder\n");
+ save_folder = folder_get_default_trash();
+ }
+ }
+ if (save_folder) {
+ for (cur = new_spams; cur; cur = cur->next) {
+ msginfo = (MsgInfo *)cur->data;
+ msginfo->filter_op = IS_MOVE;
+ msginfo->to_filter_folder = save_folder;
+ }
+ }
+ }
+ if (config.save_unsure && new_unsure) {
+ FolderItem *save_unsure_folder = NULL;
+
+ if ((!config.save_unsure_folder) ||
+ (config.save_unsure_folder[0] == '\0') ||
+ ((save_unsure_folder = folder_find_item_from_identifier(config.save_unsure_folder)) == NULL)) {
+ if (mail_filtering_data->account)
+ save_unsure_folder = folder_find_item_from_identifier(
+ mail_filtering_data->account->inbox);
+ if (save_unsure_folder == NULL && mail_filtering_data->account &&
+ mail_filtering_data->account->folder)
+ save_unsure_folder = mail_filtering_data->account->folder->inbox;
+ if (save_unsure_folder == NULL && mail_filtering_data->account &&
+ !mail_filtering_data->account->folder) {
+ if (mail_filtering_data->account->inbox) {
+ FolderItem *item = folder_find_item_from_identifier(
+ mail_filtering_data->account->inbox);
+ if (item) {
+ save_unsure_folder = item;
+ }
+ }
+ if (!save_unsure_folder && mail_filtering_data->account->local_inbox) {
+ FolderItem *item = folder_find_item_from_identifier(
+ mail_filtering_data->account->local_inbox);
+ if (item) {
+ save_unsure_folder = item;
+ }
+ }
+ }
+ if (save_unsure_folder == NULL)
+ save_unsure_folder = folder_get_default_inbox();
+ }
+ if (save_unsure_folder) {
+ for (cur = new_unsure; cur; cur = cur->next) {
+ msginfo = (MsgInfo *)cur->data;
+ msginfo->filter_op = IS_MOVE;
+ msginfo->to_filter_folder = save_unsure_folder;
+ }
}
}
}
+ g_slist_free(new_hams);
+ g_slist_free(new_unsure);
+ g_slist_free(new_spams);
+ g_slist_free(whitelisted_new_spams);
if (message_callback != NULL)
- message_callback(NULL, 0, 0);
- mail_filtering_data->filtered = g_slist_reverse(
+ message_callback(NULL, 0, 0, FALSE);
+ mail_filtering_data->filtered = g_slist_reverse(
mail_filtering_data->filtered);
mail_filtering_data->unfiltered = g_slist_reverse(
mail_filtering_data->unfiltered);
return -1;
} else {
if (message_callback != NULL)
- message_callback(_("Bogofilter: learning from message..."), 0, 0);
+ message_callback(_("Bogofilter: learning from message..."), 0, 0, FALSE);
if (spam)
/* learn as spam */
cmd = g_strdup_printf("%s -s -I '%s'", bogo_exec, file);
else
/* learn as ham */
cmd = g_strdup_printf("%s -n -I '%s'", bogo_exec, file);
+
+ debug_print("%s\n", cmd);
if ((status = execute_command_line(cmd, FALSE)) != 0)
- log_error(_("Learning failed; `%s` returned with status %d."),
+ log_error(LOG_PROTOCOL, _("Learning failed; `%s` returned with status %d."),
cmd, status);
g_free(cmd);
g_free(file);
if (message_callback != NULL)
- message_callback(NULL, 0, 0);
+ message_callback(NULL, 0, 0, FALSE);
return 0;
}
}
gboolean some_correction = FALSE, some_no_correction = FALSE;
if (message_callback != NULL)
- message_callback(_("Bogofilter: learning from messages..."), total, 0);
+ message_callback(_("Bogofilter: learning from messages..."), total, 0, FALSE);
for (cur = msglist; cur && status == 0; cur = cur->next) {
info = (MsgInfo *)cur->data;
else
/* learn as ham */
cmd = g_strdup_printf("%s -n -I '%s'", bogo_exec, file);
-
+
+ debug_print("%s\n", cmd);
if ((status = execute_command_line(cmd, FALSE)) != 0)
- log_error(_("Learning failed; `%s` returned with status %d."),
+ log_error(LOG_PROTOCOL, _("Learning failed; `%s` returned with status %d."),
cmd, status);
g_free(cmd);
g_free(file);
done++;
if (message_callback != NULL)
- message_callback(NULL, total, done);
+ message_callback(NULL, total, done, FALSE);
}
} else if (some_correction || some_no_correction) {
cur = msglist;
bogo_args[1] = spam ? "-s":"-n";
bogo_args[2] = "-b";
bogo_args[3] = NULL;
-
+ debug_print("|%s %s %s ...\n", bogo_args[0], bogo_args[1], bogo_args[2]);
bogo_forked = g_spawn_async_with_pipes(
NULL, bogo_args,NULL, G_SPAWN_SEARCH_PATH|G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, &bogo_pid, &bogo_stdin,
g_free(file);
done++;
if (message_callback != NULL)
- message_callback(NULL, total, done);
+ message_callback(NULL, total, done, FALSE);
cur = cur->next;
}
if (bogo_forked) {
status = WEXITSTATUS(status);
}
if (!bogo_forked || status != 0) {
- log_error(_("Learning failed; `%s %s %s` returned with error:\n%s"),
+ log_error(LOG_PROTOCOL, _("Learning failed; `%s %s %s` returned with error:\n%s"),
bogo_args[0], bogo_args[1], bogo_args[2],
error ? error->message:_("Unknown error"));
if (error)
}
if (message_callback != NULL)
- message_callback(NULL, 0, 0);
+ message_callback(NULL, 0, 0, FALSE);
return 0;
}
return -1;
prefs_file_close_revert(pfile);
return;
}
- fprintf(pfile->fp, "\n");
-
- prefs_file_close(pfile);
+ if (fprintf(pfile->fp, "\n") < 0) {
+ FILE_OP_ERROR(rcpath, "fprintf");
+ prefs_file_close_revert(pfile);
+ } else
+ prefs_file_close(pfile);
}
void bogofilter_set_message_callback(MessageCallback callback)
hook_id = -1;
- if ((sylpheed_get_version() > VERSION_NUMERIC)) {
- *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the Bogofilter plugin was built with");
- return -1;
- }
-
- if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
- *error = g_strdup("Your version of Sylpheed-Claws is too old for the Bogofilter plugin");
+ if (!check_plugin_version(MAKE_NUMERIC_VERSION(2,9,2,72),
+ VERSION_NUMERIC, PLUGIN_NAME, error))
return -1;
- }
prefs_set_default(param);
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
debug_print("Bogofilter plugin loaded\n");
+#ifdef USE_PTHREAD
+ bogofilter_start_thread();
+#endif
+
if (config.process_emails) {
bogofilter_register_hook();
}
procmsg_register_spam_learner(bogofilter_learn);
- procmsg_spam_set_folder(config.save_folder);
+ procmsg_spam_set_folder(config.save_folder, bogofilter_get_spam_folder);
return 0;
}
-void plugin_done(void)
+FolderItem *bogofilter_get_spam_folder(MsgInfo *msginfo)
+{
+ FolderItem *item = folder_find_item_from_identifier(config.save_folder);
+
+ if (item || msginfo == NULL || msginfo->folder == NULL)
+ return item;
+
+ if (msginfo->folder->folder &&
+ msginfo->folder->folder->account &&
+ msginfo->folder->folder->account->set_trash_folder) {
+ item = folder_find_item_from_identifier(
+ msginfo->folder->folder->account->trash_folder);
+ }
+
+ if (item == NULL &&
+ msginfo->folder->folder &&
+ msginfo->folder->folder->trash)
+ item = msginfo->folder->folder->trash;
+
+ if (item == NULL)
+ item = folder_get_default_trash();
+
+ debug_print("bogo spam dir: %s\n", folder_item_get_path(item));
+ return item;
+}
+
+gboolean plugin_done(void)
{
if (hook_id != -1) {
bogofilter_unregister_hook();
}
+#ifdef USE_PTHREAD
+ bogofilter_stop_thread();
+#endif
g_free(config.save_folder);
bogofilter_gtk_done();
procmsg_unregister_spam_learner(bogofilter_learn);
- procmsg_spam_set_folder(NULL);
+ procmsg_spam_set_folder(NULL, NULL);
debug_print("Bogofilter plugin unloaded\n");
+ return TRUE;
}
const gchar *plugin_name(void)
{
- return _("Bogofilter");
+ return PLUGIN_NAME;
}
const gchar *plugin_desc(void)
{
return _("This plugin can check all messages that are received from an "
"IMAP, LOCAL or POP account for spam using Bogofilter. "
- "You will need Bogofilter installed locally.\n "
+ "You will need Bogofilter installed locally.\n"
"\n"
"Before Bogofilter can recognize spam messages, you have to "
- "train it by marking a few hundred spam and ham messages. "
- "Use \"/Mark/Mark as Spam\" and \"/Mark/Mark as ham\" to "
- "train Bogofilter.\n"
+ "train it by marking a few hundred spam and ham messages "
+ "with the use of \"/Mark/Mark as spam\" and \"/Mark/Mark as "
+ "ham\".\n"
"\n"
"When a message is identified as spam it can be deleted or "
"saved in a specially designated folder.\n"
const gchar *plugin_licence(void)
{
- return "GPL";
+ return "GPL3+";
}
const gchar *plugin_version(void)
void bogofilter_register_hook(void)
{
- hook_id = hooks_register_hook(MAIL_LISTFILTERING_HOOKLIST, mail_filtering_hook, NULL);
+ if (hook_id == -1)
+ hook_id = hooks_register_hook(MAIL_LISTFILTERING_HOOKLIST, mail_filtering_hook, NULL);
if (hook_id == -1) {
g_warning("Failed to register mail filtering hook");
config.process_emails = FALSE;
if (hook_id != -1) {
hooks_unregister_hook(MAIL_LISTFILTERING_HOOKLIST, hook_id);
}
+ hook_id = -1;
}
projects / claws.git / blobdiff