static gint hook_id;
static int flags = SPAMC_RAW_MODE | SPAMC_SAFE_FALLBACK | SPAMC_CHECK_ONLY;
+static gchar *username = NULL;
-gboolean spamassassin_enable;
-gchar *spamassassin_hostname;
-int spamassassin_port;
-int spamassassin_max_size;
-gboolean spamassassin_receive_spam;
-gchar *spamassassin_save_folder;
+static SpamAssassinConfig config;
static PrefParam param[] = {
- {"enable", "FALSE", &spamassassin_enable, P_BOOL,
+ {"enable", "FALSE", &config.enable, P_BOOL,
NULL, NULL, NULL},
- {"hostname", "localhost", &spamassassin_hostname, P_STRING,
+ {"hostname", "localhost", &config.hostname, P_STRING,
NULL, NULL, NULL},
- {"port", "783", &spamassassin_port, P_USHORT,
+ {"port", "783", &config.port, P_USHORT,
NULL, NULL, NULL},
- {"max_size", "250", &spamassassin_max_size, P_USHORT,
+ {"max_size", "250", &config.max_size, P_USHORT,
NULL, NULL, NULL},
- {"receive_spam", "TRUE", &spamassassin_receive_spam, P_BOOL,
+ {"receive_spam", "TRUE", &config.receive_spam, P_BOOL,
NULL, NULL, NULL},
- {"save_folder", NULL, &spamassassin_save_folder, P_STRING,
+ {"save_folder", NULL, &config.save_folder, P_STRING,
NULL, NULL, NULL},
{NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
gboolean is_spam = FALSE;
FILE *fp = NULL;
struct message m;
- int ret;
- gchar *username = NULL, *oldlocale = NULL;
+ gchar *oldlocale = NULL;
struct sockaddr addr;
- if (!spamassassin_enable)
+ if (!config.enable)
return FALSE;
debug_print("Filtering message %d\n", msginfo->msgnum);
- oldlocale = g_strdup(setlocale(LC_ALL, NULL));
- if (oldlocale == NULL) {
- debug_print("failed to get locale");
- goto CATCH;
- }
-
+ /* remember old locale and set it to C */
+ Xstrdup_a(oldlocale, setlocale(LC_ALL, NULL), return FALSE);
setlocale(LC_ALL, "C");
- ret = lookup_host(spamassassin_hostname, spamassassin_port, &addr);
- if (ret != EX_OK) {
+ if (lookup_host(config.hostname, config.port, &addr) != EX_OK) {
debug_print("failed to look up spamd host");
- goto CATCH;
+ return FALSE;
}
m.type = MESSAGE_NONE;
- m.max_len = spamassassin_max_size * 1024;
-
- username = g_get_user_name();
- if (username == NULL) {
- debug_print("failed to get username");
- goto CATCH;
- }
+ m.max_len = config.max_size * 1024;
- fp = procmsg_open_message(msginfo);
- if (fp == NULL) {
+ if ((fp = procmsg_open_message(msginfo)) == NULL) {
debug_print("failed to open message file");
- goto CATCH;
+ return FALSE;
}
- ret = message_read(fileno(fp), flags, &m);
- if (ret != EX_OK) {
+ if (message_read(fileno(fp), flags, &m) != EX_OK) {
debug_print("failed to read message");
- goto CATCH;
+ fclose(fp);
+ message_cleanup(&m);
+ return FALSE;
}
- ret = message_filter(&addr, username, flags, &m);
- if ((ret == EX_OK) && (m.is_spam == EX_ISSPAM))
+ if ((message_filter(&addr, username, flags, &m) == EX_OK) && (m.is_spam == EX_ISSPAM))
is_spam = TRUE;
-CATCH:
- if (fp != NULL)
- fclose(fp);
message_cleanup(&m);
- if (oldlocale != NULL) {
- setlocale(LC_ALL, oldlocale);
- g_free(oldlocale);
- }
+ fclose(fp);
+ setlocale(LC_ALL, oldlocale);
if (is_spam) {
- if (spamassassin_receive_spam) {
+ if (config.receive_spam) {
FolderItem *save_folder;
debug_print("message is spam\n");
- if ((!spamassassin_save_folder) ||
- (spamassassin_save_folder[0] == '\0') ||
- ((save_folder = folder_find_item_from_identifier(spamassassin_save_folder)) == NULL))
+ 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();
procmsg_msginfo_unset_flags(msginfo, ~0, 0);
return FALSE;
}
+SpamAssassinConfig *spamassassin_get_config()
+{
+ return &config;
+}
+
void spamassassin_save_config()
{
PrefFile *pfile;
return -1;
}
+ username = g_get_user_name();
+ if (username == NULL) {
+ *error = g_strdup("Failed to get username");
+ return -1;
+ }
+
prefs_set_default(param);
prefs_read_config(param, "SpamAssassin", COMMON_RC);
void plugin_done()
{
hooks_unregister_hook(MAIL_FILTERING_HOOKLIST, hook_id);
- g_free(spamassassin_hostname);
+ g_free(config.hostname);
+ g_free(config.save_folder);
debug_print("Spamassassin plugin unloaded\n");
}
static void spamassassin_create_widget_func(PrefsPage * _page, GtkWindow *window, gpointer data)
{
struct SpamAssassinPage *page = (struct SpamAssassinPage *) _page;
+ SpamAssassinConfig *config;
/* ------------------ code made by glade -------------------- */
GtkWidget *table1;
gtk_misc_set_alignment(GTK_MISC(label11), 0, 0.5);
/* --------------------------------------------------------- */
+ config = spamassassin_get_config();
+
gtk_widget_set_usize(GTK_WIDGET(port), 64, -1);
gtk_signal_connect(GTK_OBJECT(button4), "released", GTK_SIGNAL_FUNC(foldersel_cb), page);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enable), spamassassin_enable);
- if (spamassassin_hostname != NULL)
- gtk_entry_set_text(GTK_ENTRY(hostname), spamassassin_hostname);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(port), (float) spamassassin_port);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(max_size), (float) spamassassin_max_size);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(receive_spam), spamassassin_receive_spam);
- if (spamassassin_save_folder != NULL)
- gtk_entry_set_text(GTK_ENTRY(save_folder), spamassassin_save_folder);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enable), config->enable);
+ if (config->hostname != NULL)
+ gtk_entry_set_text(GTK_ENTRY(hostname), config->hostname);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(port), (float) config->port);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(max_size), (float) config->max_size);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(receive_spam), config->receive_spam);
+ if (config->save_folder != NULL)
+ gtk_entry_set_text(GTK_ENTRY(save_folder), config->save_folder);
page->enable = enable;
page->hostname = hostname;
static void spamassassin_save_func(PrefsPage *_page)
{
struct SpamAssassinPage *page = (struct SpamAssassinPage *) _page;
- gchar *tmp;
+ SpamAssassinConfig *config;
debug_print("Saving SpamAssassin Page\n");
- spamassassin_enable = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->enable));
- if (spamassassin_hostname)
- g_free(spamassassin_hostname);
- spamassassin_hostname = gtk_editable_get_chars(GTK_EDITABLE(page->hostname), 0, -1);
- tmp = gtk_editable_get_chars(GTK_EDITABLE(page->port), 0, -1);
- spamassassin_port = atoi(tmp);
- g_free(tmp);
- spamassassin_max_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->max_size));
- spamassassin_receive_spam = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->receive_spam));
- if (spamassassin_save_folder)
- g_free(spamassassin_save_folder);
- spamassassin_save_folder = gtk_editable_get_chars(GTK_EDITABLE(page->save_folder), 0, -1);
+ config = spamassassin_get_config();
+
+ /* enable */
+ config->enable = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->enable));
+
+ /* hostname */
+ g_free(config->hostname);
+ config->hostname = gtk_editable_get_chars(GTK_EDITABLE(page->hostname), 0, -1);
+
+ /* port */
+ config->port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->port));
+
+ /* maxsize */
+ config->max_size = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(page->max_size));
+
+ /* receive_spam */
+ config->receive_spam = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->receive_spam));
+
+ /* save_folder */
+ g_free(config->save_folder);
+ config->save_folder = gtk_editable_get_chars(GTK_EDITABLE(page->save_folder), 0, -1);
spamassassin_save_config();
}
-static struct SpamAssassinPage *spamassassin_page;
+static struct SpamAssassinPage spamassassin_page;
gint plugin_init(gchar **error)
{
- struct SpamAssassinPage *page;
-
- page = g_new0(struct SpamAssassinPage, 1);
- page->page.path = _("Filtering/SpamAssassin");
- page->page.create_widget = spamassassin_create_widget_func;
- page->page.destroy_widget = spamassassin_destroy_widget_func;
- page->page.save_page = spamassassin_save_func;
- prefs_gtk_register_page((PrefsPage *) page);
+ spamassassin_page.page.path = "Filtering/SpamAssassin";
+ spamassassin_page.page.create_widget = spamassassin_create_widget_func;
+ spamassassin_page.page.destroy_widget = spamassassin_destroy_widget_func;
+ spamassassin_page.page.save_page = spamassassin_save_func;
- spamassassin_page = page;
+ prefs_gtk_register_page((PrefsPage *) &spamassassin_page);
debug_print("SpamAssassin GTK plugin loaded\n");
return 0;
void plugin_done()
{
- prefs_gtk_unregister_page((PrefsPage *) spamassassin_page);
- g_free(spamassassin_page);
+ prefs_gtk_unregister_page((PrefsPage *) &spamassassin_page);
debug_print("SpamAssassin GTK plugin unloaded\n");
}
projects / claws.git / commitdiff