diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-07-16 09:38:19 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-07-16 09:38:19 +0100 |
| commit | c7f2ca45ba4d57b9bd7aff160325e81a1a761ff0 (patch) | |
| tree | c6d6db8a17c9e25b8535d5b100da904014928382 /src/libmime/mime_expressions.c | |
| parent | c81b5b124a6ce760894b46f254d64739175b9590 (diff) | |
| download | rspamd-c7f2ca45ba4d57b9bd7aff160325e81a1a761ff0.tar.gz rspamd-c7f2ca45ba4d57b9bd7aff160325e81a1a761ff0.zip | |
Use the new API.
Diffstat (limited to 'src/libmime/mime_expressions.c')
| -rw-r--r-- | src/libmime/mime_expressions.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libmime/mime_expressions.c b/src/libmime/mime_expressions.c index be49f11d8..c367ad073 100644 --- a/src/libmime/mime_expressions.c +++ b/src/libmime/mime_expressions.c @@ -1559,11 +1559,11 @@ static gboolean search_html_node_callback (GNode * node, gpointer data) { struct html_callback_data *cd = data; - struct html_node *nd; + struct html_tag *nd; nd = node->data; if (nd) { - if (nd->tag == cd->tag) { + if (nd->id == cd->tag->id) { *cd->res = TRUE; return TRUE; } @@ -1606,8 +1606,9 @@ rspamd_has_html_tag (struct rspamd_task * task, GArray * args, void *unused) for (i = 0; i < task->text_parts->len && res; i ++) { p = g_ptr_array_index (task->text_parts, i); - if (!IS_PART_EMPTY (p) && IS_PART_HTML (p) && p->html_nodes) { - g_node_traverse (p->html_nodes, + if (!IS_PART_EMPTY (p) && IS_PART_HTML (p) && p->html) { + /* TODO: too slow */ + g_node_traverse (p->html->html_tags, G_PRE_ORDER, G_TRAVERSE_ALL, -1, @@ -1630,7 +1631,7 @@ rspamd_has_fake_html (struct rspamd_task * task, GArray * args, void *unused) for (i = 0; i < task->text_parts->len && res; i ++) { p = g_ptr_array_index (task->text_parts, i); - if (!IS_PART_EMPTY (p) && IS_PART_HTML (p) && p->html_nodes == NULL) { + if (!IS_PART_EMPTY (p) && IS_PART_HTML (p) && p->html->html_tags == NULL) { res = TRUE; } } |