diff --git a/data/conf/rspamd/local.d/metadata_exporter.conf b/data/conf/rspamd/local.d/metadata_exporter.conf index 9fb22b23..f29f4808 100644 --- a/data/conf/rspamd/local.d/metadata_exporter.conf +++ b/data/conf/rspamd/local.d/metadata_exporter.conf @@ -53,7 +53,7 @@ return function(task) and not task:has_symbol('GLOBAL_RCPT_BL') and not task:has_symbol('MAILCOW_BLACK') then local action = task:get_metric_action('default') - if action == 'reject' or action == 'add header' then + if action == 'reject' or action == 'add header' or action == 'rewrite subject' then return true end end diff --git a/data/web/js/site/qhandler.js b/data/web/js/site/qhandler.js index f2b71ff6..4d32547b 100644 --- a/data/web/js/site/qhandler.js +++ b/data/web/js/site/qhandler.js @@ -47,8 +47,10 @@ jQuery(function($){ if (typeof data.score !== 'undefined' && typeof data.action !== 'undefined') { if (data.action === "add header") { $('#qid_detail_score').append('' + data.score + ' - ' + lang.junk_folder + ''); - } else { + } else if (data.action === "reject") { $('#qid_detail_score').append('' + data.score + ' - ' + lang.rejected + ''); + } else if (data.action === "rewrite subject") { + $('#qid_detail_score').append('' + data.score + ' - ' + lang.rewrite_subject + ''); } } if (typeof data.recipients !== 'undefined') { @@ -66,4 +68,4 @@ jQuery(function($){ } } }); -}); \ No newline at end of file +}); diff --git a/data/web/js/site/quarantine.js b/data/web/js/site/quarantine.js index b68f0cb9..80eb1c14 100644 --- a/data/web/js/site/quarantine.js +++ b/data/web/js/site/quarantine.js @@ -86,6 +86,8 @@ jQuery(function($){ item.rspamdaction = '' + lang.rejected + ''; } else if (item.action === "add header") { item.rspamdaction = '' + lang.junk_folder + ''; + } else if (item.action === "rewrite subject") { + item.rspamdaction = '' + lang.rewrite_subject + ''; } if(item.notified > 0) { item.notified = '✔'; @@ -182,8 +184,10 @@ jQuery(function($){ if (typeof data.score !== 'undefined' && typeof data.action !== 'undefined') { if (data.action == "add header") { $('#qid_detail_score').append('' + data.score + ' - ' + lang.junk_folder + ''); - } else { + } else if (data.action == "reject") { $('#qid_detail_score').append('' + data.score + ' - ' + lang.rejected + ''); + } else if (data.action == "rewrite subject") { + $('#qid_detail_score').append('' + data.score + ' - ' + lang.rewrite_subject + ''); } } if (typeof data.recipients !== 'undefined') {