/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2012 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 "config.h"
+#include "claws-features.h"
#endif
#include "defs.h"
#include "log.h"
#include "prefs_common.h"
#include "alertpanel.h"
+#include "addr_compl.h"
#ifdef HAVE_SYSEXITS_H
#include <sysexits.h>
NULL, NULL, NULL},
{"username", "", &config.username, P_STRING,
NULL, NULL, NULL},
+ {"mark_as_read", "TRUE", &config.mark_as_read, 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},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
};
}
if (transport_setup(&trans, flags) != EX_OK) {
- log_error(_("SpamAssassin plugin couldn't connect to spamd.\n"));
+ log_error(LOG_PROTOCOL, _("SpamAssassin plugin couldn't connect to spamd.\n"));
debug_print("failed to setup transport\n");
return MSG_FILTERING_ERROR;
}
}
if (message_filter(&trans, config.username, flags, &m) != EX_OK) {
- log_error(_("SpamAssassin plugin filtering failed.\n"));
+ log_error(LOG_PROTOCOL, _("SpamAssassin plugin filtering failed.\n"));
debug_print("filtering the message failed\n");
message_cleanup(&m);
return MSG_FILTERING_ERROR;
return is_spam ? MSG_IS_SPAM:MSG_IS_HAM;
}
+static gboolean sa_found_in_addressbook(const gchar *address)
+{
+ 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;
+}
+
static gboolean mail_filtering_hook(gpointer source, gpointer data)
{
MailFilteringData *mail_filtering_data = (MailFilteringData *) source;
/* SPAMASSASSIN_DISABLED : keep test for compatibility purpose */
if (!config.enable || config.transport == SPAMASSASSIN_DISABLED) {
- log_warning(_("SpamAssassin plugin is disabled by its preferences.\n"));
+ log_warning(LOG_PROTOCOL, _("SpamAssassin plugin is disabled by its preferences.\n"));
return FALSE;
}
debug_print("Filtering message %d\n", msginfo->msgnum);
return FALSE;
}
+ if (config.whitelist_ab) {
+ gchar *ab_folderpath;
+ gboolean whitelisted = FALSE;
+
+ 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);
+ if (msginfo->from &&
+ sa_found_in_addressbook(msginfo->from))
+ whitelisted = TRUE;
+ end_address_completion();
+
+ if (whitelisted) {
+ debug_print("message is ham (whitelisted)\n");
+ fclose(fp);
+ return FALSE;
+ }
+ }
pid = fork();
if (pid == 0) {
_exit(msg_is_spam(fp));
running &= ~CHILD_RUNNING;
} /* ret == 0 continue */
- g_main_iteration(TRUE);
+ g_main_context_iteration(NULL, TRUE);
}
while (running & TIMEOUT_RUNNING)
- g_main_iteration(TRUE);
+ g_main_context_iteration(NULL, TRUE);
}
fclose(fp);
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)
+ 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)
+ mail_filtering_data->account->folder) {
save_folder = mail_filtering_data->account->folder->trash;
- if (save_folder == NULL)
+ 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();
+ }
}
- procmsg_msginfo_unset_flags(msginfo, ~0, 0);
+ if (config.mark_as_read)
+ procmsg_msginfo_unset_flags(msginfo, ~0, 0);
procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);
- msginfo->is_move = TRUE;
+ msginfo->filter_op = IS_MOVE;
msginfo->to_filter_folder = save_folder;
} else {
folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
"sure spamd is running and accessible.");
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);
}
}
if (config.transport == SPAMASSASSIN_TRANSPORT_TCP
&& prefs_common.work_offline
- && !inc_offline_should_override(
+ && !inc_offline_should_override(TRUE,
_("Claws Mail needs network access in order "
"to feed this mail(s) to the remote learner."))) {
return -1;
spamc_wrapper, " ", file, NULL);
}
} else {
- cmd = g_strdup_printf("sa-learn -u %s %s %s %s",
+ cmd = g_strdup_printf("sa-learn -u %s%s %s %s",
config.username,
- prefs_common.work_offline?"-L":"",
+ prefs_common.work_offline?" -L":"",
spam?"--spam":"--ham", file);
}
}
g_free(spamc_wrapper);
return 0;
} else {
- cmd = g_strdup_printf("sa-learn -u %s %s %s",
+ cmd = g_strdup_printf("sa-learn -u %s%s %s",
config.username,
- prefs_common.work_offline?"-L":"",
+ prefs_common.work_offline?" -L":"",
spam?"--spam":"--ham");
/* concatenate all message tmpfiles to the sa-learn command-line */
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);
}
gboolean spamassassin_check_username(void)
spamassassin_unregister_hook();
}
procmsg_unregister_spam_learner(spamassassin_learn);
- procmsg_spam_set_folder(NULL);
+ procmsg_spam_set_folder(NULL, NULL);
return FALSE;
}
}
hook_id = -1;
- if (!check_plugin_version(MAKE_NUMERIC_VERSION(0, 9, 3, 86),
+ if (!check_plugin_version(MAKE_NUMERIC_VERSION(2,9,2,72),
VERSION_NUMERIC, PLUGIN_NAME, error))
return -1;
}
if (!config.enable || config.transport == SPAMASSASSIN_DISABLED) {
- log_warning(_("SpamAssassin plugin is loaded but disabled by its preferences.\n"));
+ log_warning(LOG_PROTOCOL, _("SpamAssassin plugin is loaded but disabled by its preferences.\n"));
}
else {
if (config.transport == SPAMASSASSIN_TRANSPORT_TCP)
debug_print("Enabling learner with a remote spamassassin server requires spamc/spamd 3.1.x\n");
procmsg_register_spam_learner(spamassassin_learn);
- procmsg_spam_set_folder(config.save_folder);
+ procmsg_spam_set_folder(config.save_folder, spamassassin_get_spam_folder);
}
return 0;
}
-void plugin_done(void)
+gboolean plugin_done(void)
{
if (hook_id != -1) {
spamassassin_unregister_hook();
g_free(config.save_folder);
spamassassin_gtk_done();
procmsg_unregister_spam_learner(spamassassin_learn);
- procmsg_spam_set_folder(NULL);
+ procmsg_spam_set_folder(NULL, NULL);
debug_print("SpamAssassin plugin unloaded\n");
+ return TRUE;
}
const gchar *plugin_name(void)
const gchar *plugin_licence(void)
{
- return "GPL";
+ return "GPL3+";
}
const gchar *plugin_version(void)
}
hook_id = -1;
}
+
+FolderItem *spamassassin_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("SA spam dir: %s\n", folder_item_get_path(item));
+ return item;
+}
+
projects / claws.git / blobdiff