/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto and the Sylpheed-Claws Team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws 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
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include <sys/wait.h>
#include <glib.h>
+#include <glib/gi18n.h>
#if HAVE_LOCALE_H
# include <locale.h>
#include "folder.h"
#include "prefs.h"
#include "prefs_gtk.h"
-#include "intl.h"
#include "libspamc.h"
#include "spamassassin.h"
}
if (transport_setup(&trans, flags) != EX_OK) {
+ log_error("Spamassassin plugin couldn't connect to spamd.\n");
debug_print("failed to setup transport\n");
return FALSE;
}
int pid = 0;
int status;
- if (config.transport == SPAMASSASSIN_DISABLED)
+ if (config.transport == SPAMASSASSIN_DISABLED) {
+ log_error("Spamassassin plugin is disabled by its preferences.\n");
return FALSE;
-
+ }
debug_print("Filtering message %d\n", msginfo->msgnum);
if (message_callback != NULL)
message_callback(_("SpamAssassin: filtering message..."));
running |= CHILD_RUNNING;
- g_timeout_add(1000, timeout_func, &running);
+ g_timeout_add(50, timeout_func, &running);
running |= TIMEOUT_RUNNING;
while(running & CHILD_RUNNING) {
if (is_spam) {
debug_print("message is spam\n");
-
+ procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);
if (config.receive_spam) {
FolderItem *save_folder;
save_folder = folder_get_default_trash();
procmsg_msginfo_unset_flags(msginfo, ~0, 0);
+ procmsg_msginfo_set_flags(msginfo, MSG_SPAM, 0);
folder_item_move_msg(save_folder, msginfo);
} else {
folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
}
return TRUE;
+ } else {
+ debug_print("message is ham\n");
+ procmsg_msginfo_unset_flags(msginfo, MSG_SPAM, 0);
}
-
return FALSE;
}
return &config;
}
+void spamassassin_learn(MsgInfo *msginfo, GSList *msglist, gboolean spam)
+{
+ gchar *cmd = NULL;
+ gchar *file = NULL;
+ gboolean async = FALSE;
+
+ if (msginfo == NULL && msglist == NULL)
+ return;
+
+ if (msginfo) {
+ file = procmsg_get_message_file(msginfo);
+ if (file == NULL)
+ return;
+ cmd = g_strdup_printf("sa-learn %s %s",
+ spam?"--spam":"--ham", file);
+ }
+ if (msglist) {
+ GSList *cur;
+ MsgInfo *info;
+ cmd = g_strdup_printf("sa-learn %s", spam?"--spam":"--ham");
+ for (cur = msglist; cur; cur = cur->next) {
+ info = (MsgInfo *)cur->data;
+ gchar *tmpcmd = NULL;
+ gchar *tmpfile = get_tmp_file();
+
+ if (tmpfile &&
+ copy_file(procmsg_get_message_file(info), tmpfile, TRUE) == 0) {
+ tmpcmd = g_strconcat
+ (cmd, " ", tmpfile, NULL);
+ g_free(cmd);
+ cmd = tmpcmd;
+ }
+ if (tmpfile)
+ g_free(tmpfile);
+ }
+ async = TRUE;
+ }
+ if (cmd == NULL)
+ return;
+ debug_print("%s\n",cmd);
+ /* only run async if we have a list, or we could end up
+ * forking lots of perl processes and bury the machine */
+ execute_command_line(cmd, async);
+ g_free(cmd);
+
+}
+
void spamassassin_save_config(void)
{
PrefFile *pfile;
gint plugin_init(gchar **error)
{
+ gchar *rcpath;
+
if ((sylpheed_get_version() > VERSION_NUMERIC)) {
- *error = g_strdup("Your sylpheed version is newer than the version the plugin was built with");
+ *error = g_strdup("Your version of Sylpheed-Claws is newer than the version the SpamAssassin plugin was built with");
return -1;
}
if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 3, 86))) {
- *error = g_strdup("Your sylpheed version is too old");
+ *error = g_strdup("Your version of Sylpheed-Claws is too old for the SpamAssassin plugin");
return -1;
}
return -1;
}
- username = g_get_user_name();
+ username = (gchar*)g_get_user_name();
if (username == NULL) {
+ hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
*error = g_strdup("Failed to get username");
return -1;
}
prefs_set_default(param);
- prefs_read_config(param, "SpamAssassin", COMMON_RC);
-
+ rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
+ prefs_read_config(param, "SpamAssassin", rcpath, NULL);
+ g_free(rcpath);
+ spamassassin_gtk_init();
+
+ procmsg_register_spam_learner(spamassassin_learn);
+ procmsg_spam_set_folder(config.save_folder);
+
debug_print("Spamassassin plugin loaded\n");
+ if (config.transport == SPAMASSASSIN_DISABLED) {
+ log_error("Spamassassin plugin is loaded but disabled by its preferences.\n");
+ }
+
return 0;
}
hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
g_free(config.hostname);
g_free(config.save_folder);
-
+ spamassassin_gtk_done();
+ procmsg_unregister_spam_learner(spamassassin_learn);
+ procmsg_spam_set_folder(NULL);
debug_print("Spamassassin plugin unloaded\n");
}
"\n"
"When a message is identified as spam it can be deleted or "
"saved into a special folder.\n"
- "\n"
- "This plugin only contains the actual function for filtering "
- "and deleting or moving the message. You probably want to load "
- "a User Interface plugin too, otherwise you will have to "
- "manually write the plugin configuration.\n");
+ "\n");
}
const gchar *plugin_type(void)
{
- return "Common";
+ return "GTK2";
+}
+
+const gchar *plugin_licence(void)
+{
+ return "GPL";
}
+
+const gchar *plugin_version(void)
+{
+ return VERSION;
+}
+
projects / claws.git / blobdiff